wristband 1.0.5 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.1.0

data/lib/wristband/application_extensions.rb

@@ -11,15 +11,15 @@ module Wristband
     end
 
     module InstanceMethods
-      def login(session_user)
-        login_as_user(session_user.user, session_user.remember_me)
+      def login(session_user, cookie_expires_at = 2.weeks.from_now.utc)
+        login_as_user(session_user.user, session_user.remember_me, cookie_expires_at)
       end
       
-      def login_as_user(user, remember_me=false)
+      def login_as_user(user, remember_me=false, cookie_expires_at = 2.weeks.from_now.utc)
         self.current_user = user
         if remember_me
           token = Support.encrypt_with_salt(user.id.to_s, Time.now.to_f.to_s)
-          cookies[:login_token] = { :value => token, :expires => 2.weeks.from_now.utc }
+          cookies[:login_token] = { :value => token, :expires => cookie_expires_at}
           user.update_attribute(:remember_token, token)
         end
       end

data/lib/wristband/support.rb

@@ -13,12 +13,12 @@ module Wristband
     def encrypt_with_salt(password, salt)
       return password unless (salt and !salt.empty?)
     
-      Digest::SHA1.hexdigest([ password, salt ].to_s)
+      Digest::SHA1.hexdigest([ password, salt ].join)
     end
     module_function :encrypt_with_salt
   
     def random_salt(length = nil)
-      salt = Digest::SHA1.hexdigest([ rand, rand, random_string(64), rand, rand ].to_s)
+      salt = Digest::SHA1.hexdigest([ rand, rand, random_string(64), rand, rand ].join)
     
       length ? salt[0, length] : salt
     end

data/test/functional/sessions_controller_test.rb

@@ -90,4 +90,5 @@ class SessionsControllerTest < ActionController::TestCase
     assert_not_nil assigns(:session_user).user.remember_token
     assert_equal assigns(:session_user).user.remember_token, cookies['login_token']
   end
+  
 end

data/wristband.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wristband}
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   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-06-27}
+  s.date = %q{2011-09-13}
   s.description = %q{Provides a starting point for user authentication}
   s.email = %q{jack@theworkinggroup.ca}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wristband
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-27 00:00:00.000000000 -04:00
+date: 2011-09-13 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169497820 !ruby/object:Gem::Requirement
+  requirement: &2168802080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2169497820
+  version_requirements: *2168802080
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2169497240 !ruby/object:Gem::Requirement
+  requirement: &2168801260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *2169497240
+  version_requirements: *2168801260
 - !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &2169496660 !ruby/object:Gem::Requirement
+  requirement: &2168800540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2169496660
+  version_requirements: *2168800540
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169496120 !ruby/object:Gem::Requirement
+  requirement: &2168799800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169496120
+  version_requirements: *2168799800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169495540 !ruby/object:Gem::Requirement
+  requirement: &2168799280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169495540
+  version_requirements: *2168799280
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169494940 !ruby/object:Gem::Requirement
+  requirement: &2168798720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 3.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2169494940
+  version_requirements: *2168798720
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2169494360 !ruby/object:Gem::Requirement
+  requirement: &2168798060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 3.0.25
   type: :runtime
   prerelease: false
-  version_requirements: *2169494360
+  version_requirements: *2168798060
 - !ruby/object:Gem::Dependency
   name: formatted_form
-  requirement: &2169493780 !ruby/object:Gem::Requirement
+  requirement: &2168797340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169493780
+  version_requirements: *2168797340
 description: Provides a starting point for user authentication
 email: jack@theworkinggroup.ca
 executables: []
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2039141860052392450
+      hash: 2843623027733758625
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: