sorcery 0.3.1 → 0.4.2

data/spec/rails3/config/database.yml

@@ -0,0 +1,27 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+# development:
+#   adapter: sqlite3
+#   database: db/development.sqlite3
+#   pool: 5
+#   timeout: 5000
+# 
+# # Warning: The database defined as "test" will be erased and
+# # re-generated from your development database when you run "rake".
+# # Do not set this db to the same as development or production.
+# test:
+#   adapter: sqlite3
+#   database: db/test.sqlite3
+#   pool: 5
+#   timeout: 5000
+# 
+# production:
+#   adapter: sqlite3
+#   database: db/production.sqlite3
+#   pool: 5
+#   timeout: 5000
+  
+in_memory:
+  adapter: sqlite3
+  database: ":memory:"
+  verbosity: quiet

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

@@ -22,10 +22,8 @@ describe ApplicationController do
     after(:each) do
       User.delete_all
     end
-
-    it "should respond to 'current_users'" do
-      subject.should respond_to(:current_users)
-    end
+    
+    specify { subject.should respond_to(:current_users) }
 
     it "'current_users' should be empty when no users are logged in" do
       subject.current_users.size.should == 0

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

@@ -19,6 +19,7 @@ describe ApplicationController do
     after(:each) do
       Sorcery::Controller::Config.reset!
       sorcery_controller_property_set(:user_class, User)
+      Timecop.return
     end
     
     it "should count login retries" do
@@ -46,7 +47,7 @@ describe ApplicationController 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
@@ -57,7 +58,7 @@ describe ApplicationController 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/rails3/{app_root/spec → spec}/controller_oauth2_spec.rb

