sorcery 0.7.2 → 0.7.3

data/Gemfile

@@ -4,15 +4,12 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 gem 'oauth', "~> 0.4.4"
 gem 'oauth2', "~> 0.4.1"
-gem 'mongo_mapper'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rails", ">= 3.0.0"
   gem 'json', ">= 1.5.1"
-  gem "mongoid", "~> 2.0"
-  gem "bson_ext", "~> 1.3"
   gem "rspec", "~> 2.5.0"
   gem 'rspec-rails', "~> 2.5.0"
   gem 'ruby-debug19'

data/Gemfile.lock

@@ -32,8 +32,6 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.2.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
     builder (3.0.0)
     columnize (0.3.4)
     diff-lcs (1.1.3)
@@ -56,25 +54,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongo_mapper (0.9.2)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.3.8)
-    mongoid (2.3.2)
-      activemodel (~> 3.1)
-      mongo (~> 1.4)
-      tzinfo (~> 0.3.22)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    plucky (0.3.8)
-      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.3.5)
     rack-cache (1.1)
@@ -100,7 +86,7 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rdoc (3.11)
       json (~> 1.4)
     rspec (2.5.0)
@@ -150,12 +136,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson_ext (~> 1.3)
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
   json (>= 1.5.1)
-  mongo_mapper
-  mongoid (~> 2.0)
   oauth (~> 0.4.4)
   oauth2 (~> 0.4.1)
   rails (>= 3.0.0)

data/README.rdoc

@@ -28,7 +28,7 @@ Railscast: http://railscasts.com/episodes/283-authentication-with-sorcery
 
 Example Rails 3 app using sorcery: https://github.com/NoamB/sorcery-example-app
 
-Documentation: http://rubydoc.info/gems/sorcery/0.7.2/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.7.3/frames
 
 Check out the tutorials in the github wiki!
 

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/generators/sorcery/install_generator.rb

@@ -54,6 +54,7 @@ module Sorcery
       # Define the next_migration_number method (necessary for the migration_template method to work)
       def self.next_migration_number(dirname)
         if ActiveRecord::Base.timestamped_migrations
+          sleep 100 # make sure each time we get a different timestamp
           Time.new.utc.strftime("%Y%m%d%H%M%S")
         else
           "%.3d" % (current_migration_number(dirname) + 1)

data/lib/sorcery/controller/submodules/activity_logging.rb

@@ -52,14 +52,14 @@ module Sorcery
           # This runs as a hook just after a successful login.
           def register_login_time_to_db(user, credentials)
             return unless Config.register_login_time
-            user.update_attributes!(user.sorcery_config.last_login_at_attribute_name => Time.now.utc)
+            user.update_attribute(user.sorcery_config.last_login_at_attribute_name, Time.now.in_time_zone)
           end
           
           # registers last logout time on every logout.
           # This runs as a hook just before a logout.
           def register_logout_time_to_db(user)
             return unless Config.register_logout_time
-            user.update_attributes!(user.sorcery_config.last_logout_at_attribute_name => Time.now.utc)
+            user.update_attribute(user.sorcery_config.last_logout_at_attribute_name, Time.now.in_time_zone)
           end
           
           # Updates last activity time on every request.
@@ -67,10 +67,10 @@ module Sorcery
           def register_last_activity_time_to_db
             return unless Config.register_last_activity_time
             return unless logged_in?
-            current_user.update_attributes!(current_user.sorcery_config.last_activity_at_attribute_name => Time.now.utc)
+            current_user.update_attribute(current_user.sorcery_config.last_activity_at_attribute_name, Time.now.in_time_zone)
           end
         end
       end
     end
   end
-end
+end

data/lib/sorcery/controller/submodules/brute_force_protection.rb

@@ -30,10 +30,10 @@ module Sorcery
           # Runs as a hook after a successful login.
           def reset_failed_logins_count!(user, credentials)
             user.send(:"#{user_class.sorcery_config.failed_logins_count_attribute_name}=", 0)
-            user.save!
+            user.save!(:validate => false)
           end
         end
       end
     end
   end
-end
+end

