Permalink
Browse files

conform to app generated by version 1.4.10 of rails_apps_composer

  • Loading branch information...
1 parent abc8fcc commit 66438fea21f4a2f19f1fe453177e7732cfbba0cb @DanielKehoe DanielKehoe committed May 12, 2012
View
@@ -7,11 +7,11 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
gem 'jquery-rails'
-gem "rspec-rails", ">= 2.9.0.rc2", :group => [:development, :test]
-gem "factory_girl_rails", ">= 3.1.0", :group => [:development, :test]
+gem "rspec-rails", ">= 2.10.1", :group => [:development, :test]
+gem "factory_girl_rails", ">= 3.2.0", :group => [:development, :test]
gem "email_spec", ">= 1.2.1", :group => :test
-gem "cucumber-rails", ">= 1.3.0", :group => :test
+gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
gem "capybara", ">= 1.1.2", :group => :test
gem "database_cleaner", ">= 0.7.2", :group => :test
gem "launchy", ">= 2.1.0", :group => :test
-gem "devise", ">= 2.1.0.rc"
+gem "devise", ">= 2.1.0.rc2"
View
@@ -28,7 +28,7 @@ GEM
activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.7)
+ addressable (2.2.8)
arel (3.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.0)
@@ -39,7 +39,7 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.1)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -48,44 +48,43 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
- cucumber (1.1.9)
+ cucumber (1.2.0)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.10.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
database_cleaner (0.7.2)
- devise (2.1.0.rc)
+ devise (2.1.0.rc2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
+ orm_adapter (~> 0.0.7)
railties (~> 3.1)
warden (~> 1.1.1)
diff-lcs (1.1.3)
email_spec (1.2.1)
mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0)
- execjs (1.3.0)
+ execjs (1.3.2)
multi_json (~> 1.0)
- factory_girl (3.1.0)
+ factory_girl (3.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.1.0)
- factory_girl (~> 3.1.0)
+ factory_girl_rails (3.2.0)
+ factory_girl (~> 3.2.0)
railties (>= 3.0.0)
ffi (1.0.11)
- gherkin (2.9.3)
+ gherkin (2.10.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.6)
+ json (1.7.3)
launchy (2.1.0)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
@@ -95,7 +94,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
- multi_json (1.2.0)
+ multi_json (1.3.5)
nokogiri (1.5.2)
orm_adapter (0.0.7)
polyglot (0.3.3)
@@ -124,37 +123,36 @@ GEM
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.1)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.0)
+ rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.9.0)
- rubyzip (0.9.7)
- sass (3.1.15)
+ rspec (~> 2.10.0)
+ rubyzip (0.9.8)
+ sass (3.1.18)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.21.0)
+ selenium-webdriver (2.21.2)
childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sqlite3 (1.3.5)
- term-ansicolor (1.0.7)
+ sqlite3 (1.3.6)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -177,13 +175,13 @@ DEPENDENCIES
coffee-rails (~> 3.2.1)
cucumber-rails (>= 1.3.0)
database_cleaner (>= 0.7.2)
- devise (>= 2.1.0.rc)
+ devise (>= 2.1.0.rc2)
email_spec (>= 1.2.1)
- factory_girl_rails (>= 3.1.0)
+ factory_girl_rails (>= 3.2.0)
jquery-rails
launchy (>= 2.1.0)
rails (= 3.2.3)
- rspec-rails (>= 2.9.0.rc2)
+ rspec-rails (>= 2.10.1)
sass-rails (~> 3.2.3)
sqlite3
uglifier (>= 1.0.3)
View
@@ -1,4 +1,4 @@
-h1. Rails Application for Devise with RSpec and Cucumber
+h1. !http://railsapps.github.com/images/rails-36x36.jpg(Rails Application for Devise with RSpec and Cucumber)! Rails App for Devise with RSpec and Cucumber
Rails 3.2 example application shows how to use "Devise":http://github.com/plataformatec/devise with "RSpec":http://rspec.info/ and "Cucumber":http://cukes.info/.
@@ -8,15 +8,13 @@ Rails 3.2 example application shows how to use "Devise":http://github.com/plataf
Best of all, there's a "detailed tutorial":http://railsapps.github.com/tutorial-rails-devise-rspec-cucumber.html 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.
+You can clone this app or generate a new Rails application using an "application template":https://github.com/RailsApps/rails3-application-templates.
h2. !http://twitter-badges.s3.amazonaws.com/t_logo-a.png(Follow on Twitter)!:http://www.twitter.com/rails_apps Follow on Twitter
Follow the project on Twitter: "@rails_apps":http://twitter.com/rails_apps. Please tweet some praise if you like what you've found.
-h2. !http://railsapps.github.com/images/rails-36x36.jpg(Tutorial)! Tutorial
+h2. Tutorial
A complete walkthrough tutorial is available on the GitHub wiki:
@@ -32,14 +30,14 @@ This is a demonstration application that allows you to visit a home page and see
h4. Similar Examples and Tutorials
+This is one in a series of Rails example apps and tutorials from the "RailsApps Project":http://railsapps.github.com/. See a list of additional "Rails examples, tutorials, and starter apps":http://railsapps.github.com/rails-examples-tutorials.html.
+
This example application uses ActiveRecord and a SQLite database. You can use the Mongoid ORM with the MongoDB datastore instead, for faster development 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.
For an extended version of this example that adds "CanCan":https://github.com/ryanb/cancan for authorization (controlling access to administrative pages) and "Twitter Bootstrap":http://twitter.github.com/bootstrap/ (for CSS styling) see the "rails3-bootstrap-devise-cancan":https://github.com/RailsApps/rails3-bootstrap-devise-cancan example application.
The "rails-prelaunch-signup":https://github.com/RailsApps/rails-prelaunch-signup example and tutorial from the RailsApps project is also based on this example application.
-See an expanded list of similar "Rails examples, tutorials, and starter apps":http://railsapps.github.com/rails-examples-tutorials.html.
-
h2. Dependencies
Before generating your application, you will need:
@@ -118,6 +116,7 @@ To reproduce the example application exactly as found in the repository, make th
* Would you like to use "rails-footnotes":https://github.com/josevalim/rails-footnotes during development? *no*
* Would you like to set a robots.txt file to ban spiders? *yes*
* Would you like to add 'will_paginate' for pagination? *no*
+* Add 'therubyracer' JavaScript runtime (for Linux users without node.js)? *no*
You can choose other selections if you don't care about matching the example application exactly.
@@ -222,6 +221,8 @@ You'll want to set up a default user so you can easily log in to test the app. Y
puts 'SETTING UP DEFAULT USER LOGIN'
user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
puts 'New user created: ' << user.name
+user2 = User.create! :name => 'Second User', :email => 'user2@example.com', :password => 'please', :password_confirmation => 'please'
+puts 'New user created: ' << user2.name
</pre>
Use the defaults or change the values for name, email, and password as you wish.
View
@@ -1,10 +1,10 @@
class User < ActiveRecord::Base
# Include default devise modules. Others available are:
- # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+ # :token_authenticatable, :confirmable,
+ # :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
attr_accessible :name, :email, :password, :password_confirmation, :remember_me
- # attr_accessible :title, :body
end
@@ -0,0 +1,3 @@
+<% flash.each do |name, msg| %>
+ <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
+<% end %>
@@ -2,20 +2,20 @@
<ul class="nav">
<% if user_signed_in? %>
<li>
- <%= link_to('Logout', destroy_user_session_path, :method=>'delete') %>
+ <%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %>
</li>
<% else %>
<li>
- <%= link_to('Login', new_user_session_path) %>
+ <%= link_to 'Login', new_user_session_path %>
</li>
<% end %>
<% if user_signed_in? %>
<li>
- <%= link_to('Edit account', edit_user_registration_path) %>
+ <%= link_to 'Edit account', edit_user_registration_path %>
</li>
<% else %>
<li>
- <%= link_to('Sign up', new_user_registration_path) %>
+ <%= link_to 'Sign up', new_user_registration_path %>
</li>
<% end %>
</ul>
@@ -15,9 +15,7 @@
<div id="container" class="container">
<header>
<%= render 'layouts/navigation' %>
- <%- flash.each do |name, msg| -%>
- <%= content_tag :div, msg, :id => "flash_#{name}" if msg.is_a?(String) %>
- <%- end -%>
+ <%= render 'layouts/messages' %>
</header>
<div id="main" role="main">
<%= yield %>
@@ -9,9 +9,6 @@
# Configure the class responsible to send e-mails.
# config.mailer = "Devise::Mailer"
- # Automatically apply schema changes in tableless databases
- config.apply_schema = false
-
# ==> ORM configuration
# Load and configure the ORM. Supports :active_record (default) and
# :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -95,7 +92,7 @@
# the user cannot access the website without confirming his account.
# config.allow_unconfirmed_access_for = 2.days
- # If true, requires any email changes to be confirmed (exctly the same way as
+ # If true, requires any email changes to be confirmed (exactly the same way as
# initial account confirmation) to be applied. Requires additional unconfirmed_email
# db field (see migrations). Until confirmed new email is stored in
# unconfirmed email column, and copied to email column on successful confirmation.
@@ -111,10 +108,6 @@
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
- # If true, uses the password salt as remember token. This should be turned
- # to false if you are not using database authenticatable.
- config.use_salt_as_remember_token = true
-
# Options to be passed to the created cookie. For instance, you can set
# :secure => true in order to force SSL only cookies.
# config.rememberable_options = {}

0 comments on commit 66438fe

Please sign in to comment.