sorcery 0.1.3 → 0.2.0

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +02:00
+date: 2011-03-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,69 +18,69 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.3
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
-  type: :development
+        version: 1.5.1
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: oauth
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 0.4.4
+  type: :runtime
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: oauth2
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 0.1.1
+  type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: rspec-rails
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: ruby-debug19
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,8 +91,30 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: sqlite3-ruby
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +122,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,10 +133,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,7 +144,40 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: oauth2
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id015
 description: Provides common authentication needs such as signing in/out, activating by email and resetting password.
 email: nbenari@gmail.com
 executables: []
@@ -141,11 +196,16 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- features/support/env.rb
 - lib/sorcery.rb
 - lib/sorcery/controller.rb
+- lib/sorcery/controller/submodules/activity_logging.rb
 - lib/sorcery/controller/submodules/brute_force_protection.rb
 - lib/sorcery/controller/submodules/http_basic_auth.rb
+- lib/sorcery/controller/submodules/oauth.rb
+- lib/sorcery/controller/submodules/oauth/oauth1.rb
+- lib/sorcery/controller/submodules/oauth/oauth2.rb
+- lib/sorcery/controller/submodules/oauth/providers/facebook.rb
+- lib/sorcery/controller/submodules/oauth/providers/twitter.rb
 - lib/sorcery/controller/submodules/remember_me.rb
 - lib/sorcery/controller/submodules/session_timeout.rb
 - lib/sorcery/crypto_providers/aes256.rb
@@ -156,23 +216,30 @@ files:
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
 - lib/sorcery/model.rb
-- lib/sorcery/model/submodules/password_reset.rb
+- lib/sorcery/model/submodules/activity_logging.rb
+- lib/sorcery/model/submodules/brute_force_protection.rb
+- lib/sorcery/model/submodules/oauth.rb
 - lib/sorcery/model/submodules/remember_me.rb
+- lib/sorcery/model/submodules/reset_password.rb
 - lib/sorcery/model/submodules/user_activation.rb
+- lib/sorcery/model/temporary_token.rb
+- lib/sorcery/test_helpers.rb
 - sorcery.gemspec
 - spec/Gemfile
 - spec/Gemfile.lock
 - spec/Rakefile
 - spec/rails3/.rspec
-- spec/rails3/Gemfile
-- spec/rails3/Gemfile.lock
-- spec/rails3/Rakefile
 - spec/rails3/app_root/.gitignore
+- spec/rails3/app_root/.rspec
+- spec/rails3/app_root/Gemfile
+- spec/rails3/app_root/Gemfile.lock
 - spec/rails3/app_root/README
+- spec/rails3/app_root/Rakefile
 - spec/rails3/app_root/Rakefile.unused
 - spec/rails3/app_root/app/controllers/application_controller.rb
 - spec/rails3/app_root/app/helpers/application_helper.rb
 - spec/rails3/app_root/app/mailers/sorcery_mailer.rb
+- spec/rails3/app_root/app/models/authentication.rb
 - spec/rails3/app_root/app/models/user.rb
 - spec/rails3/app_root/app/views/layouts/application.html.erb
 - spec/rails3/app_root/app/views/sorcery_mailer/activation_email.html.erb
@@ -198,9 +265,12 @@ files:
 - spec/rails3/app_root/config/locales/en.yml
 - spec/rails3/app_root/config/routes.rb
 - spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
 - spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb
-- spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb
+- spec/rails3/app_root/db/migrate/oauth/20101224223628_create_authentications.rb
 - spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
 - spec/rails3/app_root/db/schema.rb
 - spec/rails3/app_root/db/seeds.rb
 - spec/rails3/app_root/lib/tasks/.gitkeep
@@ -219,21 +289,24 @@ files:
 - spec/rails3/app_root/public/robots.txt
 - spec/rails3/app_root/public/stylesheets/.gitkeep
 - spec/rails3/app_root/script/rails
-- spec/rails3/app_root/test/fixtures/users.yml
-- spec/rails3/app_root/test/performance/browsing_test.rb
-- spec/rails3/app_root/test/test_helper.rb
-- spec/rails3/app_root/test/unit/user_test.rb
+- spec/rails3/app_root/spec/controller_activity_logging_spec.rb
+- spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb
+- spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb
+- spec/rails3/app_root/spec/controller_oauth2_spec.rb
+- spec/rails3/app_root/spec/controller_oauth_spec.rb
+- spec/rails3/app_root/spec/controller_remember_me_spec.rb
+- spec/rails3/app_root/spec/controller_session_timeout_spec.rb
+- spec/rails3/app_root/spec/controller_spec.rb
+- spec/rails3/app_root/spec/spec_helper.orig.rb
+- spec/rails3/app_root/spec/spec_helper.rb
+- spec/rails3/app_root/spec/user_activation_spec.rb
+- spec/rails3/app_root/spec/user_activity_logging_spec.rb
+- spec/rails3/app_root/spec/user_brute_force_protection_spec.rb
+- spec/rails3/app_root/spec/user_oauth_spec.rb
+- spec/rails3/app_root/spec/user_remember_me_spec.rb
+- spec/rails3/app_root/spec/user_reset_password_spec.rb
+- spec/rails3/app_root/spec/user_spec.rb
 - spec/rails3/app_root/vendor/plugins/.gitkeep
-- spec/rails3/controller_brute_force_protection_spec.rb
-- spec/rails3/controller_http_basic_auth_spec.rb
-- spec/rails3/controller_remember_me_spec.rb
-- spec/rails3/controller_session_timeout_spec.rb
-- spec/rails3/controller_spec.rb
-- spec/rails3/spec_helper.rb
-- spec/rails3/user_activation_spec.rb
-- spec/rails3/user_password_reset_spec.rb
-- spec/rails3/user_remember_me_spec.rb
-- spec/rails3/user_spec.rb
 - spec/sorcery_crypto_providers_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -260,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Magical authentication for Rails 3 applications
@@ -268,6 +341,7 @@ test_files:
 - spec/rails3/app_root/app/controllers/application_controller.rb
 - spec/rails3/app_root/app/helpers/application_helper.rb
 - spec/rails3/app_root/app/mailers/sorcery_mailer.rb
+- spec/rails3/app_root/app/models/authentication.rb
 - spec/rails3/app_root/app/models/user.rb
 - spec/rails3/app_root/config/application.rb
 - spec/rails3/app_root/config/boot.rb
@@ -283,23 +357,30 @@ test_files:
 - spec/rails3/app_root/config/initializers/session_store.rb
 - spec/rails3/app_root/config/routes.rb
 - spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
+- spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
+- spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
 - spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb
-- spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb
+- spec/rails3/app_root/db/migrate/oauth/20101224223628_create_authentications.rb
 - spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
+- spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
 - spec/rails3/app_root/db/schema.rb
 - spec/rails3/app_root/db/seeds.rb
-- spec/rails3/app_root/test/performance/browsing_test.rb
-- spec/rails3/app_root/test/test_helper.rb
-- spec/rails3/app_root/test/unit/user_test.rb
-- spec/rails3/controller_brute_force_protection_spec.rb
-- spec/rails3/controller_http_basic_auth_spec.rb
-- spec/rails3/controller_remember_me_spec.rb
-- spec/rails3/controller_session_timeout_spec.rb
-- spec/rails3/controller_spec.rb
-- spec/rails3/spec_helper.rb
-- spec/rails3/user_activation_spec.rb
-- spec/rails3/user_password_reset_spec.rb
-- spec/rails3/user_remember_me_spec.rb
-- spec/rails3/user_spec.rb
+- spec/rails3/app_root/spec/controller_activity_logging_spec.rb
+- spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb
+- spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb
+- spec/rails3/app_root/spec/controller_oauth2_spec.rb
+- spec/rails3/app_root/spec/controller_oauth_spec.rb
+- spec/rails3/app_root/spec/controller_remember_me_spec.rb
+- spec/rails3/app_root/spec/controller_session_timeout_spec.rb
+- spec/rails3/app_root/spec/controller_spec.rb
+- spec/rails3/app_root/spec/spec_helper.orig.rb
+- spec/rails3/app_root/spec/spec_helper.rb
+- spec/rails3/app_root/spec/user_activation_spec.rb
+- spec/rails3/app_root/spec/user_activity_logging_spec.rb
+- spec/rails3/app_root/spec/user_brute_force_protection_spec.rb
+- spec/rails3/app_root/spec/user_oauth_spec.rb
+- spec/rails3/app_root/spec/user_remember_me_spec.rb
+- spec/rails3/app_root/spec/user_reset_password_spec.rb
+- spec/rails3/app_root/spec/user_spec.rb
 - spec/sorcery_crypto_providers_spec.rb
 - spec/spec_helper.rb

data/features/support/env.rb

@@ -1,13 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
-require 'sorcery'
-
-require 'rspec/expectations'

data/lib/sorcery/model/submodules/password_reset.rb