data/lib/sorcery/controller/submodules/external/providers/twitter.rb

@@ -55,7 +55,7 @@ module Sorcery
                   user_hash = {}
                   response = @access_token.get(@user_info_path)
                   user_hash[:user_info] = JSON.parse(response.body)
-                  user_hash[:uid] = user_hash[:user_info]['id']
+                  user_hash[:uid] = user_hash[:user_info]['id'].to_s
                   user_hash
                 end
                 

data/lib/sorcery/controller/submodules/remember_me.rb

@@ -1,7 +1,7 @@
 module Sorcery
   module Controller
     module Submodules
-      # The Remember Me submodule takes care of setting the user's cookie so that he will 
+      # The Remember Me submodule takes care of setting the user's cookie so that he will
       # be automatically logged in to the site on every visit,
       # until the cookie expires.
       # See Sorcery::Model::Submodules::RememberMe for configuration options.
@@ -12,20 +12,20 @@ module Sorcery
           Config.after_login << :remember_me_if_asked_to
           Config.after_logout << :forget_me!
         end
-        
+
         module InstanceMethods
           # This method sets the cookie and calls the user to save the token and the expiration to db.
           def remember_me!
             current_user.remember_me!
-            set_remember_me_cookie!(current_user)      
+            set_remember_me_cookie!(current_user)
           end
 
           # Clears the cookie and clears the token from the db.
           def forget_me!
             @current_user.forget_me!
-            cookies[:remember_me_token] = nil
+            cookies.delete(:remember_me_token, :domain => Config.cookie_domain)
           end
-          
+
           # Override.
           # logins a user instance, and optionally remembers him.
           def auto_login(user, should_remember = false)
@@ -33,31 +33,32 @@ module Sorcery
             @current_user = user
             remember_me! if should_remember
           end
-          
+
           protected
-          
+
           # calls remember_me! if a third credential was passed to the login method.
           # Runs as a hook after login.
           def remember_me_if_asked_to(user, credentials)
             remember_me! if ( credentials.size == 3 && credentials[2] && credentials[2] != "0" )
           end
-          
-          # Checks the cookie for a remember me token, tried to find a user with that token 
+
+          # Checks the cookie for a remember me token, tried to find a user with that token
           # and logs the user in if found.
           # Runs as a login source. See 'current_user' method for how it is used.
           def login_from_cookie
             user = cookies.signed[:remember_me_token] && user_class.find_by_remember_me_token(cookies.signed[:remember_me_token])
             if user && user.remember_me_token?
               set_remember_me_cookie!(user)
+              session[:user_id] = user.id
               @current_user = user
             else
               @current_user = false
             end
           end
-          
+
           def set_remember_me_cookie!(user)
-            cookies.signed[:remember_me_token] = { 
-              :value => user.send(user.sorcery_config.remember_me_token_attribute_name), 
+            cookies.signed[:remember_me_token] = {
+              :value => user.send(user.sorcery_config.remember_me_token_attribute_name),
               :expires => user.send(user.sorcery_config.remember_me_token_expires_at_attribute_name),
               :httponly => true,
               :domain => Config.cookie_domain

data/lib/sorcery/controller/submodules/session_timeout.rb

@@ -30,18 +30,18 @@ module Sorcery
           # Registers last login to be used as the timeout starting point.
           # Runs as a hook after a successful login.
           def register_login_time(user, credentials)
-            session[:login_time] = session[:last_action_time] = Time.now.utc
+            session[:login_time] = session[:last_action_time] = Time.now.in_time_zone
           end
           
           # Checks if session timeout was reached and expires the current session if so.
           # To be used as a before_filter, before require_login
           def validate_session
             session_to_use = Config.session_timeout_from_last_action ? session[:last_action_time] : session[:login_time]
-            if session_to_use && (Time.now.utc - session_to_use > Config.session_timeout)
+            if session_to_use && (Time.now.in_time_zone - session_to_use > Config.session_timeout)
               reset_session
               @current_user = nil
             else
-              session[:last_action_time] = Time.now.utc
+              session[:last_action_time] = Time.now.in_time_zone
             end
           end
 

data/lib/sorcery/model/submodules/brute_force_protection.rb

@@ -54,7 +54,7 @@ module Sorcery
             config = sorcery_config
             return if !unlocked?
             self.increment(config.failed_logins_count_attribute_name)
-            save!
+            save!(:validate => false)
             self.lock! if self.send(config.failed_logins_count_attribute_name) >= config.consecutive_login_retries_amount_limit
           end
           
@@ -62,15 +62,15 @@ module Sorcery
 
           def lock!
             config = sorcery_config
-            self.send(:"#{config.lock_expires_at_attribute_name}=", Time.now.utc + config.login_lock_time_period)
-            self.save!
+            self.send(:"#{config.lock_expires_at_attribute_name}=", Time.now.in_time_zone + config.login_lock_time_period)
+            self.save!(validate: false)
           end
 
           def unlock!
             config = sorcery_config
             self.send(:"#{config.lock_expires_at_attribute_name}=", nil)
             self.send(:"#{config.failed_logins_count_attribute_name}=", 0)
-            self.save!
+            self.save!(validate: false)
           end
           
           def unlocked?
@@ -83,7 +83,7 @@ module Sorcery
           def prevent_locked_user_login
             config = sorcery_config
             if !self.unlocked? && config.login_lock_time_period != 0
-              self.unlock! if self.send(config.lock_expires_at_attribute_name) <= Time.now.utc
+              self.unlock! if self.send(config.lock_expires_at_attribute_name) <= Time.now.in_time_zone
             end
             unlocked?
           end
@@ -91,4 +91,4 @@ module Sorcery
       end
     end
   end
-end
+end

data/lib/sorcery/model/submodules/remember_me.rb

@@ -50,7 +50,7 @@ module Sorcery
           def remember_me!
             config = sorcery_config
             self.send(:"#{config.remember_me_token_attribute_name}=", TemporaryToken.generate_random_token)
-            self.send(:"#{config.remember_me_token_expires_at_attribute_name}=", Time.now + config.remember_me_for)
+            self.send(:"#{config.remember_me_token_expires_at_attribute_name}=", Time.now.in_time_zone + config.remember_me_for)
             self.save!(:validate => false)
           end
           

data/lib/sorcery/model/submodules/reset_password.rb

@@ -91,8 +91,8 @@ module Sorcery
             # hammering protection
             return if config.reset_password_time_between_emails && self.send(config.reset_password_email_sent_at_attribute_name) && self.send(config.reset_password_email_sent_at_attribute_name) > config.reset_password_time_between_emails.ago.utc
             self.send(:"#{config.reset_password_token_attribute_name}=", TemporaryToken.generate_random_token)
-            self.send(:"#{config.reset_password_token_expires_at_attribute_name}=", Time.now.utc + config.reset_password_expiration_period) if config.reset_password_expiration_period
-            self.send(:"#{config.reset_password_email_sent_at_attribute_name}=", Time.now.utc)
+            self.send(:"#{config.reset_password_token_expires_at_attribute_name}=", Time.now.in_time_zone + config.reset_password_expiration_period) if config.reset_password_expiration_period
+            self.send(:"#{config.reset_password_email_sent_at_attribute_name}=", Time.now.in_time_zone)
             self.class.transaction do
               self.save!(:validate => false)
               generic_send_email(:reset_password_email_method_name, :reset_password_mailer)

data/lib/sorcery/model/submodules/user_activation.rb

@@ -115,7 +115,7 @@ module Sorcery
             generated_activation_token = TemporaryToken.generate_random_token
             self.send(:"#{config.activation_token_attribute_name}=", generated_activation_token)
             self.send(:"#{config.activation_state_attribute_name}=", "pending")
-            self.send(:"#{config.activation_token_expires_at_attribute_name}=", Time.now.utc + config.activation_token_expiration_period) if config.activation_token_expiration_period
+            self.send(:"#{config.activation_token_expires_at_attribute_name}=", Time.now.in_time_zone + config.activation_token_expiration_period) if config.activation_token_expiration_period
           end
 
           # called automatically after user initial creation.

data/lib/sorcery/model/temporary_token.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Sorcery
   module Model
     # This module encapsulates the logic for temporary token.
@@ -10,7 +12,7 @@ module Sorcery
       
       # Random code, used for salt and temporary tokens.
       def self.generate_random_token
-        Digest::SHA1.hexdigest( Time.now.to_s.split(//).sort_by {rand}.join )
+        SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
       end
       
       module ClassMethods
@@ -18,7 +20,7 @@ module Sorcery
           return nil if token.blank?
           user = find_by_sorcery_token(token_attr_name,token)
           if !user.blank? && !user.send(token_expiration_date_attr).nil?
-            return Time.now.utc < user.send(token_expiration_date_attr) ? user : nil
+            return Time.now.in_time_zone < user.send(token_expiration_date_attr) ? user : nil
           end
           user
         end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2011-10-22"
+  s.date = "2011-10-29"
   s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
   s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
@@ -307,11 +307,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
       s.add_runtime_dependency(%q<oauth2>, ["~> 0.4.1"])
-      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 3.0.0"])
       s.add_development_dependency(%q<json>, [">= 1.5.1"])
-      s.add_development_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_development_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
@@ -327,11 +324,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<oauth>, ["~> 0.4.4"])
       s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 3.0.0"])
       s.add_dependency(%q<json>, [">= 1.5.1"])
-      s.add_dependency(%q<mongoid>, ["~> 2.0"])
-      s.add_dependency(%q<bson_ext>, ["~> 1.3"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
       s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
@@ -348,11 +342,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<oauth>, ["~> 0.4.4"])
     s.add_dependency(%q<oauth2>, ["~> 0.4.1"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 3.0.0"])
     s.add_dependency(%q<json>, [">= 1.5.1"])
-    s.add_dependency(%q<mongoid>, ["~> 2.0"])
-    s.add_dependency(%q<bson_ext>, ["~> 1.3"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
     s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])

data/spec/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.7.1)
+    sorcery (0.7.2)
       bcrypt-ruby (~> 3.0.0)
-      mongo_mapper
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
       oauth2 (~> 0.4.1)
@@ -43,7 +42,6 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
     builder (2.1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
@@ -61,21 +59,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongo_mapper (0.9.2)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.3.8)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    plucky (0.3.8)
-      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -95,7 +85,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/spec/rails3/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.1)
+    sorcery (0.7.2)
       bcrypt-ruby (~> 3.0.0)
-      mongo_mapper
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
       oauth2 (~> 0.4.1)
@@ -43,7 +42,6 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
     builder (2.1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
@@ -63,21 +61,13 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongo_mapper (0.9.2)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.3.8)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     oauth (0.4.5)
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    plucky (0.3.8)
-      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -97,7 +87,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -30,7 +30,7 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       @user.last_login_at.should_not be_nil
       @user.last_login_at.to_s(:db).should >= now.to_s(:db)
@@ -39,7 +39,7 @@ describe ApplicationController do
 
     it "should log logout time on logout" do
       login_user
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       logout_user
       User.first.last_logout_at.should_not be_nil
       User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
@@ -48,7 +48,7 @@ describe ApplicationController do
 
     it "should log last activity time when logged in" do
       login_user
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       get :some_action
       User.first.last_activity_at.to_s(:db).should >= now.to_s(:db)
       User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
@@ -81,14 +81,14 @@ describe ApplicationController do
     
     it "should not register login time if configured so" do
       sorcery_controller_property_set(:register_login_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       @user.last_login_at.should be_nil
     end
     
     it "should not register logout time if configured so" do
       sorcery_controller_property_set(:register_logout_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       logout_user
       @user.last_logout_at.should be_nil
@@ -96,7 +96,7 @@ describe ApplicationController do
     
     it "should not register last activity time if configured so" do
       sorcery_controller_property_set(:register_last_activity_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       get :some_action
       @user.last_activity_at.should be_nil

data/spec/rails3/spec/controller_brute_force_protection_spec.rb

@@ -47,7 +47,7 @@ describe ApplicationController do
       get :test_login, :username => 'gizmo', :password => 'blabla'
       get :test_login, :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.should_not be_nil
-      Timecop.travel(Time.now + 0.3)
+      Timecop.travel(Time.now.in_time_zone + 0.3)
       get :test_login, :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.should be_nil
     end
@@ -58,7 +58,7 @@ describe ApplicationController do
       get :test_login, :username => 'gizmo', :password => 'blabla'
       get :test_login, :username => 'gizmo', :password => 'blabla'
       unlock_date = User.find_by_username('gizmo').lock_expires_at
-      Timecop.travel(Time.now + 1)
+      Timecop.travel(Time.now.in_time_zone + 1)
       get :test_login, :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.to_s.should == unlock_date.to_s
     end

data/spec/rails3/spec/controller_session_timeout_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationController do
     
     it "should reset session after session timeout" do
       login_user
-      Timecop.travel(Time.now+0.6)
+      Timecop.travel(Time.now.in_time_zone+0.6)
       get :test_should_be_logged_in
       session[:user_id].should be_nil
       response.should be_a_redirect
@@ -33,10 +33,10 @@ describe ApplicationController do
       it "should not logout if there was activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         get :test_login, :username => 'gizmo', :password => 'secret'
-        Timecop.travel(Time.now+0.3)
+        Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
         session[:user_id].should_not be_nil
-        Timecop.travel(Time.now+0.3)
+        Timecop.travel(Time.now.in_time_zone+0.3)
         get :test_should_be_logged_in
         session[:user_id].should_not be_nil
         response.should be_a_success
@@ -45,7 +45,7 @@ describe ApplicationController do
       it "with 'session_timeout_from_last_action' should logout if there was no activity" do
         sorcery_controller_property_set(:session_timeout_from_last_action, true)
         get :test_login, :username => 'gizmo', :password => 'secret'
-        Timecop.travel(Time.now+0.6)
+        Timecop.travel(Time.now.in_time_zone+0.6)
         get :test_should_be_logged_in
         session[:user_id].should be_nil
         response.should be_a_redirect

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.1)
+    sorcery (0.7.2)
       bcrypt-ruby (~> 3.0.0)
-      mongo_mapper
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
       oauth2 (~> 0.4.1)
@@ -43,8 +42,8 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (2.1.2)
     coderay (0.9.8)
     columnize (0.3.4)
@@ -63,11 +62,11 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.6.6)
-      ruby_parser (~> 2.0.5)
-    mime-types (1.16)
-    mongo (1.4.1)
-      bson (= 1.4.1)
+    method_source (0.6.7)
+      ruby_parser (>= 2.3.1)
+    mime-types (1.17.2)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mongo_mapper (0.9.2)
       activemodel (~> 3.0)
       activesupport (~> 3.0)
@@ -81,10 +80,10 @@ GEM
     plucky (0.3.8)
       mongo (~> 1.3)
     polyglot (0.3.2)
-    pry (0.9.6.2)
+    pry (0.9.7.3)
       coderay (~> 0.9.8)
-      method_source (~> 0.6.5)
-      ruby_parser (~> 2.0.5)
+      method_source (~> 0.6.7)
+      ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -104,7 +103,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -128,7 +127,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.7)
     simplecov (0.5.4)

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.1)
+    sorcery (0.7.2)
       bcrypt-ruby (~> 3.0.0)
-      mongo_mapper
       oauth (~> 0.4.4)
       oauth (~> 0.4.4)
       oauth2 (~> 0.4.1)
@@ -43,8 +42,8 @@ GEM
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
-    bson (1.4.1)
-    bson_ext (1.4.1)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (2.1.2)
     columnize (0.3.4)
     diff-lcs (1.1.3)
@@ -62,13 +61,9 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    mongo (1.4.1)
-      bson (= 1.4.1)
-    mongo_mapper (0.9.2)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.3.8)
+    mime-types (1.17.2)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
     mongoid (2.2.3)
       activemodel (~> 3.0)
       mongo (~> 1.3)
@@ -79,8 +74,6 @@ GEM
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    plucky (0.3.8)
-      mongo (~> 1.3)
     polyglot (0.3.2)
     rack (1.2.4)
     rack-mount (0.6.14)
@@ -100,7 +93,7 @@ GEM
       activesupport (= 3.0.3)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.9.2.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)

data/spec/rails3_mongoid/spec/controller_activity_logging_spec.rb

@@ -23,7 +23,7 @@ describe ApplicationController do
     end
 
     it "should log login time on login" do
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       @user.last_login_at.should_not be_nil
       @user.last_login_at.to_s(:db).should >= now.to_s(:db)
@@ -32,7 +32,7 @@ describe ApplicationController do
 
     it "should log logout time on logout" do
       login_user
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       logout_user
       User.first.last_logout_at.should_not be_nil
       User.first.last_logout_at.to_s(:db).should >= now.to_s(:db)
@@ -41,7 +41,7 @@ describe ApplicationController do
 
     it "should log last activity time when logged in" do
       login_user
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       get :some_action
       User.first.last_activity_at.to_s(:db).should >= now.to_s(:db)
       User.first.last_activity_at.to_s(:db).should <= (now+2).to_s(:db)
@@ -74,14 +74,14 @@ describe ApplicationController do
     
     it "should not register login time if configured so" do
       sorcery_controller_property_set(:register_login_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       @user.last_login_at.should be_nil
     end
     
     it "should not register logout time if configured so" do
       sorcery_controller_property_set(:register_logout_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       logout_user
       @user.last_logout_at.should be_nil
@@ -89,7 +89,7 @@ describe ApplicationController do
     
     it "should not register last activity time if configured so" do
       sorcery_controller_property_set(:register_last_activity_time, false)
-      now = Time.now.utc
+      now = Time.now.in_time_zone
       login_user
       get :some_action
       @user.last_activity_at.should be_nil

data/spec/shared_examples/user_activation_shared_examples.rb

@@ -155,7 +155,7 @@ shared_examples_for "rails_3_activation_model" do
     it "load_from_activation_token should NOT return user when token is found and expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 0.1)
       create_new_user
-      Timecop.travel(Time.now+0.5)
+      Timecop.travel(Time.now.in_time_zone+0.5)
       User.load_from_activation_token(@user.activation_token).should == nil
     end
     

data/spec/shared_examples/user_remember_me_shared_examples.rb

@@ -34,7 +34,7 @@ shared_examples_for "rails_3_remember_me_model" do
     it "should set an expiration based on 'remember_me_for' attribute" do
       sorcery_model_property_set(:remember_me_for, 2 * 60 * 60 * 24)
       @user.remember_me!
-      @user.remember_me_token_expires_at.utc.to_s.should == (Time.now + 2 * 60 * 60 * 24).utc.to_s
+      @user.remember_me_token_expires_at.utc.to_s.should == (Time.now.in_time_zone + 2 * 60 * 60 * 24).utc.to_s
     end
     
     it "should delete the token and expiration on 'forget_me!'" do

data/spec/shared_examples/user_reset_password_shared_examples.rb

@@ -93,7 +93,7 @@ shared_examples_for "rails_3_reset_password_model" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, 0.1)
       @user.deliver_reset_password_instructions!
-      Timecop.travel(Time.now+0.5)
+      Timecop.travel(Time.now.in_time_zone+0.5)
       User.load_from_reset_password_token(@user.reset_password_token).should == nil
     end
     
@@ -157,7 +157,7 @@ shared_examples_for "rails_3_reset_password_model" do
       old_size = ActionMailer::Base.deliveries.size
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 1
-      Timecop.travel(Time.now+0.5)
+      Timecop.travel(Time.now.in_time_zone+0.5)
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 2
     end

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-22 00:00:00 Z
+date: 2011-10-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -34,20 +34,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -55,10 +44,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,32 +55,10 @@ dependencies:
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
-  type: :development
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: bson_ext
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
-  type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,10 +66,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,10 +77,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -121,10 +88,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,10 +99,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,10 +110,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id012
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -154,10 +121,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -165,10 +132,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id014
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -176,10 +143,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *id015
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,10 +154,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -198,10 +165,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *id017
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: oauth
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -209,10 +176,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *id018
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: oauth2
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -220,7 +187,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *id019
+  version_requirements: *id016
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []