sorcery 0.5.0 → 0.6.0

data/lib/sorcery/model.rb

@@ -3,7 +3,8 @@ module Sorcery
   # It should be included into the ORM base class.
   # In the case of Rails this is usually ActiveRecord (actually, in that case, the plugin does this automatically).
   #
-  # When included it defines a single method: 'activate_sorcery!' which when called adds the other capabilities to the class.
+  # When included it defines a single method: 'activate_sorcery!' which when called adds the other capabilities 
+  # to the class.
   # This method is also the place to configure the plugin in the Model layer.
   module Model
     def self.included(klass)
@@ -14,40 +15,58 @@ 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
+            end
+            
+            include_required_submodules!
+
+            # 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}
+            
+            init_mongoid_support! if defined?(Mongoid) and self.ancestors.include?(Mongoid::Document)
+
+            init_orm_hooks!
+            
+            @sorcery_config.after_config << :add_config_inheritance if @sorcery_config.subclasses_inherit_config
+            @sorcery_config.after_config.each { |c| send(c) }
+          end
+          
+          protected
+          
+          # includes required submodules into the model class, 
+          # which usually is called User.
+          def include_required_submodules!
+            self.class_eval do
               @sorcery_config.submodules = ::Sorcery::Controller::Config.submodules
               @sorcery_config.submodules.each do |mod|
                 begin
                   include Submodules.const_get(mod.to_s.split("_").map {|p| p.capitalize}.join("")) 
                 rescue NameError
-                  # don't stop on a missing submodule. Needed because some submodules are only defined in the controller side.
+                  # don't stop on a missing submodule. Needed because some submodules are only defined 
+                  # in the controller side.
                 end
               end
             end
-
-            # 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}
-
+          end
+          
+          # defines mongoid fields on the model class,
+          # using 1.8.x hash syntax to perserve compatibility.
+          def init_mongoid_support!
             self.class_eval do
-              field sorcery_config.username_attribute_name, type: String
-              field sorcery_config.password_attribute_name, type: String
-              field sorcery_config.email_attribute_name, type: String unless sorcery_config.username_attribute_name == sorcery_config.email_attribute_name
-              field sorcery_config.crypted_password_attribute_name, type: String
-              field sorcery_config.salt_attribute_name, type: String
-            end if defined?(Mongoid) and self.ancestors.include?(Mongoid::Document)
-
-            # add virtual password accessor and ORM callbacks
+              field sorcery_config.username_attribute_name,         :type => String
+              field sorcery_config.email_attribute_name,            :type => String unless sorcery_config.username_attribute_name == sorcery_config.email_attribute_name
+              field sorcery_config.crypted_password_attribute_name, :type => String
+              field sorcery_config.salt_attribute_name,             :type => String
+            end
+          end
+          
+          # add virtual password accessor and ORM callbacks.
+          def init_orm_hooks!
             self.class_eval do
               attr_accessor @sorcery_config.password_attribute_name
               attr_protected @sorcery_config.crypted_password_attribute_name, @sorcery_config.salt_attribute_name
               before_save :encrypt_password, :if => Proc.new { |record| record.send(sorcery_config.password_attribute_name).present? }
               after_save :clear_virtual_password, :if => Proc.new { |record| record.send(sorcery_config.password_attribute_name).present? }
             end
-            
-            @sorcery_config.after_config << :add_config_inheritance if @sorcery_config.subclasses_inherit_config
-            @sorcery_config.after_config.each { |c| send(c) }
           end
         end
       end
@@ -122,7 +141,7 @@ module Sorcery
       # encrypts password with salt and saves it.
       def encrypt_password
         config = sorcery_config
-        new_salt = self.send(:"#{config.salt_attribute_name}=", generate_random_token) if !config.salt_attribute_name.nil?
+        self.send(:"#{config.salt_attribute_name}=", new_salt = generate_random_token) if !config.salt_attribute_name.nil?
         self.send(:"#{config.crypted_password_attribute_name}=", self.class.encrypt(self.send(config.password_attribute_name),new_salt))
       end
 
