sorcery 0.5.30 → 0.6.0

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.30/frames
+Documentation: http://rubydoc.info/gems/sorcery/0.6.0/frames
 
 Check out the tutorials in the github wiki!
 
@@ -224,6 +224,14 @@ The patch version changes are backward compatible.
 In short, an app that works with x.3.1 should be able to upgrade to x.3.2 with no code changes.
 The same cannot be said about upgrading to x.4.0 and above, however.
 
+== Upgrading
+
+Important notes while upgrading:
+
+* If upgrading from <= v0.5.1 to >= v0.5.2 you need to explicitly set your user_class model in the initializer file.
+
+    # This line must come after the 'user config' block.
+    config.user_class = User
 
 == Contributing to sorcery
 

data/VERSION

@@ -1 +1 @@
-0.5.30
+0.6.0

data/lib/sorcery/controller.rb

@@ -29,7 +29,7 @@ module Sorcery
       # Takes credentials and returns a user on successful authentication.
       # Runs hooks after login or failed login.
       def login(*credentials)
-        user = Config.user_class.authenticate(*credentials)
+        user = user_class.authenticate(*credentials)
         if user
           return_to_url = session[:return_to_url]
           reset_session # protect from session fixation attacks
@@ -91,7 +91,7 @@ module Sorcery
       end
       
       def login_from_session
-        @current_user = (Config.user_class.find_by_id(session[:user_id]) if session[:user_id]) || false
+        @current_user = (user_class.find_by_id(session[:user_id]) if session[:user_id]) || false
       end
       
       def after_login!(user, credentials)
@@ -110,14 +110,15 @@ module Sorcery
         Config.after_logout.each {|c| self.send(c)}
       end
       
+      def user_class
+        @user_class ||= Config.user_class.to_s.constantize
+      end
     end
     
     module Config
       class << self
         attr_accessor :submodules,
-        
                       :user_class,                    # what class to use as the user class. 
-                      
                       :not_authenticated_action,      # what controller action to call for non-authenticated users.
                       
                       :save_return_to_url,            # when a non logged in user tries to enter a page that requires
@@ -128,8 +129,8 @@ module Sorcery
                       :after_login,
                       :after_failed_login,
                       :before_logout,
-                      :after_logout                      
-                      
+                      :after_logout             
+        
         def init!
           @defaults = {
             :@user_class                           => nil,

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

@@ -22,7 +22,7 @@ module Sorcery
         module InstanceMethods
           # Returns an array of the active users.
           def current_users
-            Config.user_class.current_users
+            user_class.current_users
             # A possible patch here:
             # we'll add the current_user to the users list if he's not in it
             # (can happen when he was inactive for more than activity timeout):

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

@@ -22,14 +22,14 @@ module Sorcery
           # Increments the failed logins counter on every failed login.
           # Runs as a hook after a failed login.
           def update_failed_logins_count!(credentials)
-            user = Config.user_class.find_by_credentials(credentials)
+            user = user_class.find_by_credentials(credentials)
             user.register_failed_login! if user
           end
           
           # Resets the failed logins counter.
           # Runs as a hook after a successful login.
           def reset_failed_logins_count!(user, credentials)
-            user.update_attributes!(Config.user_class.sorcery_config.failed_logins_count_attribute_name => 0)
+            user.update_attributes!(user_class.sorcery_config.failed_logins_count_attribute_name => 0)
           end
         end
       end

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

@@ -43,7 +43,7 @@ module Sorcery
             @provider = Config.send(provider)
             @provider.process_callback(params,session)
             @user_hash = @provider.get_user_hash
-            if user = Config.user_class.load_from_provider(provider,@user_hash[:uid])
+            if user = user_class.load_from_provider(provider,@user_hash[:uid])
               reset_session
               login_user(user)
               user
@@ -65,14 +65,19 @@ module Sorcery
             provider = provider.to_sym
             @provider = Config.send(provider)
             @user_hash = @provider.get_user_hash
-            config = Config.user_class.sorcery_config
+            config = user_class.sorcery_config
             attrs = {}
             @provider.user_info_mapping.each do |k,v|
-              (varr = v.split("/")).size > 1 ? attrs.merge!(k => varr.inject(@user_hash[:user_info]) {|hsh,v| hsh[v] }) : attrs.merge!(k => @user_hash[:user_info][v])
+              if (varr = v.split("/")).size > 1
+                attribute_value = varr.inject(@user_hash[:user_info]) {|hsh,v| hsh[v] } rescue nil
+                attribute_value.nil? ? attrs : attrs.merge!(k => attribute_value)
+              else
+                attrs.merge!(k => @user_hash[:user_info][v])
+              end
             end
-            Config.user_class.transaction do
-              @user = Config.user_class.create!(attrs)
-              Config.user_class.sorcery_config.authentications_class.create!({config.authentications_user_id_attribute_name => @user.id, config.provider_attribute_name => provider, config.provider_uid_attribute_name => @user_hash[:uid]})
+            user_class.transaction do
+              @user = user_class.create!(attrs)
+              user_class.sorcery_config.authentications_class.create!({config.authentications_user_id_attribute_name => @user.id, config.provider_attribute_name => provider, config.provider_uid_attribute_name => @user_hash[:uid]})
             end
             @user
           end

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

@@ -45,7 +45,7 @@ module Sorcery
           # given to main controller module as a login source callback
           def login_from_basic_auth
             authenticate_with_http_basic do |username, password|
-              @current_user = (Config.user_class.authenticate(username, password) if session[:http_authentication_used]) || false
+              @current_user = (user_class.authenticate(username, password) if session[:http_authentication_used]) || false
               login_user(@current_user) if @current_user
               @current_user
             end

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

@@ -38,7 +38,7 @@ module Sorcery
           # and logs the user in if found.
           # Runs as a login source. See 'current_user' method for how it is used.
           def login_from_cookie
-            user = cookies[:remember_me_token] && Config.user_class.find_by_remember_me_token(cookies[:remember_me_token])
+            user = cookies[:remember_me_token] && user_class.find_by_remember_me_token(cookies[:remember_me_token])
             if user && user.remember_me_token?
               set_remember_me_cookie!(user)
               @current_user = user

data/lib/sorcery/initializers/initializer.rb

@@ -173,6 +173,6 @@ Rails.application.config.sorcery.configure do |config|
   end
 
   # This line must come after the 'user config' block.
-  config.user_class = User                                                            # define which model authenticates
+  config.user_class = "User"                                                          # define which model authenticates
                                                                                       # with sorcery.
 end

data/lib/sorcery/model.rb

@@ -15,7 +15,27 @@ module Sorcery
             self.class_eval do
               extend ClassMethods # included here, before submodules, so they can be overriden by them.
               include InstanceMethods
+            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
@@ -26,28 +46,27 @@ module Sorcery
                 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}
