sorcery 0.5.1 → 0.5.2

data/README.rdoc

@@ -29,7 +29,7 @@ Example Rails 3 app using sorcery: https://github.com/NoamB/sorcery-example-app
 
 Example Sinatra app using sorcery: https://github.com/NoamB/sorcery-example-app-sinatra
 
-Documentation: http://rubydoc.info/gems/sorcery/0.5.1/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.5.2/frames
 
 Check out the tutorials in the github wiki!
 

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/sorcery.rb

@@ -56,28 +56,26 @@ module Sorcery
     module Internal
       autoload :Rails, 'sorcery/test_helpers/internal/rails'
       autoload :Sinatra, 'sorcery/test_helpers/internal/sinatra'
+      autoload :SinatraModular, 'sorcery/test_helpers/internal/sinatra_modular'
     end
 
   end
 
   if defined?(ActiveRecord)
     ActiveRecord::Base.send(:include, Sorcery::Model)
-    ActiveRecord::Base.send(:include, ::Sorcery::Model::Adapters::ActiveRecord)
+    ActiveRecord::Base.send(:include, Sorcery::Model::Adapters::ActiveRecord)
   end
 
   if defined?(Mongoid)
     Mongoid::Document.module_eval do
       included do
         attr_reader :new_record
-        include Sorcery::Model::Adapters::Mongoid
         include Sorcery::Model
+        include Sorcery::Model::Adapters::Mongoid
       end
     end
   end
 
   require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
   require 'sorcery/sinatra' if defined?(Sinatra)
-
-
-
 end

data/lib/sorcery/controller/adapters/sinatra.rb

@@ -16,7 +16,7 @@ module Sorcery
                   process_route(*arguments) { instance_eval(&block) }
                 end
               end
-              
+
               def after_filter(filter)
                 after do
                   send(filter)
@@ -24,66 +24,73 @@ module Sorcery
               end
             end
           end
-          
+
           ::Sinatra::Request.class_eval do
             def authorization
-              env['HTTP_AUTHORIZATION']   ||
-              env['X-HTTP_AUTHORIZATION'] ||
-              env['X_HTTP_AUTHORIZATION'] ||
-              env['REDIRECT_X_HTTP_AUTHORIZATION'] || nil
+              env['HTTP_AUTHORIZATION'] ||
+                  env['X-HTTP_AUTHORIZATION'] ||
+                  env['X_HTTP_AUTHORIZATION'] ||
+                  env['REDIRECT_X_HTTP_AUTHORIZATION'] || nil
             end
           end
-          
+
+          base.send(:include, SorceryHelpers)
           base.send(:include, InstanceMethods)
           base.extend(ClassMethods)
         end
-        
+
+        module SorceryHelpers
+
+          def request_http_basic_authentication(realm)
+            response.header['WWW-Authenticate'] = %(Basic realm="#{realm}")
+            response.status = 401
+          end
+
+          def authenticate_with_http_basic(&blk)
+            @auth ||= Rack::Auth::Basic::Request.new(request.env)
+            yield @auth.credentials if (@auth.provided? && @auth.basic? && @auth.credentials)
+          end
+
+        end
+
         module InstanceMethods
           def reset_session
             session.clear
           end
-        
+
           def redirect_to(*args)
             args.pop if args.last.is_a?(Hash)
             redirect(*args)
           end
-        
+
           def root_path
             '/'
           end
-          
-          helpers do
-            def request_http_basic_authentication(realm)
-              response.header['WWW-Authenticate'] = %(Basic realm="#{realm}")
-              response.status = 401
-            end
-            
-            def authenticate_with_http_basic(&blk)
-              @auth ||=  Rack::Auth::Basic::Request.new(request.env)
-              yield @auth.credentials if ( @auth.provided? && @auth.basic? && @auth.credentials )
-            end
+
+          ::Sinatra.helpers do
+            include SorceryHelpers
           end
-          
+
           def cookies
-            @cookie_proxy ||= CookieProxy.new(request,response)
+            @cookie_proxy ||= CookieProxy.new(request, response)
           end
         end
-        
+
         class CookieProxy
-          def initialize(request,response)
+          def initialize(request, response)
             @request = request
             @response = response
           end
-          
+
           def [](key)
             @request.cookies[key.to_s]
           end
-          
+
           def []=(key, value)
             @response.set_cookie(key, value)
           end
         end
-        
+
         module ClassMethods
           def prepend_before_filter(filter)
             prepend_filter(:before) do

data/lib/sorcery/controller/submodules/http_basic_auth.rb

@@ -21,7 +21,7 @@ module Sorcery
         end
         
         module InstanceMethods
-          
+
           protected
           
           # to be used as a before_filter.

data/lib/sorcery/engine.rb

@@ -12,13 +12,6 @@ module Sorcery
       ActionController::Base.helper_method :current_user
     end
     
-    initializer "attempt to preload user model" do |app|
-      begin
-        require Rails.root + "app/models/user.rb"
-      rescue LoadError
-      end
-    end
-    
     rake_tasks do
       load "sorcery/railties/tasks.rake"
     end

