doorkeeper 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68df4a2a59a456f294e58416fb229932a8ea08c3
-  data.tar.gz: 30ff755d1ec25a53119b419ad1d0be3a69bedd7d
+  metadata.gz: ba5c804bf7f98c343b73a08ddeb8aca3c16e068f
+  data.tar.gz: 2b7e888f0adec7f5067bcae28e3b3e2d6d0ade2e
 SHA512:
-  metadata.gz: df0bc1f0075ede4a575d2c007806ae887ef11d746204df8bda6345b73abf504911fd8bde1c22e6cbf55066553a3c7f9f10653d127a79ead3c2b5fa204dc9b0d1
-  data.tar.gz: becadfd542de1ee8c6863f4dcb4a53db12ea737687942f0699519eb5299a7c22ecac9beb8026a9833dd3dd166810cf6bf0213602fa5696def66fefe6cc5dbb38
+  metadata.gz: d9945f4ec12a539210541bf179d5ccd3d45d5e9627d7a890d321ba74cb9392913646c0186eeba1cc9b7da143938cc913b47f3295ba53d946c41c203c4bbdd502
+  data.tar.gz: 5fb30e9a5d74d6ca628cef571f20ffc51bb648a63aae85b91ec9794a5f5bfe6ea4955286ff64bc087253ca7439b54d46ca3a473113049d125764e4ab9a3bb982

data/NEWS.md

@@ -4,6 +4,11 @@ User-visible changes worth mentioning.
 
 ## master
 
+## 4.1.0
+
+- [#845] Allow customising the `Doorkeeper::ApplicationController` base
+  controller
+
 ## 4.0.0
 
 - [#834] Fix AssetNotPrecompiled error with Sprockets 4

data/README.md

@@ -91,11 +91,17 @@ rake db:migrate
 
 ### Other ORMs
 
-See [doorkeeper-mongodb project] for mongoid and mongomapper support. Follow along
+See [doorkeeper-mongodb project] for Mongoid and MongoMapper support. Follow along
 the implementation in that repository to extend doorkeeper with other ORMs.
 
 [doorkeeper-mongodb project]: https://github.com/doorkeeper-gem/doorkeeper-mongodb
 
+If you are using [Sequel gem] then you can add [doorkeeper-sequel extension] to your project.
+Follow configuration instructions for setting up the necessary Doorkeeper ORM.
+
+[Sequel gem]: https://github.com/jeremyevans/sequel/
+[doorkeeper-sequel extension]: https://github.com/nbulaj/doorkeeper-sequel
+
 ### Routes
 
 The installation script will also automatically add the Doorkeeper routes into
@@ -282,6 +288,16 @@ end
 JWT token support is available with
 [Doorkeeper-JWT](https://github.com/chriswarren/doorkeeper-jwt).
 
+### Custom Base Controller
+
+By default Doorkeeper's main controller `Doorkeeper::ApplicationController` inherits from `ActionController::Base`.
+You may want to use your own controller to inherit from, to keep Doorkeeper controllers in the same context than the rest your app:
+
+```ruby
+Doorkeeper.configure do
+  base_controller 'ApplicationController'
+end
+```
 
 ### Authenticated resource owner
 

data/app/controllers/doorkeeper/application_controller.rb

@@ -1,5 +1,7 @@
 module Doorkeeper
-  class ApplicationController < ActionController::Base
+  class ApplicationController <
+    Doorkeeper.configuration.base_controller.constantize
+
     include Helpers::Controller
 
     if ::Rails.version.to_i < 4

data/lib/doorkeeper/config.rb

@@ -93,6 +93,10 @@ doorkeeper.
           '@access_token_generator', access_token_generator
         )
       end
+
+      def base_controller(base_controller)
+        @config.instance_variable_set('@base_controller', base_controller)
+      end
     end
 
     module Option
@@ -184,7 +188,10 @@ doorkeeper.
     option :realm,                          default: 'Doorkeeper'
     option :force_ssl_in_redirect_uri,      default: !Rails.env.development?
     option :grant_flows,                    default: %w(authorization_code client_credentials)
-    option :access_token_generator,         default: "Doorkeeper::OAuth::Helpers::UniqueToken"
+    option :access_token_generator,
+           default: 'Doorkeeper::OAuth::Helpers::UniqueToken'
+    option :base_controller,
+           default: 'ActionController::Base'
 
     attr_reader :reuse_access_token
 

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "4.0.0".freeze
+  VERSION = "4.1.0".freeze
 end

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -31,7 +31,12 @@ Doorkeeper.configure do
 
   # Use a custom class for generating the access token.
   # https://github.com/doorkeeper-gem/doorkeeper#custom-access-token-generator
-  # access_token_generator "::Doorkeeper::JWT"
+  # access_token_generator '::Doorkeeper::JWT'
+
+  # The controller Doorkeeper::ApplicationController inherits from.
+  # Defaults to ActionController::Base.
+  # https://github.com/doorkeeper-gem/doorkeeper#custom-base-controller
+  # base_controller 'ApplicationController'
 
   # Reuse access token for the same resource owner within an application (disabled by default)
   # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383

data/spec/lib/config_spec.rb

@@ -314,4 +314,21 @@ describe Doorkeeper, 'configuration' do
       expect(subject.access_token_generator).to eq('Example')
     end
   end
+
+  describe 'base_controller' do
+    context 'default' do
+      it { expect(Doorkeeper.configuration.base_controller).to eq('ActionController::Base') }
+    end
+
+    context 'custom' do
+      before do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          base_controller 'ApplicationController'
+        end
+      end
+
+      it { expect(Doorkeeper.configuration.base_controller).to eq('ApplicationController') }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape