devise 0.9.0 → 0.9.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 0.9.1
+
+* bug fix
+  * Allow bigger salt size (by github.com/jgeiger)
+  * Fix relative url root
+
 == 0.9.0
 
 * deprecation

data/lib/devise/mapping.rb

@@ -92,24 +92,20 @@ module Devise
       self.path_prefix.count("/")
     end
 
-    # Returns the raw path using the current relative_url_root, path_prefix and as.
+    # Returns the raw path using path_prefix and as.
     def raw_path
-      ActionController::Base.relative_url_root.to_s + path_prefix + as.to_s
+      path_prefix + as.to_s
     end
 
-    # Returns the parsed path. If you need meta information in your path_prefix,
-    # you should overwrite this method to use it. The only information supported
-    # by default is I18n.locale.
-    #
+    # Returns the parsed path taking into account the relative url root and raw path.
     def parsed_path
-      returning raw_path do |path|
+      returning (ActionController::Base.relative_url_root.to_s + raw_path) do |path|
         self.class.default_url_options.each do |key, value|
           path.gsub!(key.inspect, value.to_param)
         end
       end
     end
 
-
     # Create magic predicates for verifying what module is activated by this map.
     # Example:
     #

data/lib/devise/models/authenticatable.rb

@@ -71,7 +71,7 @@ module Devise
 
         # Digests the password using the configured encryptor.
         def password_digest(password)
-          self.class.encryptor_class.digest(password, self.class.stretches, password_salt, self.class.pepper)
+          self.class.encryptor_class.digest(password, self.class.stretches, self.password_salt, self.class.pepper)
         end
 
       module ClassMethods

data/lib/devise/schema.rb

@@ -12,9 +12,9 @@ module Devise
       null       = options[:null] || false
       encryptor  = options[:encryptor] || (respond_to?(:encryptor) ? self.encryptor : :sha1)
 
-      apply_schema :email,              String, :null => null, :limit => 100
+      apply_schema :email,              String, :null => null
       apply_schema :encrypted_password, String, :null => null, :limit => Devise::ENCRYPTORS_LENGTH[encryptor]
-      apply_schema :password_salt,      String, :null => null, :limit => 20
+      apply_schema :password_salt,      String, :null => null
     end
 
     # Creates confirmation_token, confirmed_at and confirmation_sent_at.

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.9.0".freeze
+  VERSION = "0.9.1".freeze
 end

data/test/mapping_test.rb

@@ -97,18 +97,12 @@ class MappingTest < ActiveSupport::TestCase
     assert_equal '/:locale/accounts', Devise.mappings[:manager].raw_path
   end
   
-  test 'raw path adds in the relative_url_root' do
-    swap ActionController::Base, :relative_url_root => '/abc' do
-      assert_equal '/abc/users', Devise.mappings[:user].raw_path
-    end
-  end
-
-  test 'raw path deals with a nil relative_url_root' do
-    swap ActionController::Base, :relative_url_root => nil do
+  test 'raw path ignores the relative_url_root' do
+    swap ActionController::Base, :relative_url_root => "/abc" do
       assert_equal '/users', Devise.mappings[:user].raw_path
     end
   end
-
+  
   test 'parsed path is returned' do
     begin
       Devise.default_url_options {{ :locale => I18n.locale }}
@@ -119,12 +113,18 @@ class MappingTest < ActiveSupport::TestCase
     end
   end
   
-  test 'parsed path deals with non-standard relative_url_roots' do
-    swap ActionController::Base, :relative_url_root => "/abc" do
+  test 'parsed path adds in the relative_url_root' do
+    swap ActionController::Base, :relative_url_root => '/abc' do
       assert_equal '/abc/users', Devise.mappings[:user].parsed_path
     end
   end
-  
+
+  test 'parsed path deals with a nil relative_url_root' do
+    swap ActionController::Base, :relative_url_root => nil do
+      assert_equal '/users', Devise.mappings[:user].raw_path
+    end
+  end
+
   test 'should have default route options' do
     assert_equal({}, Devise.mappings[:user].route_options)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 +01:00
+date: 2010-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency