RubyGems - devise - Versions diffs - 1.1.3 → 1.2.0 - Mend

devise 1.1.3 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (157) hide show

data/.gitignore +10 -0
data/.travis.yml +1 -0
data/CHANGELOG.rdoc +94 -0
data/Gemfile +24 -13
data/Gemfile.lock +119 -75
data/MIT-LICENSE +1 -1
data/README.rdoc +144 -101
data/Rakefile +3 -24
data/app/controllers/devise/confirmations_controller.rb +1 -1
data/app/controllers/devise/omniauth_callbacks_controller.rb +26 -0
data/app/controllers/devise/passwords_controller.rb +1 -1
data/app/controllers/devise/registrations_controller.rb +60 -7
data/app/controllers/devise/sessions_controller.rb +6 -4
data/app/controllers/devise/unlocks_controller.rb +1 -1
data/app/helpers/devise_helper.rb +10 -2
data/app/mailers/devise/mailer.rb +27 -10
data/app/views/devise/confirmations/new.html.erb +1 -1
data/app/views/devise/passwords/edit.html.erb +2 -2
data/app/views/devise/passwords/new.html.erb +1 -1
data/app/views/devise/registrations/edit.html.erb +1 -1
data/app/views/devise/registrations/new.html.erb +1 -1
data/app/views/devise/sessions/new.html.erb +1 -1
data/app/views/devise/shared/_links.erb +6 -0
data/app/views/devise/unlocks/new.html.erb +1 -1
data/config/locales/en.yml +11 -2
data/devise.gemspec +25 -0
data/lib/devise/controllers/helpers.rb +119 -116
data/lib/devise/controllers/internal_helpers.rb +29 -8
data/lib/devise/controllers/rememberable.rb +52 -0
data/lib/devise/controllers/scoped_views.rb +4 -6
data/lib/devise/controllers/url_helpers.rb +3 -5
data/lib/devise/encryptors/authlogic_sha512.rb +1 -1
data/lib/devise/encryptors/base.rb +1 -1
data/lib/devise/encryptors/restful_authentication_sha1.rb +4 -4
data/lib/devise/failure_app.rb +46 -10
data/lib/devise/hooks/activatable.rb +2 -2
data/lib/devise/hooks/forgetable.rb +1 -3
data/lib/devise/hooks/rememberable.rb +5 -42
data/lib/devise/hooks/timeoutable.rb +1 -1
data/lib/devise/mapping.rb +18 -7
data/lib/devise/models/authenticatable.rb +73 -31
data/lib/devise/models/confirmable.rb +16 -20
data/lib/devise/models/database_authenticatable.rb +27 -37
data/lib/devise/models/encryptable.rb +72 -0
data/lib/devise/models/lockable.rb +27 -21
data/lib/devise/models/omniauthable.rb +23 -0
data/lib/devise/models/recoverable.rb +13 -3
data/lib/devise/models/registerable.rb +13 -0
data/lib/devise/models/rememberable.rb +39 -34
data/lib/devise/models/timeoutable.rb +20 -3
data/lib/devise/models/token_authenticatable.rb +22 -10
data/lib/devise/models/validatable.rb +16 -4
data/lib/devise/models.rb +4 -16
data/lib/devise/modules.rb +15 -8
data/lib/devise/omniauth/config.rb +18 -0
data/lib/devise/omniauth/url_helpers.rb +33 -0
data/lib/devise/omniauth.rb +32 -0
data/lib/devise/orm/active_record.rb +2 -0
data/lib/devise/orm/mongoid.rb +4 -2
data/lib/devise/rails/routes.rb +67 -20
data/lib/devise/rails/warden_compat.rb +101 -15
data/lib/devise/rails.rb +33 -44
data/lib/devise/schema.rb +16 -16
data/lib/devise/strategies/authenticatable.rb +48 -7
data/lib/devise/strategies/database_authenticatable.rb +1 -1
data/lib/devise/strategies/rememberable.rb +6 -5
data/lib/devise/strategies/token_authenticatable.rb +6 -2
data/lib/devise/test_helpers.rb +13 -3
data/lib/devise/version.rb +1 -1
data/lib/devise.rb +162 -50
data/lib/generators/active_record/devise_generator.rb +2 -2
data/lib/generators/active_record/templates/migration.rb +2 -0
data/lib/generators/devise/devise_generator.rb +3 -1
data/lib/generators/devise/orm_helpers.rb +1 -1
data/lib/generators/devise/views_generator.rb +8 -45
data/lib/generators/mongoid/devise_generator.rb +2 -2
data/lib/generators/templates/devise.rb +82 -39
data/test/controllers/helpers_test.rb +78 -72
data/test/controllers/internal_helpers_test.rb +29 -8
data/test/controllers/url_helpers_test.rb +2 -1
data/test/devise_test.rb +10 -0
data/test/failure_app_test.rb +86 -22
data/test/generators/active_record_generator_test.rb +24 -0
data/test/generators/devise_generator_test.rb +33 -0
data/test/generators/install_generator_test.rb +13 -0
data/test/generators/mongoid_generator_test.rb +22 -0
data/test/generators/views_generator_test.rb +35 -0
data/test/indifferent_hash.rb +33 -0
data/test/integration/authenticatable_test.rb +165 -62
data/test/integration/database_authenticatable_test.rb +22 -0
data/test/integration/http_authenticatable_test.rb +12 -2
data/test/integration/omniauthable_test.rb +138 -0
data/test/integration/recoverable_test.rb +39 -20
data/test/integration/registerable_test.rb +60 -4
data/test/integration/rememberable_test.rb +72 -29
data/test/integration/timeoutable_test.rb +10 -1
data/test/integration/token_authenticatable_test.rb +55 -6
data/test/mailers/confirmation_instructions_test.rb +4 -0
data/test/mailers/reset_password_instructions_test.rb +4 -0
data/test/mailers/unlock_instructions_test.rb +4 -0
data/test/mapping_test.rb +37 -3
data/test/models/confirmable_test.rb +32 -15
data/test/models/database_authenticatable_test.rb +14 -71
data/test/models/encryptable_test.rb +65 -0
data/test/models/lockable_test.rb +48 -11
data/test/models/recoverable_test.rb +28 -2
data/test/models/rememberable_test.rb +186 -125
data/test/models/token_authenticatable_test.rb +19 -1
data/test/models_test.rb +12 -5
data/test/omniauth/url_helpers_test.rb +54 -0
data/test/orm/mongoid.rb +3 -2
data/test/rails_app/Rakefile +10 -0
data/test/rails_app/app/active_record/admin.rb +4 -1
data/test/rails_app/app/active_record/user.rb +5 -4
data/test/rails_app/app/controllers/{sessions_controller.rb → admins/sessions_controller.rb} +1 -1
data/test/rails_app/app/controllers/application_controller.rb +0 -1
data/test/rails_app/app/controllers/home_controller.rb +9 -0
data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +14 -0
data/test/rails_app/app/mongoid/admin.rb +4 -1
data/test/rails_app/app/mongoid/shim.rb +16 -3
data/test/rails_app/app/mongoid/user.rb +5 -5
data/test/rails_app/app/views/admins/index.html.erb +1 -0
data/test/rails_app/app/views/admins/sessions/new.html.erb +2 -0
data/test/rails_app/app/views/home/index.html.erb +1 -0
data/test/rails_app/app/views/home/private.html.erb +1 -0
data/test/rails_app/app/views/layouts/application.html.erb +24 -0
data/test/rails_app/app/views/users/index.html.erb +1 -0
data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +1 -0
data/test/rails_app/app/views/users/sessions/new.html.erb +1 -0
data/test/rails_app/config/application.rb +5 -0
data/test/rails_app/config/boot.rb +2 -2
data/test/rails_app/config/database.yml +18 -0
data/test/rails_app/config/initializers/devise.rb +71 -31
data/test/rails_app/config/routes.rb +14 -6
data/test/rails_app/config.ru +4 -0
data/test/rails_app/db/migrate/20100401102949_create_tables.rb +21 -17
data/test/rails_app/db/schema.rb +17 -51
data/test/rails_app/lib/shared_admin.rb +9 -0
data/test/rails_app/lib/shared_user.rb +23 -0
data/test/rails_app/public/404.html +26 -0
data/test/rails_app/public/422.html +26 -0
data/test/rails_app/public/500.html +26 -0
data/test/rails_app/public/favicon.ico +0 -0
data/test/rails_app/script/rails +10 -0
data/test/routes_test.rb +42 -9
data/test/schema_test.rb +33 -0
data/test/support/integration.rb +4 -4
data/test/support/locale/en.yml +4 -0
data/test/support/webrat/integrations/rails.rb +11 -19
data/test/test_helper.rb +8 -2
data/test/test_helpers_test.rb +64 -2
metadata +106 -30
data/TODO +0 -3
data/lib/devise/encryptors/bcrypt.rb +0 -19
data/lib/generators/devise_install_generator.rb +0 -4
data/lib/generators/devise_views_generator.rb +0 -4
data/test/support/test_silencer.rb +0 -5

