sorcery 0.9.1 → 0.10.0

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

@@ -17,30 +17,30 @@ module Sorcery
           ::Sorcery::Controller::Config.init!
           ::Sorcery::Controller::Config.reset!
 
-          # remove all plugin before_filters so they won't fail other tests.
+          # remove all plugin before_actions 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.
-          chain = if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new("4.1.0")
+          chain = if Gem::Version.new(::Rails::VERSION::STRING) >= Gem::Version.new('4.1.0')
                     SorceryController._process_action_callbacks.send :chain
                   else
                     SorceryController._process_action_callbacks
                   end
 
-          chain.delete_if {|c| SUBMODULES_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
+          chain.delete_if { |c| SUBMODULES_AUTO_ADDED_CONTROLLER_FILTERS.include?(c.filter) }
 
           # configure
           ::Sorcery::Controller::Config.submodules = submodules
           ::Sorcery::Controller::Config.user_class = nil
-          ActionController::Base.send(:include,::Sorcery::Controller)
-          ::Sorcery::Controller::Config.user_class = "User"
+          ActionController::Base.send(:include, ::Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = 'User'
 
           ::Sorcery::Controller::Config.user_config do |user|
-            options.each do |property,value|
+            options.each do |property, value|
               user.send(:"#{property}=", value)
             end
           end
           User.authenticates_with_sorcery!
-          if defined?(DataMapper) and User.ancestors.include?(DataMapper::Resource)
+          if defined?(DataMapper) && User.ancestors.include?(DataMapper::Resource)
             DataMapper.auto_migrate!
             User.finalize
             Authentication.finalize
@@ -60,7 +60,15 @@ module Sorcery
         # all this without calling the :logout action explicitly.
         # A dirty dirty hack.
         def clear_user_without_logout
-          subject.instance_variable_set(:@current_user,nil)
+          subject.instance_variable_set(:@current_user, nil)
+        end
+
+        if ::Rails.version < '5.0.0'
+          %w(get post put).each do |method|
+            define_method(method) do |action, options = {}|
+              super action, options[:params] || {}, options[:session]
+            end
+          end
         end
       end
     end

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

@@ -2,7 +2,7 @@ module Sorcery
   module TestHelpers
     module Rails
       module Controller
-        def login_user(user = nil, test_context = {})
+        def login_user(user = nil, _test_context = {})
           user ||= @user
           @controller.send(:auto_login, user)
           @controller.send(:after_login!, user, [user.send(user.sorcery_config.username_attribute_names.first), 'secret'])

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

@@ -2,20 +2,19 @@ module Sorcery
   module TestHelpers
     module Rails
       module Integration
-        
-        #Accepts arguments for user to login, route to use and HTTP method
-        #Defaults - @user, 'sessions_url' and POST
+        # Accepts arguments for user to login, route to use and HTTP method
+        # Defaults - @user, 'sessions_url' and POST
         def login_user(user = nil, route = nil, http_method = :post)
           user ||= @user
           route ||= sessions_url
 
           username_attr = user.sorcery_config.username_attribute_names.first
           username = user.send(username_attr)
-          page.driver.send(http_method, route, { :"#{username_attr}" => username, :password => 'secret' })
+          page.driver.send(http_method, route, :"#{username_attr}" => username, :password => 'secret')
         end
 
-        #Accepts route and HTTP method arguments
-        #Default - 'logout_url' and GET
+        # Accepts route and HTTP method arguments
+        # Default - 'logout_url' and GET
         def logout_user(route = nil, http_method = :get)
           route ||= logout_url
           page.driver.send(http_method, route)

data/lib/sorcery/version.rb

@@ -1,3 +1,3 @@
 module Sorcery
-  VERSION = "0.9.1"
+  VERSION = '0.10.0'
 end

data/sorcery.gemspec

@@ -3,32 +3,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'sorcery/version'
 
 Gem::Specification.new do |s|
-  s.name = "sorcery"
+  s.name = 'sorcery'
   s.version = Sorcery::VERSION
-  s.authors = ["Noam Ben Ari", "Kir Shatrov", "Grzegorz Witek"]
-  s.email = "nbenari@gmail.com"
-  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
-  s.summary = "Magical authentication for Rails 3 & 4 applications"
-  s.homepage = "http://github.com/NoamB/sorcery"
-
-  s.files         = `git ls-files`.split($/)
-  s.require_paths = ["lib"]
-
-  s.licenses = ["MIT"]
-
-  s.required_ruby_version = '>= 1.9.3'
-
-  s.add_dependency "oauth", "~> 0.4", ">= 0.4.4"
-  s.add_dependency "oauth2", ">= 0.8.0"
-  s.add_dependency "bcrypt", "~> 3.1"
-
-  s.add_development_dependency "abstract", ">= 1.0.0"
-  s.add_development_dependency "json", ">= 1.7.7"
-  s.add_development_dependency "yard", "~> 0.6.0"
-
-  s.add_development_dependency "timecop"
-  s.add_development_dependency "simplecov", ">= 0.3.8"
-  s.add_development_dependency "rspec", "~> 3.0.0"
-  s.add_development_dependency "rspec-rails", "~> 3.0.0"
+  s.authors = ['Noam Ben Ari', 'Kir Shatrov', 'Grzegorz Witek', 'Chase Gilliam']
+  s.email = 'chase.gilliam@gmail.com'
+  s.description = 'Provides common authentication needs such as signing in/out, activating by email and resetting password.'
+  s.summary = 'Magical authentication for Rails applications'
+  s.homepage = 'https://github.com/Sorcery/sorcery'
+  s.post_install_message = "As of version 1.0 oauth/oauth2 won't be automatically bundled\n"
+  s.post_install_message += 'you need to add those dependencies to your Gemfile'
+
+  s.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  s.require_paths = ['lib']
+
+  s.licenses = ['MIT']
+
+  s.required_ruby_version = '>= 2.0.0'
+
+  s.add_dependency 'oauth', '~> 0.4', '>= 0.4.4'
+  s.add_dependency 'oauth2', '~> 1.0', '>= 0.8.0'
+  s.add_dependency 'bcrypt', '~> 3.1'
+
+  s.add_development_dependency 'yard', '~> 0.6.0'
+  s.add_development_dependency 'timecop'
+  s.add_development_dependency 'simplecov', '>= 0.3.8'
+  s.add_development_dependency 'rspec-rails', '~> 3.5.0'
+  s.add_development_dependency 'test-unit', '~> 3.1.0'
 end
-

data/spec/active_record/user_activation_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_activation_shared_examples'
 
-describe User, "with activation submodule", :active_record => true do
+describe User, 'with activation submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
     User.reset_column_information
@@ -13,6 +13,5 @@ describe User, "with activation submodule", :active_record => true do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activation")
   end
 
-  it_behaves_like "rails_3_activation_model"
-
+  it_behaves_like 'rails_3_activation_model'
 end

data/spec/active_record/user_activity_logging_spec.rb

@@ -1,8 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_activity_logging_shared_examples'
 
-describe User, "with activity logging submodule", :active_record => true do
-
+describe User, 'with activity logging submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
     User.reset_column_information
@@ -12,6 +11,5 @@ describe User, "with activity logging submodule", :active_record => true do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
   end
 
-  it_behaves_like "rails_3_activity_logging_model"
-
+  it_behaves_like 'rails_3_activity_logging_model'
 end

data/spec/active_record/user_brute_force_protection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_brute_force_protection_shared_examples'
 
-describe User, "with brute_force_protection submodule", :active_record => true do
+describe User, 'with brute_force_protection submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/brute_force_protection")
     User.reset_column_information
@@ -11,6 +11,5 @@ describe User, "with brute_force_protection submodule", :active_record => true d
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/brute_force_protection")
   end
 
-  it_behaves_like "rails_3_brute_force_protection_model"
-
-end
+  it_behaves_like 'rails_3_brute_force_protection_model'
+end

data/spec/active_record/user_oauth_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_oauth_shared_examples'
 
-describe User, "with oauth submodule", :active_record => true do
+describe User, 'with oauth submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
     User.reset_column_information
@@ -11,6 +11,5 @@ describe User, "with oauth submodule", :active_record => true do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
 
-  it_behaves_like "rails_3_oauth_model"
-
-end
+  it_behaves_like 'rails_3_oauth_model'
+end

data/spec/active_record/user_remember_me_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_remember_me_shared_examples'
 
-describe User, "with remember_me submodule", :active_record => true do
+describe User, 'with remember_me submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/remember_me")
     User.reset_column_information
@@ -11,6 +11,5 @@ describe User, "with remember_me submodule", :active_record => true do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/remember_me")
   end
 
-  it_behaves_like "rails_3_remember_me_model"
-
-end
+  it_behaves_like 'rails_3_remember_me_model'
+end

data/spec/active_record/user_reset_password_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'shared_examples/user_reset_password_shared_examples'
 
-describe User, "with reset_password submodule", :active_record => true do
+describe User, 'with reset_password submodule', active_record: true do
   before(:all) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/reset_password")
     User.reset_column_information
@@ -11,6 +11,5 @@ describe User, "with reset_password submodule", :active_record => true do
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/reset_password")
   end
 
-  it_behaves_like "rails_3_reset_password_model"
-
+  it_behaves_like 'rails_3_reset_password_model'
 end

data/spec/active_record/user_spec.rb

@@ -2,26 +2,26 @@ require 'spec_helper'
 require 'rails_app/app/mailers/sorcery_mailer'
 require 'shared_examples/user_shared_examples'
 
-describe User, "with no submodules (core)", :active_record => true do
+describe User, 'with no submodules (core)', active_record: true do
   before(:all) do
     sorcery_reload!
   end
 
-  context "when app has plugin loaded" do
-    it "responds to the plugin activation class method" do
+  context 'when app has plugin loaded' do
+    it 'responds to the plugin activation class method' do
       expect(ActiveRecord::Base).to respond_to :authenticates_with_sorcery!
     end
 
-    it "User responds to .authenticates_with_sorcery!" do
+    it 'User responds to .authenticates_with_sorcery!' do
       expect(User).to respond_to :authenticates_with_sorcery!
     end
   end
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
 
-  it_should_behave_like "rails_3_core_model"
+  it_should_behave_like 'rails_3_core_model'
 
-  describe "external users" do
+  describe 'external users' do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
       User.reset_column_information
@@ -32,6 +32,6 @@ describe User, "with no submodules (core)", :active_record => true do
       ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
     end
 
-    it_should_behave_like "external_user"
+    it_should_behave_like 'external_user'
   end
 end

data/spec/controllers/controller_activity_logging_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # require 'shared_examples/controller_activity_logging_shared_examples'
 
-describe SorceryController do
+describe SorceryController, type: :controller do
   after(:all) do
     sorcery_controller_property_set(:register_login_time, true)
     sorcery_controller_property_set(:register_logout_time, true)
@@ -11,8 +11,7 @@ describe SorceryController do
   end
 
   # ----------------- ACTIVITY LOGGING -----------------------
-  context "with activity logging features" do
-
+  context 'with activity logging features' do
     let(:adapter) { double('sorcery_adapter') }
     let(:user) { double('user', id: 42, sorcery_adapter: adapter) }
 
@@ -20,8 +19,6 @@ describe SorceryController do
       sorcery_reload!([:activity_logging])
     end
 
-    specify { expect(subject).to respond_to(:current_users) }
-
     before(:each) do
       allow(user).to receive(:username)
       allow(user).to receive_message_chain(:sorcery_config, :username_attribute_names, :first) { :username }
@@ -33,14 +30,7 @@ describe SorceryController do
       sorcery_controller_property_set(:register_last_activity_time, false)
     end
 
-    it "'current_users' should proxy to User.current_users" do
-      expect(User).to receive(:current_users).with(no_args)
-
-      subject.current_users
-    end
-
-
-    it "logs login time on login" do
+    it 'logs login time on login' do
       now = Time.now.in_time_zone
       Timecop.freeze(now)
 
@@ -51,7 +41,7 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs logout time on logout" do
+    it 'logs logout time on logout' do
       login_user(user)
       now = Time.now.in_time_zone
       Timecop.freeze(now)
@@ -62,7 +52,7 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs last activity time when logged in" do
+    it 'logs last activity time when logged in' do
       sorcery_controller_property_set(:register_last_activity_time, true)
 
       login_user(user)
@@ -75,14 +65,14 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "logs last IP address when logged in" do
+    it 'logs last IP address when logged in' do
       sorcery_controller_property_set(:register_last_ip_address, true)
-      expect(user).to receive(:set_last_ip_addess).with('0.0.0.0')
+      expect(user).to receive(:set_last_ip_address).with('0.0.0.0')
 
       login_user(user)
     end
 
-    it "updates nothing but activity fields" do
+    it 'updates nothing but activity fields' do
       pending 'Move to model'
       original_user_name = User.last.username
       login_user(user)
@@ -91,14 +81,14 @@ describe SorceryController do
       expect(User.last.username).to eq original_user_name
     end
 
-    it "does not register login time if configured so" do
+    it 'does not register login time if configured so' do
       sorcery_controller_property_set(:register_login_time, false)
 
       expect(user).to receive(:set_last_login_at).never
       login_user(user)
     end
 
-    it "does not register logout time if configured so" do
+    it 'does not register logout time if configured so' do
       sorcery_controller_property_set(:register_logout_time, false)
       login_user(user)
 
@@ -106,19 +96,18 @@ describe SorceryController do
       logout_user
     end
 
-    it "does not register last activity time if configured so" do
+    it 'does not register last activity time if configured so' do
       sorcery_controller_property_set(:register_last_activity_time, false)
 
       expect(user).to receive(:set_last_activity_at).never
       login_user(user)
     end
 
-    it "does not register last IP address if configured so" do
+    it 'does not register last IP address if configured so' do
       sorcery_controller_property_set(:register_last_ip_address, false)
-      expect(user).to receive(:set_last_ip_addess).never
+      expect(user).to receive(:set_last_ip_address).never
 
       login_user(user)
     end
-
   end
 end

data/spec/controllers/controller_brute_force_protection_spec.rb

@@ -1,16 +1,14 @@
 require 'spec_helper'
 
-describe SorceryController do
-
+describe SorceryController, type: :controller do
   let(:user) { double('user', id: 42, email: 'bla@bla.com') }
 
   def request_test_login
-    get :test_login, email: 'bla@bla.com', password: 'blabla'
+    get :test_login, params: { email: 'bla@bla.com', password: 'blabla' }
   end
 
   # ----------------- SESSION TIMEOUT -----------------------
-  describe "brute force protection features" do
-
+  describe 'brute force protection features' do
     before(:all) do
       sorcery_reload!([:brute_force_protection])
     end
@@ -21,7 +19,7 @@ describe SorceryController do
       Timecop.return
     end
 
-    it "counts login retries" do
+    it 'counts login retries' do
       allow(User).to receive(:authenticate)
       allow(User.sorcery_adapter).to receive(:find_by_credentials).with(['bla@bla.com', 'blabla']).and_return(user)
 
@@ -30,14 +28,14 @@ describe SorceryController do
       3.times { request_test_login }
     end
 
-    it "resets the counter on a good login" do
+    it 'resets the counter on a good login' do
       # dirty hack for rails 4
       allow(@controller).to receive(:register_last_activity_time_to_db)
 
       allow(User).to receive(:authenticate).and_return(user)
       expect(user).to receive_message_chain(:sorcery_adapter, :update_attribute).with(:failed_logins_count, 0)
 
-      get :test_login, email: 'bla@bla.com', password: 'secret'
+      get :test_login, params: { email: 'bla@bla.com', password: 'secret' }
     end
   end
 end