Permalink
Browse files

update app to Rails 3.1

  • Loading branch information...
1 parent 6a6c1ad commit 0410d77d25a0b894065d6a608f373b1dac4a7103 @fortuity fortuity committed Jun 2, 2011
View
26 Gemfile
@@ -1,12 +1,16 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.8.rc2'
-gem "rspec-rails", "2.6.1", :group => [:development, :test]
-gem "database_cleaner", "0.6.7", :group => :test
-gem "mongoid-rspec", "1.4.2", :group => :test
-gem "factory_girl_rails", "1.1.beta1", :group => :test
-gem "cucumber-rails", "0.5.1", :group => :test
-gem "capybara", "1.0.0.beta1", :group => :test
-gem "launchy", "0.4.0", :group => :test
-gem "bson_ext", "1.3.1"
-gem "mongoid", "2.0.2"
-gem "omniauth", "0.2.6"
+gem 'rails', '3.1.0.rc1'
+gem 'sass'
+gem 'coffee-script'
+gem 'uglifier'
+gem 'jquery-rails'
+gem "rspec-rails", ">= 2.6.1", :group => [:development, :test]
+gem "database_cleaner", ">= 0.6.7", :group => :test
+gem "mongoid-rspec", ">= 1.4.2", :group => :test
+gem "factory_girl_rails", ">= 1.1.beta1", :group => :test
+gem "cucumber-rails", ">= 0.5.1", :group => :test
+gem "capybara", ">= 1.0.0.beta1", :group => :test
+gem "launchy", ">= 0.4.0", :group => :test
+gem "bson_ext", ">= 1.3.1"
+gem "mongoid", ">= 2.0.2"
+gem "omniauth", ">= 0.2.6"
View
@@ -1,38 +1,42 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.8.rc2)
- actionpack (= 3.0.8.rc2)
- mail (~> 2.2.19)
- actionpack (3.0.8.rc2)
- activemodel (= 3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.5.0)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.14)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
- builder (~> 2.1.2)
- i18n (~> 0.5.0)
- activerecord (3.0.8.rc2)
- activemodel (= 3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
- arel (~> 2.0.10)
- tzinfo (~> 0.3.23)
- activeresource (3.0.8.rc2)
- activemodel (= 3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
- activesupport (3.0.8.rc2)
+ actionmailer (3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ mail (~> 2.3.0)
+ actionpack (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6.0beta1)
+ rack (~> 1.3.0.beta2)
+ rack-cache (~> 1.0.1)
+ rack-mount (~> 0.8.1)
+ rack-test (~> 0.6.0)
+ sprockets (~> 2.0.0.beta.5)
+ tzinfo (~> 0.3.27)
+ activemodel (3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ bcrypt-ruby (~> 2.1.4)
+ builder (~> 3.0.0)
+ i18n (~> 0.6.0beta1)
+ activerecord (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ arel (~> 2.1.1)
+ tzinfo (~> 0.3.27)
+ activeresource (3.1.0.rc1)
+ activemodel (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ activesupport (3.1.0.rc1)
+ multi_json (~> 1.0)
addressable (2.2.4)
- arel (2.0.10)
+ arel (2.1.1)
+ bcrypt-ruby (2.1.4)
bson (1.3.1)
bson_ext (1.3.1)
- builder (2.1.2)
+ builder (3.0.0)
capybara (1.0.0.beta1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -42,6 +46,10 @@ GEM
xpath (~> 0.1.4)
childprocess (0.1.9)
ffi (~> 1.0.6)
+ coffee-script (2.2.0)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.1.1)
configuration (1.2.0)
cucumber (0.10.3)
builder (>= 2.1.2)
@@ -56,27 +64,31 @@ GEM
rack-test (>= 0.5.7)
database_cleaner (0.6.7)
diff-lcs (1.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
+ erubis (2.7.0)
+ execjs (1.0.0)
+ multi_json (~> 1.0)
factory_girl (2.0.0.beta2)
factory_girl_rails (1.1.beta1)
factory_girl (~> 2.0.0.beta)
rails (>= 3.0.0)
faraday (0.6.1)
addressable (~> 2.2.4)
multipart-post (~> 1.1.0)
- rack (< 2, >= 1.1.0)
+ rack (>= 1.1.0, < 2)
ffi (1.0.9)
- gherkin (2.3.9)
+ gherkin (2.3.10)
json (>= 1.4.6)
- i18n (0.5.0)
+ hike (1.0.0)
+ i18n (0.6.0)
+ jquery-rails (1.0.9)
+ railties (~> 3.0)
+ thor (~> 0.14)
json (1.5.1)
json_pure (1.5.1)
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- mail (2.2.19)
- activesupport (>= 2.3.6)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -134,28 +146,33 @@ GEM
oa-openid (= 0.2.6)
polyglot (0.3.1)
pyu-ruby-sasl (0.0.3.3)
- rack (1.2.3)
- rack-mount (0.6.14)
+ rack (1.3.0)
+ rack-cache (1.0.2)
+ rack (>= 0.4)
+ rack-mount (0.8.1)
rack (>= 1.0.0)
rack-openid (1.3.1)
rack (>= 1.1.0)
ruby-openid (>= 2.1.8)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.0)
rack (>= 1.0)
- rails (3.0.8.rc2)
- actionmailer (= 3.0.8.rc2)
- actionpack (= 3.0.8.rc2)
- activerecord (= 3.0.8.rc2)
- activeresource (= 3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
+ rails (3.1.0.rc1)
+ actionmailer (= 3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ activerecord (= 3.1.0.rc1)
+ activeresource (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
bundler (~> 1.0)
- railties (= 3.0.8.rc2)
- railties (3.0.8.rc2)
- actionpack (= 3.0.8.rc2)
- activesupport (= 3.0.8.rc2)
+ railties (= 3.1.0.rc1)
+ railties (3.1.0.rc1)
+ actionpack (= 3.1.0.rc1)
+ activesupport (= 3.1.0.rc1)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.9.0)
+ thor (~> 0.14.6)
+ rake (0.9.1)
rest-client (1.6.1)
mime-types (>= 1.16)
rspec (2.6.0)
@@ -176,31 +193,44 @@ GEM
ruby-openid (>= 2.1.7)
rubyntlm (0.1.1)
rubyzip (0.9.4)
- selenium-webdriver (0.2.0)
+ sass (3.1.2)
+ selenium-webdriver (0.2.1)
childprocess (>= 0.1.7)
ffi (>= 1.0.7)
json_pure
rubyzip
+ sprockets (2.0.0.beta.9)
+ hike (~> 1.0)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
term-ansicolor (1.0.5)
thor (0.14.6)
+ tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
tzinfo (0.3.27)
+ uglifier (0.5.4)
+ execjs (>= 0.3.0)
+ multi_json (>= 1.0.2)
xpath (0.1.4)
nokogiri (~> 1.3)
PLATFORMS
ruby
DEPENDENCIES
- bson_ext (= 1.3.1)
- capybara (= 1.0.0.beta1)
- cucumber-rails (= 0.5.1)
- database_cleaner (= 0.6.7)
- factory_girl_rails (= 1.1.beta1)
- launchy (= 0.4.0)
- mongoid (= 2.0.2)
- mongoid-rspec (= 1.4.2)
- omniauth (= 0.2.6)
- rails (= 3.0.8.rc2)
- rspec-rails (= 2.6.1)
+ bson_ext (>= 1.3.1)
+ capybara (>= 1.0.0.beta1)
+ coffee-script
+ cucumber-rails (>= 0.5.1)
+ database_cleaner (>= 0.6.7)
+ factory_girl_rails (>= 1.1.beta1)
+ jquery-rails
+ launchy (>= 0.4.0)
+ mongoid (>= 2.0.2)
+ mongoid-rspec (>= 1.4.2)
+ omniauth (>= 0.2.6)
+ rails (= 3.1.0.rc1)
+ rspec-rails (>= 2.6.1)
+ sass
+ uglifier
View
@@ -13,7 +13,7 @@ Any issues? Please create a "GitHub issue":http://github.com/RailsApps/rails3-mo
h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:http://www.twitter.com/rails_apps Follow on Twitter !http://railsapps.github.com/images/mailing-list-icon.jpg(Join the Mailing List)!:http://eepurl.com/dQx3o Join the Mailing List
-Follow the project on Twitter: "rails_apps":http://twitter.com/rails_apps. Please tweet some praise if you like what you've found.
+Follow the project on Twitter: "@rails_apps":http://twitter.com/rails_apps. Please tweet some praise if you like what you've found.
<a href="http://eepurl.com/dQx3o">Join the email list</a> (low volume, announcements only) for project updates and my tips about Rails resources.
@@ -51,8 +51,8 @@ h4. Similar Examples and Tutorials
| Ryan Bates | "Simple OmniAuth":http://railscasts.com/episodes/241-simple-omniauth | screencast |
| Markus Proske | "OmniAuth Pure":http://www.communityguides.eu/articles/16 | example and tutorial for OmniAuth with multiple providers |
| Markus Proske | "Devise and OmniAuth":http://www.communityguides.eu/articles/11 | example and tutorial for OmniAuth and Devise with multiple providers |
-| Daniel Kehoe | "Devise, RSpec, Cucumber":https://github.com/railsapps/rails3-devise-rspec-cucumber | Detailed tutorial, app template, starter app, using SQLite |
-| Daniel Kehoe | "Devise, Mongoid":https://github.com/railsapps/rails3-mongoid-devise | Detailed tutorial, app template, starter app, using MongoDB |
+| Daniel Kehoe | "Devise, RSpec, Cucumber":https://github.com/RailsApps/rails3-devise-rspec-cucumber | Detailed tutorial, app template, starter app, using SQLite |
+| Daniel Kehoe | "Devise, Mongoid":https://github.com/RailsApps/rails3-mongoid-devise | Detailed tutorial, app template, starter app, using MongoDB |
| Fernando Tapia Rico | "Devise, OmniAuth, Mongoid":https://github.com/fertapric/rails3-mongoid-devise-omniauth | With tutorial, using MongoDB |
See a list of additional "Rails examples, tutorials, and starter apps":http://railsapps.github.com/rails-examples-tutorials.html.
@@ -78,15 +78,19 @@ Visit "https://github.com/account/applications/new":https://github.com/account/a
h2. Dependencies
-Before running this app, you need to install
+Before running this app, you will need:
* The Ruby language (version 1.9.2)
+** @$ ruby -v@
* Rails 3.1
+** @$ rails -v@
+* Rake 0.9.1
+** @$ rake --version@
* A working installation of "MongoDB":http://www.mongodb.org/ (version 1.6.0 or newer)
-This repository also contains branches for earlier version of Rails.
+You must update the standard Ruby installation from Rake 0.8.7 to Rake 0.9.1 before using the application templates to generate a new Rails app.
-See "Managing Rails Versions and Gems":http://railsapps.github.com/managing-rails-versions-gems.html for detailed instructions and advice.
+See "Installing Rails 3.1":http://railsapps.github.com/installing-rails-3-1.html and "Managing Rails Versions and Gems":http://railsapps.github.com/managing-rails-versions-gems.html for detailed instructions and advice.
h4. Installing MongoDB
@@ -112,9 +116,9 @@ The source code is managed with Git (a version control system). You'll need Git
h4. Using the Ready-Made Application Template
-You can use an application template to generate a new version of the example app. You’ll find an application template for this app in the "RailsApps/rails3-application-templates":https://github.com/RailsApps/rails3-application-templates repository.
+You can use an application template to generate a new version of the example app. You’ll find an application template for this app in the "Rails Application Templates":https://github.com/RailsApps/rails3-application-templates repository.
-To build the "rails3-mongoid-omniauth" example application, run the command:
+Use the command:
@$ rails new APP_NAME -m https://github.com/RailsApps/rails3-application-templates/raw/master/rails3-mongoid-omniauth-template.rb -T -O@
@@ -138,7 +142,7 @@ The application generator template will ask you for your preferences:
h4. Use "Recipes" to Customize an Application Template
-The "tutorial":https://github.com/RailsApps/rails3-mongoid-omniauth/wiki/Tutorial shows how a customized application template can be assembled from "recipes." The application template was created using the "Rails Apps Composer":https://github.com/railsapps/rails_apps_composer gem which provides a convenient way to assemble a reusable application template by selecting various "recipes" for popular Rails development packages.
+The "tutorial":https://github.com/RailsApps/rails3-mongoid-omniauth/wiki/Tutorial shows how a customized application template can be assembled from "recipes." The application template was created using the "Rails Apps Composer":https://github.com/RailsApps/rails_apps_composer gem which provides a convenient way to assemble a reusable application template by selecting various "recipes" for popular Rails development packages.
h4. Please Remember: Edit the README
@@ -150,15 +154,15 @@ h4. About Required Gems
The application uses the following gems:
-* rails
-* mongoid
-* bson_ext
-* omniauth
-* rspec-rails
-* database_cleaner
-* factory_girl_rails
-* cucumber-rails
-* capybara
+* "rails":http://rubygems.org/gems/rails
+* "rspec-rails":http://rubygems.org/gems/rspec-rails
+* "database_cleaner":http://rubygems.org/gems/database_cleaner
+* "factory_girl_rails":http://rubygems.org/gems/factory_girl_rails
+* "cucumber-rails":http://rubygems.org/gems/cucumber-rails
+* "capybara":http://rubygems.org/gems/capybara
+* "mongoid":http://rubygems.org/gems/mongoid
+* "bson_ext":http://rubygems.org/gems/bson_ext
+* "omniauth":http://rubygems.org/gems/omniauth
See an example "Rails 3.1 Gemfile":http://railsapps.github.com/rails-3-1-example-gemfile.html.
@@ -274,7 +278,7 @@ h2. Credits
Daniel Kehoe ("http://danielkehoe.com/":http://danielkehoe.com/) implemented the application and wrote the tutorial.
Is the app useful to you? Follow the project on Twitter:
-"rails_apps":http://twitter.com/rails_apps
+"@rails_apps":http://twitter.com/rails_apps
and tweet some praise. I'd love to know you were helped out by what I've put together.
h2. License
View
@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-require 'rake'
Rails3MongoidOmniauth::Application.load_tasks
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -0,0 +1,9 @@
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
Oops, something went wrong.

0 comments on commit 0410d77

Please sign in to comment.