@@ -1,64 +0,0 @@
-module Sorcery
-  module Model
-    module Submodules
-      # This submodule adds the ability to reset password via email confirmation.
-      module PasswordReset        
-        def self.included(base)
-          base.sorcery_config.class_eval do
-            attr_accessor :reset_password_code_attribute_name,        # reset password code attribute name.
-                          :reset_password_mailer,                     # mailer class. Needed.
-                          :reset_password_email_method_name           # reset password email method on your mailer class.
-
-          end
-          
-          base.sorcery_config.instance_eval do
-            @defaults.merge!(:@reset_password_code_attribute_name => :reset_password_code,
-                             :@reset_password_mailer              => nil,
-                             :@reset_password_email_method_name   => :reset_password_email)
-
-            reset!
-          end
-          
-          base.class_eval do
-            clear_reset_password_code_proc = Proc.new do |record|
-              record.valid? && record.send(sorcery_config.password_attribute_name)
-            end
-            
-            before_save :clear_reset_password_code, :if =>clear_reset_password_code_proc
-          end
-          
-          base.sorcery_config.after_config << :validate_mailer_defined
-          
-          base.extend(ClassMethods)
-          base.send(:include, InstanceMethods)
-        end
-        
-        module ClassMethods
-          def validate_mailer_defined
-            msg = "To use password_reset submodule, you must define a mailer (config.reset_password_mailer = YourMailerClass)."
-            raise ArgumentError, msg if @sorcery_config.reset_password_mailer == nil
-          end
-        end
-        
-        module InstanceMethods
-          def reset_password!
-            config = sorcery_config
-            self.send(:"#{config.reset_password_code_attribute_name}=", generate_random_code)
-            self.class.transaction do
-              self.save!(:validate => false)
-              generic_send_email(:reset_password_email_method_name, :reset_password_mailer)
-            end
-          end
-
-          protected
-
-          def clear_reset_password_code
-            config = sorcery_config
-            self.send(:"#{config.reset_password_code_attribute_name}=", nil)
-          end
-        end
-        
-      end
-    end
-  end
-end

data/spec/rails3/app_root/db/migrate/password_reset/20101224223622_add_password_reset_to_users.rb

@@ -1,9 +0,0 @@
-class AddPasswordResetToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :reset_password_code, :string, :default => nil
-  end
-
-  def self.down
-    remove_column :users, :reset_password_code
-  end
-end

data/spec/rails3/app_root/test/fixtures/users.yml

@@ -1,9 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
-  email: MyString
-  crypted_password: MyString
-
-two:
-  email: MyString
-  crypted_password: MyString

data/spec/rails3/app_root/test/performance/browsing_test.rb

@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end

data/spec/rails3/app_root/test/test_helper.rb

@@ -1,13 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end

data/spec/rails3/app_root/test/unit/user_test.rb

@@ -1,8 +0,0 @@
-require 'test_helper'
-
-class UserTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
-  end
-end

data/spec/rails3/controller_brute_force_protection_spec.rb

@@ -1,72 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe ApplicationController do
-  
-  # ----------------- SESSION TIMEOUT -----------------------
-  describe ApplicationController, "with brute force protection features" do
-    before(:all) do
-      plugin_model_configure([:brute_force_protection])
-      create_new_user
-    end
-    
-    after(:each) do
-      Sorcery::Controller::Config.reset!
-      plugin_set_controller_config_property(:user_class, User)
-    end
-    
-    it "should have configuration for 'login_retries_amount_allowed' per session" do
-      plugin_set_controller_config_property(:login_retries_amount_allowed, 32)
-      Sorcery::Controller::Config.login_retries_amount_allowed.should equal(32)
-    end
-    
-    it "should have configuration for 'login_retries_counter_reset_time'" do
-      plugin_set_controller_config_property(:login_retries_time_period, 32)
-      Sorcery::Controller::Config.login_retries_time_period.should equal(32)
-    end
-    
-    it "should count login retries per session" do
-      3.times {get :test_login, :username => 'gizmo', :password => 'blabla'}
-      session[:failed_logins].should == 3
-    end
-    
-    it "should reset the counter if enough time has passed" do
-      plugin_set_controller_config_property(:login_retries_amount_allowed, 5)
-      plugin_set_controller_config_property(:login_retries_time_period, 0.2)
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      sleep 0.4
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      session[:failed_logins].should == 1
-    end
-    
-    it "should ban session when number of retries reached within an amount of time" do
-      plugin_set_controller_config_property(:login_retries_amount_allowed, 1)
-      plugin_set_controller_config_property(:login_retries_time_period, 50)
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      session[:banned].should == true
-    end
-
-    it "should clear ban after ban time limit passes" do
-      plugin_set_controller_config_property(:login_retries_amount_allowed, 1)
-      plugin_set_controller_config_property(:login_retries_time_period, 50)
-      plugin_set_controller_config_property(:login_ban_time_period, 0.2)
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      session[:banned].should == true
-      sleep 0.3
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      session[:banned].should == nil
-    end
-    
-    it "banned session calls the configured banned action" do
-      plugin_set_controller_config_property(:login_retries_amount_allowed, 1)
-      plugin_set_controller_config_property(:login_retries_time_period, 50)
-      plugin_set_controller_config_property(:login_ban_time_period, 50)
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      get :test_login, :username => 'gizmo', :password => 'blabla'
-      session[:banned].should == true
-      response.body.should == " "
-    end
-  end
-end