devise 1.0.11 → 1.1.pre

data/test/rails_app/config/environment.rb

@@ -1,42 +1,5 @@
-# Be sure to restart your server when you modify this file
+# Load the rails application
+require File.expand_path('../application', __FILE__)
 
-# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.11' unless defined? RAILS_GEM_VERSION
-DEVISE_ORM = :active_record unless defined? DEVISE_ORM
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-
-  # Add additional load paths for your own custom dirs
-  config.autoload_paths += [ "#{RAILS_ROOT}/app/#{DEVISE_ORM}/" ]
-
-  # Specify gems that this application depends on and have them installed with rake gems:install
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "sqlite3-ruby", :lib => "sqlite3"
-  # config.gem "aws-s3", :lib => "aws/s3"
-
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
-  config.frameworks -= [ :active_record ] unless DEVISE_ORM == :active_record
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names.
-  config.time_zone = 'UTC'
-
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :en
-end
+# Initialize the rails application
+RailsApp::Application.initialize!

data/test/rails_app/config/environments/development.rb

@@ -1,17 +1,19 @@
-# Settings specified here will take precedence over those in config/environment.rb
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# In the development environment your application's code is reloaded on
-# every request.  This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_view.debug_rjs                         = true
-config.action_controller.perform_caching             = false
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
 
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+end

data/test/rails_app/config/environments/production.rb

@@ -1,28 +1,33 @@
-# Settings specified here will take precedence over those in config/environment.rb
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# The production environment is meant for finished, "live" apps.
-# Code is not reloaded between requests
-config.cache_classes = true
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
 
-# Full error reports are disabled and caching is turned on
-config.action_controller.consider_all_requests_local = false
-config.action_controller.perform_caching             = true
-config.action_view.cache_template_loading            = true
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
 
-# See everything in the log (default is :info)
-# config.log_level = :debug
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
 
-# Use a different logger for distributed setups
-# config.logger = SyslogLogger.new
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
 
-# Use a different cache store in production
-# config.cache_store = :mem_cache_store
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
 
-# Enable serving of images, stylesheets, and javascripts from an asset server
-# config.action_controller.asset_host = "http://assets.example.com"
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
 
-# Disable delivery errors, bad email addresses will be ignored
-# config.action_mailer.raise_delivery_errors = false
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
 
-# Enable threaded mode
-# config.threadsafe!
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+end

data/test/rails_app/config/environments/test.rb

@@ -1,28 +1,29 @@
-# Settings specified here will take precedence over those in config/environment.rb
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
 
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = true
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-config.action_view.cache_template_loading            = true
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
 
-# Disable request forgery protection in test environment
-config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
 
-# Tell Action Mailer not to deliver emails to the real world.
-# The :test delivery method accumulates sent emails in the
-# ActionMailer::Base.deliveries array.
-config.action_mailer.delivery_method = :test
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
 
-# Use SQL instead of Active Record's schema dumper when creating the test 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
-# config.active_record.schema_format = :sql
+  # Use SQL instead of Active Record's schema dumper when creating the test 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
+  # config.active_record.schema_format = :sql
+end

data/test/rails_app/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+Rails.backtrace_cleaner.remove_silencers!

data/test/rails_app/config/initializers/cookie_verification_secret.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.cookie_verifier_secret = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'

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

@@ -35,9 +35,6 @@ Devise.setup do |config|
 
   # Configure the e-mail address which will be shown in DeviseMailer.
   config.mailer_sender = "please-change-me-omg@yourapp.com"
-  
-  # Configure the content type of DeviseMailer mails (defaults to text/html")
-  # config.mailer_content_type = "text/plain"
 
   # Load and configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
   require "devise/orm/#{DEVISE_ORM}"

data/test/rails_app/config/initializers/session_store.rb

@@ -5,8 +5,8 @@
 # Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
