sorcery 0.8.4 → 0.8.5

data/lib/sorcery/controller/submodules/external/protocols/oauth2.rb

@@ -14,7 +14,8 @@ module Sorcery
               client.auth_code.authorize_url(
                 :redirect_uri => @callback_url,
                 :scope => @scope,
-                :display => @display
+                :display => @display,
+                :state => @state
               )
             end
 

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

@@ -37,7 +37,8 @@ module Sorcery
                               :scope,
                               :user_info_mapping,
                               :display,
-                              :access_permissions
+                              :access_permissions,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth2

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

@@ -37,7 +37,8 @@ module Sorcery
                               :site,
                               :scope,
                               :user_info_path,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth2

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

@@ -37,7 +37,8 @@ module Sorcery
                               :token_path,
                               :user_info_url,
                               :scope,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth2

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

@@ -39,7 +39,8 @@ module Sorcery
                               :user_info_path,
                               :user_info_mapping,
                               :user_info_fields,
-                              :access_permissions
+                              :access_permissions,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth1

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

@@ -37,7 +37,8 @@ module Sorcery
                               :token_path,
                               :user_info_url,
                               :scope,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth2

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

@@ -37,7 +37,8 @@ module Sorcery
                               :callback_url,
                               :site,
                               :user_info_path,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth1
@@ -67,7 +68,7 @@ module Sorcery
 
                 # calculates and returns the url to which the user should be redirected,
                 # to get authenticated at the external provider's site.
-                def login_url(params,session)
+                def login_url(params, session)
                   req_token = self.get_request_token
                   session[:request_token]         = req_token.token
                   session[:request_token_secret]  = req_token.secret

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

@@ -35,7 +35,8 @@ module Sorcery
                               :auth_path,
                               :token_path,
                               :site,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth2

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

@@ -37,7 +37,8 @@ module Sorcery
                               :request_token_path,
                               :access_token_path,
                               :user_info_path,
-                              :user_info_mapping
+                              :user_info_mapping,
+                              :state
                 attr_reader   :access_token
 
                 include Protocols::Oauth1

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

@@ -31,7 +31,7 @@ module Sorcery
 
           # Clears the cookie and clears the token from the db.
           def forget_me!
-            @current_user.forget_me!
+            current_user.forget_me!
             cookies.delete(:remember_me_token, :domain => Config.cookie_domain)
           end
 

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

@@ -38,7 +38,7 @@ module Sorcery
           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.in_time_zone - session_to_use > Config.session_timeout)
-              reset_session
+              reset_sorcery_session
               @current_user = nil
             else
               session[:last_action_time] = Time.now.in_time_zone

data/lib/sorcery/model.rb

@@ -104,10 +104,16 @@ module Sorcery
       # returns the user if success, nil otherwise.
       def authenticate(*credentials)
         raise ArgumentError, "at least 2 arguments required" if credentials.size < 2
-        credentials[0].downcase! if @sorcery_config.downcase_username_before_authenticating
+
+        return false if credentials[0].blank?
+
+        if @sorcery_config.downcase_username_before_authenticating
+          credentials[0].downcase!
+        end
+
         user = find_by_credentials(credentials)
 
-        set_encryption_attributes()
+        set_encryption_attributes
 
         _salt = user.send(@sorcery_config.salt_attribute_name) if user && !@sorcery_config.salt_attribute_name.nil? && !@sorcery_config.encryption_provider.nil?
         user if user && @sorcery_config.before_authenticate.all? {|c| user.send(c)} && credentials_match?(user.send(@sorcery_config.crypted_password_attribute_name),credentials[1],_salt)