data/test/rails_app/app/mongoid/user.rb CHANGED Viewed

@@ -1,10 +1,10 @@
+require 'shared_user'
 class User
   include Mongoid::Document
   include Shim
+  include SharedUser
-  field :created_at, :type => DateTime
-  devise :database_authenticatable, :confirmable, :lockable, :recoverable,
-         :registerable, :rememberable, :timeoutable, :token_authenticatable,
-         :trackable, :validatable
+  field :username, :type => String
+  field :facebook_token, :type => String
 end

data/test/rails_app/app/views/admins/index.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Welcome Admin!

data/test/rails_app/app/views/admins/sessions/new.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ Welcome to "sessions/new" view!
2	+ <%= render :file => "devise/sessions/new" %>

data/test/rails_app/app/views/home/index.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Home!

data/test/rails_app/app/views/home/private.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Private!

data/test/rails_app/app/views/layouts/application.html.erb ADDED Viewed

@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Devise Test App</title>
+  </head>
+  <body>
+    <div id="container">
+      <%- flash.each do |name, msg| -%>
+        <%= content_tag :div, msg, :id => "flash_#{name}" %>
+      <%- end -%>
+      <% if user_signed_in? -%>
+        <p>Hello User <%= current_user.email %>! You are signed in!</p>
+      <% end -%>
+      <% if admin_signed_in? -%>
+        <p>Hello Admin <%= current_admin.email %>! You are signed in!</p>
+      <% end -%>
+      <%= yield %>
+    </div>
+  </body>
+</html>

data/test/rails_app/app/views/users/index.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Welcome User #<%= current_user.id %>!

data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ <%= @resource.email %>

data/test/rails_app/app/views/users/sessions/new.html.erb ADDED Viewed

	@@ -0,0 +1 @@
1	+ Special user view

data/test/rails_app/config/application.rb CHANGED Viewed

@@ -31,5 +31,10 @@ module RailsApp
     config.filter_parameters << :password
     config.action_mailer.default_url_options = { :host => "localhost:3000" }
+    # This was used to break devise in some situations
+    config.to_prepare do
+      Devise::SessionsController.layout "application"
+    end
   end
 end

data/test/rails_app/config/boot.rb CHANGED Viewed

@@ -7,7 +7,7 @@ begin
 rescue LoadError
   require 'rubygems'
   require 'bundler'
-  Bundler.setup :default, DEVISE_ORM
+  Bundler.setup :default, :test, DEVISE_ORM
 end
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/test/rails_app/config/database.yml ADDED Viewed

@@ -0,0 +1,18 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  pool: 5
+  timeout: 5000
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: ":memory:"
+production:
+  adapter: sqlite3
+  database: ":memory:"

data/test/rails_app/config/initializers/devise.rb CHANGED Viewed

@@ -15,20 +15,37 @@ Devise.setup do |config|
   require "devise/orm/#{DEVISE_ORM}"
   # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
+  # Configure which keys are used when authenticating a user. By default is
   # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
+  # authenticating a user, both parameters are required. Remember that those
   # parameters are used only when authenticating and not when retrieving from
   # session. If you need permissions, you should implement that in a before filter.
+  # You can also supply hash where the value is a boolean expliciting if authentication
+  # should be aborted or not if the value is not present. By default is empty.
   # config.authentication_keys = [ :email ]
+  # Configure parameters from the request object used for authentication. Each entry
+  # given should be a request method and it will automatically be passed to
+  # find_for_authentication method and considered in your model lookup. For instance,
+  # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
+  # The same considerations mentioned for authentication_keys also apply to request_keys.
+  # config.request_keys = []
+  # Configure which authentication keys should be case-insensitive.
+  # These keys will be downcased upon creating or modifying a user and when used
+  # to authenticate or find a user. Default is :email.
+  config.case_insensitive_keys = [ :email ]
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
-  # Tell if authentication through HTTP Basic Auth is enabled. True by default.
-  # config.http_authenticatable = true
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  config.http_authenticatable = true
+  # If http headers should be returned for AJAX requests. True by default.
+  # config.http_authenticatable_on_xhr = true
-  # The realm used in Http Basic Authentication
+  # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
   # ==> Configuration for :database_authenticatable
@@ -36,15 +53,6 @@ Devise.setup do |config|
   # using other encryptors, it sets how many times you want the password re-encrypted.
   config.stretches = 10
-  # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
-  # Setup a pepper to generate the encrypted password.
-  config.pepper = "d142367154e5beacca404b1a6a4f8bc52c6fdcfa3ccc3cf8eb49f3458a688ee6ac3b9fae488432a3bfca863b8a90008368a9f3a3dfbe5a962e64b6ab8f3a3a1a"
   # ==> Configuration for :confirmable
   # The time you want to give your user to confirm his account. During this time
   # he will be able to access your application without confirming. Default is nil.
@@ -54,6 +62,9 @@ Devise.setup do |config|
   # (ie 2 days).
   # config.confirm_within = 2.days
+  # Defines which key will be used when confirming an account
+  # config.confirmation_keys = [ :email ]
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
@@ -64,8 +75,12 @@ Devise.setup do |config|
   # 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
   # ==> Configuration for :validatable
-  # Range for password length
+  # Range for password length. Default is 6..20.
   # config.password_length = 6..20
   # Regex to use to validate the email address
@@ -73,8 +88,8 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
+  # time the user will be asked for credentials again. Default is 30 minutes.
+  # config.timeout_in = 30.minutes
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.
@@ -82,6 +97,9 @@ Devise.setup do |config|
   # :none            = No lock strategy. You should handle locking by yourself.
   # config.lock_strategy = :failed_attempts
+  # Defines which key will be used when locking and unlocking an account
+  # config.unlock_keys = [ :email ]
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
@@ -96,24 +114,44 @@ Devise.setup do |config|
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
+  # ==> Configuration for :recoverable
+  #
+  # Defines which key will be used when recovering the password for an account
+  # config.reset_password_keys = [ :email ]
+  # ==> Configuration for :encryptable
+  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
+  # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
+  # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
+  # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
+  # REST_AUTH_SITE_KEY to pepper)
+  config.encryptor = :sha512
+  # Setup a pepper to generate the encrypted password.
+  config.pepper = "d142367154e5beacca404b1a6a4f8bc52c6fdcfa3ccc3cf8eb49f3458a688ee6ac3b9fae488432a3bfca863b8a90008368a9f3a3dfbe5a962e64b6ab8f3a3a1a"
   # ==> Configuration for :token_authenticatable
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
+  # If true, authentication through token does not store user in session and needs
+  # to be supplied on each request. Useful if you are using the token as API token.
+  # config.stateless_token = false
   # ==> Scopes configuration
   # Turn scoped views on. Before rendering "sessions/new", it will first check for
   # "users/sessions/new". It's turned off by default because it's slower if you
   # are using only default views.
-  # config.scoped_views = true
+  # config.scoped_views = false
   # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
+  # devise role declared in your routes (usually :user).
   # config.default_scope = :user
   # Configure sign_out behavior.
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
+  # 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.
+  # config.sign_out_all_scopes = true
   # ==> Navigation configuration
   # Lists the formats that should be treated as navigational. Formats like
