devise 1.5.0 → 1.5.1

data/.travis.yml

@@ -10,3 +10,4 @@ notifications:
     - jose.valim@plataformatec.com.br
     - carlos@plataformatec.com.br
     - rodrigo.flores@plataformatec.com.br
+    - rafael.franca@plataformatec.com.br

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.5.1
+
+* bug fix
+  * Devise should not attempt to load OmniAuth strategies. Strategies should be loaded before hand by the developer or explicitly given to Devise.
+
 == 1.5.0
 
 * enhancements

data/Gemfile

@@ -3,30 +3,27 @@ source "http://rubygems.org"
 gemspec
 
 gem "rails", "~> 3.1.0"
-gem 'omniauth', '~> 1.0.0'
-gem 'omniauth-oauth2', '~> 1.0.0'
-
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"
 
 group :test do
-  gem 'omniauth-facebook'
-  gem 'omniauth-openid', '~> 1.0.1'
+  gem "omniauth-facebook"
+  gem "omniauth-openid", "~> 1.0.1"
   gem "webrat", "0.7.2", :require => false
   gem "mocha", :require => false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbc-adapter'
-  gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'jruby-openssl'
-end
 
-platforms :mri_18 do
-  group :test do
+  platforms :mri_18 do
     gem "ruby-debug", ">= 0.10.3"
   end
 end
 
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
 platforms :ruby do
   gem "sqlite3-ruby"
 

data/app/controllers/devise/sessions_controller.rb

@@ -21,13 +21,14 @@ class Devise::SessionsController < ApplicationController
   # DELETE /resource/sign_out
   def destroy
     signed_in = signed_in?(resource_name)
+    redirect_path = after_sign_out_path_for(resource_name)
     Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
     set_flash_message :notice, :signed_out if signed_in
 
-    # We actually need to hardcode this, as Rails default responder doesn't
+    # We actually need to hardcode this as Rails default responder doesn't
     # support returning empty response on GET request
     respond_to do |format|
-      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name) }
+      format.any(*navigational_formats) { redirect_to redirect_path }
       format.all do
         method = "to_#{request_format}"
         text = {}.respond_to?(method) ? {}.send(method) : ""

data/lib/devise/controllers/helpers.rb

@@ -207,7 +207,7 @@ module Devise
       # scope. Notice that differently from +after_sign_in_path_for+ this method
       # receives a symbol with the scope, and not the resource.
       #
-      # By default is the root_path.
+      # By default it is the root_path.
       def after_sign_out_path_for(resource_or_scope)
         root_path
       end
@@ -236,8 +236,9 @@ module Devise
       # after_sign_out_path_for.
       def sign_out_and_redirect(resource_or_scope)
         scope = Devise::Mapping.find_scope!(resource_or_scope)
+        redirect_path = after_sign_out_path_for(scope)
         Devise.sign_out_all_scopes ? sign_out : sign_out(scope)
-        redirect_to after_sign_out_path_for(scope)
+        redirect_to redirect_path
       end
 
       # Overwrite Rails' handle unverified request to sign out all scopes,

data/lib/devise/omniauth.rb

@@ -1,6 +1,6 @@
 begin
   require "omniauth"
-  require 'omniauth/version'
+  require "omniauth/version"
 rescue LoadError => e
   warn "Could not load 'omniauth'. Please ensure you have the omniauth gem >= 1.0.0 installed and listed in your Gemfile."
   raise

data/lib/devise/omniauth/config.rb

@@ -1,23 +1,28 @@
 module Devise
   module OmniAuth
+    class StrategyNotFound < NameError
+      def initialize(strategy)
+        @strategy = strategy
+        super("Could not find a strategy with name `#{strategy}'. " \
+          "Please ensure it is required or explicitly set it using the :klass option.")
+      end
+    end
+
     class Config
       attr_accessor :strategy
-      attr_reader :args, :options, :provider
+      attr_reader :args, :options, :provider, :strategy_name
 
       def initialize(provider, args)