@@ -230,7 +236,7 @@ module Sorcery
       def initialize
         @defaults = {
           :@submodules                           => [],
-          :@username_attribute_names              => [:username],
+          :@username_attribute_names              => [:email],
           :@password_attribute_name              => :password,
           :@downcase_username_before_authenticating => false,
           :@email_attribute_name                 => :email,

data/lib/sorcery/model/adapters/mongoid.rb

@@ -9,7 +9,7 @@ module Sorcery
 
         module InstanceMethods
           def increment(attr)
-            self.inc(attr,1)
+            self.inc(attr, 1)
           end
 
           def update_many_attributes(attrs)
@@ -27,8 +27,8 @@ module Sorcery
 
         module ClassMethods
           def credential_regex(credential)
-            return { :$regex =>  /^#{credential}$/i  }  if (@sorcery_config.downcase_username_before_authenticating)
-            return credential
+            return { :$regex =>  /^#{credential}$/i  } if (@sorcery_config.downcase_username_before_authenticating)
+            credential
           end
 
           def find_by_credentials(credentials)

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

@@ -82,8 +82,8 @@ module Sorcery
           def unlock!
             config = sorcery_config
             attributes = {config.lock_expires_at_attribute_name => nil,
-                          config.failed_logins_count_attribute_name => 0}
-            attributes[config.unlock_token_attribute_name] = nil unless config.unlock_token_mailer_disabled or config.unlock_token_mailer.nil?
+                          config.failed_logins_count_attribute_name => 0,
+                          config.unlock_token_attribute_name => nil}
             self.update_many_attributes(attributes)
           end
 
@@ -91,14 +91,12 @@ module Sorcery
 
           def lock!
             config = sorcery_config
-            attributes = {config.lock_expires_at_attribute_name => Time.now.in_time_zone + config.login_lock_time_period}
+            attributes = {config.lock_expires_at_attribute_name => Time.now.in_time_zone + config.login_lock_time_period,
+                          config.unlock_token_attribute_name => TemporaryToken.generate_random_token}
+            self.update_many_attributes(attributes)
 
             unless config.unlock_token_mailer_disabled || config.unlock_token_mailer.nil?
-              attributes[config.unlock_token_attribute_name] = TemporaryToken.generate_random_token
-              self.update_many_attributes(attributes)
               send_unlock_token_email!
-            else
-              self.update_many_attributes(attributes)
             end
           end
 
@@ -108,7 +106,7 @@ module Sorcery
           end
 
           def send_unlock_token_email!
-            generic_send_email(:unlock_token_email_method_name, :unlock_token_mailer) unless sorcery_config.unlock_token_email_method_name.nil? or sorcery_config.unlock_token_mailer_disabled == true
+            generic_send_email(:unlock_token_email_method_name, :unlock_token_mailer) unless sorcery_config.unlock_token_email_method_name.nil?
           end
 
           # Prevents a locked user from logging in, and unlocks users that expired their lock time.

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

@@ -101,7 +101,7 @@ module Sorcery
             attributes[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.class.transaction do
               self.update_many_attributes(attributes)
-              generic_send_email(:reset_password_email_method_name, :reset_password_mailer) unless config.reset_password_mailer_disabled
+              send_reset_password_email! unless sorcery_config.reset_password_mailer_disabled
             end
           end
           
@@ -113,6 +113,10 @@ module Sorcery
           end
 
           protected
+          
+          def send_reset_password_email!
+            generic_send_email(:reset_password_email_method_name, :reset_password_mailer)
+          end
 
           # Clears the token.
           def clear_reset_password_token

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

@@ -54,7 +54,7 @@ module Sorcery
             # don't setup activation if no password supplied - this user is created automatically
             before_create :setup_activation, :if => Proc.new { |user| user.send(sorcery_config.password_attribute_name).present? }
             # don't send activation needed email if no crypted password created - this user is external (OAuth etc.)
-            after_create  :send_activation_needed_email!, :if => Proc.new { |user| !user.external? }
+            after_create  :send_activation_needed_email!, :if => :send_activation_needed_email?
           end
           
           base.sorcery_config.after_config << :validate_mailer_defined
@@ -111,7 +111,7 @@ module Sorcery
             config = sorcery_config
             self.send(:"#{config.activation_token_attribute_name}=", nil)
             self.send(:"#{config.activation_state_attribute_name}=", "active")
-            send_activation_success_email! unless self.external?
+            send_activation_success_email! if send_activation_success_email?
             save!(:validate => false) # don't run validations
           end
           
@@ -127,11 +127,25 @@ module Sorcery
 
           # called automatically after user initial creation.
           def send_activation_needed_email!
-            generic_send_email(:activation_needed_email_method_name, :user_activation_mailer) unless sorcery_config.activation_needed_email_method_name.nil? or sorcery_config.activation_mailer_disabled == true
+            generic_send_email(:activation_needed_email_method_name, :user_activation_mailer)
           end
 
           def send_activation_success_email!
-            generic_send_email(:activation_success_email_method_name, :user_activation_mailer) unless sorcery_config.activation_success_email_method_name.nil? or sorcery_config.activation_mailer_disabled == true
+            generic_send_email(:activation_success_email_method_name, :user_activation_mailer)
+          end
+          
+          def send_activation_success_email?
+            !external? && (
+              !(sorcery_config.activation_success_email_method_name.nil? ||
+                sorcery_config.activation_mailer_disabled == true)
+            )
+          end
+          
+          def send_activation_needed_email?
+            !external? && (
+              !(sorcery_config.activation_needed_email_method_name.nil? ||
+                sorcery_config.activation_mailer_disabled == true)
+            )
           end
           
           def prevent_non_active_login

data/lib/sorcery/test_helpers/internal.rb

@@ -15,7 +15,7 @@ module Sorcery
       end
 
       # a patch to fix a bug in testing that happens when you 'destroy' a session twice.
-      # After the first destroy, the session is an ordinary hash, and then when destroy 
+      # After the first destroy, the session is an ordinary hash, and then when destroy
       # is called again there's an exception.
       class ::Hash
         def destroy
@@ -23,9 +23,13 @@ module Sorcery
         end
       end
 
-      def create_new_user(attributes_hash = nil)
+      def build_new_user(attributes_hash = nil)
         user_attributes_hash = attributes_hash || {:username => 'gizmo', :email => "bla@bla.com", :password => 'secret'}
         @user = User.new(user_attributes_hash)
+      end
+
+      def create_new_user(attributes_hash = nil)
+        @user = build_new_user(attributes_hash)
         @user.save!
         @user
       end
@@ -38,6 +42,16 @@ module Sorcery
         @user
       end
 
+      def custom_create_new_external_user(provider, authentication_class, attributes_hash = nil)
+        authentication_association = authentication_class.name.underscore.pluralize
+
+        user_attributes_hash = attributes_hash || {:username => 'gizmo'}
+        @user = User.new(user_attributes_hash)
+        @user.save!
+        @user.send(authentication_association).create!({:provider => provider, :uid => 123})
+        @user
+      end
+
       def sorcery_model_property_set(property, *values)
         User.class_eval do
           sorcery_config.send(:"#{property}=", *values)
@@ -49,9 +63,12 @@ module Sorcery
       # reload user class between specs
       # so it will be possible to test the different submodules in isolation
       def reload_user_class
-        Object.send(:remove_const,:User)
+        Object.send(:remove_const, "User")
         load 'user.rb'
+        if User.respond_to?(:reset_column_information)
+          User.reset_column_information
+        end
       end
     end
   end
-end
+end

data/lib/sorcery/test_helpers/internal/rails.rb

@@ -5,14 +5,14 @@ module Sorcery
         include ::Sorcery::TestHelpers::Rails
 
         SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [
-          :register_last_activity_time_to_db, 
-          :deny_banned_user, 
+          :register_last_activity_time_to_db,
+          :deny_banned_user,
           :validate_session
         ]
 
         def sorcery_reload!(submodules = [], options = {})
           reload_user_class
-          
+
           # return to no-module configuration
           ::Sorcery::Controller::Config.init!
           ::Sorcery::Controller::Config.reset!
@@ -20,7 +20,7 @@ module Sorcery
           # remove all plugin before_filters so they won't fail other tests.
           # I don't like this way, but I didn't find another.
           # hopefully it won't break until Rails 4.
-          ApplicationController._process_action_callbacks.delete_if {|c| SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
+          SorceryController._process_action_callbacks.delete_if {|c| SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
 
           # configure
           ::Sorcery::Controller::Config.submodules = submodules

data/lib/sorcery/test_helpers/rails.rb

@@ -4,8 +4,8 @@ module Sorcery
       # logins a user and calls all callbacks
       def login_user(user = nil)
         user ||= @user
-        @controller.send(:auto_login,user)
-        @controller.send(:after_login!,user,[user.send(user.sorcery_config.username_attribute_names.first),'secret'])
+        @controller.send(:auto_login, user)
+        @controller.send(:after_login!, user, [user.send(user.sorcery_config.username_attribute_names.first), 'secret'])
       end
 
       def logout_user

data/sorcery.gemspec

@@ -1,372 +1,34 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.8.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Noam Ben Ari"]
-  s.date = "2013-11-10"
-  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
+  s.version = "0.8.5"
+  s.authors = ["Noam Ben Ari", "Kir Shatrov"]
   s.email = "nbenari@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/generators/sorcery/USAGE",
-    "lib/generators/sorcery/install_generator.rb",
-    "lib/generators/sorcery/templates/initializer.rb",
-    "lib/generators/sorcery/templates/migration/activity_logging.rb",
-    "lib/generators/sorcery/templates/migration/brute_force_protection.rb",
-    "lib/generators/sorcery/templates/migration/core.rb",
-    "lib/generators/sorcery/templates/migration/external.rb",
-    "lib/generators/sorcery/templates/migration/remember_me.rb",
-    "lib/generators/sorcery/templates/migration/reset_password.rb",
-    "lib/generators/sorcery/templates/migration/user_activation.rb",
-    "lib/sorcery.rb",
-    "lib/sorcery/controller.rb",
-    "lib/sorcery/controller/submodules/activity_logging.rb",
-    "lib/sorcery/controller/submodules/brute_force_protection.rb",
-    "lib/sorcery/controller/submodules/external.rb",
-    "lib/sorcery/controller/submodules/external/protocols/certs/ca-bundle.crt",
-    "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
-    "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
-    "lib/sorcery/controller/submodules/external/providers/base.rb",
-    "lib/sorcery/controller/submodules/external/providers/facebook.rb",
-    "lib/sorcery/controller/submodules/external/providers/github.rb",
-    "lib/sorcery/controller/submodules/external/providers/google.rb",
-    "lib/sorcery/controller/submodules/external/providers/linkedin.rb",
-    "lib/sorcery/controller/submodules/external/providers/liveid.rb",
-    "lib/sorcery/controller/submodules/external/providers/twitter.rb",
-    "lib/sorcery/controller/submodules/external/providers/vk.rb",
-    "lib/sorcery/controller/submodules/external/providers/xing.rb",
-    "lib/sorcery/controller/submodules/http_basic_auth.rb",
-    "lib/sorcery/controller/submodules/remember_me.rb",
-    "lib/sorcery/controller/submodules/session_timeout.rb",
-    "lib/sorcery/crypto_providers/aes256.rb",
-    "lib/sorcery/crypto_providers/bcrypt.rb",
-    "lib/sorcery/crypto_providers/common.rb",
-    "lib/sorcery/crypto_providers/md5.rb",
-    "lib/sorcery/crypto_providers/sha1.rb",
-    "lib/sorcery/crypto_providers/sha256.rb",
-    "lib/sorcery/crypto_providers/sha512.rb",
-    "lib/sorcery/engine.rb",
-    "lib/sorcery/model.rb",
-    "lib/sorcery/model/adapters/active_record.rb",
-    "lib/sorcery/model/adapters/mongo_mapper.rb",
-    "lib/sorcery/model/adapters/mongoid.rb",
-    "lib/sorcery/model/submodules/activity_logging.rb",
-    "lib/sorcery/model/submodules/brute_force_protection.rb",
-    "lib/sorcery/model/submodules/external.rb",
-    "lib/sorcery/model/submodules/remember_me.rb",
-    "lib/sorcery/model/submodules/reset_password.rb",
-    "lib/sorcery/model/submodules/user_activation.rb",
-    "lib/sorcery/model/temporary_token.rb",
-    "lib/sorcery/railties/tasks.rake",
-    "lib/sorcery/test_helpers.rb",
-    "lib/sorcery/test_helpers/internal.rb",
-    "lib/sorcery/test_helpers/internal/rails.rb",
-    "lib/sorcery/test_helpers/rails.rb",
-    "sorcery.gemspec",
-    "spec/Gemfile",
-    "spec/Gemfile.lock",
-    "spec/README.md",
-    "spec/Rakefile",
-    "spec/rails3/.gitignore",
-    "spec/rails3/.rspec",
-    "spec/rails3/Gemfile",
-    "spec/rails3/Gemfile.lock",
-    "spec/rails3/README",
-    "spec/rails3/Rakefile",
-    "spec/rails3/app/controllers/application_controller.rb",
-    "spec/rails3/app/helpers/application_helper.rb",
-    "spec/rails3/app/mailers/sorcery_mailer.rb",
-    "spec/rails3/app/models/authentication.rb",
-    "spec/rails3/app/models/user.rb",
-    "spec/rails3/app/views/application/index.html.erb",
-    "spec/rails3/app/views/layouts/application.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/send_unlock_token_email.text.erb",
-    "spec/rails3/config.ru",
-    "spec/rails3/config/application.rb",
-    "spec/rails3/config/boot.rb",
-    "spec/rails3/config/database.yml",
-    "spec/rails3/config/environment.rb",
-    "spec/rails3/config/environments/development.rb",
-    "spec/rails3/config/environments/in_memory.rb",
-    "spec/rails3/config/environments/production.rb",
-    "spec/rails3/config/environments/test.rb",
-    "spec/rails3/config/initializers/backtrace_silencers.rb",
-    "spec/rails3/config/initializers/inflections.rb",
-    "spec/rails3/config/initializers/mime_types.rb",
-    "spec/rails3/config/initializers/secret_token.rb",
-    "spec/rails3/config/initializers/session_store.rb",
-    "spec/rails3/config/locales/en.yml",
-    "spec/rails3/config/routes.rb",
-    "spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/rails3/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/rails3/db/schema.rb",
-    "spec/rails3/db/seeds.rb",
-    "spec/rails3/lib/tasks/.gitkeep",
-    "spec/rails3/public/404.html",
-    "spec/rails3/public/422.html",
-    "spec/rails3/public/500.html",
-    "spec/rails3/public/favicon.ico",
-    "spec/rails3/public/images/rails.png",
-    "spec/rails3/public/javascripts/application.js",
-    "spec/rails3/public/javascripts/controls.js",
-    "spec/rails3/public/javascripts/dragdrop.js",
-    "spec/rails3/public/javascripts/effects.js",
-    "spec/rails3/public/javascripts/prototype.js",
-    "spec/rails3/public/javascripts/rails.js",
-    "spec/rails3/public/robots.txt",
-    "spec/rails3/public/stylesheets/.gitkeep",
-    "spec/rails3/script/rails",
-    "spec/rails3/spec/controller_activity_logging_spec.rb",
-    "spec/rails3/spec/controller_brute_force_protection_spec.rb",
-    "spec/rails3/spec/controller_http_basic_auth_spec.rb",
-    "spec/rails3/spec/controller_oauth2_spec.rb",
-    "spec/rails3/spec/controller_oauth_spec.rb",
-    "spec/rails3/spec/controller_remember_me_spec.rb",
-    "spec/rails3/spec/controller_session_timeout_spec.rb",
-    "spec/rails3/spec/controller_spec.rb",
-    "spec/rails3/spec/integration_spec.rb",
-    "spec/rails3/spec/spec.opts",
-    "spec/rails3/spec/spec_helper.orig.rb",
-    "spec/rails3/spec/spec_helper.rb",
-    "spec/rails3/spec/user_activation_spec.rb",
-    "spec/rails3/spec/user_activity_logging_spec.rb",
-    "spec/rails3/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3/spec/user_oauth_spec.rb",
-    "spec/rails3/spec/user_remember_me_spec.rb",
-    "spec/rails3/spec/user_reset_password_spec.rb",
-    "spec/rails3/spec/user_spec.rb",
-    "spec/rails3/vendor/plugins/.gitkeep",
-    "spec/rails3_mongo_mapper/.gitignore",
-    "spec/rails3_mongo_mapper/.rspec",
-    "spec/rails3_mongo_mapper/Gemfile",
-    "spec/rails3_mongo_mapper/Gemfile.lock",
-    "spec/rails3_mongo_mapper/Rakefile",
-    "spec/rails3_mongo_mapper/app/controllers/application_controller.rb",
-    "spec/rails3_mongo_mapper/app/helpers/application_helper.rb",
-    "spec/rails3_mongo_mapper/app/mailers/sorcery_mailer.rb",
-    "spec/rails3_mongo_mapper/app/models/authentication.rb",
-    "spec/rails3_mongo_mapper/app/models/user.rb",
-    "spec/rails3_mongo_mapper/app/views/layouts/application.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3_mongo_mapper/config.ru",
-    "spec/rails3_mongo_mapper/config/application.rb",
-    "spec/rails3_mongo_mapper/config/boot.rb",
-    "spec/rails3_mongo_mapper/config/environment.rb",
-    "spec/rails3_mongo_mapper/config/environments/development.rb",
-    "spec/rails3_mongo_mapper/config/environments/in_memory.rb",
-    "spec/rails3_mongo_mapper/config/environments/production.rb",
-    "spec/rails3_mongo_mapper/config/environments/test.rb",
-    "spec/rails3_mongo_mapper/config/initializers/backtrace_silencers.rb",
-    "spec/rails3_mongo_mapper/config/initializers/inflections.rb",
-    "spec/rails3_mongo_mapper/config/initializers/mime_types.rb",
-    "spec/rails3_mongo_mapper/config/initializers/mongo.rb",
-    "spec/rails3_mongo_mapper/config/initializers/secret_token.rb",
-    "spec/rails3_mongo_mapper/config/initializers/session_store.rb",
-    "spec/rails3_mongo_mapper/config/locales/en.yml",
-    "spec/rails3_mongo_mapper/config/routes.rb",
-    "spec/rails3_mongo_mapper/db/schema.rb",
-    "spec/rails3_mongo_mapper/db/seeds.rb",
-    "spec/rails3_mongo_mapper/lib/tasks/.gitkeep",
-    "spec/rails3_mongo_mapper/public/404.html",
-    "spec/rails3_mongo_mapper/public/422.html",
-    "spec/rails3_mongo_mapper/public/500.html",
-    "spec/rails3_mongo_mapper/public/favicon.ico",
-    "spec/rails3_mongo_mapper/public/images/rails.png",
-    "spec/rails3_mongo_mapper/public/javascripts/application.js",
-    "spec/rails3_mongo_mapper/public/javascripts/controls.js",
-    "spec/rails3_mongo_mapper/public/javascripts/dragdrop.js",
-    "spec/rails3_mongo_mapper/public/javascripts/effects.js",
-    "spec/rails3_mongo_mapper/public/javascripts/prototype.js",
-    "spec/rails3_mongo_mapper/public/javascripts/rails.js",
-    "spec/rails3_mongo_mapper/public/robots.txt",
-    "spec/rails3_mongo_mapper/public/stylesheets/.gitkeep",
-    "spec/rails3_mongo_mapper/script/rails",
-    "spec/rails3_mongo_mapper/spec/controller_spec.rb",
-    "spec/rails3_mongo_mapper/spec/spec.opts",
-    "spec/rails3_mongo_mapper/spec/spec_helper.orig.rb",
-    "spec/rails3_mongo_mapper/spec/spec_helper.rb",
-    "spec/rails3_mongo_mapper/spec/user_activation_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_activity_logging_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_oauth_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_remember_me_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_reset_password_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_spec.rb",
-    "spec/rails3_mongo_mapper/vendor/plugins/.gitkeep",
-    "spec/rails3_mongoid/.gitignore",
-    "spec/rails3_mongoid/.rspec",
-    "spec/rails3_mongoid/Gemfile",
-    "spec/rails3_mongoid/Gemfile.lock",
-    "spec/rails3_mongoid/Rakefile",
-    "spec/rails3_mongoid/app/controllers/application_controller.rb",
-    "spec/rails3_mongoid/app/helpers/application_helper.rb",
-    "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
-    "spec/rails3_mongoid/app/models/authentication.rb",
-    "spec/rails3_mongoid/app/models/user.rb",
-    "spec/rails3_mongoid/app/views/layouts/application.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3_mongoid/config.ru",
-    "spec/rails3_mongoid/config/application.rb",
-    "spec/rails3_mongoid/config/boot.rb",
-    "spec/rails3_mongoid/config/environment.rb",
-    "spec/rails3_mongoid/config/environments/development.rb",
-    "spec/rails3_mongoid/config/environments/in_memory.rb",
-    "spec/rails3_mongoid/config/environments/production.rb",
-    "spec/rails3_mongoid/config/environments/test.rb",
-    "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
-    "spec/rails3_mongoid/config/initializers/inflections.rb",
-    "spec/rails3_mongoid/config/initializers/mime_types.rb",
-    "spec/rails3_mongoid/config/initializers/secret_token.rb",
-    "spec/rails3_mongoid/config/initializers/session_store.rb",
-    "spec/rails3_mongoid/config/locales/en.yml",
-    "spec/rails3_mongoid/config/mongoid.yml",
-    "spec/rails3_mongoid/config/routes.rb",
-    "spec/rails3_mongoid/db/schema.rb",
-    "spec/rails3_mongoid/db/seeds.rb",
-    "spec/rails3_mongoid/lib/tasks/.gitkeep",
-    "spec/rails3_mongoid/public/404.html",
-    "spec/rails3_mongoid/public/422.html",
-    "spec/rails3_mongoid/public/500.html",
-    "spec/rails3_mongoid/public/favicon.ico",
-    "spec/rails3_mongoid/public/images/rails.png",
-    "spec/rails3_mongoid/public/javascripts/application.js",
-    "spec/rails3_mongoid/public/javascripts/controls.js",
-    "spec/rails3_mongoid/public/javascripts/dragdrop.js",
-    "spec/rails3_mongoid/public/javascripts/effects.js",
-    "spec/rails3_mongoid/public/javascripts/prototype.js",
-    "spec/rails3_mongoid/public/javascripts/rails.js",
-    "spec/rails3_mongoid/public/robots.txt",
-    "spec/rails3_mongoid/public/stylesheets/.gitkeep",
-    "spec/rails3_mongoid/script/rails",
-    "spec/rails3_mongoid/spec/controller_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/controller_spec.rb",
-    "spec/rails3_mongoid/spec/spec.opts",
-    "spec/rails3_mongoid/spec/spec_helper.orig.rb",
-    "spec/rails3_mongoid/spec/spec_helper.rb",
-    "spec/rails3_mongoid/spec/user_activation_spec.rb",
-    "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3_mongoid/spec/user_oauth_spec.rb",
-    "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
-    "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
-    "spec/rails3_mongoid/spec/user_spec.rb",
-    "spec/rails3_mongoid/vendor/plugins/.gitkeep",
-    "spec/shared_examples/controller_oauth2_shared_examples.rb",
-    "spec/shared_examples/controller_oauth_shared_examples.rb",
-    "spec/shared_examples/user_activation_shared_examples.rb",
-    "spec/shared_examples/user_activity_logging_shared_examples.rb",
-    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
-    "spec/shared_examples/user_oauth_shared_examples.rb",
-    "spec/shared_examples/user_remember_me_shared_examples.rb",
-    "spec/shared_examples/user_reset_password_shared_examples.rb",
-    "spec/shared_examples/user_shared_examples.rb",
-    "spec/sorcery_crypto_providers_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
+  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
+  s.summary = "Magical authentication for Rails 3 applications"
   s.homepage = "http://github.com/NoamB/sorcery"
-  s.licenses = ["MIT"]
+
+  s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Magical authentication for Rails 3 applications"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.licenses = ["MIT"]
+
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency("oauth", "~> 0.4.4")
+  s.add_dependency("oauth2", ">= 0.8.0", "< 1.0.0")
+  s.add_dependency("bcrypt-ruby", ">= 3.0")
 
-    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.8.0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<json>, [">= 1.7.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, [">= 0"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, ["~> 2.4.4"])
-    else
-      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<json>, [">= 1.7.7"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, [">= 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0.3.8"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
-    end
-  else
-    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-    s.add_dependency(%q<abstract>, [">= 1.0.0"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<json>, [">= 1.7.7"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, [">= 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0.3.8"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
-  end
+  s.add_development_dependency("abstract", ">= 1.0.0")
+  s.add_development_dependency("rails", ">= 3.2.15")
+  s.add_development_dependency("json", ">= 1.7.7")
+  s.add_development_dependency("rspec", "~> 2.5.0")
+  s.add_development_dependency("rspec-rails", "~> 2.5.0")
+  s.add_development_dependency("sqlite3", ">= 0")
+  s.add_development_dependency("yard", "~> 0.6.0")
+  s.add_development_dependency("bundler", ">= 1.1.0")
+  s.add_development_dependency("simplecov", ">= 0.3.8")
+  s.add_development_dependency("timecop", ">= 0")
+  s.add_development_dependency("mongo_mapper", ">= 0")
+  s.add_development_dependency("mongoid", "~> 2.4.4")
 end