doorkeeper 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.4.1
+
+- enhancements:
+  - Backport: Move doorkeeper_for extension to Filter helper
+
 ## 0.4.0
 
 - deprecation

data/lib/doorkeeper.rb

@@ -30,6 +30,10 @@ module Doorkeeper
     autoload :Scopes,    "doorkeeper/models/scopes"
   end
 
+  module Helpers
+    autoload :Filter, "doorkeeper/helpers/filter"
+  end
+
   def self.configured?
     @config.present?
   end

data/lib/doorkeeper/doorkeeper_for.rb

@@ -71,51 +71,4 @@ module Doorkeeper
       end
     end
   end
-
-  module Controller
-    module ClassMethods
-      def doorkeeper_for(*args)
-        doorkeeper_for = DoorkeeperForBuilder.create_doorkeeper_for(*args)
-
-        before_filter doorkeeper_for.filter_options do
-          return if doorkeeper_for.validate_token(doorkeeper_token)
-          render_options = doorkeeper_unauthorized_render_options
-          if render_options.nil? || render_options.empty?
-            head :unauthorized
-          else
-            render_options[:status] = :unauthorized
-            render_options[:layout] = false if render_options[:layout].nil?
-            render render_options
-          end
-        end
-      end
-    end
-
-    def self.included(base)
-      base.extend ClassMethods
-      base.send(:private, :doorkeeper_token, :get_doorkeeper_token)
-    end
-
-    def doorkeeper_token
-      @token ||= get_doorkeeper_token
-    end
-
-    def get_doorkeeper_token
-      token = params[:access_token] || params[:bearer_token] || authorization_bearer_token
-      if token
-        AccessToken.find_by_token(token)
-      end
-    end
-
-    def authorization_bearer_token
-      header = request.env['HTTP_AUTHORIZATION']
-      header.gsub(/^Bearer /, '') if header && header.match(/^Bearer /)
-    end
-
-    def doorkeeper_unauthorized_render_options
-      nil
-    end
-  end
 end
-
-ActionController::Base.send(:include, Doorkeeper::Controller)

data/lib/doorkeeper/engine.rb

@@ -33,5 +33,11 @@ WARN
         end
       end
     end
+
+    initializer "doorkeeper.helpers" do
+      ActiveSupport.on_load(:action_controller) do
+        include Doorkeeper::Helpers::Filter
+      end
+    end
   end
 end

data/lib/doorkeeper/helpers/filter.rb

@@ -0,0 +1,52 @@
+module Doorkeeper
+  module Helpers
+    module Filter
+      module ClassMethods
+        def doorkeeper_for(*args)
+          doorkeeper_for = DoorkeeperForBuilder.create_doorkeeper_for(*args)
+
+          before_filter doorkeeper_for.filter_options do
+            return if doorkeeper_for.validate_token(doorkeeper_token)
+            render_options = doorkeeper_unauthorized_render_options
+            if render_options.nil? || render_options.empty?
+              head :unauthorized
+            else
+              render_options[:status] = :unauthorized
+              render_options[:layout] = false if render_options[:layout].nil?
+              render render_options
+            end
+          end
+        end
+      end
+
+      def self.included(base)
+        base.extend ClassMethods
+        base.send :private,
+                  :doorkeeper_token,
+                  :get_doorkeeper_token,
+                  :authorization_bearer_token,
+                  :doorkeeper_unauthorized_render_options
+      end
+
+      def doorkeeper_token
+        @token ||= get_doorkeeper_token
+      end
+
+      def get_doorkeeper_token
+        token = params[:access_token] || params[:bearer_token] || authorization_bearer_token
+        if token
+          AccessToken.find_by_token(token)
+        end
+      end
+
+      def authorization_bearer_token
+        header = request.env['HTTP_AUTHORIZATION']
+        header.gsub(/^Bearer /, '') if header && header.match(/^Bearer /)
+      end
+
+      def doorkeeper_unauthorized_render_options
+        nil
+      end
+    end
+  end
+end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/dummy/app/controllers/metal_controller.rb

