sorcery 0.8.1 → 0.8.2

data/spec/rails3_mongoid/spec/controller_spec.rb

@@ -1,28 +1,28 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe ApplicationController do
- 
+
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe ApplicationController, "plugin configuration" do
     before(:all) do
       sorcery_reload!
     end
-    
+
     after(:each) do
       Sorcery::Controller::Config.reset!
       sorcery_reload!
     end
-    
+
     it "should enable configuration option 'user_class'" do
       sorcery_controller_property_set(:user_class, "TestUser")
       Sorcery::Controller::Config.user_class.should == "TestUser"
     end
-    
+
     it "should enable configuration option 'not_authenticated_action'" do
       sorcery_controller_property_set(:not_authenticated_action, :my_action)
       Sorcery::Controller::Config.not_authenticated_action.should equal(:my_action)
     end
-    
+
   end
 
   # ----------------- PLUGIN ACTIVATED -----------------------
@@ -35,7 +35,7 @@ describe ApplicationController do
     before(:each) do
       create_new_user
     end
-  
+
     after(:each) do
       Sorcery::Controller::Config.reset!
       sorcery_reload!
@@ -43,27 +43,27 @@ describe ApplicationController do
       sorcery_controller_property_set(:user_class, User)
       sorcery_model_property_set(:username_attribute_names, [:username, :email])
     end
-    
+
     specify { should respond_to(:login) }
 
     specify { should respond_to(:logout) }
-  
+
     specify { should respond_to(:logged_in?) }
-    
+
     specify { should respond_to(:current_user) }
-  
+
     it "login(username,password) should return the user when success and set the session with user.id" do
       get :test_login, :username => 'gizmo', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
-    
+
     it "login(email,password) should return the user when success and set the session with user.id" do
       get :test_login, :username => 'bla@bla.com', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
-  
+
     it "login(username,password) should return nil and not set the session when failure" do
       get :test_login, :username => 'gizmo', :password => 'opensesame!'
       assigns[:user].should be_nil
@@ -75,14 +75,19 @@ describe ApplicationController do
       assigns[:user].should be_nil
       session[:user_id].should be_nil
     end
-  
+
+    it "login(email,password) should return the user when success and set the session with the _csrf_token" do
+      get :test_login, :username => 'gizmo', :password => 'secret'
+      session[:_csrf_token].should_not be_nil
+    end
+
     it "login(username,password) should return the user and set the session with user.id when upper case username and config is downcase before authenticating" do
       sorcery_model_property_set(:downcase_username_before_authenticating, true)
       get :test_login, :username => 'GIZMO', :password => 'secret'
       assigns[:user].should == @user
       session[:user_id].should == @user.id
     end
-  
+
     it "login(username,password) should return nil and not set the session when user was created with upper case username, config is default, and log in username is lower case" do
       create_new_user({:username => 'GIZMO1', :email => "bla1@bla.com", :password => 'secret1'})
       get :test_login, :username => 'gizmo1', :password => 'secret1'
@@ -104,28 +109,28 @@ describe ApplicationController do
       get :test_logout
       session[:user_id].should be_nil
     end
-  
+
     it "logged_in? should return true if logged in" do
       session[:user_id] = @user.id
       subject.logged_in?.should be_true
     end
-  
+
     it "logged_in? should return false if not logged in" do
       session[:user_id] = nil
       subject.logged_in?.should be_false
     end
-    
+
     it "current_user should return the user instance if logged in" do
       create_new_user
       session[:user_id] = @user.id
       subject.current_user.should == @user
     end
-    
+
     it "current_user should return false if not logged in" do
       session[:user_id] = nil
       subject.current_user.should == false
     end
-    
+
     specify { should respond_to(:require_login) }
 
     it "should call the configured 'not_authenticated_action' when session[:user_id] isn't found" do
@@ -136,40 +141,40 @@ describe ApplicationController do
       user.destroy
       sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
       get :test_logout