-        @provider = provider
-        @args     = args
-        @strategy = nil
-        @options = @args.last.is_a?(Hash) ? @args.last : {}
-      end
-
-      # open_id strategy can have configurable name
-      def strategy_name
-        options[:name] || @provider
+        @provider       = provider
+        @args           = args
+        @options        = @args.last.is_a?(Hash) ? @args.last : {}
+        @strategy       = nil
+        @strategy_name  = options[:name] || @provider
+        @strategy_class = options.delete(:strategy_class)
       end
 
       def strategy_class
-        find_strategy || require_strategy
+        @strategy_class ||= find_strategy || autoload_strategy
       end
 
       def find_strategy
@@ -27,20 +32,14 @@ module Devise
         end
       end
 
-      def require_strategy
-        if [:facebook, :github, :twitter].include?(provider.to_sym)
-          require "omniauth/strategies/#{provider}"
-        elsif options[:require]
-          require options[:require]
+      def autoload_strategy
+        name = ::OmniAuth::Utils.camelize(provider.to_s)
+        if ::OmniAuth::Strategies.const_defined?(name)
+          ::OmniAuth::Strategies.const_get(name)
         else
-          require "omniauth-#{provider}"
+          raise StrategyNotFound, name
         end
-        find_strategy || autoload_strategy
-      end
-
-      def autoload_strategy
-        ::OmniAuth::Strategies.const_get(::OmniAuth::Utils.camelize(provider.to_s))
       end
     end
   end
-end     
+end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.5.0".freeze
+  VERSION = "1.5.1".freeze
 end

data/test/omniauth/config_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
 
 class OmniAuthConfigTest < ActiveSupport::TestCase
-  setup do
-    $: << File.dirname(__FILE__)
+  class MyStrategy
+    include OmniAuth::Strategy
   end
 
   test 'strategy_name returns provider if no options given' do
@@ -42,15 +42,16 @@ class OmniAuthConfigTest < ActiveSupport::TestCase
     assert_equal UnNamedTestStrategy, config.strategy_class
   end
 
-  test 'attempts to load an as-yet not loaded plugin' do
-    config = Devise::OmniAuth::Config.new :my_strategy, [{}]
-    config_class = config.strategy_class
-    assert_equal MyStrategy, config_class
+  test 'raises an error if strategy cannot be found' do
+    config = Devise::OmniAuth::Config.new :my_other_strategy, [{}]
+    assert_raise Devise::OmniAuth::StrategyNotFound do
+      config.strategy_class
+    end
   end
 
   test 'allows the user to define a custom require path' do
-    config = Devise::OmniAuth::Config.new :my_other_strategy, [{:require => 'my_other_strategy'}]
+    config = Devise::OmniAuth::Config.new :my_strategy, [{:strategy_class => MyStrategy}]
     config_class = config.strategy_class
-    assert_equal MyOtherStrategy, config_class
+    assert_equal MyStrategy, config_class
   end
 end

data/test/rails_app/config/initializers/devise.rb

@@ -1,3 +1,6 @@
+require "omniauth-facebook"
+require "omniauth-openid"
+
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-13 00:00:00.000000000 Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
-  requirement: &70275073382440 !ruby/object:Gem::Requirement
+  requirement: &70325690146000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70275073382440
+  version_requirements: *70325690146000
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &70275073381940 !ruby/object:Gem::Requirement
+  requirement: &70325690145300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70275073381940
+  version_requirements: *70325690145300
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70275073381340 !ruby/object:Gem::Requirement
+  requirement: &70325690144180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70275073381340
+  version_requirements: *70325690144180
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -198,8 +198,6 @@ files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/omniauth/config_test.rb
-- test/omniauth/my_other_strategy.rb
-- test/omniauth/omniauth-my_strategy.rb
 - test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
@@ -330,8 +328,6 @@ test_files:
 - test/models/validatable_test.rb
 - test/models_test.rb
 - test/omniauth/config_test.rb
-- test/omniauth/my_other_strategy.rb
-- test/omniauth/omniauth-my_strategy.rb
 - test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb

data/test/omniauth/my_other_strategy.rb

@@ -1,5 +0,0 @@
-require 'omniauth'
-
-class MyOtherStrategy
-  include OmniAuth::Strategy
-end

data/test/omniauth/omniauth-my_strategy.rb

@@ -1,5 +0,0 @@
-require 'omniauth'
-
-class MyStrategy
-  include OmniAuth::Strategy
-end