@@ -123,17 +161,19 @@ Devise.setup do |config|
   # should add them to the navigational formats lists. Default is [:html]
   # config.navigational_formats = [:html, :iphone]
+  # The default HTTP method used to sign out a resource. Default is :get.
+  # config.sign_out_via = :get
+  # ==> OmniAuth
+  config.omniauth :facebook, 'APP_ID', 'APP_SECRET', :scope => 'email,offline_access'
+  config.omniauth :open_id
   # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  # If you want to use other strategies, that are not supported by Devise, or
+  # change the failure app, you can configure them inside the config.warden block.
   #
   # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
-  #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+  #   manager.failure_app = AnotherApp
+  #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end
 end

data/test/rails_app/config/routes.rb CHANGED Viewed

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
   resources :admins, :only => [:index]
   # Users scope
-  devise_for :users do
+  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" } do
     match "/devise_for/sign_in", :to => "devise/sessions#new"
   end
@@ -19,7 +19,7 @@ Rails.application.routes.draw do
   match "/sign_in", :to => "devise/sessions#new"
   # Admin scope
-  devise_for :admin, :path => "admin_area", :controllers => { :sessions => "sessions" }, :skip => :passwords
+  devise_for :admin, :path => "admin_area", :controllers => { :sessions => "admins/sessions" }, :skip => :passwords
   match "/admin_area/home", :to => "admins#index", :as => :admin_root
   match "/anywhere", :to => "foo#bar", :as => :new_admin_password
@@ -29,19 +29,27 @@ Rails.application.routes.draw do
   end
   # Other routes for routing_test.rb
-  namespace :publisher, :path_names => { :sign_in => "i_don_care", :sign_out => "get_out" } do
-    devise_for :accounts, :class_name => "User", :path_names => { :sign_in => "get_in" }
+  namespace :publisher, :path_names => { :sign_in => "i_dont_care", :sign_out => "get_out" } do
+    devise_for :accounts, :class_name => "Admin", :path_names => { :sign_in => "get_in" }
   end
   scope ":locale" do
-    devise_for :accounts, :singular => "manager", :class_name => "User",
+    devise_for :accounts, :singular => "manager", :class_name => "Admin",
       :path_names => {
         :sign_in => "login", :sign_out => "logout",
         :password => "secret", :confirmation => "verification",
         :unlock => "unblock", :sign_up => "register",
-        :registration => "management"
+        :registration => "management", :cancel => "giveup"
       }
   end
+  namespace :sign_out_via, :module => "devise" do
+    devise_for :deletes, :sign_out_via => :delete, :class_name => "Admin"
+    devise_for :posts, :sign_out_via => :post, :class_name => "Admin"
+    devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "Admin"
+  end
+  match "/set", :to => "home#set"
+  match "/unauthenticated", :to => "home#unauthenticated"
   root :to => "home#index"
 end

data/test/rails_app/config.ru ADDED Viewed

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+require ::File.expand_path('../config/environment',  __FILE__)
+run RailsApp::Application

data/test/rails_app/db/migrate/20100401102949_create_tables.rb CHANGED Viewed

@@ -1,27 +1,31 @@
 class CreateTables < ActiveRecord::Migration
   def self.up
-    [:users, :admins, :accounts].each do |table|
-      create_table table do |t|
-        t.database_authenticatable :null => (table == :admins)
+    create_table :users do |t|
+      t.string :username
+      t.string :facebook_token
-        if table != :admin
-          t.string :username
-          t.confirmable
-          t.recoverable
-          t.rememberable
-          t.trackable
-          t.lockable
-          t.token_authenticatable
-        end
+      t.database_authenticatable :null => false
+      t.confirmable
+      t.recoverable
+      t.rememberable
+      t.trackable
+      t.lockable
+      t.token_authenticatable
+      t.timestamps
+    end
-        t.timestamps
-      end
+    create_table :admins do |t|
+      t.database_authenticatable :null => true
+      t.encryptable
+      t.rememberable :use_salt => false
+      t.recoverable
+      t.lockable
+      t.timestamps
     end
   end
   def self.down
