sorcery 0.7.12 → 0.7.13

data/spec/rails3/spec/controller_oauth_spec.rb

@@ -43,11 +43,28 @@ describe ApplicationController do
       Authentication.delete_all
     end
     
-    it "login_at redirects correctly" do
-      create_new_user
-      get :login_at_test
-      response.should be_a_redirect
-      response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
+    context "when callback_url begin with /" do 
+      before do
+        sorcery_controller_external_property_set(:twitter, :callback_url, "/oauth/twitter/callback")
+      end
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test
+        response.should be_a_redirect
+        response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Ftest.host%2Foauth%2Ftwitter%2Fcallback&oauth_token=")
+      end
+      after do
+        sorcery_controller_external_property_set(:twitter, :callback_url, "http://blabla.com")
+      end
+    end
+
+    context "when callback_url begin with http://" do 
+      it "login_at redirects correctly" do
+        create_new_user
+        get :login_at_test
+        response.should be_a_redirect
+        response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
+      end
     end
     
     it "logins if user exists" do
@@ -107,4 +124,83 @@ describe ApplicationController do
       ActionMailer::Base.deliveries.size.should == old_size
     end
   end
-end
+
+  describe ApplicationController, "OAuth with user activation features"  do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+      sorcery_reload!([:activity_logging, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+    end
+
+    context "when twitter" do
+      before(:each) do
+        User.delete_all
+        Authentication.delete_all
+        sorcery_controller_property_set(:register_login_time, true)
+        stub_all_oauth_requests!
+        sorcery_model_property_set(:authentications_class, Authentication)
+        create_new_external_user(:twitter)
+      end
+
+      it "should register login time" do
+        now = Time.now.in_time_zone
+        get :test_login_from
+        User.last.last_login_at.should_not be_nil
+        User.last.last_login_at.to_s(:db).should >= now.to_s(:db)
+        User.last.last_login_at.to_s(:db).should <= (now+2).to_s(:db)
+      end
+
+      it "should not register login time if configured so" do
+        sorcery_controller_property_set(:register_login_time, false)
+        now = Time.now.in_time_zone
+        get :test_login_from
+        User.last.last_login_at.should be_nil
+      end
+    end
+  end
+
+  describe ApplicationController, "OAuth with session timeout features" do
+    before(:all) do
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
+      sorcery_reload!([:session_timeout, :external])
+    end
+
+    after(:all) do
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
+    end
+
+    context "when twitter" do
+      before(:each) do
+        User.delete_all
+        Authentication.delete_all
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_property_set(:session_timeout,0.5)
+        stub_all_oauth_requests!
+        create_new_external_user(:twitter)
+      end
+
+      after(:each) do
+        Timecop.return
+      end
+
+      it "should not reset session before session timeout" do
+        get :test_login_from
+        session[:user_id].should_not be_nil
+        flash[:notice].should == "Success!"
+      end
+
+      it "should reset session after session timeout" do
+        get :test_login_from
+        Timecop.travel(Time.now.in_time_zone+0.6)
+        get :test_should_be_logged_in
+        session[:user_id].should be_nil
+        response.should be_a_redirect
+      end
+    end
+  end
+end

data/spec/rails3/spec/controller_spec.rb

@@ -141,6 +141,13 @@ describe ApplicationController do
       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'

data/spec/rails3_mongo_mapper/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,6 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -51,10 +48,9 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
+    httpauth (0.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -73,9 +69,10 @@ GEM
       plucky (~> 0.4.0)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth (0.4.6)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     plucky (0.4.4)
       mongo (~> 1.5)

data/spec/rails3_mongo_mapper/app/controllers/application_controller.rb

@@ -101,6 +101,20 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def test_create_from_provider_with_block
+    provider = params[:provider]
+    login_from(provider)
+    @user = create_from(provider) do |user|
+      # check uniqueness of username
+      User.where(:username => user.username).empty?
+    end
+    if @user 
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
   protected
   
   

data/spec/rails3_mongo_mapper/spec/controller_spec.rb

@@ -141,6 +141,13 @@ describe ApplicationController do
       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'

data/spec/rails3_mongoid/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.10)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
-      bundler (>= 1.1.0)
       oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      sorcery
+      oauth2 (~> 0.6.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,6 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -50,10 +47,9 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.6)
-      addressable (~> 2.2)
+    faraday (0.8.1)
       multipart-post (~> 1.1)
-      rack (~> 1.1)
+    httpauth (0.1)
     i18n (0.6.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
@@ -71,9 +67,10 @@ GEM
       tzinfo (~> 0.3.22)
     multi_json (1.1.0)
     multipart-post (1.1.5)
-    oauth (0.4.5)
-    oauth2 (0.5.2)
+    oauth (0.4.6)
+    oauth2 (0.6.0)
       faraday (~> 0.7)
+      httpauth (~> 0.1)
       multi_json (~> 1.0)
     polyglot (0.3.3)
     rack (1.2.5)

data/spec/rails3_mongoid/app/controllers/application_controller.rb

@@ -106,6 +106,20 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def test_create_from_provider_with_block
+    provider = params[:provider]
+    login_from(provider)
+    @user = create_from(provider) do |user|
+      # check uniqueness of username
+      User.where(:username => user.username).empty?
+    end
+    if @user 
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+  
   protected
   
   

data/spec/rails3_mongoid/spec/controller_spec.rb

@@ -152,6 +152,13 @@ describe ApplicationController do
       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'

data/spec/shared_examples/controller_oauth2_shared_examples.rb

@@ -32,6 +32,25 @@ shared_examples_for "oauth2_controller" do
       end.should change(User, :count).by(1)
       User.first.username.should == "Noam Ben Ari"
       User.first.created_at.should_not be_nil
-    end 
+    end
+   
+    describe "with a block" do
+      
+      before(:each) do
+        user = User.new(:username => 'Noam Ben Ari')
+        user.save!(:validate => false)
+        user.authentications.create(:provider => 'twitter', :uid => '456')
+      end
+      
+      it "should not create user" do
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
+        lambda do
+          # test_create_from_provider_with_block in controller will check for uniqueness of username
+          get :test_create_from_provider_with_block, :provider => "facebook"
+        end.should_not change(User, :count)
+      end
+    
+    end
   end
 end

data/spec/shared_examples/controller_oauth_shared_examples.rb

@@ -33,5 +33,23 @@ shared_examples_for "oauth_controller" do
       User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
       User.first.created_at.should_not be_nil
     end
+    
+    describe "with a block" do
+      
+      before(:each) do
+        user = User.new(:username => 'nbenari')
+        user.save!(:validate => false)
+        user.authentications.create(:provider => 'github', :uid => '456')
+      end
+      
+      it "should not create user" do
+        sorcery_model_property_set(:authentications_class, Authentication)
+        sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
+        lambda do
+          get :test_create_from_provider_with_block, :provider => "twitter"
+        end.should_not change(User, :count)
+      end
+    
+    end
   end
 end

data/spec/sorcery_crypto_providers_spec.rb

@@ -181,6 +181,15 @@ describe "Crypto Providers wrappers" do
     it "matches? returns false when no match" do
       Sorcery::CryptoProviders::BCrypt.matches?(@digest, 'Some Dude').should be_false
     end
+
+    it "respond_to?(:stretches) returns true" do
+      Sorcery::CryptoProviders::BCrypt.respond_to?(:stretches).should be_true
+    end
+
+    it "sets cost when stretches is set" do
+      Sorcery::CryptoProviders::BCrypt.stretches = 4
+      Sorcery::CryptoProviders::BCrypt.cost.should == 4
+    end
     
   end
   

metadata

@@ -1,212 +1,225 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sorcery
-version: !ruby/object:Gem::Version
-  version: 0.7.12
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.7.13
 platform: ruby
-authors:
+authors: 
 - Noam Ben Ari
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-22 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: oauth
-  requirement: &2158314580 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2158314580
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: oauth2
-  requirement: &2158314020 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158314020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bcrypt-ruby
-  requirement: &2158313520 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158313520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: abstract
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &2158313000 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2158313000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &2158312440 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *2158312440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &2158311900 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2158311900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
-  requirement: &2158613600 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2158613600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &2158611860 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2158611860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
-  requirement: &2158611100 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2158611100
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &2158610620 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2158610620
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &2158610060 !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *2158610060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &2158609520 !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2158609520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &2158609020 !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *2158609020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: timecop
-  requirement: &2158608520 !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2158608520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: capybara
-  requirement: &2158608000 !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2158608000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  requirement: &2158607480 !ruby/object:Gem::Requirement
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *2158607480
-- !ruby/object:Gem::Dependency
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
   name: mongoid
-  requirement: &2158606940 !ruby/object:Gem::Requirement
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.4.4
   type: :development
   prerelease: false
-  version_requirements: *2158606940
-description: Provides common authentication needs such as signing in/out, activating
-  by email and resetting password.
+  version_requirements: *id018
+description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - .travis.yml
@@ -489,28 +502,31 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/NoamB/sorcery
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Magical authentication for Rails 3 applications
 test_files: []
+