sorcery 0.9.0 → 0.10.0

data/lib/sorcery.rb

@@ -1,7 +1,6 @@
 require 'sorcery/version'
 
 module Sorcery
-
   require 'sorcery/model'
 
   module Adapters
@@ -12,7 +11,6 @@ module Sorcery
     require 'sorcery/model/temporary_token'
     require 'sorcery/model/config'
 
-
     module Submodules
       require 'sorcery/model/submodules/user_activation'
       require 'sorcery/model/submodules/reset_password'
@@ -63,7 +61,6 @@ module Sorcery
     module Internal
       require 'sorcery/test_helpers/internal/rails'
     end
-
   end
 
   require 'sorcery/adapters/base_adapter'
@@ -81,30 +78,5 @@ module Sorcery
     end
   end
 
-  if defined?(Mongoid)
-    require 'sorcery/adapters/mongoid_adapter'
-    Mongoid::Document::ClassMethods.send :include, Sorcery::Model
-
-    Mongoid::Document.send :define_method, :sorcery_adapter do
-      @sorcery_adapter ||= Sorcery::Adapters::MongoidAdapter.new(self)
-    end
-
-    Mongoid::Document::ClassMethods.send :define_method, :sorcery_adapter do
-      Sorcery::Adapters::MongoidAdapter.from(self)
-    end
-  end
-
-  if defined?(MongoMapper)
-    require 'sorcery/adapters/mongo_mapper_adapter'
-    MongoMapper::Document.send(:plugin, Sorcery::Adapters::MongoMapperAdapter::Wrapper)
-  end
-
-  if defined?(DataMapper)
-    require 'sorcery/adapters/data_mapper_adapter'
-    DataMapper::Model.append_extensions(Sorcery::Model)
-
-    DataMapper::Model.append_inclusions(Sorcery::Adapters::DataMapperAdapter::Wrapper)
-  end
-
   require 'sorcery/engine' if defined?(Rails)
 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

data/spec/controllers/controller_http_basic_auth_spec.rb

@@ -1,68 +1,67 @@
 require 'spec_helper'
 
-describe SorceryController do
+describe SorceryController, type: :controller do
+  let(:user) { double('user', id: 42, email: 'bla@bla.com') }
 
-  let(:user) { double("user", id: 42, email: 'bla@bla.com') }
-
-  describe  "with http basic auth features" do
+  describe 'with http basic auth features' do
     before(:all) do
       sorcery_reload!([:http_basic_auth])
 
-      sorcery_controller_property_set(:controller_to_realm_map, {"sorcery" => "sorcery"})
+      sorcery_controller_property_set(:controller_to_realm_map, 'sorcery' => 'sorcery')
     end
 
     after(:each) do
       logout_user
     end
 
-    it "requests basic authentication when before_filter is used" do
+    it 'requests basic authentication when before_action is used' do
       get :test_http_basic_auth
 
       expect(response.status).to eq 401
     end
 
-    it "authenticates from http basic if credentials are sent" do
+    it 'authenticates from http basic if credentials are sent' do
       # dirty hack for rails 4
       allow(subject).to receive(:register_last_activity_time_to_db)
 
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:secret")}"
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:secret")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'secret').and_return(user)
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
       expect(response).to be_a_success
     end
 
-    it "fails authentication if credentials are wrong" do
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:wrong!")}"
+    it 'fails authentication if credentials are wrong' do
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:wrong!")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'wrong!').and_return(nil)
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
       expect(response).to redirect_to root_url
     end
 
     it "allows configuration option 'controller_to_realm_map'" do
-      sorcery_controller_property_set(:controller_to_realm_map, {"1" => "2"})
+      sorcery_controller_property_set(:controller_to_realm_map, '1' => '2')
 
-      expect(Sorcery::Controller::Config.controller_to_realm_map).to eq({"1" => "2"})
+      expect(Sorcery::Controller::Config.controller_to_realm_map).to eq('1' => '2')
     end
 
-    it "displays the correct realm name configured for the controller" do
-      sorcery_controller_property_set(:controller_to_realm_map, {"sorcery" => "Salad"})
+    it 'displays the correct realm name configured for the controller' do
+      sorcery_controller_property_set(:controller_to_realm_map, 'sorcery' => 'Salad')
       get :test_http_basic_auth
 
-      expect(response.headers["WWW-Authenticate"]).to eq "Basic realm=\"Salad\""
+      expect(response.headers['WWW-Authenticate']).to eq 'Basic realm="Salad"'
     end
 
     it "signs in the user's session on successful login" do
       # dirty hack for rails 4
       allow(controller).to receive(:register_last_activity_time_to_db)
 
-      @request.env["HTTP_AUTHORIZATION"] = "Basic #{Base64::encode64("#{user.email}:secret")}"
+      @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64("#{user.email}:secret")}"
       expect(User).to receive('authenticate').with('bla@bla.com', 'secret').and_return(user)
 
-      get :test_http_basic_auth, nil, http_authentication_used: true
+      get :test_http_basic_auth, params: {}, session: { http_authentication_used: true }
 
-      expect(session[:user_id]).to eq "42"
+      expect(session[:user_id]).to eq '42'
     end
   end
 end