-    [:users, :admins, :accounts].each do |table|
-      drop_table table
-    end
+    drop_table :users
+    drop_table :admins
   end
 end

data/test/rails_app/db/schema.rb CHANGED Viewed

@@ -1,81 +1,47 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file,
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
 ActiveRecord::Schema.define(:version => 20100401102949) do
-  create_table "accounts", :force => true do |t|
-    t.string   "email",                :default => "", :null => false
-    t.string   "encrypted_password",   :default => "", :null => false
-    t.string   "password_salt",        :default => "", :null => false
-    t.string   "username"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string   "reset_password_token"
-    t.string   "remember_token"
-    t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
-    t.string   "unlock_token"
-    t.datetime "locked_at"
-    t.string   "authentication_token"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
   create_table "admins", :force => true do |t|
-    t.string   "email",                :default => ""
-    t.string   "encrypted_password",   :default => ""
-    t.string   "password_salt",        :default => ""
-    t.string   "username"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string   "reset_password_token"
+    t.string   "email"
+    t.string   "encrypted_password",   :limit => 128
+    t.string   "password_salt"
     t.string   "remember_token"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
+    t.string   "reset_password_token"
+    t.integer  "failed_attempts",                     :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
-    t.string   "authentication_token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
   create_table "users", :force => true do |t|
-    t.string   "email",                :default => "", :null => false
-    t.string   "encrypted_password",   :default => "", :null => false
-    t.string   "password_salt",        :default => "", :null => false
     t.string   "username"
+    t.string   "facebook_token"
+    t.string   "email",                               :default => "", :null => false
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "reset_password_token"
-    t.string   "remember_token"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
+    t.integer  "sign_in_count",                       :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
+    t.integer  "failed_attempts",                     :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.string   "authentication_token"

data/test/rails_app/lib/shared_admin.rb ADDED Viewed

@@ -0,0 +1,9 @@
+module SharedAdmin
+  extend ActiveSupport::Concern
+  included do
+    devise :database_authenticatable, :encryptable, :registerable,
+           :timeoutable, :recoverable, :rememberable, :lockable,
+           :unlock_strategy => :time
+  end
+end

data/test/rails_app/lib/shared_user.rb ADDED Viewed

@@ -0,0 +1,23 @@
+module SharedUser
+  extend ActiveSupport::Concern
+  included do
+    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+           :registerable, :rememberable, :timeoutable, :token_authenticatable,
+           :trackable, :validatable, :omniauthable
+    # They need to be included after Devise is called.
+    extend ExtendMethods
+  end
+  module ExtendMethods
+    def new_with_session(params, session)
+      super.tap do |user|
+        if data = session["devise.facebook_data"]
+          user.email = data["email"]
+          user.confirmed_at = Time.now
+        end
+      end
+    end
+  end
+end

data/test/rails_app/public/404.html ADDED Viewed

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The page you were looking for doesn't exist (404)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/404.html -->
+  <div class="dialog">
+    <h1>The page you were looking for doesn't exist.</h1>
+    <p>You may have mistyped the address or the page may have moved.</p>
+  </div>
+</body>
+</html>

data/test/rails_app/public/422.html ADDED Viewed

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>The change you wanted was rejected (422)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>The change you wanted was rejected.</h1>
+    <p>Maybe you tried to change something you didn't have access to.</p>
+  </div>
+</body>
+</html>

data/test/rails_app/public/500.html ADDED Viewed

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>We're sorry, but something went wrong (500)</title>
+  <style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/500.html -->
+  <div class="dialog">
+    <h1>We're sorry, but something went wrong.</h1>
+    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
+  </div>
+</body>
+</html>

data/test/rails_app/public/favicon.ico ADDED Viewed

File without changes

data/test/rails_app/script/rails ADDED Viewed

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+ENV_PATH  = File.expand_path('../../config/environment',  __FILE__)
+BOOT_PATH = File.expand_path('../../config/boot',  __FILE__)
+APP_PATH  = File.expand_path('../../config/application',  __FILE__)
+ROOT_PATH = File.expand_path('../..',  __FILE__)
+require BOOT_PATH
+require 'rails/commands'