doorkeeper 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f77e11de4933a587d6936a1185a31d722fd21a7
-  data.tar.gz: d7aa73af1c190fab721a82e364d3c02035ed1974
+  metadata.gz: a284126c1f1a3788dd355b21caebb53aec39b113
+  data.tar.gz: de3aa39b50748e9e476247249ac8e8ab9061906f
 SHA512:
-  metadata.gz: 1e21a060785183070bc2fc685b18cadedd220a069aeab87028caaf0d584f894fb47d69dc554e4169205d869de80c4e385a861bf5755565f45986ec4cf6124720
-  data.tar.gz: 0374fabbd9af363de49f374bc1aecb51579d4e13ddc74fc538c5856ee16dc7b9378bd9cf4c99b8cbbefab49086920382d87cba21f9232691ee2bb79a27028891
+  metadata.gz: 3e3a84a470d287473a53a65b145fa5aa19a5c14478991766717d175af9251cd097f3b391627a1eb52bf44ec33642570358e46b31e123078db6718ecdb2ddb999
+  data.tar.gz: 66aa9dcc5d678484ff32496a3cd5e897cf4b73a3e649ae57dba9e98a1dd17fbe48be609caf8502a7462fdaa9433839b8146a477b6622f0641968383ebcfdc775

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.7.3
+
+- enhancements
+  - [#204] Allow to overwrite scope in routes
+- internals
+  - Returns only present keys in Token Response (may imply a backwards
+    incompatible change). https://github.com/applicake/doorkeeper/issues/220
+- bug
+  - [#290] Support for Rails 4 when 'protected_attributes' gem is present.
+
+
 ## 0.7.2
 
 - enhancements

data/README.md

@@ -25,7 +25,7 @@ The gem is under constant development. It is based in the [version 22 of the OAu
 Put this in your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 0.7.2'
+gem 'doorkeeper', '~> 0.7.0'
 ```
 
 Run the installation generator with:

data/lib/doorkeeper/models/access_grant.rb

@@ -8,7 +8,7 @@ module Doorkeeper
 
     belongs_to :application, :class_name => "Doorkeeper::Application", :inverse_of => :access_grants
 
-    if ::Rails.version.to_i < 4
+    if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :resource_owner_id, :application_id, :expires_in, :redirect_uri, :scopes
     end
 

data/lib/doorkeeper/models/access_token.rb

@@ -13,7 +13,7 @@ module Doorkeeper
     validates :refresh_token, :uniqueness => true, :if => :use_refresh_token?
 
     attr_accessor :use_refresh_token
-    if ::Rails.version.to_i < 4
+    if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :application_id, :resource_owner_id, :expires_in, :scopes, :use_refresh_token
     end
 

data/lib/doorkeeper/models/application.rb

@@ -11,7 +11,7 @@ module Doorkeeper
 
     before_validation :generate_uid, :generate_secret, :on => :create
 
-    if ::Rails.version.to_i < 4
+    if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :name, :redirect_uri
     end
 

data/lib/doorkeeper/oauth/token_response.rb

@@ -14,7 +14,7 @@ module Doorkeeper
           'expires_in'    => token.expires_in,
           'refresh_token' => token.refresh_token,
           'scope'         => token.scopes_string
-        }
+        }.reject { |_, value| value.blank? }
       end
 
       def status

data/lib/doorkeeper/rails/routes.rb

@@ -28,13 +28,13 @@ module Doorkeeper
 
       attr_accessor :routes
 
-      def initialize(routes, &options)
-        @routes, @options = routes, options
+      def initialize(routes, &block)
+        @routes, @block = routes, block
       end
 
       def generate_routes!(options)
-        @mapping = Mapper.new.map(&@options)
-        routes.scope 'oauth', :as => 'oauth' do
+        @mapping = Mapper.new.map(&@block)
+        routes.scope options[:scope] || 'oauth', :as => 'oauth' do
           map_route(:authorizations, :authorization_routes)
           map_route(:tokens, :token_routes)
           map_route(:applications, :application_routes)

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.7.2"
+  VERSION = '0.7.3'
 end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,19 @@
 Rails.application.routes.draw do
   use_doorkeeper
+  use_doorkeeper :scope => 'scope'
+
+  scope 'inner_space' do
+    use_doorkeeper :scope => 'scope' do
+      controllers :authorizations => 'custom_authorizations',
+                  :tokens => 'custom_authorizations',
+                  :applications => 'custom_authorizations',
+                  :token_info => 'custom_authorizations'
+
+      as :authorizations => 'custom_auth',
+         :tokens => 'custom_token',
+         :token_info => 'custom_token_info'
+    end
+  end
 
   scope 'space' do
     use_doorkeeper do

data/spec/lib/oauth/token_response_spec.rb

@@ -48,5 +48,31 @@ module Doorkeeper::OAuth
         subject['refresh_token'].should == 'some-refresh-token'
       end
     end
+
+    describe '.body filters out empty values' do
+      let(:access_token) do
+        mock :access_token, {
+          :token => 'some-token',
+          :expires_in => '',
+          :scopes_string => '',
+          :refresh_token => '',
+          :token_type => 'bearer'
+        }
+      end
+
+      subject { TokenResponse.new(access_token).body }
+
+      it 'includes :expires_in' do
+        subject['expires_in'].should be_nil
+      end
+
+      it 'includes :scope' do
+        subject['scope'].should be_nil
+      end
+
+      it 'includes :refresh_token' do
+        subject['refresh_token'].should be_nil
+      end
+    end
   end
 end

data/spec/requests/endpoints/token_spec.rb

@@ -25,7 +25,7 @@ feature 'Token endpoint' do
     config_is_set(:access_token_expires_in, nil)
     post token_endpoint_url(:code => @authorization.token, :client => @client)
     should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-    should_have_json 'expires_in', nil
+    should_not_have_json 'expires_in'
   end
 
   scenario 'returns unsupported_grant_type for invalid grant_type param' do

data/spec/requests/flows/client_credentials_spec.rb

@@ -12,8 +12,8 @@ describe 'Client Credentials Request' do
 
       should_have_json 'access_token', Doorkeeper::AccessToken.first.token
       should_have_json 'expires_in', Doorkeeper.configuration.access_token_expires_in
-      should_have_json 'scope', ''
-      should_have_json 'refresh_token', nil
+      should_not_have_json 'scope'
+      should_not_have_json 'refresh_token'
 
       should_not_have_json 'error'
       should_not_have_json 'error_description'

data/spec/routing/custom_controller_routes_spec.rb

@@ -1,6 +1,30 @@
 require 'spec_helper_integration'
 
 describe 'Custom controller for routes' do
+  it 'GET /space/scope/authorize routes to custom authorizations controller' do
+    get('/inner_space/scope/authorize').should route_to('custom_authorizations#new')
+  end
+
+  it 'POST /space/scope/authorize routes to custom authorizations controller' do
+    post('/inner_space/scope/authorize').should route_to('custom_authorizations#create')
+  end
+
+  it 'DELETE /space/scope/authorize routes to custom authorizations controller' do
+    delete('/inner_space/scope/authorize').should route_to('custom_authorizations#destroy')
+  end
+
+  it 'POST /space/scope/token routes to tokens controller' do
+    post('/inner_space/scope/token').should route_to('custom_authorizations#create')
+  end
+
+  it 'GET /space/scope/applications routes to applications controller' do
+    get('/inner_space/scope/applications').should route_to('custom_authorizations#index')
+  end
+
+  it 'GET /space/scope/token/info routes to the token_info controller' do
+    get('/inner_space/scope/token/info').should route_to('custom_authorizations#show')
+  end
+
   it 'GET /space/oauth/authorize routes to custom authorizations controller' do
     get('/space/oauth/authorize').should route_to('custom_authorizations#new')
   end
@@ -22,7 +46,7 @@ describe 'Custom controller for routes' do
   end
 
   it 'GET /space/oauth/token/info routes to the token_info controller' do
-    get('/space/oauth/token/info').should route_to('custom_authorizations#show')  
+    get('/space/oauth/token/info').should route_to('custom_authorizations#show')
   end
 
   it 'POST /outer_space/oauth/token is not be routable' do
@@ -40,5 +64,5 @@ describe 'Custom controller for routes' do
   it 'GET /outer_space/oauth/token_info is not routable' do
     get('/outer_space/oauth/token/info').should_not be_routable
   end
-    
+
 end

data/spec/routing/scoped_routes_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper_integration'
+
+describe 'Scoped routes' do
+  it 'GET /scope/authorize routes to authorizations controller' do
+    get('/scope/authorize').should route_to('doorkeeper/authorizations#new')
+  end
+
+  it 'POST /scope/authorize routes to authorizations controller' do
+    post('/scope/authorize').should route_to('doorkeeper/authorizations#create')
+  end
+
+  it 'DELETE /scope/authorize routes to authorizations controller' do
+    delete('/scope/authorize').should route_to('doorkeeper/authorizations#destroy')
+  end
+
+  it 'POST /scope/token routes to tokens controller' do
+    post('/scope/token').should route_to('doorkeeper/tokens#create')
+  end
+
+  it 'GET /scope/applications routes to applications controller' do
+    get('/scope/applications').should route_to('doorkeeper/applications#index')
+  end
+
+  it 'GET /scope/authorized_applications routes to authorized applications controller' do
+    get('/scope/authorized_applications').should route_to('doorkeeper/authorized_applications#index')
+  end
+
+  it 'GET /scope/token/info route to authorzed tokeninfo controller' do
+    get('/scope/token/info').should route_to('doorkeeper/token_info#show')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -372,6 +372,7 @@ files:
 - spec/requests/protected_resources/private_api_spec.rb
 - spec/routing/custom_controller_routes_spec.rb
 - spec/routing/default_routes_spec.rb
+- spec/routing/scoped_routes_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_integration.rb
 - spec/support/dependencies/factory_girl.rb