sorcery 0.3.0 → 0.4.0

data/spec/sinatra/myapp.rb

@@ -53,7 +53,7 @@ end
 post '/test_return_to' do
   session[:return_to_url] = params[:return_to_url] if params[:return_to_url]
   @user = login(params[:username], params[:password])
-  return_or_redirect_to(:some_action)
+  redirect_back_or_to(:some_action)
 end
 
 get '/test_should_be_logged_in' do
@@ -96,12 +96,12 @@ end
 
 # oauth
 
-get '/auth_at_provider_test' do
-  auth_at_provider(:twitter)
+get '/login_at_test' do
+  login_at(:twitter)
 end
 
-get '/test_login_from_access_token' do
-  if @user = login_from_access_token(:twitter)
+get '/test_login_from' do
+  if @user = login_from(:twitter)
     erb "Success!"
   else
     erb "Failed!"
@@ -110,12 +110,12 @@ end
 
 # oauth2
 
-get '/auth_at_provider_test2' do
-  auth_at_provider(:facebook)
+get '/login_at_test2' do
+  login_at(:facebook)
 end
 
-get '/test_login_from_access_token2' do
-  if @user = login_from_access_token(:facebook)
+get '/test_login_from2' do
+  if @user = login_from(:facebook)
     erb "Success!"
   else
     erb "Failed!"
@@ -124,8 +124,8 @@ end
 
 get '/test_create_from_provider' do
   provider = params[:provider]
-  login_from_access_token(provider)
-  if @user = create_from_provider!(provider)
+  login_from(provider)
+  if @user = create_from(provider)
     erb "Success!"
   else
     erb "Failed!"

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

@@ -12,16 +12,16 @@ end
 
 describe 'MyApp' do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_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")
+    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
+    sorcery_reload!([:external])
+    sorcery_controller_property_set(:external_providers, [:facebook])
+    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
-    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
   describe Sinatra::Application, "with OAuth features" do
@@ -35,29 +35,30 @@ describe 'MyApp' do
       Authentication.delete_all
     end
     
-    it "auth_at_provider redirects correctly" do
+    it "login_at redirects correctly" do
       create_new_user
-      get "/auth_at_provider_test2"
+      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_access_token' logins if user exists" do
+    it "'login_from' logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:facebook)
-      get "/test_login_from_access_token2"
+      get "/test_login_from2"
       last_response.body.should == "Success!"
     end
     
-    it "'login_from_access_token' fails if user doesn't exist" do
+    it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
-      get "/test_login_from_access_token2"
+      get "/test_login_from2"
       last_response.body.should == "Failed!"
     end
   end
   
-  describe Sinatra::Application, "'create_from_provider!'" do
+  describe Sinatra::Application, "'create_from'" do
     before(:each) do
       stub_all_oauth2_requests!
       User.delete_all
@@ -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)
@@ -86,11 +87,11 @@ describe 'MyApp' do
   describe Sinatra::Application, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/activation")
-      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
-      sorcery_controller_property_set(:oauth_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_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
+      sorcery_controller_property_set(:external_providers, [:facebook])
+      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

@@ -18,19 +18,19 @@ end
 
 describe Sinatra::Application do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/oauth")
-    sorcery_reload!([:oauth])
-    sorcery_controller_property_set(:oauth_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")
+    ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/external")
+    sorcery_reload!([:external])
+    sorcery_controller_property_set(:external_providers, [:twitter])
+    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
-    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{APP_ROOT}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe Sinatra::Application, "'login_from_access_token'" do
+  describe Sinatra::Application, "'login_from'" do
   
     before(:each) do
       stub_all_oauth_requests!
@@ -41,9 +41,9 @@ describe Sinatra::Application do
       Authentication.delete_all
     end
     
-    it "auth_at_provider redirects correctly" do
+    it "login_at_test redirects correctly" do
       create_new_user
-      get "/auth_at_provider_test"
+      get "/login_at_test"
       last_response.should be_a_redirect
       last_response.should redirect_to("http://myapi.com/oauth/authorize?oauth_callback=http%3A%2F%2Fblabla.com&oauth_token=")
     end
@@ -51,19 +51,19 @@ describe Sinatra::Application do
     it "logins if user exists" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_external_user(:twitter)
-      get '/test_login_from_access_token', :oauth_verifier => "blablaRERASDFcxvSDFA"
+      get '/test_login_from', :oauth_verifier => "blablaRERASDFcxvSDFA"
       last_response.body.should == "Success!"
     end
     
-    it "'login_from_access_token' fails if user doesn't exist" do
+    it "'login_from' fails if user doesn't exist" do
       sorcery_model_property_set(:authentications_class, Authentication)
       create_new_user
-      get :test_login_from_access_token, :oauth_verifier => "blablaRERASDFcxvSDFA"
+      get '/test_login_from', :oauth_verifier => "blablaRERASDFcxvSDFA"
       last_response.body.should == "Failed!"
     end
   end
   
-  describe Sinatra::Application, "'create_from_provider!'" do
+  describe Sinatra::Application, "'create_from'" do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
@@ -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)
@@ -92,7 +92,7 @@ describe Sinatra::Application do
   describe Sinatra::Application, "OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{APP_ROOT}/db/migrate/activation")
-      sorcery_reload!([:user_activation,:oauth], :user_activation_mailer => ::SorceryMailer)
+      sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)
     end
     
     after(:all) do

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,7 +23,7 @@ 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
@@ -29,10 +33,10 @@ describe Sinatra::Application do
       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
+      Timecop.travel(Time.now+1)
       get "/test_should_be_logged_in"
       session[:user_id].should_not be_nil
-      sleep 1
+      Timecop.travel(Time.now+1)
       get "/test_should_be_logged_in"
       session[:user_id].should_not be_nil
       last_response.should be_ok
@@ -42,7 +46,7 @@ describe Sinatra::Application 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
+      Timecop.travel(Time.now+0.6)
       get "/test_should_be_logged_in"
       session[:user_id].should be_nil
       last_response.should be_a_redirect

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
@@ -36,7 +37,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'