sorcery 0.4.1 → 0.5.0

data/spec/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem "sorcery", '0.4.1', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"
 group :development do

data/spec/Gemfile.lock

@@ -1,7 +1,14 @@
 PATH
-  remote: ../../../
+  remote: ../
   specs:
-    sorcery (0.4.1)
+    sorcery (0.5.0)
+      bcrypt-ruby (~> 2.1.4)
+      json (>= 1.5.1)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -36,7 +43,7 @@ GEM
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
-    bcrypt-ruby (2.1.3)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -47,6 +54,7 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
+    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)
@@ -118,4 +126,4 @@ DEPENDENCIES
   rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.4.1)!
+  sorcery (>= 0.1.0)!

data/spec/rails3/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.4.1', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../../'
 
 group :development, :test do
   gem "rspec", "~> 2.5.0"

data/spec/rails3/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ../../../
   specs:
     oauth (0.4.4)
-    sorcery (0.4.1)
+    sorcery (0.5.0)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -64,11 +64,11 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    multi_json (0.0.5)
+    multi_json (1.0.1)
     multipart-post (1.1.0)
-    oauth2 (0.4.0)
-      faraday (~> 0.6.0)
-      multi_json (~> 0.0.4)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
     polyglot (0.3.1)
     rack (1.2.1)
     rack-mount (0.6.13)
@@ -131,6 +131,6 @@ DEPENDENCIES
   rspec-rails (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.4.1)!
+  sorcery (>= 0.1.0)!
   sqlite3-ruby
   timecop

data/spec/rails3/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/spec/controller_oauth_spec.rb

@@ -31,7 +31,7 @@ describe ApplicationController 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
@@ -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

@@ -29,26 +29,27 @@ describe ApplicationController do
       response.should be_a_redirect
     end
     
-    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'
-      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
+    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
+      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/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_helper.rb

@@ -65,6 +65,6 @@ class TestMailer < ActionMailer::Base
 
 end
 
-include ::Sorcery::TestHelpers
-include ::Sorcery::TestHelpers::Rails
+include ::Sorcery::TestHelpers::Internal
+include ::Sorcery::TestHelpers::Internal::Rails
 

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

data/spec/rails3/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/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/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(:change_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)
@@ -147,7 +146,7 @@ describe "User with reset_password submodule" do
       create_new_user
       @user.deliver_reset_password_instructions!
       @user.reset_password_token.should_not be_nil
-      @user.reset_password!(:password => "blabulsdf")
+      @user.change_password!("blabulsdf")
       @user.save!
       @user.reset_password_token.should be_nil
     end

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
 
@@ -307,5 +323,4 @@ describe "User with no submodules (core)" do
       @user.external?.should be_true
     end
   end
-
 end

data/spec/rails3_mongoid/.gitignore

@@ -0,0 +1,4 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/spec/rails3_mongoid/.rspec

@@ -0,0 +1 @@
+--colour

data/spec/rails3_mongoid/Gemfile

@@ -0,0 +1,14 @@
+source 'http://rubygems.org'
+
+gem 'rails', '3.0.3'
+gem "sorcery", '>= 0.1.0', :path => '../../../'
+gem "mongoid", "~> 2.0"
+gem "bson_ext", "~> 1.3"
+
+group :development, :test do
+  gem "rspec", "~> 2.5.0"
+  gem 'rspec-rails', "~> 2.5.0"
+  gem 'ruby-debug19'
+  gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
+  gem 'timecop'
+end

data/spec/rails3_mongoid/Gemfile.lock

@@ -0,0 +1,146 @@
+PATH
+  remote: ../../../
+  specs:
+    oauth (0.4.4)
+    sorcery (0.5.0)
+      bcrypt-ruby (~> 2.1.4)
+      json (>= 1.5.1)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+      rails (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.3)
+      actionpack (= 3.0.3)
+      mail (~> 2.2.9)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+    activesupport (3.0.3)
+    addressable (2.2.5)
+    archive-tar-minitar (0.5.2)
+    arel (2.0.6)
+    bcrypt-ruby (2.1.4)
+    bson (1.3.0)
+    bson_ext (1.3.0)
+    builder (2.1.2)
+    columnize (0.3.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    faraday (0.6.1)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (< 2, >= 1.1.0)
+    i18n (0.5.0)
+    json (1.5.1)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    mail (2.2.13)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mongo (1.3.0)
+      bson (>= 1.3.0)
+    mongoid (2.0.1)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    multi_json (1.0.1)
+    multipart-post (1.1.0)
+    oauth2 (0.4.1)
+      faraday (~> 0.6.1)
+      multi_json (>= 0.0.5)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rails (3.0.3)
+      actionmailer (= 3.0.3)
+      actionpack (= 3.0.3)
+      activerecord (= 3.0.3)
+      activeresource (= 3.0.3)
+      activesupport (= 3.0.3)
+      bundler (~> 1.0)
+      railties (= 3.0.3)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    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.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    simplecov (0.3.9)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
+    thor (0.14.6)
+    timecop (0.3.5)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bson_ext (~> 1.3)
+  mongoid (~> 2.0)
+  rails (= 3.0.3)
+  rspec (~> 2.5.0)
+  rspec-rails (~> 2.5.0)
+  ruby-debug19
+  simplecov (>= 0.3.8)
+  sorcery (>= 0.1.0)!
+  timecop

data/spec/rails3_mongoid/Rakefile

@@ -0,0 +1,11 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Default: Run all specs for a specific rails version.'
+task :default => :spec
+
+desc "Run all specs for a specific rails version"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = '**/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec/spec.opts"]
+end