@@ -148,26 +167,38 @@ module Sorcery
     end
 
     # Each class which calls 'activate_sorcery!' receives an instance of this class.
-    # Every submodule which gets loaded may add accessors to this class so that all options will be configured from a single place.
+    # Every submodule which gets loaded may add accessors to this class so that all 
+    # options will be configured from a single place.
     class Config
 
-      attr_accessor :username_attribute_name,           # change default username attribute, for example, to use :email as the login.
-                    :password_attribute_name,           # change *virtual* password attribute, the one which is used until an encrypted one is generated.
+      attr_accessor :username_attribute_name,           # change default username attribute, for example, to use :email
+                                                        # as the login.
+                                                        
+                    :password_attribute_name,           # change *virtual* password attribute, the one which is used
+                                                        # until an encrypted one is generated.
+                                                        
                     :email_attribute_name,              # change default email attribute.
                     :crypted_password_attribute_name,   # change default crypted_password attribute.
                     :salt_join_token,                   # what pattern to use to join the password with the salt
                     :salt_attribute_name,               # change default salt attribute.
                     :stretches,                         # how many times to apply encryption to the password.
-                    :encryption_key,                    # encryption key used to encrypt reversible encryptions such as AES256.
-                    :subclasses_inherit_config,         # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI.
+                    :encryption_key,                    # encryption key used to encrypt reversible encryptions such as
+                                                        # AES256.
+                                                        
+                    :subclasses_inherit_config,         # make this configuration inheritable for subclasses. Useful for
+                                                        # ActiveRecord's STI.
                     
                     :submodules,                        # configured in config/application.rb
-                    :before_authenticate,               # an array of method names to call before authentication completes. used internally.
-                    :after_config                       # an array of method names to call after configuration by user. used internally.
+                    :before_authenticate,               # an array of method names to call before authentication
+                                                        # completes. used internally.
+                                                        
+                    :after_config                       # an array of method names to call after configuration by user.
+                                                        # used internally.
                     
       attr_reader   :encryption_provider,               # change default encryption_provider.
                     :custom_encryption_provider,        # use an external encryption class.
-                    :encryption_algorithm               # encryption algorithm name. See 'encryption_algorithm=' below for available options.
+                    :encryption_algorithm               # encryption algorithm name. See 'encryption_algorithm=' below
+                                                        # for available options.
 
       def initialize
         @defaults = {

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

@@ -4,7 +4,11 @@ module Sorcery
       module Rails
         include ::Sorcery::TestHelpers::Rails
 
-        SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [:register_last_activity_time_to_db, :deny_banned_user, :validate_session]
+        SUBMODUELS_AUTO_ADDED_CONTROLLER_FILTERS = [
+          :register_last_activity_time_to_db, 
+          :deny_banned_user, 
+          :validate_session
+        ]
 
         def sorcery_reload!(submodules = [], options = {})
           reload_user_class
@@ -22,6 +26,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/lib/sorcery/test_helpers/internal.rb

@@ -15,7 +15,8 @@ module Sorcery
       end
 
       # a patch to fix a bug in testing that happens when you 'destroy' a session twice.
-      # After the first destroy, the session is an ordinary hash, and then when destroy is called again there's an exception.
+      # After the first destroy, the session is an ordinary hash, and then when destroy 
+      # is called again there's an exception.
       class ::Hash
         def destroy
           clear

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/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   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-10}
+  s.date = %q{2011-07-30}
   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",
@@ -217,6 +218,15 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
     "spec/rails3_mongoid/spec/user_spec.rb",
     "spec/rails3_mongoid/vendor/plugins/.gitkeep",
+    "spec/shared_examples/controller_oauth2_shared_examples.rb",
+    "spec/shared_examples/controller_oauth_shared_examples.rb",
+    "spec/shared_examples/user_activation_shared_examples.rb",
+    "spec/shared_examples/user_activity_logging_shared_examples.rb",
+    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
+    "spec/shared_examples/user_oauth_shared_examples.rb",
+    "spec/shared_examples/user_remember_me_shared_examples.rb",
+    "spec/shared_examples/user_reset_password_shared_examples.rb",
+    "spec/shared_examples/user_shared_examples.rb",
     "spec/sinatra/Gemfile",
     "spec/sinatra/Gemfile.lock",
     "spec/sinatra/Rakefile",
