doorkeeper 4.2.0 → 4.2.5

data/spec/spec_helper.rb

@@ -1,2 +1,4 @@
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../lib'))
 $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), '../app'))
+
+require 'doorkeeper'

data/spec/spec_helper_integration.rb

@@ -1,3 +1,8 @@
+if ENV['TRAVIS']
+  require 'coveralls'
+  Coveralls.wear!('rails') { add_filter('/spec/') }
+end
+
 ENV['RAILS_ENV'] ||= 'test'
 TABLE_NAME_PREFIX = ENV['table_name_prefix'] || nil
 TABLE_NAME_SUFFIX = ENV['table_name_suffix'] || nil

data/spec/support/helpers/request_spec_helper.rb

@@ -27,6 +27,10 @@ module RequestSpecHelper
     URI.parse(page.current_url)
   end
 
+  def request_response
+    respond_to?(:response) ? response : page.driver.response
+  end
+
   def should_have_header(header, value)
     expect(headers[header]).to eq(value)
   end
@@ -44,15 +48,15 @@ module RequestSpecHelper
   end
 
   def should_have_json(key, value)
-    expect(JSON.parse(response.body).fetch(key)).to eq(value)
+    expect(JSON.parse(request_response.body).fetch(key)).to eq(value)
   end
 
   def should_have_json_within(key, value, range)
-    expect(JSON.parse(response.body).fetch(key)).to be_within(range).of(value)
+    expect(JSON.parse(request_response.body).fetch(key)).to be_within(range).of(value)
   end
 
   def should_not_have_json(key)
-    expect(JSON.parse(response.body)).not_to have_key(key)
+    expect(JSON.parse(request_response.body)).not_to have_key(key)
   end
 
   def sign_in
@@ -60,6 +64,10 @@ module RequestSpecHelper
     click_on 'Sign in'
   end
 
+  def create_access_token(authorization_code, client)
+    page.driver.post token_endpoint_url(code: authorization_code, client: client)
+  end
+
   def i_should_see_translated_error_message(key)
     i_should_see translated_error_message(key)
   end
@@ -69,7 +77,7 @@ module RequestSpecHelper
   end
 
   def response_status_should_be(status)
-    expect(page.driver.response.status.to_i).to eq(status)
+    expect(request_response.status.to_i).to eq(status)
   end
 end
 

data/spec/support/http_method_shim.rb

@@ -2,23 +2,37 @@
 # in favor of keyword arguments. However, the keyword argument form is only
 # supported in Rails 5+. Since we support back to 4, we need some sort of shim
 # to avoid super noisy deprecations when running tests.
-module HTTPMethodShim
-  def get(path, params = nil, headers = nil)
+module RoutingHTTPMethodShim
+  def get(path, params = {}, headers = nil)
     super(path, params: params, headers: headers)
   end
 
-  def post(path, params = nil, headers = nil)
+  def post(path, params = {}, headers = nil)
     super(path, params: params, headers: headers)
   end
 
-  def put(path, params = nil, headers = nil)
+  def put(path, params = {}, headers = nil)
     super(path, params: params, headers: headers)
   end
 end
 
+module ControllerHTTPMethodShim
+  def get(path, params = {})
+    super(path, params: params)
+  end
+
+  def post(path, params = {})
+    super(path, params: params)
+  end
+
+  def put(path, params = {})
+    super(path, params: params)
+  end
+end
+
 if ::Rails::VERSION::MAJOR >= 5
   RSpec.configure do |config|
-    config.include HTTPMethodShim, type: :controller
-    config.include HTTPMethodShim, type: :request
+    config.include ControllerHTTPMethodShim, type: :controller
+    config.include RoutingHTTPMethodShim, type: :request
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.5
 platform: ruby
 authors:
 - Felipe Elias Philipp
 - Tute Costa
+- Jon Moss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-18 00:00:00.000000000 Z
+date: 2017-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -39,62 +40,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.3
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 11.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -115,25 +130,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.1
 description: Doorkeeper is an OAuth 2 provider for Rails and Grape.
 email:
-- tutecosta@gmail.com
+- me@jonathanmoss.me
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".coveralls.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".travis.yml"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -167,6 +184,9 @@ files:
 - app/views/layouts/doorkeeper/application.html.erb
 - config/locales/en.yml
 - doorkeeper.gemspec
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
 - lib/doorkeeper.rb
 - lib/doorkeeper/config.rb
 - lib/doorkeeper/engine.rb
