Skip to content

Commit

Permalink
Updated to Rails 4.0.0 RC2
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafamanzo
rafamanzo committed Jun 21, 2013
1 parent 1f40ba1 commit 7fe62e2
Show file tree
Hide file tree
Showing 43 changed files with 444 additions and 828 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*.log
Expand Down
65 changes: 42 additions & 23 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,73 @@
source 'https://rubygems.org'

gem 'rails', '3.2.13'

# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.0.0.rc2'

# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0.rc2'

# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'sass-rails', '~> 3.2.3'
gem 'coffee-rails', '~> 3.2.1'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platforms => :ruby
# Use CoffeeScript for .js.coffee assets and views
gem 'coffee-rails', '~> 4.0.0'

gem 'uglifier', '>= 1.0.3'
end
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'therubyracer', :platforms => :ruby

# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

# Use Modernizr for better browser compability
gem 'modernizr-rails'

# Use jquery as the JavaScript library
gem 'jquery-rails'

# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.2'

group :doc do
# bundle exec rake doc:rails generates the API under doc/api.
gem 'sdoc', require: false
end

group :test do
# Easier test writing
gem "shoulda-matchers"

# Test coverage
gem 'simplecov', :require => false
end

group :development, :test do
# Test framework
gem 'rspec-rails'

# Fixtures made easy
gem 'factory_girl_rails'
end

group :cucumber do
gem 'cucumber-rails'
# Acceptance tests
group :cucumber do
gem 'cucumber-rails'
gem 'database_cleaner'
end

# To use ActiveModel has_secure_password
# Use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'

# To use Jbuilder templates for JSON
# gem 'jbuilder'

# Use unicorn as the app server
# gem 'unicorn'

# Deploy with Capistrano
# gem 'capistrano'
# Use Capistrano for deployment
# gem 'capistrano', group: :development

# To use debugger
# gem 'debugger'
# Use debugger
# gem 'debugger', group: [:development, :test]
167 changes: 88 additions & 79 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,56 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (3.2.13)
actionpack (= 3.2.13)
actionmailer (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
mail (~> 2.5.3)
actionpack (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
actionpack (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.13)
activesupport (= 3.2.13)
builder (~> 3.0.0)
activerecord (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.13)
activemodel (= 3.2.13)
activesupport (= 3.2.13)
activesupport (3.2.13)
i18n (= 0.6.1)
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.4)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0.rc2)
activesupport (= 4.0.0.rc2)
builder (~> 3.1.0)
activerecord (4.0.0.rc2)
activemodel (= 4.0.0.rc2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0.rc2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0.rc2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.9)
builder (3.1.4)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (~> 2.0)
coffee-rails (3.2.2)
coffee-rails (4.0.0)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0.beta, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.2)
cucumber (1.3.1)
cucumber (1.3.2)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
gherkin (~> 2.12.0)
multi_json (~> 1.3)
cucumber-rails (1.3.1)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.2.0)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
rails (~> 3.0)
database_cleaner (0.9.1)
database_cleaner (1.0.1)
diff-lcs (1.2.4)
erubis (2.7.0)
execjs (1.4.0)
Expand All @@ -65,87 +62,96 @@ GEM
railties (>= 3.0.0)
gherkin (2.12.0)
multi_json (~> 1.3)
hike (1.2.2)
i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.2.1)
hike (1.2.3)
i18n (0.6.4)
jbuilder (1.4.2)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-rails (3.0.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
json (1.8.0)
libv8 (3.11.8.17)
mail (2.5.3)
i18n (>= 0.4.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.23)
modernizr-rails (2.6.2.1)
multi_json (1.7.3)
nokogiri (1.5.9)
mini_portile (0.5.0)
minitest (4.7.4)
modernizr-rails (2.6.2.3)
multi_json (1.7.7)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
polyglot (0.3.3)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.13)
actionmailer (= 3.2.13)
actionpack (= 3.2.13)
activerecord (= 3.2.13)
activeresource (= 3.2.13)
activesupport (= 3.2.13)
bundler (~> 1.0)
railties (= 3.2.13)
railties (3.2.13)
actionpack (= 3.2.13)
activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rails (4.0.0.rc2)
actionmailer (= 4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activerecord (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0.rc2)
sprockets-rails (~> 2.0.0)
railties (4.0.0.rc2)
actionpack (= 4.0.0.rc2)
activesupport (= 4.0.0.rc2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.0.4)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.4)
ref (1.0.5)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.1)
rspec-rails (2.13.1)
rspec-rails (2.13.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
sass (3.2.8)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (3.2.9)
sass-rails (4.0.0.rc2)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
tilt (~> 1.3)
shoulda-matchers (2.1.0)
sprockets-rails (~> 2.0.0)
sdoc (0.3.20)
json (>= 1.1.3)
rdoc (~> 3.10)
shoulda-matchers (2.2.0)
activesupport (>= 3.0.0)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)
sprockets (2.2.2)
sprockets (2.10.0)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.0.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
sqlite3 (1.3.7)
therubyracer (0.11.4)
libv8 (~> 3.11.8.12)
ref
thor (0.18.1)
tilt (1.4.0)
treetop (1.4.12)
thread_safe (0.1.0)
atomic
tilt (1.4.1)
treetop (1.4.14)
polyglot
polyglot (>= 0.3.1)
turbolinks (1.2.0)
coffee-rails
tzinfo (0.3.37)
uglifier (2.0.1)
uglifier (2.1.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
xpath (2.0.0)
Expand All @@ -155,17 +161,20 @@ PLATFORMS
ruby

DEPENDENCIES
coffee-rails (~> 3.2.1)
coffee-rails (~> 4.0.0)
cucumber-rails
database_cleaner
factory_girl_rails
jbuilder (~> 1.2)
jquery-rails
modernizr-rails
rails (= 3.2.13)
rails (= 4.0.0.rc2)
rspec-rails
sass-rails (~> 3.2.3)
sass-rails (~> 4.0.0.rc2)
sdoc
shoulda-matchers
simplecov
sqlite3
therubyracer
uglifier (>= 1.0.3)
turbolinks
uglifier (>= 1.3.0)
Loading

0 comments on commit 7fe62e2

Please sign in to comment.