@@ -229,6 +239,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 +254,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"
@@ -326,6 +364,15 @@ Gem::Specification.new do |s|
     "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
     "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
     "spec/rails3_mongoid/spec/user_spec.rb",
+    "spec/shared_examples/controller_oauth2_shared_examples.rb",
+    "spec/shared_examples/controller_oauth_shared_examples.rb",
+    "spec/shared_examples/user_activation_shared_examples.rb",
+    "spec/shared_examples/user_activity_logging_shared_examples.rb",
+    "spec/shared_examples/user_brute_force_protection_shared_examples.rb",
+    "spec/shared_examples/user_oauth_shared_examples.rb",
+    "spec/shared_examples/user_remember_me_shared_examples.rb",
+    "spec/shared_examples/user_reset_password_shared_examples.rb",
+    "spec/shared_examples/user_shared_examples.rb",
     "spec/sinatra/authentication.rb",
     "spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb",
     "spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
@@ -335,6 +382,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 +395,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,14 +1,12 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.5.0)
+    sorcery (0.5.30)
       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/
@@ -54,7 +52,6 @@ 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)

data/spec/rails3/Gemfile.lock

@@ -2,14 +2,12 @@ PATH
   remote: ../../../
   specs:
     oauth (0.4.4)
-    sorcery (0.5.0)
+    sorcery (0.5.30)
       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/
@@ -55,7 +53,6 @@ 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)

data/spec/rails3/spec/controller_oauth2_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth2_shared_examples')
 
 def stub_all_oauth2_requests!
   @client = OAuth2::Client.new("key","secret", :site => "http://myapi.com")
@@ -58,30 +59,8 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "'create_from'" do
-    before(:each) do
-      stub_all_oauth2_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new user" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name"})
-      lambda do
-        get :test_create_from_provider, :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Noam Ben Ari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "hometown/name"})
-      lambda do
-        get :test_create_from_provider, :provider => "facebook"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "Haifa, Israel"
-    end
+  describe ApplicationController do
+    it_behaves_like "oauth2_controller"
   end
   
   describe ApplicationController, "OAuth with User Activation features" do

data/spec/rails3/spec/controller_oauth_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../shared_examples/controller_oauth_shared_examples')
 require 'ostruct'
 
 def stub_all_oauth_requests!
@@ -64,30 +65,8 @@ describe ApplicationController do
     end
   end
   
-  describe ApplicationController, "using 'create_from'" do
-    before(:each) do
-      stub_all_oauth_requests!
-      User.delete_all
-      Authentication.delete_all
-    end
-      
-    it "should create a new user" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "screen_name"})
-      lambda do
-        get :test_create_from_provider, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "nbenari"
-    end
-    
-    it "should support nested attributes" do
-      sorcery_model_property_set(:authentications_class, Authentication)
-      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text"})
-      lambda do
-        get :test_create_from_provider, :provider => "twitter"
-      end.should change(User, :count).by(1)
-      User.first.username.should == "coming soon to sorcery gem: twitter and facebook authentication support."
-    end
+  describe ApplicationController do
+    it_behaves_like "oauth_controller"
   end
   
   describe ApplicationController, "using OAuth with User Activation features" do

data/spec/rails3/spec/controller_spec.rb

@@ -14,8 +14,8 @@ describe ApplicationController do
     end
     
     it "should enable configuration option 'user_class'" do
-      sorcery_controller_property_set(:user_class, TestUser)
-      Sorcery::Controller::Config.user_class.should equal(TestUser)
+      sorcery_controller_property_set(:user_class, "TestUser")
+      Sorcery::Controller::Config.user_class.should == "TestUser"
     end
     
     it "should enable configuration option 'not_authenticated_action'" do