@@ -186,9 +206,10 @@ files:
 - lib/doorkeeper/oauth/authorization/token.rb
 - lib/doorkeeper/oauth/authorization/uri_builder.rb
 - lib/doorkeeper/oauth/authorization_code_request.rb
+- lib/doorkeeper/oauth/base_request.rb
+- lib/doorkeeper/oauth/base_response.rb
 - lib/doorkeeper/oauth/client.rb
 - lib/doorkeeper/oauth/client/credentials.rb
-- lib/doorkeeper/oauth/client/methods.rb
 - lib/doorkeeper/oauth/client_credentials/creator.rb
 - lib/doorkeeper/oauth/client_credentials/issuer.rb
 - lib/doorkeeper/oauth/client_credentials/validation.rb
@@ -205,7 +226,6 @@ files:
 - lib/doorkeeper/oauth/password_access_token_request.rb
 - lib/doorkeeper/oauth/pre_authorization.rb
 - lib/doorkeeper/oauth/refresh_token_request.rb
-- lib/doorkeeper/oauth/request_concern.rb
 - lib/doorkeeper/oauth/scopes.rb
 - lib/doorkeeper/oauth/token.rb
 - lib/doorkeeper/oauth/token_request.rb
@@ -297,8 +317,9 @@ files:
 - spec/lib/models/scopes_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
+- spec/lib/oauth/base_request_spec.rb
+- spec/lib/oauth/base_response_spec.rb
 - spec/lib/oauth/client/credentials_spec.rb
-- spec/lib/oauth/client/methods_spec.rb
 - spec/lib/oauth/client_credentials/creator_spec.rb
 - spec/lib/oauth/client_credentials/issuer_spec.rb
 - spec/lib/oauth/client_credentials/validation_spec.rb
@@ -371,7 +392,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -379,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: OAuth 2 provider for Rails and Grape
@@ -442,8 +463,9 @@ test_files:
 - spec/lib/models/scopes_spec.rb
 - spec/lib/oauth/authorization/uri_builder_spec.rb
 - spec/lib/oauth/authorization_code_request_spec.rb
+- spec/lib/oauth/base_request_spec.rb
+- spec/lib/oauth/base_response_spec.rb
 - spec/lib/oauth/client/credentials_spec.rb
-- spec/lib/oauth/client/methods_spec.rb
 - spec/lib/oauth/client_credentials/creator_spec.rb
 - spec/lib/oauth/client_credentials/issuer_spec.rb
 - spec/lib/oauth/client_credentials/validation_spec.rb

data/lib/doorkeeper/oauth/client/methods.rb

@@ -1,18 +0,0 @@
-module Doorkeeper
-  module OAuth
-    class Client
-      module Methods
-        def from_params(request)
-          request.parameters.values_at(:client_id, :client_secret)
-        end
-
-        def from_basic(request)
-          authorization = request.authorization
-          if authorization.present? && authorization =~ /^Basic (.*)/m
-            Base64.decode64($1).split(/:/, 2)
-          end
-        end
-      end
-    end
-  end
-end

data/spec/lib/oauth/client/methods_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-require 'active_support/core_ext/string'
-require 'doorkeeper/oauth/client'
-
-class Doorkeeper::OAuth::Client
-  describe 'Methods' do
-    let(:client_id) { 'some-uid' }
-    let(:client_secret) { 'some-secret' }
-
-    subject do
-      Class.new do
-        include Methods
-      end.new
-    end
-
-    describe :from_params do
-      it 'returns credentials from parameters when Authorization header is not available' do
-        request     = double parameters: { client_id: client_id, client_secret: client_secret }
-        uid, secret = subject.from_params(request)
-
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
-      end
-
-      it 'is blank when there are no credentials' do
-        request     = double parameters: {}
-        uid, secret = subject.from_params(request)
-
-        expect(uid).to    be_blank
-        expect(secret).to be_blank
-      end
-    end
-
-    describe :from_basic do
-      let(:credentials) { Base64.encode64("#{client_id}:#{client_secret}") }
-
-      it 'decodes the credentials' do
-        request     = double authorization: "Basic #{credentials}"
-        uid, secret = subject.from_basic(request)
-
-        expect(uid).to    eq('some-uid')
-        expect(secret).to eq('some-secret')
-      end
-
-      it 'is blank if Authorization is not Basic' do
-        request     = double authorization: "#{credentials}"
-        uid, secret = subject.from_basic(request)
-
-        expect(uid).to    be_blank
-        expect(secret).to be_blank
-      end
-    end
-  end
-end