svenfuchs-devise_oauth2_authenticatable 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/devise_oauth2_authenticatable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{svenfuchs-devise_oauth2_authenticatable}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["bhbryant"]

data/lib/devise_oauth2_authenticatable/model.rb

@@ -81,7 +81,6 @@ module Devise #:nodoc:
         #   * http://oauth2er.pjkh.com/user/populate
         #
         def on_before_oauth2_auto_create(oauth2_user_attributes)
-          
           if self.respond_to?(:before_oauth2_auto_create)
             self.send(:before_oauth2_auto_create, oauth2_user_attributes) rescue nil
           end
@@ -101,7 +100,7 @@ module Devise #:nodoc:
         #   end
         #
         def on_after_oauth2_connect(oauth2_user_attributes)
-          
+
           if self.respond_to?(:after_oauth2_connect)
             self.send(:after_oauth2_connect, oauth2_user_attributes) rescue nil
           end
@@ -114,13 +113,13 @@ module Devise #:nodoc:
             self.update_attribute(self.send(:"#{self.class.oauth2_token_field}"), using_token)
           end
         end
-      
+
       protected
 
       # Passwords are always required if it's a new rechord and no oauth_id exists, or if the password
       # or confirmation are being set somewhere.
       def password_required?
-        
+
         ( new_record? && self.send(:"#{self.class.oauth2_uid_field}").nil? ) || !password.nil? || !password_confirmation.nil?
       end
 
@@ -152,8 +151,8 @@ module Devise #:nodoc:
           # Authenticate a user based on OAuth2 UID.
           #
           def authenticate_with_oauth2(oauth2_id, oauth2_token)
-            
-              # find user and update access token 
+
+              # find user and update access token
               returning(self.find_for_oauth2(oauth2_id)) do |user|
                 user.update_attributes(:"#{self.oauth2_token_field}" => oauth2_token) unless user.nil?
               end
@@ -162,7 +161,7 @@ module Devise #:nodoc:
 
           protected
 
-          
+
 
             # Find first record based on conditions given (OAuth2 UID).
             # Overwrite to add customized conditions, create a join, or maybe use a
@@ -178,8 +177,8 @@ module Devise #:nodoc:
             def find_for_oauth2(uid, conditions = {})
               self.send(:"find_by_#{self.oauth2_uid_field}",uid, :conditions => conditions)
             end
-            
-            
+
+
 
             # Contains the logic used in authentication. Overwritten by other devise modules.
             # In the OAuth2 Connect case; nothing fancy required.

data/lib/devise_oauth2_authenticatable/rails.rb

@@ -2,23 +2,11 @@ module Devise
   class Engine
     config.after_initialize do
       begin
-        config_file = Rails.root.join('config', 'oauth2.yml')
-        unless File.exists?(config_file)
-          config_file = Rails.root.join('config', 'oauth2_config.yml')
-          if File.exists?(config_file)
-            puts "Deprecated OAuth2 config file config/oauth2_config.yml. Please use config/oauth.yml instead."
-          end
-        end
-
-        Devise::OAUTH2_CONFIG = YAML.load_file(config_file)[Rails.env]
-
-        unless Devise::OAUTH2_CONFIG['user_attributes_path']
-          puts "Your config/oauth2.yml does not seem to contain a user_attributes_path setting. Assuming '/me' for FacebookConnect."
-          Devise::OAUTH2_CONFIG['user_attributes_path'] = '/me'
-        end
+        Devise::OAUTH2_CONFIG ||= YAML.load_file(Rails.root.join('config', 'oauth2.yml'))[Rails.env]
       rescue
         puts "Can't load oauth2.yml. You can generate with rails g devise:oauth2_authenticatable"
       end
     end
   end
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: svenfuchs-devise_oauth2_authenticatable
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - bhbryant
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Implements OAuth2 for Devise