data/lib/sorcery/initializers/initializer.rb

@@ -9,8 +9,7 @@ Rails.application.config.sorcery.configure do |config|
   # config.not_authenticated_action = :not_authenticated              # what controller action to call for non-authenticated users. You can also override 'not_authenticated' instead.
   # config.save_return_to_url = true                                  # when a non logged in user tries to enter a page that requires login, save the URL he wanted to reach, 
                                                                       # and send him there after login, using 'redirect_back_or_to'.
-  # subclasses_inherit_config = false                                 # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI.
-                                                                      
+
   # -- session timeout --                                             
   # config.session_timeout = 3600                                     # how long in seconds to keep the session alive.
   # config.session_timeout_from_last_action = false                   # use the last action as the beginning of session timeout.
@@ -84,4 +83,7 @@ Rails.application.config.sorcery.configure do |config|
     # user.provider_attribute_name = :provider                                        # provider's identifier in authentications class.
     # user.provider_uid_attribute_name = :uid                                         # user's external unique identifier in authentications class.
   end
+
+  # This line must come after the 'user config' block.
+  config.user_class_name = User                                                       # define which model authenticates with sorcery.
 end

data/lib/sorcery/model.rb

@@ -14,9 +14,7 @@ module Sorcery
             self.class_eval do
               extend ClassMethods # included here, before submodules, so they can be overriden by them.
               include InstanceMethods
-              
-              # set the user_class for the controller methods which call it
-              ::Sorcery::Controller::Config.user_class = self
+
               @sorcery_config.submodules = ::Sorcery::Controller::Config.submodules
               @sorcery_config.submodules.each do |mod|
                 begin
@@ -30,6 +28,7 @@ module Sorcery
             # This runs the options block set in the initializer on the model class.
             ::Sorcery::Controller::Config.user_config.tap{|blk| blk.call(@sorcery_config) if blk}
 
+            # Mongoid support
             self.class_eval do
               field sorcery_config.username_attribute_name, type: String
               #field sorcery_config.password_attribute_name, type: String

data/lib/sorcery/test_helpers/internal/rails.rb

