wristband 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/wristband/user_extensions.rb

@@ -59,8 +59,28 @@ module Wristband
         self.send("#{self.class.wristband[:password_column]}=", Wristband::Support.encrypt_with_salt(self.password, self.password_salt))
       end
     
+      # 231badb19b93e44f47da1bd64a8147f2
       def password_match?(string)
-        self.send(self.class.wristband[:password_column]) == Wristband::Support.encrypt_with_salt(string, self.password_salt)
+        if matches_legacy_password?(string)
+          self.password = string
+          initialize_salt
+          encrypt_password
+          self.send("#{self.class.wristband[:legacy_password][:column_name]}=", nil)
+          self.save
+        else
+          self.send(self.class.wristband[:password_column]) == Wristband::Support.encrypt_with_salt(string, self.password_salt)
+        end
+      end
+      
+      def matches_legacy_password?(string)
+        return unless self.class.wristband[:legacy_password][:column_name].present? && self.send(self.class.wristband[:legacy_password][:column_name]).present?
+        
+        case self.class.wristband[:legacy_password][:encryption]
+        when :md5
+          self.send("#{self.class.wristband[:legacy_password][:column_name]}") == Digest::MD5.hexdigest(string)
+        else
+          false
+        end
       end
     
       def password_hash=(value)
@@ -73,7 +93,6 @@ module Wristband
       def reset_perishable_token!
         update_attribute(:perishable_token, Wristband::Support.random_salt.gsub(/[^A-Za-z0-9]/,''))
       end
-      
     end
   end
 end

data/lib/wristband.rb

@@ -5,7 +5,7 @@ require 'wristband/authority_check'
 
 module Wristband
 
-  VERSION = "1.0.0"
+  VERSION = "1.0.5"
 
   class Engine < ::Rails::Engine; end
 
@@ -22,6 +22,7 @@ module Wristband
       options[:after_authentication]  ||= []
       options[:has_authorities]       ||= false
       options[:roles]                 ||= []
+      options[:legacy_password]       ||= {}
 
       class_eval do
         include Wristband::UserExtensions
@@ -53,7 +54,8 @@ module Wristband
         :before_authentication_chain  => [options[:before_authentication]].flatten,
         :after_authentication_chain   => [options[:after_authentication]].flatten,
         :password_column              => options[:password_column],
-        :roles                        => options[:roles]
+        :roles                        => options[:roles],
+        :legacy_password              => options[:legacy_password]
       }
       
       if options[:has_authorities]

data/test/unit/wristband_test.rb

@@ -11,6 +11,7 @@ class WristbandTest < ActiveSupport::TestCase
       initialize_token
       encrypt_password
       password_match?
+      matches_legacy_password?
       password_hash=
       is_admin?
       is_regular_user?
@@ -46,6 +47,7 @@ class WristbandTest < ActiveSupport::TestCase
     assert_equal User.wristband[:after_authentication_chain], []
     assert_equal User.wristband[:password_column], :password_hash
     assert_equal User.wristband[:roles], ['admin', 'regular_user']
+    assert_equal User.wristband[:legacy_password], {}
   end
   
   def test_authentication_by_email

data/wristband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Neto", "The Working Group Inc"]
-  s.date = %q{2011-02-15}
+  s.date = %q{2011-06-27}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -73,7 +73,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/twg/wristband}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{An authentication engine}
   s.test_files = [
     "test/dummy/user.rb",
@@ -88,7 +88,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,146 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wristband
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 4
-  version: 1.0.4
+version: !ruby/object:Gem::Version
+  version: 1.0.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jack Neto
 - The Working Group Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-15 00:00:00 -05:00
+date: 2011-06-27 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2169497820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169497820
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2169497240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 25
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169497240
+- !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2169496660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169496660
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2169496120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169496120
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2169495540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169495540
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2169494940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169494940
+- !ruby/object:Gem::Dependency
   name: haml
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2169494360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 25
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2169494360
+- !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2169493780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *2169493780
 description: Provides a starting point for user authentication
 email: jack@theworkinggroup.ca
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - .DS_Store
 - Gemfile
 - Gemfile.lock
@@ -198,37 +165,32 @@ files:
 has_rdoc: true
 homepage: http://github.com/twg/wristband
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -600781172638808744
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2039141860052392450
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An authentication engine
-test_files: 
+test_files:
 - test/dummy/user.rb
 - test/functional/passwords_controller_test.rb
 - test/functional/sessions_controller_test.rb