devise 0.7.3 → 0.7.4

data/test/rails_app/app/mongo_mapper/admin.rb

@@ -0,0 +1,9 @@
+class Admin
+  include MongoMapper::Document
+
+  devise :all, :timeoutable, :except => [:recoverable, :confirmable, :rememberable, :validatable, :trackable]
+
+  def self.find_for_authentication(conditions)
+    last(:conditions => conditions, :order => "email")
+  end
+end

data/test/rails_app/app/mongo_mapper/user.rb

@@ -0,0 +1,6 @@
+class User
+  include MongoMapper::Document
+  key :created_at, DateTime
+  devise :all, :timeoutable
+  # attr_accessible :username, :email, :password, :password_confirmation
+end

data/test/rails_app/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -12,7 +12,7 @@ Rails::Initializer.run do |config|
   # -- all .rb files in that directory are automatically loaded.
 
   # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+  config.load_paths += [ "#{RAILS_ROOT}/app/#{DEVISE_ORM}/" ]
 
   # Specify gems that this application depends on and have them installed with rake gems:install
   # config.gem "bj"
@@ -26,7 +26,7 @@ Rails::Initializer.run do |config|
 
   # 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, :active_resource, :action_mailer ]
+  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

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

@@ -0,0 +1,76 @@
+# Use this hook to configure devise mailer, warden hooks and so forth. The first
+# four configuration values can also be set straight in your models.
+Devise.setup do |config|
+  # Configure Devise modules used by default. You should always set this value
+  # because if Devise adds a new strategy, it won't be added to your application
+  # by default, unless you configure it here.
+  #
+  # Remember that Devise includes other modules on its own (like :activatable
+  # and :timeoutable) which are not included here and also plugins. So be sure
+  # to check the docs for a complete set.
+  config.all = [:authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable]
+
+  # Invoke `rake secret` and use the printed value to setup a pepper to generate
+  # the encrypted password. By default no pepper is used.
+  # config.pepper = "rake secret output"
+
+  # Configure how many times you want the password is reencrypted. Default is 10.
+  # config.stretches = 10
+
+  # Define which will be the encryption algorithm. Supported algorithms are :sha1
+  # (default) and :sha512. Devise also supports encryptors from others authentication
+  # frameworks 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 = :sha1
+
+  # Configure which keys are used when authenticating an 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
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # config.authentication_keys = [ :email ]
+
+  # The time you want give to your user to confirm his account. During this time
+  # he will be able to access your application without confirming. Default is nil.
+  # config.confirm_within = 2.days
+
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # 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
+
+  # Configure the e-mail address which will be shown in DeviseMailer.
+  # config.mailer_sender = "foo.bar@yourapp.com"
+
+  # Load and configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
+  require "devise/orm/#{DEVISE_ORM}"
+  config.orm = DEVISE_ORM
+
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "sessions/users/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = true
+
+  # 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
+  #
+  # 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.unshift :twitter_oauth
+  # end
+
+  # Configure default_url_options if you are using dynamic segments in :path_prefix
+  # for devise_for.
+  #
+  # config.default_url_options do
+  #   { :locale => I18n.locale }
+  # end
+end

data/test/rails_app/config/routes.rb

@@ -1,12 +1,9 @@
 ActionController::Routing::Routes.draw do |map|
   map.devise_for :users
   map.devise_for :admin, :as => 'admin_area'
-  map.devise_for :account, :path_names => {
+  map.devise_for :accounts, :path_names => {
     :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification'
-  }
-  map.devise_for :organizers, :scope => 'manager',
-                              :path_prefix => '/:locale',
-                              :requirements => { :extra => 'value' }
+  }, :scope => 'manager', :path_prefix => '/:locale', :requirements => { :extra => 'value' }
 
   map.resources :users, :only => [:index], :member => { :expire => :get }
   map.resources :admins, :only => :index

data/test/routes_test.rb

