sorcery 0.6.1 → 0.7.0

data/spec/rails3/spec/integration_spec.rb

@@ -0,0 +1,23 @@
+# require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+# 
+# describe "the login process", :type => :request do
+#   before(:all) do
+#     sorcery_reload!
+#     create_new_user
+#   end
+#   
+#   after(:all) do
+#   end
+# 
+#   it "handles unverified request" do
+#     visit root_path
+#     # save_and_open_page
+#     fill_in 'Username', :with => 'gizmo'
+#     fill_in 'Password', :with => 'secret'
+#     # <input name="authenticity_token" type="hidden" value="+8M9lXnjnhAW/mAuzwI9Mmy6hM+00qZJa8VMQUg+NmM=">
+#     #page.execute_script("$$('hidden').value='mezuza'")
+#     #save_and_open_page
+#     click_button 'Login'
+#     save_and_open_page
+#   end
+# end

data/spec/rails3/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $: << File.join(File.dirname(__FILE__), '..', '..', 'lib' )
 # This file is copied to spec/ when you run 'rails generate rspec:install'
+
 # Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'in_memory'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
+ENV["RAILS_ENV"] ||= 'in_memory'  
+require File.expand_path("../../config/environment", __FILE__)  
+require 'rspec/rails'  
+require 'capybara/rspec'
 require 'timecop'
 # require 'simplecov'
 # SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )
@@ -43,6 +45,7 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
   
+  #ActiveRecord::Base.logger = Logger.new(STDOUT)
   config.before(:suite) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/core")
   end

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.6.0)
+    sorcery (0.6.1)
       bcrypt-ruby (~> 3.0.0)
-      oauth (>= 0.4.4)
-      oauth (>= 0.4.4)
-      oauth2 (>= 0.1.1)
-      oauth2 (>= 0.1.1)
+      oauth (~> 0.4.4)
+      oauth2 (~> 0.5.0)
 
 GEM
   remote: http://rubygems.org/
@@ -41,7 +39,7 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     bson (1.3.0)
     bson_ext (1.3.0)
     builder (2.1.2)
@@ -49,8 +47,8 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
@@ -72,9 +70,9 @@ GEM
     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)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)

data/spec/rails3_mongoid/spec/controller_spec.rb

@@ -0,0 +1,130 @@
+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 -----------------------
+  describe ApplicationController, "when activated with sorcery" do
+    before(:all) do
+      sorcery_reload!
+      User.delete_all
+      create_new_user
+    end
+  
+    after(:each) do
+      Sorcery::Controller::Config.reset!
+      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
+      session[:user_id].should be_nil
+    end
+  
+    it "logout should clear the session" do
+      cookies[:remember_me_token] = nil
+      session[:user_id] = @user.id
+      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 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 "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
+      subject.auto_login(@user)
+      subject.logged_in?.should be_true
+    end
+  end
+  
+end

data/spec/shared_examples/user_remember_me_shared_examples.rb

@@ -30,6 +30,7 @@ shared_examples_for "rails_3_remember_me_model" do
       @user.remember_me_token.should_not be_nil
     end
     
+    # FIXME: assert on line 37 sometimes fails by a second
     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!

data/spec/shared_examples/user_shared_examples.rb

@@ -4,9 +4,9 @@ shared_examples_for "rails_3_core_model" do
       User.sorcery_config.reset!
     end
     
-    it "should enable configuration option 'username_attribute_name'" do
-      sorcery_model_property_set(:username_attribute_name, :email)
-      User.sorcery_config.username_attribute_name.should equal(:email)
+    it "should enable configuration option 'username_attribute_names'" do
+      sorcery_model_property_set(:username_attribute_names, :email)
+      User.sorcery_config.username_attribute_names.should == [:email]
     end
       
     it "should enable configuration option 'password_attribute_name'" do
@@ -76,12 +76,12 @@ shared_examples_for "rails_3_core_model" do
   
     it "authenticate should return true if credentials are good" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "authenticate should return false if credentials are bad" do
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'wrong!').should be_false
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'wrong!').should be_false
     end
   
     specify { User.should respond_to(:encrypt) }
