devise 0.4.2 → 0.4.3

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.4.3
+
+* bug fix
+  * [#29] Authentication fail if user cannot be serialized from session;
+  * Default configuration values should not overwrite user values;
+
 == 0.4.2
 
 * deprecations

data/Rakefile

@@ -36,7 +36,7 @@ begin
     s.description = "Flexible authentication solution for Rails with Warden"
     s.authors = ['José Valim', 'Carlos Antônio']
     s.files =  FileList["[A-Z]*", "{app,config,generators,lib}/**/*", "init.rb"]
-    s.add_dependency("warden", "~> 0.5.1")
+    s.add_dependency("warden", "~> 0.5.2")
   end
 
   Jeweler::GemcutterTasks.new

data/lib/devise.rb

@@ -12,17 +12,31 @@ module Devise
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
   # Maps the messages types that comes from warden to a flash type.
+  # This hash is not frozen, so you can add your messages as well.
   FLASH_MESSAGES = {
     :unauthenticated => :success,
     :unconfirmed => :failure
   }
 
-  # Models configuration
-  mattr_accessor :pepper, :stretches, :remember_for, :confirm_within
+  # Used to encrypt password. Please generate one with rake secret
+  mattr_accessor :pepper
+  @@pepper = nil
+  
+  # The number of times to encrypt password.
+  mattr_accessor :stretches
+  @@stretches = 10
+  
+  # Time interval where the remember me token is valid.
+  mattr_accessor :remember_for
+  @@remember_for = 2.weeks
+  
+  # Time interval you can access your account before confirming your account.
+  mattr_accessor :confirm_within
+  @@confirm_within = 0.days
 
-  # Mappings
+  # Store scopes mappings.
   mattr_accessor :mappings
-  self.mappings = {}
+  @@mappings = {}
 
   class << self
     # Default way to setup Devise. Run script/generate devise_install to create
@@ -76,4 +90,4 @@ module Devise
 end
 
 require 'devise/warden'
-require 'devise/rails'
+require 'devise/rails'

data/lib/devise/models.rb

@@ -16,9 +16,7 @@ module Devise
     # To add the class methods you need to have a module ClassMethods defined
     # inside the given class.
     #
-    def self.config(mod, accessor, default=nil) #:nodoc:
-      Devise.send :"#{accessor}=", default
-
+    def self.config(mod, accessor) #:nodoc:
       mod.class_eval <<-METHOD, __FILE__, __LINE__
         def #{accessor}
           self.class.#{accessor}

data/lib/devise/models/authenticatable.rb

@@ -91,7 +91,7 @@ module Devise
       end
 
       Devise::Models.config(self, :pepper)
-      Devise::Models.config(self, :stretches, 10)
+      Devise::Models.config(self, :stretches)
     end
   end
 end

data/lib/devise/models/confirmable.rb

@@ -150,7 +150,7 @@ module Devise
         end
       end
 
-      Devise::Models.config(self, :confirm_within, 0.days)
+      Devise::Models.config(self, :confirm_within)
     end
   end
 end

data/lib/devise/models/rememberable.rb

@@ -89,7 +89,7 @@ module Devise
         end
       end
 
-      Devise::Models.config(self, :remember_for, 2.weeks)
+      Devise::Models.config(self, :remember_for)
     end
   end
 end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.4.2".freeze
+  VERSION = "0.4.3".freeze
 end

data/lib/devise/warden.rb

@@ -13,7 +13,7 @@ Warden::Manager.serialize_into_session{ |user| [user.class, user.id] }
 # Session Serialization out. This block gets the user out of the session.
 # It should be the reverse of serializing the object into the session
 Warden::Manager.serialize_from_session do |klass, id|
-  klass.find(id)
+  klass.find_by_id(id)
 end
 
 # Setup devise strategies for Warden

data/test/integration/authenticatable_test.rb

@@ -184,4 +184,12 @@ class AuthenticationTest < ActionController::IntegrationTest
     visit 'users/index'
     assert_equal "Cart", @controller.user_session[:cart]
   end
+  
+  test 'destroyed account is logged out' do
+    sign_in_as_user
+    visit 'users/index'
+    User.destroy_all
+    visit 'users/index'
+    assert_redirected_to '/users/sign_in?unauthenticated=true'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -02:00
+date: 2009-11-10 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.5.1
+        version: 0.5.2
     version: 
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
@@ -112,43 +112,43 @@ signing_key:
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
 test_files: 
-- test/rails_app/config/boot.rb
-- test/rails_app/config/routes.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/environment.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/controllers/admins_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/app/models/admin.rb
-- test/rails_app/app/models/organizer.rb
-- test/rails_app/app/models/account.rb
-- test/rails_app/app/models/user.rb
-- test/controllers/url_helpers_test.rb
-- test/controllers/helpers_test.rb
 - test/controllers/filters_test.rb
-- test/models_test.rb
+- test/controllers/helpers_test.rb
+- test/controllers/url_helpers_test.rb
+- test/devise_test.rb
+- test/failure_test.rb
 - test/integration/authenticatable_test.rb
-- test/integration/rememberable_test.rb
-- test/integration/recoverable_test.rb
 - test/integration/confirmable_test.rb
+- test/integration/recoverable_test.rb
+- test/integration/rememberable_test.rb
 - test/mailers/confirmation_instructions_test.rb
 - test/mailers/reset_password_instructions_test.rb
+- test/mapping_test.rb
 - test/models/authenticatable_test.rb
-- test/models/rememberable_test.rb
+- test/models/confirmable_test.rb
 - test/models/recoverable_test.rb
+- test/models/rememberable_test.rb
 - test/models/validatable_test.rb
-- test/models/confirmable_test.rb
-- test/failure_test.rb
-- test/support/model_tests_helper.rb
+- test/models_test.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/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/new_rails_defaults.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/routes.rb
+- test/routes_test.rb
 - test/support/assertions_helper.rb
 - test/support/integration_tests_helper.rb
-- test/devise_test.rb
-- test/routes_test.rb
+- test/support/model_tests_helper.rb
 - test/test_helper.rb
-- test/mapping_test.rb