@@ -53,30 +53,18 @@ class MapRoutingTest < ActionController::TestCase
   end
 
   test 'map account with custom path name for session sign in' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, 'account/login')
+    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/login')
   end
 
   test 'map account with custom path name for session sign out' do
-    assert_recognizes({:controller => 'sessions', :action => 'destroy'}, 'account/logout')
+    assert_recognizes({:controller => 'sessions', :action => 'destroy', :locale => 'en', :extra => 'value'}, '/en/accounts/logout')
   end
 
   test 'map account with custom path name for password' do
-    assert_recognizes({:controller => 'passwords', :action => 'new'}, 'account/secret/new')
+    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/secret/new')
   end
 
   test 'map account with custom path name for confirmation' do
-    assert_recognizes({:controller => 'confirmations', :action => 'new'}, 'account/verification/new')
-  end
-
-  test 'map organizer with custom singular name' do
-    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/password/new')
-  end
-
-  test 'map organizer with path prefix' do
-    assert_recognizes({:controller => 'sessions', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/sign_in')
-  end
-
-  test 'map organizer with additional route options' do
-    assert_recognizes({:controller => 'passwords', :action => 'new', :locale => "en", :extra => 'value'}, '/en/organizers/password/new')
+    assert_recognizes({:controller => 'confirmations', :action => 'new', :locale => 'en', :extra => 'value'}, '/en/accounts/verification/new')
   end
 end

data/test/support/assertions_helper.rb

@@ -19,4 +19,19 @@ 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

data/test/support/integration_tests_helper.rb

@@ -7,7 +7,7 @@ class ActionController::IntegrationTest
   def create_user(options={})
     @user ||= begin
       user = User.create!(
-        :email => 'user@test.com', :password => '123456', :password_confirmation => '123456'
+        :email => 'user@test.com', :password => '123456', :password_confirmation => '123456', :created_at => Time.now.utc
       )
       user.confirm! unless options[:confirm] == false
       user

data/test/support/model_tests_helper.rb

@@ -33,19 +33,4 @@ class ActiveSupport::TestCase
   def create_user(attributes={})
     User.create!(valid_attributes(attributes))
   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

data/test/support/test_silencer.rb

@@ -0,0 +1,5 @@
+module Devise
+  module TestSilencer
+    def test(*args, &block); end
+  end
+end

data/test/test_helper.rb

@@ -1,7 +1,11 @@
+require 'rubygems'
+
 ENV["RAILS_ENV"] = "test"
-require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
+DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
+
+puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
+require File.join(File.dirname(__FILE__), 'orm', DEVISE_ORM.to_s)
 
-require 'test_help'
 require 'webrat'
 require 'mocha'
 
@@ -11,34 +15,7 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'test.com'
 
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.logger = Logger.new(nil)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-
-ActiveRecord::Schema.define(:version => 1) do
-  [:users, :admins, :accounts].each do |table|
-    create_table table do |t|
-      t.authenticatable :null => table == :admins
-
-      if table != :admin
-        t.string :username
-        t.confirmable
-        t.recoverable
-        t.rememberable
-        t.trackable
-      end
-
-      t.timestamps
-    end
-  end
-end
-
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
-end
-
-class ActiveSupport::TestCase
-  self.use_transactional_fixtures = true
-  self.use_instantiated_fixtures  = false
-end
+end

data/test/test_helpers_test.rb

@@ -39,7 +39,7 @@ class TestHelpersTest < ActionController::TestCase
   end
 
   test "allows to sign in with different users" do
-    first_user = create_user(1)
+    first_user = create_user
     first_user.confirm!
 
     sign_in first_user
@@ -47,15 +47,11 @@ class TestHelpersTest < ActionController::TestCase
     assert_equal first_user.id.to_s, @response.body
     sign_out first_user
 
-    second_user = create_user(2)
+    second_user = create_user
     second_user.confirm!
 
     sign_in second_user
     get :show
     assert_equal second_user.id.to_s, @response.body
   end
-
-  def create_user(i=nil)
-    User.create!(:email => "jose.valim#{i}@plataformatec.com", :password => "123456")
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +01:00
+date: 2009-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,16 +69,19 @@ files:
 - lib/devise/encryptors/sha1.rb
 - lib/devise/encryptors/sha512.rb
 - lib/devise/failure_app.rb
-- lib/devise/hooks/confirmable.rb
+- lib/devise/hooks/activatable.rb
 - lib/devise/hooks/timeoutable.rb
 - lib/devise/hooks/trackable.rb
 - lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/models.rb
+- lib/devise/models/activatable.rb
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
+- lib/devise/models/cookie_serializer.rb
 - lib/devise/models/recoverable.rb
 - lib/devise/models/rememberable.rb
+- lib/devise/models/session_serializer.rb
 - lib/devise/models/timeoutable.rb
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
@@ -89,9 +92,9 @@ files:
 - lib/devise/rails/routes.rb
 - lib/devise/rails/warden_compat.rb
 - lib/devise/schema.rb
-- lib/devise/serializers/authenticatable.rb
 - lib/devise/serializers/base.rb
-- lib/devise/serializers/rememberable.rb
+- lib/devise/serializers/cookie.rb
+- lib/devise/serializers/session.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/test_helpers.rb
@@ -148,20 +151,25 @@ test_files:
 - test/models/trackable_test.rb
 - test/models/validatable_test.rb
 - test/models_test.rb
+- test/orm/active_record.rb
+- test/orm/mongo_mapper.rb
+- test/rails_app/app/active_record/account.rb
+- test/rails_app/app/active_record/admin.rb
+- test/rails_app/app/active_record/user.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/models/account.rb
-- test/rails_app/app/models/admin.rb
-- test/rails_app/app/models/organizer.rb
-- test/rails_app/app/models/user.rb
+- test/rails_app/app/mongo_mapper/account.rb
+- test/rails_app/app/mongo_mapper/admin.rb
+- test/rails_app/app/mongo_mapper/user.rb
 - test/rails_app/config/boot.rb
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
 - test/rails_app/config/environments/test.rb
+- test/rails_app/config/initializers/devise.rb
 - test/rails_app/config/initializers/inflections.rb
 - test/rails_app/config/initializers/new_rails_defaults.rb
 - test/rails_app/config/initializers/session_store.rb
@@ -170,5 +178,6 @@ test_files:
 - test/support/assertions_helper.rb
 - test/support/integration_tests_helper.rb
 - test/support/model_tests_helper.rb
+- test/support/test_silencer.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb

data/lib/devise/serializers/authenticatable.rb

@@ -1,11 +0,0 @@
-require 'devise/serializers/base'
-
-module Devise
-  module Serializers
-    class Authenticatable < Warden::Serializers::Session
-      include Devise::Serializers::Base
-    end
-  end
-end
-
-Warden::Serializers.add(:authenticatable, Devise::Serializers::Authenticatable)

data/lib/devise/serializers/rememberable.rb

@@ -1,30 +0,0 @@
-require 'devise/serializers/base'
-
-module Devise
-  module Serializers
-    class Rememberable < Warden::Serializers::Cookie
-      include Devise::Serializers::Base
-
-      def store(record, scope)
-        remember_me = params[scope].try(:fetch, :remember_me, nil)
-        if Devise::TRUE_VALUES.include?(remember_me) && record.respond_to?(:remember_me!)
-          record.remember_me!
-          super
-        end
-      end
-
-      def default_options(record)
-        super.merge!(:expires => record.remember_expires_at)
-      end
-
-      def delete(scope, record=nil)
-        if record && record.respond_to?(:forget_me!)
-          record.forget_me!
-          super
-        end
-      end
-    end
-  end
-end
-
-Warden::Serializers.add(:rememberable, Devise::Serializers::Rememberable)

data/test/rails_app/app/models/organizer.rb

@@ -1,3 +0,0 @@
-class Organizer < ActiveRecord::Base
-  devise :all
-end