sorcery 0.3.1 → 0.4.2

data/spec/sinatra/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.3.1)
+    sorcery (0.4.2)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -40,7 +40,7 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.4)
+    addressable (2.2.5)
     archive-tar-minitar (0.5.2)
     arel (2.0.7)
     bcrypt-ruby (2.1.4)
@@ -49,7 +49,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.5.5)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
@@ -66,12 +66,12 @@ GEM
     multi_json (0.0.5)
     multipart-post (1.1.0)
     oauth (0.4.4)
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
+    oauth2 (0.4.0)
+      faraday (~> 0.6.0)
       multi_json (~> 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.13)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
@@ -89,14 +89,14 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -113,10 +113,10 @@ GEM
     sinatra (1.2.0)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
-    spork (0.9.0.rc3)
     sqlite3-ruby (1.3.2)
     thor (0.14.6)
     tilt (1.2.2)
+    timecop (0.3.5)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.24)
@@ -125,10 +125,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec
+  rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
   sinatra (>= 1.2.0)
-  sorcery (= 0.3.1)!
-  spork (~> 0.9.0.rc)
+  sorcery (>= 0.1.0)!
   sqlite3-ruby
+  timecop

data/spec/sinatra/Rakefile

@@ -7,4 +7,5 @@ task :default => :spec
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '**/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec/spec.opts"]
 end

data/spec/sinatra/spec/controller_brute_force_protection_spec.rb

@@ -23,6 +23,7 @@ describe Sinatra::Application do
       Sorcery::Controller::Config.reset!
       sorcery_controller_property_set(:user_class, User)
       User.delete_all
+      Timecop.return
     end
     
     it "should count login retries" do
@@ -50,7 +51,7 @@ describe Sinatra::Application do
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.should_not be_nil
-      sleep 0.3
+      Timecop.travel(Time.now+0.3)
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.should be_nil
     end
@@ -61,7 +62,7 @@ describe Sinatra::Application do
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       unlock_date = User.find_by_username('gizmo').lock_expires_at
-      sleep 1
+      Timecop.travel(Time.now+1)
       get "/test_login", :username => 'gizmo', :password => 'blabla'
       User.find_by_username('gizmo').lock_expires_at.to_s.should == unlock_date.to_s
     end

data/spec/sinatra/spec/controller_oauth2_spec.rb

@@ -15,9 +15,9 @@ describe 'MyApp' do
     ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
     sorcery_reload!([:external])
     sorcery_controller_property_set(:external_providers, [:facebook])
-    sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")
+    sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
   end
   
   after(:all) do
@@ -39,7 +39,8 @@ 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&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")
     end
     
     it "'login_from' logins if user exists" do
@@ -66,7 +67,7 @@ describe 'MyApp' do
       
     it "should create a new user" do
       sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_oauth_property_set(:facebook, :user_info_mapping, {:username => "name"})
+      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
       lambda do
         get "/test_create_from_provider", :provider => "facebook"
       end.should change(User, :count).by(1)
@@ -75,7 +76,7 @@ describe 'MyApp' do
     
     it "should support nested attributes" do
       sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_oauth_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
+      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
       lambda do
         get "/test_create_from_provider", :provider => "facebook"
       end.should change(User, :count).by(1)
@@ -88,9 +89,9 @@ describe 'MyApp' do
       ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/activation")
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
       sorcery_controller_property_set(:external_providers, [:facebook])
