Permalink
Browse files

conform to app generated by version 1.5.2 of rails_apps_composer

  • Loading branch information...
1 parent 67a9f07 commit 1170efe930a4934e3494999091c0861ac0e5ae91 @DanielKehoe DanielKehoe committed Jun 20, 2012
View
4 Gemfile
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.3'
+gem 'rails', '3.2.6'
gem 'sqlite3'
group :assets do
gem 'sass-rails', '~> 3.2.3'
@@ -12,6 +12,6 @@ gem "factory_girl_rails", ">= 3.3.0", :group => [:development, :test]
gem "email_spec", ">= 1.2.1", :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 "database_cleaner", ">= 0.8.0", :group => :test
gem "launchy", ">= 2.1.0", :group => :test
gem "devise", ">= 2.1.0"
View
107 Gemfile.lock
@@ -1,31 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.3)
- actionpack (= 3.2.3)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
mail (~> 2.4.4)
- actionpack (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.3)
- activesupport (= 3.2.3)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.3)
- activemodel (= 3.2.3)
- activesupport (= 3.2.3)
- activesupport (3.2.3)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
@@ -47,40 +47,40 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.1)
- cucumber (1.2.0)
+ coffee-script-source (1.3.3)
+ cucumber (1.2.1)
builder (>= 2.1.2)
diff-lcs (>= 1.1.3)
- gherkin (~> 2.10.0)
+ gherkin (~> 2.11.0)
json (>= 1.4.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.rc2)
+ database_cleaner (0.8.0)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.7)
+ orm_adapter (~> 0.1)
railties (~> 3.1)
- warden (~> 1.1.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
email_spec (1.2.1)
mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0)
- execjs (1.3.2)
+ execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.3.0)
+ factory_girl (3.4.2)
activesupport (>= 3.0.0)
- factory_girl_rails (3.3.0)
- factory_girl (~> 3.3.0)
+ factory_girl_rails (3.4.0)
+ factory_girl (~> 3.4.0)
railties (>= 3.0.0)
ffi (1.0.11)
- gherkin (2.10.0)
+ gherkin (2.11.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.3)
+ journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
@@ -94,9 +94,9 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
- multi_json (1.3.5)
- nokogiri (1.5.2)
- orm_adapter (0.0.7)
+ multi_json (1.3.6)
+ nokogiri (1.5.4)
+ orm_adapter (0.3.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -105,29 +105,29 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.3)
- actionmailer (= 3.2.3)
- actionpack (= 3.2.3)
- activerecord (= 3.2.3)
- activeresource (= 3.2.3)
- activesupport (= 3.2.3)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.3)
- railties (3.2.3)
- actionpack (= 3.2.3)
- activesupport (= 3.2.3)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
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-core (2.10.1)
rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.10.1)
@@ -136,15 +136,14 @@ GEM
activesupport (>= 3.0)
railties (>= 3.0)
rspec (~> 2.10.0)
- rubyzip (0.9.8)
- sass (3.1.18)
+ rubyzip (0.9.9)
+ sass (3.1.19)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.21.2)
+ selenium-webdriver (2.24.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
@@ -153,16 +152,16 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
- thor (0.14.6)
+ thor (0.15.3)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
- uglifier (1.2.4)
+ uglifier (1.2.5)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- warden (1.1.1)
+ multi_json (~> 1.3)
+ warden (1.2.1)
rack (>= 1.0)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -174,13 +173,13 @@ DEPENDENCIES
capybara (>= 1.1.2)
coffee-rails (~> 3.2.1)
cucumber-rails (>= 1.3.0)
- database_cleaner (>= 0.7.2)
- devise (>= 2.1.0.rc2)
+ database_cleaner (>= 0.8.0)
+ devise (>= 2.1.0)
email_spec (>= 1.2.1)
factory_girl_rails (>= 3.3.0)
jquery-rails
launchy (>= 2.1.0)
- rails (= 3.2.3)
+ rails (= 3.2.6)
rspec-rails (>= 2.10.1)
sass-rails (~> 3.2.3)
sqlite3
View
3 app/models/user.rb
@@ -6,5 +6,6 @@ class User < ActiveRecord::Base
:recoverable, :rememberable, :trackable, :validatable
# Setup accessible (or protected) attributes for your model
- attr_accessible :name, :email, :password, :password_confirmation, :remember_me
+ attr_accessible :name, :email, :password, :password_confirmation, :remember_me
+
end
View
2 app/views/devise/confirmations/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
2 app/views/devise/passwords/edit.html.erb
@@ -13,4 +13,4 @@
<div><%= f.submit "Change my password" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
2 app/views/devise/passwords/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Send me reset password instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
2 app/views/devise/registrations/edit.html.erb
@@ -22,6 +22,6 @@
<h3>Cancel my account</h3>
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
<%= link_to "Back", :back %>
View
2 app/views/devise/registrations/new.html.erb
@@ -17,4 +17,4 @@
<div><%= f.submit "Sign up" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
2 app/views/devise/sessions/new.html.erb
@@ -14,4 +14,4 @@
<div><%= f.submit "Sign in" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
2 app/views/devise/unlocks/new.html.erb
@@ -9,4 +9,4 @@
<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
-<%= render :partial => "devise/shared/links" %>
+<%= render "devise/shared/links" %>
View
3 config/application.rb
@@ -55,6 +55,9 @@ class Application < Rails::Application
# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password, :password_confirmation]
+ # Enable escaping HTML in JSON.
+ config.active_support.escape_html_entities_in_json = true
+
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
View
4 config/environments/development.rb
@@ -16,8 +16,8 @@
# ActionMailer Config
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
config.action_mailer.delivery_method = :smtp
- # change to false to prevent email from being sent during development
- config.action_mailer.perform_deliveries = true
+ # change to true to allow email to be sent during development
+ config.action_mailer.perform_deliveries = false
config.action_mailer.raise_delivery_errors = true
config.action_mailer.default :charset => "utf-8"
View
2 config/environments/production.rb
@@ -20,7 +20,7 @@
# Generate digests for assets URLs
config.assets.digest = true
- # Defaults to Rails.root.join("public/assets")
+ # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files
View
22 config/initializers/devise.rb
@@ -126,6 +126,9 @@
# time the user will be asked for credentials again. Default is 30 minutes.
# config.timeout_in = 30.minutes
+ # If true, expires auth token on session timeout.
+ # config.expire_auth_token_on_timeout = false
+
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
@@ -181,9 +184,8 @@
# devise role declared in your routes (usually :user).
# config.default_scope = :user
- # Configure sign_out behavior.
- # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
- # The default is true, which means any logout action will sign out all active scopes.
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
# config.sign_out_all_scopes = true
# ==> Navigation configuration
@@ -213,4 +215,18 @@
# manager.intercept_401 = false
# manager.default_strategies(:scope => :user).unshift :some_external_strategy
# end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: "/my_engine"
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using omniauth, Devise cannot automatically set Omniauth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = "/my_engine/users/auth"
end
View
1 config/locales/devise.en.yml
@@ -29,6 +29,7 @@ en:
updated: 'Your password was changed successfully. You are now signed in.'
updated_not_active: 'Your password was changed successfully.'
send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+ no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
confirmations:
send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'

0 comments on commit 1170efe

Please sign in to comment.