@@ -0,0 +1,11 @@
+class MetalController < ActionController::Metal
+  include AbstractController::Callbacks
+  include ActionController::Head
+  include Doorkeeper::Helpers::Filter
+
+  doorkeeper_for :all
+
+  def index
+    self.response_body = { :ok => true }.to_json
+  end
+end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
   mount Doorkeeper::Engine => "/oauth"
+
+  get 'metal.json' => 'metal#index'
   get '/callback', :to => "home#callback"
   get '/sign_in',  :to => "home#sign_in"
   resources :semi_protected_resources

data/spec/requests/protected_resources/metal_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper_integration'
+
+feature 'ActionController::Metal API' do
+  background do
+    @client   = FactoryGirl.create(:application)
+    @resource = User.create!(:name => "Joe", :password => "sekret")
+    @token    = client_is_authorized(@client, @resource)
+  end
+
+  scenario 'client requests protected resource with valid token' do
+    get "/metal.json?access_token=#{@token.token}"
+    should_have_json 'ok', true
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-26 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70213938588360 !ruby/object:Gem::Requirement
+  requirement: &70352107713180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70213938588360
+  version_requirements: *70352107713180
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70213938586440 !ruby/object:Gem::Requirement
+  requirement: &70352107712140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70213938586440
+  version_requirements: *70352107712140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70213938584520 !ruby/object:Gem::Requirement
+  requirement: &70352107710740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70213938584520
+  version_requirements: *70352107710740
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70213938582960 !ruby/object:Gem::Requirement
+  requirement: &70352107708060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70213938582960
+  version_requirements: *70352107708060
 - !ruby/object:Gem::Dependency
   name: generator_spec
-  requirement: &70213938582320 !ruby/object:Gem::Requirement
+  requirement: &70352107706980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 0.8.5
   type: :development
   prerelease: false
-  version_requirements: *70213938582320
+  version_requirements: *70352107706980
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70213938597380 !ruby/object:Gem::Requirement
+  requirement: &70352107732340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.4
   type: :development
   prerelease: false
-  version_requirements: *70213938597380
+  version_requirements: *70352107732340
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70213938595120 !ruby/object:Gem::Requirement
+  requirement: &70352107731020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70213938595120
+  version_requirements: *70352107731020
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70213938592720 !ruby/object:Gem::Requirement
+  requirement: &70352107729580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.7.1
   type: :development
   prerelease: false
-  version_requirements: *70213938592720
+  version_requirements: *70352107729580
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70213938591020 !ruby/object:Gem::Requirement
+  requirement: &70352107728220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,7 +110,7 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70213938591020
+  version_requirements: *70352107728220
 description: Doorkeeper is an OAuth 2 provider for Rails.
 email:
 - felipe@applicake.com
@@ -158,6 +158,7 @@ files:
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/doorkeeper_for.rb
 - lib/doorkeeper/engine.rb
+- lib/doorkeeper/helpers/filter.rb
 - lib/doorkeeper/models/expirable.rb
 - lib/doorkeeper/models/revocable.rb
 - lib/doorkeeper/models/scopes.rb
@@ -202,6 +203,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/full_protected_resources_controller.rb
 - spec/dummy/app/controllers/home_controller.rb
+- spec/dummy/app/controllers/metal_controller.rb
 - spec/dummy/app/controllers/semi_protected_resources_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/user.rb
@@ -275,6 +277,7 @@ files:
 - spec/requests/flows/password_spec.rb
 - spec/requests/flows/refresh_token_spec.rb
 - spec/requests/flows/skip_authorization_spec.rb
+- spec/requests/protected_resources/metal_spec.rb
 - spec/requests/protected_resources/private_api_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_integration.rb
@@ -302,7 +305,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318783597431461187
+      hash: 2607097917564247242
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -311,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -318783597431461187
+      hash: 2607097917564247242
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.12