-      sorcery_controller_oauth_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
-      sorcery_controller_oauth_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-      sorcery_controller_oauth_property_set(:facebook, :callback_url, "http://blabla.com")
+      sorcery_controller_external_property_set(:facebook, :key, "eYVNBjBDi33aa9GkA3w")
+      sorcery_controller_external_property_set(:facebook, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+      sorcery_controller_external_property_set(:facebook, :callback_url, "http://blabla.com")
     end
     
     after(:all) do

data/spec/sinatra/spec/controller_oauth_spec.rb

@@ -21,9 +21,9 @@ describe Sinatra::Application do
     ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
     sorcery_reload!([:external])
     sorcery_controller_property_set(:external_providers, [:twitter])
-    sorcery_controller_oauth_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
-    sorcery_controller_oauth_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
-    sorcery_controller_oauth_property_set(:twitter, :callback_url, "http://blabla.com")
+    sorcery_controller_external_property_set(:twitter, :key, "eYVNBjBDi33aa9GkA3w")
+    sorcery_controller_external_property_set(:twitter, :secret, "XpbeSdCoaKSmQGSeokz5qcUATClRW5u08QWNfv71N8")
+    sorcery_controller_external_property_set(:twitter, :callback_url, "http://blabla.com")
   end
   
   after(:all) do
@@ -72,7 +72,7 @@ describe Sinatra::Application do
       
     it "should create a new user" do
       sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_oauth_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
+      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
       lambda do
         get :test_create_from_provider, :provider => "twitter"
       end.should change(User, :count).by(1)
@@ -81,7 +81,7 @@ describe Sinatra::Application do
     
     it "should support nested attributes" do
       sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_oauth_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
+      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
       lambda do
         get :test_create_from_provider, :provider => "twitter"
       end.should change(User, :count).by(1)

data/spec/sinatra/spec/controller_session_timeout_spec.rb

@@ -10,6 +10,10 @@ describe Sinatra::Application do
       create_new_user
     end
     
+    after(:each) do
+      Timecop.return
+    end
+    
     it "should not reset session before session timeout" do
       session[:user_id] = User.first.id
       get "/test_should_be_logged_in"
@@ -19,34 +23,35 @@ describe Sinatra::Application do
     it "should reset session after session timeout" do
       get "/test_login", :username => 'gizmo', :password => 'secret'
       session[:user_id].should_not be_nil
-      sleep 0.6
+      Timecop.travel(Time.now+0.6)
       get "/test_should_be_logged_in"
       last_response.should be_a_redirect
     end
     
-    it "with 'session_timeout_from_last_action' should not logout if there was activity" do
-      session[:user_id] = nil
-      sorcery_controller_property_set(:session_timeout,2)
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      get "/test_login", :username => 'gizmo', :password => 'secret'
-      sleep 1
-      get "/test_should_be_logged_in"
-      session[:user_id].should_not be_nil
-      sleep 1
-      get "/test_should_be_logged_in"
-      session[:user_id].should_not be_nil
-      last_response.should be_ok
-    end
+    context "with 'session_timeout_from_last_action'" do
+      it "should not logout if there was activity" do
+        session[:user_id] = nil
+        sorcery_controller_property_set(:session_timeout,2)
+        sorcery_controller_property_set(:session_timeout_from_last_action, true)
+        get "/test_login", :username => 'gizmo', :password => 'secret'
+        Timecop.travel(Time.now+1)
+        get "/test_should_be_logged_in"
+        session[:user_id].should_not be_nil
+        Timecop.travel(Time.now+1)
+        get "/test_should_be_logged_in"
+        session[:user_id].should_not be_nil
+        last_response.should be_ok
+      end
     
-    it "with 'session_timeout_from_last_action' should logout if there was no activity" do
-      sorcery_controller_property_set(:session_timeout,0.5)
-      sorcery_controller_property_set(:session_timeout_from_last_action, true)
-      get "/test_login", :username => 'gizmo', :password => 'secret'
-      sleep 0.6
-      get "/test_should_be_logged_in"
-      session[:user_id].should be_nil
-      last_response.should be_a_redirect
+      it "should logout if there was no activity" do
+        sorcery_controller_property_set(:session_timeout,0.5)
+        sorcery_controller_property_set(:session_timeout_from_last_action, true)
+        get "/test_login", :username => 'gizmo', :password => 'secret'
+        Timecop.travel(Time.now+0.6)
+        get "/test_should_be_logged_in"
+        session[:user_id].should be_nil
+        last_response.should be_a_redirect
+      end
     end
-    
   end
 end

data/spec/sinatra/spec/spec.opts

@@ -1,4 +1,2 @@
---colour
---format progress
---loadby mtime
---reverse
+--color
+--format documentation

data/spec/sinatra/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $: << APP_ROOT # for model reloading
 
 require 'rack/test'
 require 'rspec'
+require 'timecop'
 
 # set test environment
 set :environment, :test
@@ -19,8 +20,9 @@ end
 
 Rspec.configure do |config|
   config.send(:include, RSpecMixinExample)
-  config.send(:include, ::Sorcery::TestHelpers)
   config.send(:include, ::Sorcery::TestHelpers::Sinatra)
+  config.send(:include, ::Sorcery::TestHelpers::Internal)
+  config.send(:include, ::Sorcery::TestHelpers::Internal::Sinatra)
   config.before(:suite) do
     ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/core")
   end
@@ -36,7 +38,7 @@ require File.join(File.dirname(__FILE__), '..','user')
 require File.join(File.dirname(__FILE__), '..','authentication')
 
 class TestUser < ActiveRecord::Base
-  activate_sorcery!
+  authenticates_with_sorcery!
 end
 
 class TestMailer < ActionMailer::Base

data/spec/sorcery_crypto_providers_spec.rb

@@ -31,7 +31,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      10.times {@digest = Digest::SHA1.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA1.stretches.times {@digest = Digest::SHA1.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -61,7 +61,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      20.times {@digest = Digest::SHA256.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA256.stretches.times {@digest = Digest::SHA256.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -91,7 +91,7 @@ describe "Crypto Providers wrappers" do
     
     before(:all) do
       @digest = 'Noam Ben-Ari'
-      20.times {@digest = Digest::SHA512.hexdigest(@digest)}
+      Sorcery::CryptoProviders::SHA512.stretches.times {@digest = Digest::SHA512.hexdigest(@digest)}
     end
     
     after(:each) do
@@ -153,7 +153,8 @@ describe "Crypto Providers wrappers" do
   describe Sorcery::CryptoProviders::BCrypt do
     
     before(:all) do
-      @digest = BCrypt::Password.create('Noam Ben-Ari', :cost => 10)
+      Sorcery::CryptoProviders::BCrypt.cost = 1
+      @digest = BCrypt::Password.create('Noam Ben-Ari', :cost => Sorcery::CryptoProviders::BCrypt.cost)
     end
     
     after(:each) do

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'simplecov'
-SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
-SimpleCov.start
-
+# require 'simplecov'
+# SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
+# SimpleCov.start
 
 require 'rspec'
 require 'sorcery'