sorcery 0.3.1 → 0.4.0

data/spec/rails3/{app_root/spec → spec}/controller_session_timeout_spec.rb

@@ -10,6 +10,10 @@ describe ApplicationController do
       create_new_user
     end
     
+    after(:each) do
+      Timecop.return
+    end
+    
     it "should not reset session before session timeout" do
       login_user
       get :test_should_be_logged_in
@@ -19,7 +23,7 @@ describe ApplicationController do
     
     it "should reset session after session timeout" do
       login_user
-      sleep 0.6
+      Timecop.travel(Time.now+0.6)
       get :test_should_be_logged_in
       session[:user_id].should be_nil
       response.should be_a_redirect
@@ -28,10 +32,10 @@ describe ApplicationController do
     it "with 'session_timeout_from_last_action' should not logout if there was activity" do
       sorcery_controller_property_set(:session_timeout_from_last_action, true)
       get :test_login, :username => 'gizmo', :password => 'secret'
-      sleep 0.3
+      Timecop.travel(Time.now+0.3)
       get :test_should_be_logged_in
       session[:user_id].should_not be_nil
-      sleep 0.3
+      Timecop.travel(Time.now+0.3)
       get :test_should_be_logged_in
       session[:user_id].should_not be_nil
       response.should be_a_success
@@ -40,7 +44,7 @@ describe ApplicationController do
     it "with 'session_timeout_from_last_action' should logout if there was no activity" do
       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
       response.should be_a_redirect

data/spec/rails3/spec/spec.opts

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

data/spec/rails3/spec/spec_helper.rb

@@ -0,0 +1,70 @@
+$: << 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'
+require 'timecop'
+# require 'simplecov'
+# SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )
+# SimpleCov.start do
+#   add_filter "/config/"
+#   
+#   add_group 'Controllers', 'app/controllers'
+#   add_group 'Models', 'app/models'
+#   add_group 'Helpers', 'app/helpers'
+#   add_group 'Libraries', 'lib'
+#   add_group 'Plugins', 'vendor/plugins'
+#   add_group 'Migrations', 'db/migrate'
+# end
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+
+
+RSpec.configure do |config|
+  config.include RSpec::Rails::ControllerExampleGroup, :example_group => { :file_path => /controller(.)*_spec.rb$/ }
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+  
+  config.before(:suite) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/core")
+  end
+
+  config.after(:suite) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/core")
+  end
+end
+
+#----------------------------------------------------------------
+# needed when running individual specs
+require File.join(File.dirname(__FILE__), '..','app','models','user')
+require File.join(File.dirname(__FILE__), '..','app','models','authentication')
+
+class TestUser < ActiveRecord::Base
+  authenticates_with_sorcery!
+end
+
+class TestMailer < ActionMailer::Base
+
+end
+
+include ::Sorcery::TestHelpers
+include ::Sorcery::TestHelpers::Rails
+

data/spec/rails3/{app_root/spec → spec}/user_activation_spec.rb

@@ -150,6 +150,10 @@ describe "User with activation submodule" do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
+    after(:each) do
+      Timecop.return
+    end
+    
     it "load_from_activation_token should return user when token is found" do
       create_new_user
       User.load_from_activation_token(@user.activation_token).should == @user
@@ -169,7 +173,7 @@ describe "User with activation submodule" do
     it "load_from_activation_token should NOT return user when token is found and expired" do
       sorcery_model_property_set(:activation_token_expiration_period, 0.1)
       create_new_user
-      sleep 0.5
+      Timecop.travel(Time.now+0.5)
       User.load_from_activation_token(@user.activation_token).should == nil
     end
     

data/spec/rails3/{app_root/spec → spec}/user_oauth_spec.rb

@@ -16,9 +16,9 @@ describe "User with oauth submodule" do
       sorcery_reload!([:external])
       sorcery_controller_property_set(:external_providers, [:twitter])
       sorcery_model_property_set(:authentications_class, Authentication)
-      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")
       create_new_external_user(:twitter)
     end
     

data/spec/rails3/{app_root/spec → spec}/user_reset_password_spec.rb

@@ -76,7 +76,11 @@ describe "User with reset_password submodule" do
     before(:each) do
       User.delete_all
     end
-
+    
+    after(:each) do
+      Timecop.return
+    end
+    
     it "load_from_reset_password_token should return user when token is found" do
       create_new_user
       @user.deliver_reset_password_instructions!
@@ -100,7 +104,7 @@ describe "User with reset_password submodule" do
       create_new_user
       sorcery_model_property_set(:reset_password_expiration_period, 0.1)
       @user.deliver_reset_password_instructions!
-      sleep 0.5
+      Timecop.travel(Time.now+0.5)
       User.load_from_reset_password_token(@user.reset_password_token).should == nil
     end
     
@@ -164,7 +168,7 @@ describe "User with reset_password submodule" do
       old_size = ActionMailer::Base.deliveries.size
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 1
-      sleep 0.5
+      Timecop.travel(Time.now+0.5)
       @user.deliver_reset_password_instructions!
       ActionMailer::Base.deliveries.size.should == old_size + 2
     end

data/spec/rails3/{app_root/spec → spec}/user_spec.rb

@@ -8,14 +8,8 @@ describe "User with no submodules (core)" do
 
   describe User, "when app has plugin loaded" do
     it "should respond to the plugin activation class method" do
-      ActiveRecord::Base.should respond_to(:activate_sorcery!)
-      User.should respond_to(:activate_sorcery!)
-    end
-    
-    it "plugin activation should yield config to block" do
-      User.activate_sorcery! do |config|
-        config.class.should == ::Sorcery::Model::Config 
-      end
+      ActiveRecord::Base.should respond_to(:authenticates_with_sorcery!)
+      User.should respond_to(:authenticates_with_sorcery!)
     end
   end
 
@@ -23,7 +17,7 @@ describe "User with no submodules (core)" do
   describe TestUser, "Testing activated class self-registration" do
     it "should register itself as user_class if activated" do
       TestUser.class_eval do
-        activate_sorcery!
+        authenticates_with_sorcery!
       end
       ::Sorcery::Controller::Config.user_class.should == TestUser
     end

data/spec/sinatra/Gemfile

@@ -2,11 +2,11 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.3.1', :path => '../../'
+gem "sorcery", '0.4.0', :path => '../../'
 
 group :development, :test do
-  gem 'rspec'
+  gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
-  gem 'spork', '~> 0.9.0.rc'
+  gem 'timecop'
 end

data/spec/sinatra/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.3.1)
+    sorcery (0.4.0)
       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.4.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)