sorcery 0.2.1 → 0.4.2

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

@@ -2,23 +2,23 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "User with oauth submodule" do
   before(:all) do
-    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
   end
   
   after(:all) do
-    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
   end
 
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do
   
     before(:all) do
-      sorcery_reload!([:oauth])
-      sorcery_controller_property_set(:oauth_providers, [:twitter])
+      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
 
@@ -286,12 +296,12 @@ describe "User with no submodules (core)" do
   
   describe User, "external users" do
     before(:all) do
-      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/oauth")
+      ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/external")
       sorcery_reload!()
     end
   
     after(:all) do
-      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/oauth")
+      ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/external")
     end
     
     before(:each) do

data/spec/sinatra/Gemfile

@@ -0,0 +1,12 @@
+source 'http://rubygems.org'
+
+gem 'sinatra', '>= 1.2.0'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem "sorcery", '>= 0.1.0', :path => '../../'
+
+group :development, :test do
+  gem "rspec", "~> 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/sinatra/Gemfile.lock

@@ -0,0 +1,134 @@
+PATH
+  remote: ../../
+  specs:
+    sorcery (0.4.2)
+      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.7)
+    bcrypt-ruby (2.1.4)
+    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.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    oauth (0.4.4)
+    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.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      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)
+    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)
+    sinatra (1.2.0)
+      rack (~> 1.1)
+      tilt (< 2.0, >= 1.2.2)
+    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)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec (~> 2.5.0)
+  ruby-debug19
+  simplecov (>= 0.3.8)
+  sinatra (>= 1.2.0)
+  sorcery (>= 0.1.0)!
+  sqlite3-ruby
+  timecop

data/spec/sinatra/Rakefile

@@ -0,0 +1,11 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+desc 'Default: Run all specs.'
+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/authentication.rb

@@ -0,0 +1,3 @@
+class Authentication < ActiveRecord::Base
+  belongs_to :user
+end

data/spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb

@@ -0,0 +1,17 @@
+class AddActivationToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :activation_state, :string, :default => nil
+    add_column :users, :activation_token, :string, :default => nil
+    add_column :users, :activation_token_expires_at, :datetime, :default => nil
+    
+    add_index :users, :activation_token
+  end
+
+  def self.down
+    remove_index :users, :activation_token
+    
+    remove_column :users, :activation_token_expires_at
+    remove_column :users, :activation_token
+    remove_column :users, :activation_state
+  end
+end

data/spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb

@@ -0,0 +1,17 @@
+class AddActivityLoggingToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :last_login_at,     :datetime, :default => nil
+    add_column :users, :last_logout_at,    :datetime, :default => nil
+    add_column :users, :last_activity_at,  :datetime, :default => nil
+    
+    add_index :users, [:last_logout_at, :last_activity_at]
+  end
+
+  def self.down
+    remove_index :users, [:last_logout_at, :last_activity_at]
+    
+    remove_column :users, :last_activity_at
+    remove_column :users, :last_logout_at
+    remove_column :users, :last_login_at
+  end
+end

data/spec/sinatra/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb

@@ -0,0 +1,11 @@
+class AddBruteForceProtectionToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :failed_logins_count, :integer, :default => 0
+    add_column :users, :lock_expires_at, :datetime, :default => nil
+  end
+
+  def self.down
+    remove_column :users, :lock_expires_at
+    remove_column :users, :failed_logins_count
+  end
+end

data/spec/sinatra/db/migrate/core/20101224223620_create_users.rb

@@ -0,0 +1,16 @@
+class CreateUsers < ActiveRecord::Migration
+  def self.up
+    create_table :users do |t|
+      t.string :username,         :null => false
+      t.string :email,            :default => nil
+      t.string :crypted_password, :default => nil
+      t.string :salt,             :default => nil
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :users
+  end
+end

data/spec/sinatra/db/migrate/external/20101224223628_create_authentications.rb

@@ -0,0 +1,14 @@
+class CreateAuthentications < ActiveRecord::Migration
+  def self.up
+    create_table :authentications do |t|
+      t.integer :user_id, :null => false
+      t.string :provider, :uid, :null => false
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :authentications
+  end
+end

data/spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb

@@ -0,0 +1,15 @@
+class AddRememberMeTokenToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :remember_me_token, :string, :default => nil
+    add_column :users, :remember_me_token_expires_at, :datetime, :default => nil
+    
+    add_index :users, :remember_me_token
+  end
+
+  def self.down
+    remove_index :users, :remember_me_token
+    
+    remove_column :users, :remember_me_token_expires_at
+    remove_column :users, :remember_me_token
+  end
+end

data/spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb

@@ -0,0 +1,13 @@
+class AddResetPasswordToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :reset_password_token, :string, :default => nil
+    add_column :users, :reset_password_token_expires_at, :datetime, :default => nil
+    add_column :users, :reset_password_email_sent_at, :datetime, :default => nil
+  end
+
+  def self.down
+    remove_column :users, :reset_password_email_sent_at
+    remove_column :users, :reset_password_token_expires_at
+    remove_column :users, :reset_password_token
+  end
+end

data/spec/sinatra/filters.rb

@@ -0,0 +1,21 @@
+# --- before filters
+
+['/test_logout','/some_action','/test_should_be_logged_in'].each do |patt|
+  before patt do
+    require_login
+  end
+end
+
+before '/test_http_basic_auth' do
+  require_login_from_http_basic
+end
+
+# ----- test filters
+
+before do
+  self.class.sorcery_vars = {}
+end
+
+after do
+  save_instance_vars
+end