-  :key         => '_rails_app_session',
-  :secret      => '89e8147901a0d7c221ac130e0ded3eeab6dab4a97127255909f08fedaae371918b41dec9d4d75c5b27a55c3772d43c2b6a3cbac232c5cc2ce4b8ec22242f5e60'
+  :key    => '_rails_app_session',
+  :secret => '0c31f123b2bd4424ac366a7976aaa0696f0c82337c4073a5816a3abc6553293ad14f70cf23acb391954a8ce8cf08aaca3fab21e7642aa52ea212aefa19b7439d'
 }
 
 # Use the database for sessions instead of the cookie-based default,

data/test/rails_app/config/routes.rb

@@ -1,25 +1,21 @@
-ActionController::Routing::Routes.draw do |map|
-  map.devise_for :users
-  map.devise_for :admin, :as => 'admin_area'
-  map.devise_for :accounts, :scope => 'manager', :path_prefix => ':locale',
-    :class_name => "User", :requirements => { :extra => 'value' }, :path_names => {
-      :sign_in => 'login', :sign_out => 'logout',
-      :password => 'secret', :confirmation => 'verification',
-      :unlock => 'unblock', :sign_up => 'register'
-    }
+Rails::Application.routes.draw do
+  resources :users, :only => [:index] do
+    get :expire, :on => :member
+  end
 
-  map.resources :users, :only => [:index], :member => { :expire => :get }
-  map.resources :admins, :only => :index
-  map.root :controller => :home
+  resources :admins, :only => [:index]
 
-  map.devise_for :sign_out_via_deletes, :sign_out_via => :delete, :class_name => "User"
-  map.devise_for :sign_out_via_posts, :sign_out_via => :post, :class_name => "User"
-  map.devise_for :sign_out_via_anymethods, :sign_out_via => :any, :class_name => "User"
+  devise_for :users
+  devise_for :admin, :as => "admin_area", :controllers => { :sessions => "sessions" }
+  devise_for :accounts, :scope => "manager", :path_prefix => ":locale",
+    :class_name => "User", :path_names => {
+      :sign_in => "login", :sign_out => "logout",
+      :password => "secret", :confirmation => "verification",
+      :unlock => "unblock", :sign_up => "register"
+    }
 
-  map.connect '/admin_area/password/new', :controller => "passwords", :action => "new"
-  map.admin_root '/admin_area/home', :controller => "admins", :action => "index"
+  match "/admin_area/home", :to => "admins#index", :as => :admin_root
+  match "/sign_in", :to => "devise/sessions#new"
 
-  map.connect '/sign_in', :controller => "sessions", :action => "new"
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
-end
+  root :to => "home#index"
+end

data/test/routes_test.rb

@@ -3,129 +3,112 @@ require 'test/test_helper'
 class MapRoutingTest < ActionController::TestCase
 
   test 'map new user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'new'}, {:path => 'users/sign_in', :method => :get})
   end
 
   test 'map create user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'create'}, {:path => 'users/sign_in', :method => :post})
   end
 
   test 'map destroy user session' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => 'users/sign_out', :method => :get})
   end
 
   test 'map new user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'users/confirmation/new')
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'users/confirmation/new')
   end
 
   test 'map create user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'create'}, {:path => 'users/confirmation', :method => :post})
   end
 
   test 'map show user confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'show'}, {:path => 'users/confirmation', :method => :get})
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'show'}, {:path => 'users/confirmation', :method => :get})
   end
 
   test 'map new user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'users/password/new')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'new'}, 'users/password/new')
   end
 
   test 'map create user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
+    assert_recognizes({:controller => 'devise/passwords', :action => 'create'}, {:path => 'users/password', :method => :post})
   end
 
   test 'map edit user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'edit'}, 'users/password/edit')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'edit'}, 'users/password/edit')
   end
 
   test 'map update user password' do
