sorcery 0.4.0 → 0.4.2

data/spec/rails3/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)

data/spec/rails3/spec/user_spec.rb

@@ -9,6 +9,9 @@ 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(:authenticates_with_sorcery!)
+    end
+    
+    it "User should respond_to .authenticates_with_sorcery!" do
       User.should respond_to(:authenticates_with_sorcery!)
     end
   end
@@ -109,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,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'sinatra', '>= 1.2.0'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.4.0', :path => '../../'
+gem "sorcery", '>= 0.1.0', :path => '../../'
 
 group :development, :test do
   gem "rspec", "~> 2.5.0"

data/spec/sinatra/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.4.0)
+    sorcery (0.4.2)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -129,6 +129,6 @@ DEPENDENCIES
   ruby-debug19
   simplecov (>= 0.3.8)
   sinatra (>= 1.2.0)
-  sorcery (= 0.4.0)!
+  sorcery (>= 0.1.0)!
   sqlite3-ruby
   timecop

data/spec/sinatra/spec/controller_session_timeout_spec.rb

@@ -28,29 +28,30 @@ describe Sinatra::Application do
       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'
-      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
+    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'
-      Timecop.travel(Time.now+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_helper.rb

@@ -20,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

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +03:00
+date: 2011-04-30 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -248,6 +248,9 @@ files:
 - lib/sorcery/railties/tasks.rake
 - lib/sorcery/sinatra.rb
 - lib/sorcery/test_helpers.rb
+- lib/sorcery/test_helpers/internal.rb
+- lib/sorcery/test_helpers/internal/rails.rb
+- lib/sorcery/test_helpers/internal/sinatra.rb
 - lib/sorcery/test_helpers/rails.rb
 - lib/sorcery/test_helpers/sinatra.rb
 - sorcery.gemspec