Permalink
Browse files

update app to Rails 3.1

  • Loading branch information...
1 parent 229ac8d commit e677d7eda94717401aacbffa84a08165766dc127 @fortuity fortuity committed May 31, 2011
View
20 Gemfile
@@ -1,10 +1,14 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.8.rc2'
+gem 'rails', '3.1.0.rc1'
gem 'sqlite3'
-gem "rspec-rails", "2.6.1", :group => [:development, :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 "database_cleaner", "0.6.7", :group => :test
-gem "launchy", "0.4.0", :group => :test
-gem "devise", "1.3.4"
+gem 'sass'
+gem 'coffee-script'
+gem 'uglifier'
+gem 'jquery-rails'
+gem "rspec-rails", ">= 2.6.1", :group => [:development, :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 "database_cleaner", ">= 0.6.7", :group => :test
+gem "launchy", ">= 0.4.0", :group => :test
+gem "devise", ">= 1.3.4"
View
@@ -1,36 +1,39 @@
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)
- arel (2.0.10)
+ 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)
+ arel (2.1.1)
bcrypt-ruby (2.1.4)
- builder (2.1.2)
+ builder (3.0.0)
capybara (1.0.0.beta1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -40,6 +43,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)
@@ -58,48 +65,58 @@ GEM
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
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)
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)
mime-types (1.16)
+ multi_json (1.0.3)
nokogiri (1.4.4)
orm_adapter (0.0.5)
polyglot (0.3.1)
- 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-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)
+ thor (~> 0.14.6)
rake (0.9.0)
rspec (2.6.0)
rspec-core (~> 2.6.0)
@@ -115,17 +132,26 @@ GEM
railties (~> 3.0)
rspec (~> 2.6.0)
rubyzip (0.9.4)
+ sass (3.1.1)
selenium-webdriver (0.2.0)
childprocess (>= 0.1.7)
ffi (>= 1.0.7)
json_pure
rubyzip
+ sprockets (2.0.0.beta.8)
+ hike (~> 1.0)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
sqlite3 (1.3.3)
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)
warden (1.0.4)
rack (>= 1.0)
xpath (0.1.4)
@@ -135,12 +161,16 @@ PLATFORMS
ruby
DEPENDENCIES
- capybara (= 1.0.0.beta1)
- cucumber-rails (= 0.5.1)
- database_cleaner (= 0.6.7)
- devise (= 1.3.4)
- factory_girl_rails (= 1.1.beta1)
- launchy (= 0.4.0)
- rails (= 3.0.8.rc2)
- rspec-rails (= 2.6.1)
+ capybara (>= 1.0.0.beta1)
+ coffee-script
+ cucumber-rails (>= 0.5.1)
+ database_cleaner (>= 0.6.7)
+ devise (>= 1.3.4)
+ factory_girl_rails (>= 1.1.beta1)
+ jquery-rails
+ launchy (>= 0.4.0)
+ rails (= 3.1.0.rc1)
+ rspec-rails (>= 2.6.1)
+ sass
sqlite3
+ uglifier
View
@@ -2,23 +2,23 @@ h1. Rails 3 + Devise + RSpec + Cucumber
This is an example application for Rails 3.1 that shows how to use "Devise":http://github.com/plataformatec/devise with "RSpec":http://rspec.info/ and "Cucumber":http://cukes.info/. Devise gives you ready-made authentication and user management. RSpec is a popular alternative to the Test::Unit testing framework. Cucumber is often used with RSpec for Behaviour Driven Development.
-Best of all, there's a "detailed tutorial":https://github.com/railsapps/rails3-devise-rspec-cucumber/wiki/Tutorial (walk-through) to show how it's built.
+Best of all, there's a "detailed tutorial":https://github.com/RailsApps/rails3-devise-rspec-cucumber/wiki/Tutorial (walk-through) to show how it's built.
You can clone this app or generate a new Rails application using this app as a template.
-Any issues? Please create a "GitHub issue":http://github.com/railsapps/rails3-devise-rspec-cucumber/issues.
+Any issues? Please create a "GitHub issue":http://github.com/RailsApps/rails3-devise-rspec-cucumber/issues.
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.
h2. !http://railsapps.github.com/images/rails-36x36.jpg(Tutorial)! Tutorial
A complete walkthrough tutorial for Rails 3.1 is available on the GitHub wiki:
-h4. "View the Tutorial":https://github.com/railsapps/rails3-devise-rspec-cucumber/wiki/Tutorial
+h4. "View the Tutorial":https://github.com/RailsApps/rails3-devise-rspec-cucumber/wiki/Tutorial
The tutorial documents each step to follow to create the application. Every step is documented concisely, so a complete beginner can create this application without any additional knowledge. However, no explanation is offered for any of the steps, so if you are a beginner, you’re advised to look for an introduction to Rails elsewhere. See a list of "recommended books and online resources for learning Rails":http://railsapps.github.com/best-recommended-learning-rails-books-resources.html.
@@ -30,20 +30,24 @@ This is a demonstration application that allows you to visit a home page and see
h4. Similar Examples and Tutorials
-If you'd like to use the Mongoid ORM with the MongoDB datastore instead of ActiveRecord and a SQLite database, see the "rails3-mongoid-devise":https://github.com/railsapps/rails3-mongoid-devise example app and tutorial. Mongoid makes development quicker without schemas or migrations. The "rails3-mongoid-devise":https://github.com/railsapps/rails3-mongoid-devise example app and tutorial shows how to set up Devise and Mongoid with RSpec and Cucumber.
+If you'd like to use the Mongoid ORM with the MongoDB datastore instead of ActiveRecord and a SQLite database, see the "rails3-mongoid-devise":https://github.com/RailsApps/rails3-mongoid-devise example app and tutorial. Mongoid makes development quicker without schemas or migrations. The "rails3-mongoid-devise":https://github.com/RailsApps/rails3-mongoid-devise example app and tutorial shows how to set up Devise and Mongoid with RSpec and Cucumber.
See an expanded list of more "Rails examples, tutorials, and starter apps":http://railsapps.github.com/rails-examples-tutorials.html.
h2. Dependencies
-Before running this app, you need to install
+Before generating your application, you will need:
* The Ruby language (version 1.9.2)
+** @$ ruby -v@
* Rails 3.1
+** @$ rails -v@
+* Rake 0.9.0
+** @$ rake --version@
-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.0 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.
h2. Getting the Application
@@ -84,7 +88,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-devise-rspec-cucumber/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-devise-rspec-cucumber/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
@@ -96,13 +100,13 @@ h4. About Required Gems
The application uses the following gems:
-* rails
-* rspec-rails
-* database_cleaner
-* factory_girl_rails
-* cucumber-rails
-* capybara
-* devise
+* "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
+* "devise":http://rubygems.org/gems/devise
See an example "Rails 3.1 Gemfile":http://railsapps.github.com/rails-3-1-example-gemfile.html.
@@ -207,22 +211,21 @@ For a Devise introduction, Ryan Bates offers a "Railscast on Devise":http://rail
h4. Issues
-Please create a "GitHub issue":http://github.com/railsapps/rails3-devise-rspec-cucumber/issues if you identify any problems or have suggestions for improvements.
+Please create a "GitHub issue":http://github.com/RailsApps/rails3-devise-rspec-cucumber/issues if you identify any problems or have suggestions for improvements.
h2. Contributing
If you make improvements to this application, please share with others.
-Send the author a message, create an "issue":http://github.com/railsapps/rails3-devise-rspec-cucumber/issues, or fork the project and submit a pull request.
+Send the author a message, create an "issue":http://github.com/RailsApps/rails3-devise-rspec-cucumber/issues, or fork the project and submit a pull request.
If you add functionality to this application, create an alternative implementation, or build an application that is similar, please contact me and I'll add a note to the README so that others can find your work.
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
+Is the app useful to you? Follow the project on Twitter: "@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'
Rails3DeviseRspecCucumber::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 e677d7e

Please sign in to comment.