-    assert_recognizes({:controller => 'passwords', :action => 'update'}, {:path => 'users/password', :method => :put})
+    assert_recognizes({:controller => 'devise/passwords', :action => 'update'}, {:path => 'users/password', :method => :put})
   end
 
   test 'map new user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'new'}, 'users/unlock/new')
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'new'}, 'users/unlock/new')
   end
 
   test 'map create user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'create'}, {:path => 'users/unlock', :method => :post})
   end
 
   test 'map show user unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'show'}, {:path => 'users/unlock', :method => :get})
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'show'}, {:path => 'users/unlock', :method => :get})
   end
 
   test 'map new user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'new'}, 'users/sign_up')
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, 'users/sign_up')
   end
 
   test 'map create user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'create'}, {:path => 'users', :method => :post})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'create'}, {:path => 'users', :method => :post})
   end
 
   test 'map edit user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'edit'}, {:path => 'users/edit', :method => :get})
   end
 
   test 'map update user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'update'}, {:path => 'users', :method => :put})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'update'}, {:path => 'users', :method => :put})
   end
 
   test 'map destroy user registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
   end
 
-  test 'map admin session with :as option' do
+  test 'map admin with :as option' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new'}, {:path => 'admin_area/sign_up', :method => :get})
+  end
+
+  test 'map admin with :controllers option' do
     assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'admin_area/sign_in', :method => :get})
   end
 
   test 'does not map admin confirmation' do
     assert_raise ActionController::RoutingError do
-      assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'admin_area/confirmation/new')
+      assert_recognizes({:controller => 'devise/confirmations', :action => 'new'}, 'admin_area/confirmation/new')
     end
   end
 
   test 'map account with custom path name for session sign in' do
-    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/login')
+    assert_recognizes({:controller => 'devise/sessions', :action => 'new', :locale => 'en'}, '/en/accounts/login')
   end
 
   test 'map account with custom path name for session sign out' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy', :locale => 'en', :extra => 'value'}, '/en/accounts/logout')
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy', :locale => 'en'}, '/en/accounts/logout')
   end
 
   test 'map account with custom path name for password' do
-    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/secret/new')
+    assert_recognizes({:controller => 'devise/passwords', :action => 'new', :locale => 'en'}, '/en/accounts/secret/new')
   end
 
   test 'map account with custom path name for confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/verification/new')
+    assert_recognizes({:controller => 'devise/confirmations', :action => 'new', :locale => 'en'}, '/en/accounts/verification/new')
   end
 
   test 'map account with custom path name for unlock' do
-    assert_recognizes({:controller => 'unlocks', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/unblock/new')
+    assert_recognizes({:controller => 'devise/unlocks', :action => 'new', :locale => 'en'}, '/en/accounts/unblock/new')
   end
 
   test 'map account with custom path name for registration' do
-    assert_recognizes({:controller => 'registrations', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/register')
-  end
-
-  test 'map deletes with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_deletes/sign_out', :method => :delete})
-    assert_raise ActionController::MethodNotAllowed do
-      assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_deletes/sign_out', :method => :get})
-    end
-  end
-
-  test 'map posts with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_posts/sign_out', :method => :post})
-    assert_raise ActionController::MethodNotAllowed do
-      assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_posts/sign_out', :method => :get})
-    end
-  end
-
-  test 'map any methods with :sign_out_via option' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :get})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :post})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :delete})
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, {:path => '/sign_out_via_anymethods/sign_out', :method => :put})
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/register')
   end
 end

data/test/support/{assertions_helper.rb → assertions.rb}

@@ -19,19 +19,4 @@ class ActiveSupport::TestCase
   def assert_email_not_sent(&block)
     assert_no_difference('ActionMailer::Base.deliveries.size') { yield }
   end
-
-  # Execute the block setting the given values and restoring old values after
-  # the block is executed.
-  def swap(object, new_values)
-    old_values = {}
-    new_values.each do |key, value|
-      old_values[key] = object.send key
-      object.send :"#{key}=", value
-    end
-    yield
-  ensure
-    old_values.each do |key, value|
-      object.send :"#{key}=", value
-    end
-  end
 end