-      response.body.should == "test_not_authenticated_action"      
+      response.body.should == "test_not_authenticated_action"
     end
-    
+
     it "should call the configured 'not_authenticated_action' when authenticate before_filter fails" do
       session[:user_id] = nil
       sorcery_controller_property_set(:not_authenticated_action, :test_not_authenticated_action)
       get :test_logout
       response.body.should == "test_not_authenticated_action"
     end
-    
+
     it "require_login before_filter should save the url that the user originally wanted" do
       get :some_action
       session[:return_to_url].should == "http://test.host/application/some_action"
       response.should redirect_to("http://test.host/")
     end
-    
+
     it "require_login before_filter should not save the url that the user originally wanted upon all non-get http methods" do
       [:post, :put, :delete].each do |m|
         self.send(m, :some_action)
         session[:return_to_url].should be_nil
       end
     end
-    
+
     it "on successful login the user should be redirected to the url he originally wanted" do
       session[:return_to_url] = "http://test.host/some_action"
       post :test_return_to, :username => 'gizmo', :password => 'secret'
       response.should redirect_to("http://test.host/some_action")
       flash[:notice].should == "haha!"
     end
-    
-    
+
+
     # --- login_user(user) ---
     specify { should respond_to(:auto_login) }
-        
+
     it "auto_login(user) should login a user instance" do
       create_new_user
       session[:user_id] = nil
@@ -177,5 +182,5 @@ describe ApplicationController do
       subject.logged_in?.should be_true
     end
   end
-  
+
 end

data/spec/shared_examples/user_activity_logging_shared_examples.rb

@@ -23,5 +23,10 @@ shared_examples_for "rails_3_activity_logging_model" do
       sorcery_model_property_set(:last_activity_at_attribute_name, :activity_time)
       User.sorcery_config.last_activity_at_attribute_name.should equal(:activity_time)
     end
+
+    it "should allow configuration option 'last_login_from_ip_adress'" do
+      sorcery_model_property_set(:last_login_from_ip_address_name, :ip_address)
+      User.sorcery_config.last_login_from_ip_address_name.should equal(:ip_address)
+    end
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sorcery
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: 
-  version: 0.8.1
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,206 +15,272 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-25 00:00:00 Z
+date: 2013-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: oauth
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 4
+        - 4
         version: 0.4.4
   type: :runtime
-  prerelease: false
+  name: oauth
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: oauth2
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
         version: 0.8.0
   type: :runtime
-  prerelease: false
+  name: oauth2
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
-  prerelease: false
+  name: bcrypt-ruby
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: abstract
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :development
-  prerelease: false
+  name: abstract
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rails
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :development
-  prerelease: false
+  name: rails
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.1
+        hash: 5
+        segments: 
+        - 1
+        - 7
+        - 7
+        version: 1.7.7
   type: :development
-  prerelease: false
+  name: json
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  prerelease: false
+  name: rspec
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  prerelease: false
+  name: rspec-rails
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
+  name: sqlite3
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   type: :development
-  prerelease: false
+  name: yard
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: yard
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :development
-  prerelease: false
+  name: bundler
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        hash: 49
+        segments: 
+        - 1
+        - 8
+        - 3
+        version: 1.8.3
   type: :development
-  prerelease: false
+  name: jeweler
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        hash: 3
+        segments: 
+        - 0
+        - 3
+        - 8
+        version: 0.3.8
   type: :development
-  prerelease: false
+  name: simplecov
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: simplecov
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.8
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
+  name: timecop
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: timecop
+  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
+  name: capybara
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  prerelease: false
+  name: mongo_mapper
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: mongo_mapper
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
   prerelease: false
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: mongoid
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 4
+        - 4
         version: 2.4.4
   type: :development
-  prerelease: false
-  version_requirements: *id018
+  name: mongoid
+  version_requirements: *id017
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []
@@ -247,6 +318,7 @@ files:
 - 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
@@ -254,6 +326,7 @@ files:
 - 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
@@ -516,17 +589,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Magical authentication for Rails 3 applications