-
-            # Mongoid support
+          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.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
+            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

data/lib/sorcery/model/adapters/mongoid.rb

@@ -19,8 +19,8 @@ module Sorcery
           end
 
           def find_by_provider_and_uid(provider, uid)
-            user_klass = ::Sorcery::Controller::Config.user_class
-            where(user_klass.sorcery_config.provider_attribute_name => provider, user_klass.sorcery_config.provider_uid_attribute_name => uid).first
+            @user_klass ||= ::Sorcery::Controller::Config.user_class.to_s.constantize
+            where(@user_klass.sorcery_config.provider_attribute_name => provider, @user_klass.sorcery_config.provider_uid_attribute_name => uid).first
           end
 
           def find_by_id(id)

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

@@ -26,7 +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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property,value|

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

@@ -51,7 +51,7 @@ module Sorcery
           ::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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

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

@@ -51,7 +51,7 @@ module Sorcery
           ::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_class = "User"
 
           ::Sorcery::Controller::Config.user_config do |user|
             options.each do |property, value|

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.5.30"
+  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-07-01}
+  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 = [
@@ -218,6 +218,8 @@ 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",
@@ -362,6 +364,8 @@ 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",

data/spec/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.5.21)
+    sorcery (0.5.30)
       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.21)
+    sorcery (0.5.30)
       bcrypt-ruby (~> 2.1.4)
       oauth (>= 0.4.4)
       oauth (>= 0.4.4)

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

data/spec/rails3_mongoid/Gemfile.lock

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

data/spec/shared_examples/controller_oauth2_shared_examples.rb

@@ -0,0 +1,37 @@
+shared_examples_for "oauth2_controller" do
+  describe "using '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
+
+    it "should not crash on missing nested attributes" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      sorcery_controller_external_property_set(:facebook, :user_info_mapping, {:username => "name", :created_at => "does/not/exist"})
+      lambda do
+        get :test_create_from_provider, :provider => "facebook"
+      end.should change(User, :count).by(1)
+      User.first.username.should == "Noam Ben Ari"
+      User.first.created_at.should_not be_nil
+    end 
+  end
+end

data/spec/shared_examples/controller_oauth_shared_examples.rb

@@ -0,0 +1,37 @@
+shared_examples_for "oauth_controller" do
+  describe "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
+    
+    it "should not crash on missing nested attributes" do
+      sorcery_model_property_set(:authentications_class, Authentication)
+      sorcery_controller_external_property_set(:twitter, :user_info_mapping, {:username => "status/text", :created_at => "does/not/exist"})
+      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."
+      User.first.created_at.should_not be_nil
+    end
+  end
+end

data/spec/shared_examples/user_oauth_shared_examples.rb

@@ -27,4 +27,5 @@ shared_examples_for "rails_3_oauth_model" do
     end
     
   end
+  
 end

data/spec/sinatra/Gemfile.lock

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

data/spec/sinatra/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 'MyApp' do
     end
   end
   
-  describe Sinatra::Application, "'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 Sinatra::Application do
+    it_behaves_like "oauth2_controller"
   end
   
   describe Sinatra::Application, "OAuth with User Activation features" do

data/spec/sinatra/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!
@@ -63,30 +64,8 @@ describe Sinatra::Application do
     end
   end
   
-  describe Sinatra::Application, "'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 Sinatra::Application do
+    it_behaves_like "oauth_controller"
   end
   
   describe Sinatra::Application, "OAuth with User Activation features" do

data/spec/sinatra/spec/controller_spec.rb

@@ -14,8 +14,8 @@ describe Sinatra::Application 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

data/spec/sinatra_modular/Gemfile.lock

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

data/spec/sinatra_modular/spec_modular/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 'MyApp' do
     end
   end
   
-  describe Modular, "'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 Modular do
+    it_behaves_like "oauth2_controller"
   end
   
   describe Modular, "OAuth with User Activation features" do

data/spec/sinatra_modular/spec_modular/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!
@@ -63,30 +64,8 @@ describe Modular do
     end
   end
   
-  describe Modular, "'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 Modular do
+    it_behaves_like "oauth_controller"
   end
   
   describe Modular, "OAuth with User Activation features" do

data/spec/sinatra_modular/spec_modular/controller_spec.rb

@@ -14,8 +14,8 @@ describe Modular 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

metadata

@@ -2,7 +2,7 @@
 name: sorcery
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.30
+  version: 0.6.0
 platform: ruby
 authors: 
 - Noam Ben Ari
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 +03:00
+date: 2011-07-30 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -422,6 +422,8 @@ files:
 - 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
@@ -588,6 +590,8 @@ test_files:
 - 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