oauned 1.0.2 → 2.0.0

data/Rakefile

@@ -7,7 +7,7 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 
 require 'rspec/core'

data/app/controllers/oauned/oauth_controller.rb

@@ -89,6 +89,6 @@ class Oauned::OauthController < ApplicationController
   end
 
   def refresh_token?
-    params[:grant_type] == 'refresh-token'
+    params[:grant_type] == 'refresh_token'
   end
 end

data/lib/oauned.rb

@@ -1,8 +1,6 @@
-module Oauned
-  autoload :ControllerMethods, 'oauned/controller_methods'
-  autoload :Models, 'oauned/models'
-  autoload :Version, 'oauned/version'
-
-end
-
+require 'oauned/controller_methods'
+require 'oauned/models'
+require 'oauned/version'
+require 'oauned/strategy'
+require 'oauned/devise'
 require 'oauned/rails'

data/lib/oauned/controller_methods.rb

@@ -3,11 +3,11 @@ module Oauned
     def self.included(klass)
       klass.class_eval do
         cattr_accessor :oauth_options, :oauth_options_proc
-          
+
         protected
         def self.deny_oauth(options = {}, &block)
           raise 'options cannot contain both :only and :except' if options[:only] && options[:except]
-        
+
           [:only, :except].each do |k|
             if values = options[k]
               options[k] = Array(values).map(&:to_s).to_set
@@ -16,22 +16,7 @@ module Oauned
           self.oauth_options = options
           self.oauth_options_proc = block
         end
-          
-        def oauth_user
-          @oauth_user ||= oauth_allowed? ? user_from_oauth : nil
-        end          
-          
-        alias :normal_user :current_user
-        def current_user
-          normal_user || oauth_user
-        end
-        
-        private
-        def user_from_oauth
-          token = Connection.where(['access_token LIKE ?', params[:access_token]]).first
-          token.user if (token && !token.expired?)
-        end
-        
+
         def oauth_allowed?
           return true if (oauth_options_proc && !oauth_options_proc.call(self)) || oauth_options.nil?
           return false if oauth_options.empty?

data/lib/oauned/devise.rb

@@ -0,0 +1,10 @@
+require 'devise'
+Devise.add_module :oauthable,
+  :model => 'oauned/models/oauthable',
+  :strategy => true
+
+Devise.setup do |config|
+  config.warden do |manager|
+    manager.default_strategies(:scope => :user).unshift(:oauthable)
+  end
+end

data/lib/oauned/models.rb

@@ -1,8 +1,4 @@
 module Oauned::Models
-  autoload :Application, 'oauned/models/application'
-  autoload :Authorization, 'oauned/models/authorization'
-  autoload :Connection, 'oauned/models/connection'
-
 
   @@models = {}
   def self.[](key)
@@ -13,3 +9,8 @@ module Oauned::Models
     @@models[key] = value
   end
 end
+
+require 'oauned/models/application'
+require 'oauned/models/authorization'
+require 'oauned/models/connection'
+require 'oauned/models/oauthable'

data/lib/oauned/models/application.rb

@@ -3,10 +3,11 @@ module Oauned::Models::Application
     Oauned::Models['application'] = klass
 
     klass.class_eval do
-      before_create    :set_default
+      before_validation    :set_default,
+        :on => :create
 
       def authorize!(user)
-        Authorization.create!(:user_id => user.id, :application_id => id)
+        Oauned::Models['authorization'].create!(:user_id => user.id, :application_id => id)
       end
 
       private

data/lib/oauned/models/authorization.rb

@@ -3,7 +3,8 @@ module Oauned::Models::Authorization
     Oauned::Models['authorization'] = klass
 
     klass.class_eval do
-      before_create    :set_default
+      before_validation    :set_default,
+        :on => :create
 
       def expires_in
         (expires_at - Time.now).to_i
@@ -14,7 +15,7 @@ module Oauned::Models::Authorization
 
       def tokenize!
         self.destroy
-        Connection.create!(:user_id => user_id, :application_id => application_id)
+        Oauned::Models['connection'].create!(:user_id => user_id, :application_id => application_id)
       end
 
       private

data/lib/oauned/models/connection.rb

@@ -3,7 +3,8 @@ module Oauned::Models::Connection
     Oauned::Models['connection'] = klass
 
     klass.class_eval do
-      before_create    :set_default
+      before_validation    :set_default,
+        :on => :create
 
       def expires_in
         (expires_at - Time.now).to_i
@@ -14,7 +15,7 @@ module Oauned::Models::Connection
 
       def refresh
         self.destroy
-        Connection.create!(:user_id => user.id, :application_id => application.id)
+        self.class.create!(:user_id => user.id, :application_id => application.id)
       end
 
       private

data/lib/oauned/models/oauthable.rb

@@ -0,0 +1,19 @@
+require 'devise'
+
+module Oauned
+  module Models
+    module Oauthable
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+
+        def find_for_oauth_authentication(access_token)
+          token = Oauned::Models['connection'].where(['access_token LIKE ?', access_token]).first
+          token.user if (token && !token.expired?)
+        end
+      end
+    end
+  end
+end
+
+Devise::Models::Oauthable = Oauned::Models::Oauthable

data/lib/oauned/rails.rb

@@ -2,14 +2,5 @@ require 'oauned/rails/routing'
 
 module Oauned
   class Engine < ::Rails::Engine
-    # Force routes to be loaded if we are doing any eager load.
-    config.before_eager_load { |app| app.reload_routes! }
-    
-    initializer "oauned.controller_helpers", :after=> :disable_dependency_loading do
-      ActiveSupport.on_load(:action_controller) do
-        include Oauned::ControllerMethods
-        
-      end
-    end
   end
-end
+end

data/lib/oauned/strategy.rb

@@ -0,0 +1,27 @@
+require 'warden'
+
+module Oauned
+  class Strategy < Devise::Strategies::Authenticatable
+
+    def valid?
+      !access_token.nil?
+    end
+
+    def authenticate!
+      resource = mapping.to.find_for_oauth_authentication access_token
+
+      if resource
+        success!(resource)
+      else
+        fail(:invalid)
+      end
+    end
+
+    def access_token
+      match = request.authorization.match(/^OAuth2 (.*)$/) if request.authorization
+      match.nil? ? nil : match[1]
+    end
+  end
+end
+
+Warden::Strategies.add(:oauthable, Oauned::Strategy)

data/lib/oauned/version.rb

@@ -1,3 +1,3 @@
 module Oauned
-  VERSION = "1.0.2"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauned
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
-dependencies: []
+date: 2012-05-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70224896775220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70224896775220
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &70224896774300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70224896774300
 description: Rails Engine to be an Oauth Provider
 email: 
 executables: []
@@ -24,12 +46,15 @@ files:
 - lib/generators/oauned/templates/migration.rb
 - lib/generators/oauned/templates/migration_existing.rb
 - lib/oauned/controller_methods.rb
+- lib/oauned/devise.rb
 - lib/oauned/models/application.rb
 - lib/oauned/models/authorization.rb
 - lib/oauned/models/connection.rb
+- lib/oauned/models/oauthable.rb
 - lib/oauned/models.rb
 - lib/oauned/rails/routing.rb
 - lib/oauned/rails.rb
+- lib/oauned/strategy.rb
 - lib/oauned/version.rb
 - lib/oauned.rb
 - MIT-LICENSE
@@ -55,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Oauth Provider