@@ -186,7 +186,7 @@ shared_examples_for "rails_3_core_model" do
     it "should work with no password encryption" do
       sorcery_model_property_set(:encryption_algorithm, :none)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "should work with custom password encryption" do
@@ -202,7 +202,7 @@ shared_examples_for "rails_3_core_model" do
       sorcery_model_property_set(:encryption_algorithm, :custom)
       sorcery_model_property_set(:custom_encryption_provider, MyCrypto)
       create_new_user
-      User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'secret').should be_true
+      User.authenticate(@user.send(User.sorcery_config.username_attribute_names.first), 'secret').should be_true
     end
   
     it "if encryption algo is aes256, it should set key to crypto provider" do

data/spec/sinatra/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.6.0)
+    sorcery (0.6.1)
       bcrypt-ruby (~> 3.0.0)
-      oauth (>= 0.4.4)
-      oauth (>= 0.4.4)
-      oauth2 (>= 0.1.1)
-      oauth2 (>= 0.1.1)
+      oauth (~> 0.4.4)
+      oauth2 (~> 0.5.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,14 +36,14 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.7)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
@@ -60,9 +58,9 @@ GEM
     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)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.14)

data/spec/sinatra/spec/controller_oauth2_spec.rb

@@ -4,10 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/contro
 def stub_all_oauth2_requests!
   @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
   OAuth2::Client.stub!(:new).and_return(@client)
-  @acc_token = OAuth2::AccessToken.new(@client, "", "asd", nil, {})
-  @webby = @client.web_server
-  OAuth2::Strategy::WebServer.stub!(:new).and_return(@webby)
-  @webby.stub!(:get_access_token).and_return(@acc_token)
+  @acc_token = OAuth2::AccessToken.new(@client, "asd", {})
+  @client.stub!(:get_token).and_return(@acc_token)
   @acc_token.stub!(:get).and_return({"id"=>"123", "name"=>"Noam Ben Ari", "first_name"=>"Noam", "last_name"=>"Ben Ari", "link"=>"http://www.facebook.com/nbenari1", "hometown"=>{"id"=>"110619208966868", "name"=>"Haifa, Israel"}, "location"=>{"id"=>"106906559341067", "name"=>"Pardes Hanah, Hefa, Israel"}, "bio"=>"I'm a new daddy, and enjoying it!", "gender"=>"male", "email"=>"nbenari@gmail.com", "timezone"=>2, "locale"=>"en_US", "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}], "verified"=>true, "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
 end
 
@@ -40,8 +38,7 @@ describe 'MyApp' do
       create_new_user
       get "/login_at_test2"
       last_response.should be_a_redirect
-      #last_response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&type=web_server")
-      last_response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&response_type=code")
+      last_response.should redirect_to("http://myapi.com/oauth/authorize?redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access")
     end
     
     it "'login_from' logins if user exists" do

data/spec/sinatra/spec/controller_spec.rb

@@ -36,6 +36,7 @@ describe Sinatra::Application do
     after(:each) do
       Sorcery::Controller::Config.reset!
       sorcery_controller_property_set(:user_class, User)
+      sorcery_model_property_set(:username_attribute_names, [:username, :email])
     end
     
     it "should respond to the instance method login" do
@@ -59,6 +60,12 @@ describe Sinatra::Application do
       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!'

data/spec/sinatra_modular/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.6.0)
+    sorcery (0.6.1)
       bcrypt-ruby (~> 3.0.0)
-      oauth (>= 0.4.4)
-      oauth (>= 0.4.4)
-      oauth2 (>= 0.1.1)
-      oauth2 (>= 0.1.1)
+      oauth (~> 0.4.4)
+      oauth2 (~> 0.5.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,14 +36,14 @@ GEM
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.7)
-    bcrypt-ruby (3.0.0)
+    bcrypt-ruby (3.0.1)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
+    faraday (0.7.4)
+      addressable (~> 2.2.6)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
@@ -60,9 +58,9 @@ GEM
     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)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.14)

data/spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb

@@ -4,10 +4,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/contro
 def stub_all_oauth2_requests!
   @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
   OAuth2::Client.stub!(:new).and_return(@client)
-  @acc_token = OAuth2::AccessToken.new(@client, "", "asd", nil, {})
-  @webby = @client.web_server
-  OAuth2::Strategy::WebServer.stub!(:new).and_return(@webby)
-  @webby.stub!(:get_access_token).and_return(@acc_token)
+  @acc_token = OAuth2::AccessToken.new(@client, "asd", {})
+  @client.stub!(:get_token).and_return(@acc_token)
   @acc_token.stub!(:get).and_return({"id"=>"123", "name"=>"Noam Ben Ari", "first_name"=>"Noam", "last_name"=>"Ben Ari", "link"=>"http://www.facebook.com/nbenari1", "hometown"=>{"id"=>"110619208966868", "name"=>"Haifa, Israel"}, "location"=>{"id"=>"106906559341067", "name"=>"Pardes Hanah, Hefa, Israel"}, "bio"=>"I'm a new daddy, and enjoying it!", "gender"=>"male", "email"=>"nbenari@gmail.com", "timezone"=>2, "locale"=>"en_US", "languages"=>[{"id"=>"108405449189952", "name"=>"Hebrew"}, {"id"=>"106059522759137", "name"=>"English"}, {"id"=>"112624162082677", "name"=>"Russian"}], "verified"=>true, "updated_time"=>"2011-02-16T20:59:38+0000"}.to_json)
 end
 
@@ -40,8 +38,7 @@ describe 'MyApp' do
       create_new_user
       get "/login_at_test2"
       last_response.should be_a_redirect
-      #last_response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&type=web_server")
-      last_response.should redirect_to("http://myapi.com/oauth/authorize?client_id=key&redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access&response_type=code")
+      last_response.should redirect_to("http://myapi.com/oauth/authorize?redirect_uri=http%3A%2F%2Fblabla.com&scope=email%2Coffline_access")
     end
     
     it "'login_from' logins if user exists" do

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-02 00:00:00 Z
+date: 2011-09-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -206,7 +206,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: *id018
@@ -242,9 +242,11 @@ files:
 - 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/facebook.rb
+- lib/sorcery/controller/submodules/external/providers/github.rb
 - lib/sorcery/controller/submodules/external/providers/twitter.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
 - lib/sorcery/controller/submodules/remember_me.rb
@@ -280,6 +282,7 @@ files:
 - sorcery.gemspec
 - spec/Gemfile
 - spec/Gemfile.lock
+- spec/README.md
 - spec/Rakefile
 - spec/rails3/.gitignore
 - spec/rails3/.rspec
@@ -293,6 +296,7 @@ files:
 - 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
@@ -331,7 +335,6 @@ files:
 - spec/rails3/public/500.html
 - spec/rails3/public/favicon.ico
 - spec/rails3/public/images/rails.png
-- spec/rails3/public/index.html
 - spec/rails3/public/javascripts/application.js
 - spec/rails3/public/javascripts/controls.js
 - spec/rails3/public/javascripts/dragdrop.js
@@ -349,6 +352,7 @@ files:
 - 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
@@ -410,6 +414,7 @@ files:
 - spec/rails3_mongoid/public/robots.txt
 - spec/rails3_mongoid/public/stylesheets/.gitkeep
 - spec/rails3_mongoid/script/rails
+- 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
@@ -550,6 +555,7 @@ test_files:
 - 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_helper.orig.rb
 - spec/rails3/spec/spec_helper.rb
 - spec/rails3/spec/user_activation_spec.rb
@@ -579,6 +585,7 @@ test_files:
 - spec/rails3_mongoid/config/routes.rb
 - spec/rails3_mongoid/db/schema.rb
 - spec/rails3_mongoid/db/seeds.rb
+- spec/rails3_mongoid/spec/controller_spec.rb
 - spec/rails3_mongoid/spec/spec_helper.orig.rb
 - spec/rails3_mongoid/spec/spec_helper.rb
 - spec/rails3_mongoid/spec/user_activation_spec.rb