@@ -15,9 +15,9 @@ describe ApplicationController do
     ActiveRecord::Migrator.migrate("#{Rails.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 ApplicationController do
       create_new_user
       get :login_at_test2
       response.should be_a_redirect
-      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")
+      #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")
+      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 ApplicationController 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 ApplicationController 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 ApplicationController do
       ActiveRecord::Migrator.migrate("#{Rails.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/rails3/{app_root/spec → spec}/controller_oauth_spec.rb

@@ -22,16 +22,16 @@ describe ApplicationController do
     ActiveRecord::Migrator.migrate("#{Rails.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
     ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
   # ----------------- OAuth -----------------------
-  describe ApplicationController, "'login_from'" do
+  describe ApplicationController, "'using external API to login'" do
   
     before(:each) do
       stub_all_oauth_requests!
@@ -64,7 +64,7 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "'create_from'" do
+  describe ApplicationController, "using 'create_from'" do
     before(:each) do
       stub_all_oauth_requests!
       User.delete_all
@@ -73,7 +73,7 @@ describe ApplicationController 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)
@@ -82,7 +82,7 @@ describe ApplicationController 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)
@@ -90,7 +90,7 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "OAuth with User Activation features" do
+  describe ApplicationController, "using OAuth with User Activation features" do
     before(:all) do
       ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activation")
       sorcery_reload!([:user_activation,:external], :user_activation_mailer => ::SorceryMailer)

data/spec/rails3/spec/controller_session_timeout_spec.rb

@@ -0,0 +1,55 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe ApplicationController do
+  
+  # ----------------- SESSION TIMEOUT -----------------------
+  describe ApplicationController, "with session timeout features" do
+    before(:all) do
+      sorcery_reload!([:session_timeout])
+      sorcery_controller_property_set(:session_timeout,0.5)
+      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
+      session[:user_id].should_not be_nil
+      response.should be_a_success
+    end
+    
+    it "should reset session after session timeout" do
+      login_user
+      Timecop.travel(Time.now+0.6)
+      get :test_should_be_logged_in
+      session[:user_id].should be_nil
+      response.should be_a_redirect
+    end
+    
+    context "with 'session_timeout_from_last_action'" do
+      it "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'
+        Timecop.travel(Time.now+0.3)
+        get :test_should_be_logged_in
+        session[:user_id].should_not be_nil
+        Timecop.travel(Time.now+0.3)
+        get :test_should_be_logged_in
+        session[:user_id].should_not be_nil
+        response.should be_a_success
+      end
+    
+      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'
+        Timecop.travel(Time.now+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/{app_root/spec → spec}/controller_spec.rb

@@ -37,21 +37,13 @@ describe ApplicationController do
       sorcery_controller_property_set(:user_class, User)
     end
     
-    it "should respond to the instance method login" do
-      should respond_to(:login)
-    end
-  
-    it "should respond to the instance method logout" do
-      should respond_to(:logout)
-    end
+    specify { should respond_to(:login) }
+
+    specify { should respond_to(:logout) }
   
-    it "should respond to the instance method logged_in?" do
-      should respond_to(:logged_in?)
-    end
+    specify { should respond_to(:logged_in?) }
     
-    it "should respond to the instance method current_user" do
-      should respond_to(:current_user)
-    end
+    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'
@@ -93,9 +85,7 @@ describe ApplicationController do
       subject.current_user.should == false
     end
     
-    it "should respond to 'require_login'" do
-      should respond_to(:require_login)
-    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

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::Internal
+include ::Sorcery::TestHelpers::Internal::Rails
+

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

@@ -57,23 +57,17 @@ describe "User with activation submodule" do
       sorcery_reload!([:user_activation], :user_activation_mailer => ::SorceryMailer)
     end
     
-    it "should generate an activation code on registration" do
+    before(:each) do
       create_new_user
-      @user.activation_token.should_not be_nil
     end
     
     it "should initialize user state to 'pending'" do
-      create_new_user
       @user.activation_state.should == "pending"
     end
     
-    it "should respond to 'activate!'" do
-      create_new_user
-      @user.should respond_to(:activate!)
-    end
+    specify { @user.should respond_to(:activate!) }
     
     it "should clear activation code and change state to 'active' on activation" do
-      create_new_user
       activation_token = @user.activation_token
       @user.activate!
       @user2 = User.find(@user.id) # go to db to make sure it was saved and not just in memory
@@ -89,7 +83,6 @@ describe "User with activation submodule" do
     end
     
     it "subsequent saves do not send activation email" do
-      create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.username = "Shauli"
       @user.save!
@@ -97,14 +90,12 @@ describe "User with activation submodule" do
     end
     
     it "should send the user an activation success email on successful activation" do
-      create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.activate!
       ActionMailer::Base.deliveries.size.should == old_size + 1
     end
     
     it "subsequent saves do not send activation success email" do
-      create_new_user
       @user.activate!
       old_size = ActionMailer::Base.deliveries.size
       @user.username = "Shauli"
@@ -121,7 +112,6 @@ describe "User with activation submodule" do
     
     it "activation success email is optional" do
       sorcery_model_property_set(:activation_success_email_method_name, nil)
-      create_new_user
       old_size = ActionMailer::Base.deliveries.size
       @user.activate!
       ActionMailer::Base.deliveries.size.should == old_size
@@ -150,6 +140,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 +163,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_brute_force_protection_spec.rb

@@ -21,13 +21,8 @@ describe "User with brute_force_protection submodule" do
       User.sorcery_config.reset!
     end
     
-    it "should respond to 'failed_logins_count'" do
-      @user.should respond_to(:failed_logins_count)
-    end
-    
-    it "should respond to 'lock_expires_at'" do
-      @user.should respond_to(:failed_logins_count)
-    end
+    specify { @user.should respond_to(:failed_logins_count) }
+    specify { @user.should respond_to(:lock_expires_at) }
  
     it "should enable configuration option 'failed_logins_count_attribute_name'" do
       sorcery_model_property_set(:failed_logins_count_attribute_name, :my_count)
@@ -49,28 +44,5 @@ describe "User with brute_force_protection submodule" do
       User.sorcery_config.login_lock_time_period.should == 2.hours    
     end
   end
-
-  # ----------------- PLUGIN ACTIVATED -----------------------
-  describe User, "when activated with sorcery" do
-  
-    before(:all) do
-      sorcery_reload!([:brute_force_protection])
-    end
-  
-    before(:each) do
-      User.delete_all
-    end
-
-    # it "should increment failed_logins_count on a failed login" do
-    #   create_new_user
-    #   
-    # end
-    # 
-    # it "should set lock expiry (effectively lock user) when failed_logins_count reaches max within max period" do
-    #   create_new_user
-    #   @user.lock_expires_at.should == Time.now.utc + 30
-    # end
- 
-  end
   
 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_remember_me_spec.rb

@@ -13,6 +13,7 @@ describe "User with remember_me submodule" do
   describe User, "loaded plugin configuration" do
     before(:all) do
       sorcery_reload!([:remember_me])
+      create_new_user
     end
   
     after(:each) do
@@ -29,32 +30,23 @@ describe "User with remember_me submodule" do
       User.sorcery_config.remember_me_token_expires_at_attribute_name.should equal(:my_expires)
     end
     
-    it "should respond to 'remember_me!'" do
-      create_new_user
-      @user.should respond_to(:remember_me!)
-    end
+    specify { @user.should respond_to(:remember_me!) }
     
-    it "should respond to 'forget_me!'" do
-      create_new_user
-      @user.should respond_to(:forget_me!)
-    end
+    specify { @user.should respond_to(:forget_me!) }
     
     it "should generate a new token on 'remember_me!'" do
-      create_new_user
       @user.remember_me_token.should be_nil
       @user.remember_me!
       @user.remember_me_token.should_not be_nil
     end
     
     it "should set an expiration based on 'remember_me_for' attribute" do
-      create_new_user
       sorcery_model_property_set(:remember_me_for, 2 * 60 * 60 * 24)
       @user.remember_me!
       @user.remember_me_token_expires_at.to_s.should == (Time.now + 2 * 60 * 60 * 24).utc.to_s
     end
     
     it "should delete the token and expiration on 'forget_me!'" do
-      create_new_user
       @user.remember_me!
       @user.remember_me_token.should_not be_nil
       @user.forget_me!

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

@@ -20,21 +20,20 @@ describe "User with reset_password submodule" do
       User.sorcery_config.reset!
     end
     
-    it "should respond to 'deliver_reset_password_instructions!'" do
-      create_new_user
-      @user.should respond_to(:deliver_reset_password_instructions!)
-    end
-    
-    it "should respond to 'reset_password!" do
-      create_new_user
-      @user.should respond_to(:reset_password!)
-    end
-    
-    it "should respond to 'load_from_reset_password_token'" do
-      create_new_user
-      User.should respond_to(:load_from_reset_password_token)
+    context "API" do
+      before(:all) do
+        create_new_user
+      end
+      
+      specify { @user.should respond_to(:deliver_reset_password_instructions!) }
+      
+      specify { @user.should respond_to(:reset_password!) }
+
+      it "should respond to .load_from_reset_password_token" do
+        User.should respond_to(:load_from_reset_password_token)
+      end
     end
-    
+
     it "should allow configuration option 'reset_password_token_attribute_name'" do
       sorcery_model_property_set(:reset_password_token_attribute_name, :my_code)
       User.sorcery_config.reset_password_token_attribute_name.should equal(:my_code)
@@ -76,7 +75,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 +103,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 +167,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,11 @@ 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!)
+      ActiveRecord::Base.should respond_to(:authenticates_with_sorcery!)
     end
     
-    it "plugin activation should yield config to block" do
-      User.activate_sorcery! do |config|
-        config.class.should == ::Sorcery::Model::Config 
-      end
+    it "User should respond_to .authenticates_with_sorcery!" do
+      User.should respond_to(:authenticates_with_sorcery!)
     end
   end
 
@@ -23,7 +20,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
@@ -115,8 +112,21 @@ describe "User with no submodules (core)" do
       User.authenticate(@user.send(User.sorcery_config.username_attribute_name), 'wrong!').should be_false
     end
   
-    it "should respond to the class method encrypt" do
-      User.should respond_to(:encrypt)
+    specify { User.should respond_to(:encrypt) }
+    
+    it "subclass should inherit config if defined so" do
+      sorcery_reload!([],{:subclasses_inherit_config => true})
+      class Admin < User
+      end
+      Admin.sorcery_config.should_not be_nil
+      Admin.sorcery_config.should == User.sorcery_config
+    end
+    
+    it "subclass should not inherit config if not defined so" do
+      sorcery_reload!([],{:subclasses_inherit_config => false})
+      class Admin2 < User
+      end
+      Admin2.sorcery_config.should be_nil
     end
   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.1.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