@@ -22,6 +22,7 @@ module Sorcery
           ::Sorcery::Controller::Config.submodules = submodules
           ::Sorcery::Controller::Config.user_class = nil
           ActionController::Base.send(:include,::Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = User
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property,value|

data/lib/sorcery/test_helpers/internal/sinatra.rb

@@ -43,15 +43,15 @@ module Sorcery
 
           # clear all filters
           ::Sinatra::Application.instance_variable_set(:@filters, {:before => [], :after => []})
-          ::Sinatra::Application.class_eval do
-            load File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters.rb')
-          end
+          load File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters.rb')
+          ::Sinatra::Application.send(:include, ::Filters)
 
           # configure
           ::Sorcery::Controller::Config.submodules = submodules
           ::Sorcery::Controller::Config.user_class = nil
           ::Sinatra::Application.send(:include, Sorcery::Controller::Adapters::Sinatra)
           ::Sinatra::Application.send(:include, Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = User
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

data/lib/sorcery/test_helpers/internal/sinatra_modular.rb

@@ -0,0 +1,74 @@
+module Sorcery
+  module TestHelpers
+    module Internal
+      module SinatraModular
+        include ::Sorcery::TestHelpers::Sinatra::CookieSessionMethods
+        include ::Sorcery::TestHelpers::Sinatra::InstanceMethods
+
+        class ::Modular
+          class << self
+            attr_accessor :sorcery_vars
+          end
+          @sorcery_vars = {}
+
+          # NOTE: see before and after test filters in filters.rb
+
+          def save_instance_vars
+            instance_variables.each do |var|
+              self.class.sorcery_vars[:"#{var.to_s.delete("@")}"] = instance_variable_get(var)
+            end
+          end
+        end
+
+        ::RSpec::Matchers.define :redirect_to do |expected|
+          match do |actual|
+            actual.status == 302 && actual.location == expected
+          end
+        end
+
+        def clear_user_without_logout
+          get_sinatra_app(subject).instance_variable_set(:@current_user, nil)
+        end
+
+        def assigns
+          ::Modular.sorcery_vars
+        end
+
+        def sorcery_reload!(submodules = [], options = {})
+          reload_user_class
+
+          # return to no-module configuration
+          ::Sorcery::Controller::Config.init!
+          ::Sorcery::Controller::Config.reset!
+
+          # clear all filters
+          ::Sinatra::Base.instance_variable_set(:@filters, {:before => [], :after => []})
+          require File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'spec', 'sinatra', 'filters')
+          ::Sinatra::Base.send(:include, ::Filters)
+
+          # configure
+          ::Sorcery::Controller::Config.submodules = submodules
+          ::Sorcery::Controller::Config.user_class = nil
+          ::Sinatra::Base.send(:include, Sorcery::Controller::Adapters::Sinatra)
+          ::Sinatra::Base.send(:include, Sorcery::Controller)
+          ::Sorcery::Controller::Config.user_class = User
+
+          ::Sorcery::Controller::Config.user_config do |user|
+            options.each do |property, value|
+              user.send(:"#{property}=", value)
+            end
+          end
+          User.authenticates_with_sorcery!
+        end
+
+        def sorcery_controller_property_set(property, value)
+          ::Sorcery::Controller::Config.send(:"#{property}=", value)
+        end
+
+        def sorcery_controller_external_property_set(provider, property, value)
+          ::Sorcery::Controller::Config.send(provider).send(:"#{property}=", value)
+        end
+      end
+    end
+  end
+end

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = %q{2011-05-11}
+  s.date = %q{2011-05-19}
   s.description = %q{Provides common authentication needs such as signing in/out, activating by email and resetting password.}
   s.email = %q{nbenari@gmail.com}
   s.extra_rdoc_files = [
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
     "lib/sorcery/test_helpers/internal.rb",
     "lib/sorcery/test_helpers/internal/rails.rb",
     "lib/sorcery/test_helpers/internal/sinatra.rb",
+    "lib/sorcery/test_helpers/internal/sinatra_modular.rb",
     "lib/sorcery/test_helpers/rails.rb",
     "lib/sorcery/test_helpers/sinatra.rb",
     "sorcery.gemspec",
@@ -229,6 +230,7 @@ Gem::Specification.new do |s|
     "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/sinatra/filters.rb",
+    "spec/sinatra/modular.rb",
     "spec/sinatra/myapp.rb",
     "spec/sinatra/sorcery_mailer.rb",
     "spec/sinatra/spec/controller_activity_logging_spec.rb",
@@ -243,6 +245,33 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/spec_helper.rb",
     "spec/sinatra/user.rb",
     "spec/sinatra/views/test_login.erb",
+    "spec/sinatra_modular/Gemfile",
+    "spec/sinatra_modular/Gemfile.lock",
+    "spec/sinatra_modular/Rakefile",
+    "spec/sinatra_modular/authentication.rb",
+    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
+    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
+    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
+    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
+    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
+    "spec/sinatra_modular/filters.rb",
+    "spec/sinatra_modular/modular.rb",
+    "spec/sinatra_modular/myapp.rb",
+    "spec/sinatra_modular/sorcery_mailer.rb",
+    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_spec.rb",
+    "spec/sinatra_modular/spec_modular/spec.opts",
+    "spec/sinatra_modular/spec_modular/spec_helper.rb",
+    "spec/sinatra_modular/user.rb",
+    "spec/sinatra_modular/views/test_login.erb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -335,6 +364,7 @@ Gem::Specification.new do |s|
     "spec/sinatra/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
     "spec/sinatra/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
     "spec/sinatra/filters.rb",
+    "spec/sinatra/modular.rb",
     "spec/sinatra/myapp.rb",
     "spec/sinatra/sorcery_mailer.rb",
     "spec/sinatra/spec/controller_activity_logging_spec.rb",
@@ -347,6 +377,28 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/controller_spec.rb",
     "spec/sinatra/spec/spec_helper.rb",
     "spec/sinatra/user.rb",
+    "spec/sinatra_modular/authentication.rb",
+    "spec/sinatra_modular/db/migrate/activation/20101224223622_add_activation_to_users.rb",
+    "spec/sinatra_modular/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
+    "spec/sinatra_modular/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
+    "spec/sinatra_modular/db/migrate/core/20101224223620_create_users.rb",
+    "spec/sinatra_modular/db/migrate/external/20101224223628_create_authentications.rb",
+    "spec/sinatra_modular/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
+    "spec/sinatra_modular/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
+    "spec/sinatra_modular/filters.rb",
+    "spec/sinatra_modular/modular.rb",
+    "spec/sinatra_modular/myapp.rb",
+    "spec/sinatra_modular/sorcery_mailer.rb",
+    "spec/sinatra_modular/spec_modular/controller_activity_logging_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_brute_force_protection_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_http_basic_auth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth2_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_oauth_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_remember_me_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_session_timeout_spec.rb",
+    "spec/sinatra_modular/spec_modular/controller_spec.rb",
+    "spec/sinatra_modular/spec_modular/spec_helper.rb",
+    "spec/sinatra_modular/user.rb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.5.0)
+    sorcery (0.5.2)
       bcrypt-ruby (~> 2.1.4)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)

data/spec/rails3/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ../../../
   specs:
     oauth (0.4.4)
-    sorcery (0.5.0)
+    sorcery (0.5.2)
       bcrypt-ruby (~> 2.1.4)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)

data/spec/rails3/spec/user_spec.rb

@@ -15,16 +15,6 @@ describe "User with no submodules (core)" do
       User.should respond_to(:authenticates_with_sorcery!)
     end
   end
-
-  # ----------------- PLUGIN ACTIVATION -----------------------
-  describe TestUser, "Testing activated class self-registration" do
-    it "should register itself as user_class if activated" do
-      TestUser.class_eval do
-        authenticates_with_sorcery!
-      end
-      ::Sorcery::Controller::Config.user_class.should == TestUser
-    end
-  end
   
   # ----------------- PLUGIN CONFIGURATION -----------------------
   describe User, "loaded plugin configuration" do