wine_bouncer 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4ad54acd3b83bd267479bcc5cd6a79279bc4b9d81a7a2fee85f19c1e05e636c
-  data.tar.gz: dfe5a8513f77cc073e1fa502fa40fa0086956e817b5f26d71cfcd0cbbd6d9501
+  metadata.gz: 1454fbbede22c0f90689156a2647596fc307a322eb48b3ffef17eaf3123bf382
+  data.tar.gz: f46c04fe5263b4d0345a8739b3c417bc3316ed8188ce89d45507e5455d7db44e
 SHA512:
-  metadata.gz: 7d8533fdead8b383093ae9d973abb508a87e3f9761feba6a1cc619ee57682d2af0ab4a3afba38dd35a73cf61487ec6eb6d87647a279f84c0af8663da665e374f
-  data.tar.gz: 3a81b6342e13acafbf9c3983b04b098f7e97eb6c518383a993e7a7c45e1b24f0cf3bda7cbfe699248c458e7575294013c6074df3ff30c040506c51f32e40e4e0
+  metadata.gz: 7961c7647337360253ad72248c569b7b226b851a27bc21f11c73f1335d1399c8d46bf7990cff62da7f83fd1a5cbf5d48e43b074905ebac7a32a9b4de0bb26643
+  data.tar.gz: f39afda7aa6dee3872876237d352f86ddd331461db8c3693c3126ebf14732dbac19aaf48ceafde85f4688f814837b4f3db3e6f0dd764ea806cb4e6b56aa5be1a

data/.rubocop.yml

@@ -7,3 +7,17 @@ AllCops:
     - 'vendor/**/*'
     - 'spec/fixtures/**/*'
     - 'spec/dummy/**/*'
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*
+
+LineLength:
+  Exclude:
+    - spec/**/*
+
+StringLiterals:
+  Enabled: false
+
+TrailingBlankLines:
+  Enabled: true

data/.travis.yml

@@ -1,27 +1,61 @@
 sudo: false
-before_install:
-- gem update bundler
-- bundle --version
 language: ruby
-cache: bundler
+
+before_install:
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+
+
+install:
+  - bundle install --without production --path=${BUNDLE_PATH:-vendor/bundle}  # Install ruby gems, excluding production only gems such as unicorn (already present by default in Travis)
+
+cache:
+  - bundler: true
+
 rvm:
-- 2.3.7
-- 2.4.4
-- 2.5.1
+- 2.3.8
+- 2.4.5
+- 2.5.3
+- 2.6.0
 
 env:
-- rails=4.2.10 grape=0.16.2 doorkeeper=3.1.0
-- rails=4.2.10 grape=0.16.2 doorkeeper=4.2.0
-- rails=4.2.10 grape=1.1.0 doorkeeper=4.4.1
-- rails=5.0.0 grape=0.16.2 doorkeeper=4.4.1
-- rails=5.0.0 grape=1.0.0 doorkeeper=4.2.0
-- rails=5.0.0 grape=1.1.0 doorkeeper=4.4.1
-
-addons:
-  code_climate:
-    repo_token: ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e
-  after_success:
-    - bundle exec codeclimate-test-reporter
+  matrix:
+    - rails=4.2.11 grape=0.16.2 doorkeeper=3.1.0
+    - rails=4.2.11 grape=0.16.2 doorkeeper=4.2.6
+    - rails=4.2.11 grape=1.1.0 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=0.16.2 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=0.19.2 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=1.0.0 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=1.1.0 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=1.2.3 doorkeeper=4.4.3
+    - rails=5.0.7.1 grape=1.0.0 doorkeeper=5.0.2
+    - rails=5.0.7.1 grape=1.1.0 doorkeeper=5.0.2
+    - rails=5.0.7.1 grape=1.2.3 doorkeeper=5.0.2
+    - rails=5.1.6.1 grape=1.0.0 doorkeeper=4.4.3
+    - rails=5.1.6.1 grape=1.1.0 doorkeeper=4.4.3
+    - rails=5.1.6.1 grape=1.2.3 doorkeeper=4.4.3
+    - rails=5.1.6.1 grape=1.0.0 doorkeeper=5.0.2
+    - rails=5.1.6.1 grape=1.1.0 doorkeeper=5.0.2
+    - rails=5.1.6.1 grape=1.2.3 doorkeeper=5.0.2
+    - rails=5.2.2 grape=1.0.0 doorkeeper=4.4.3
+    - rails=5.2.2 grape=1.1.0 doorkeeper=4.4.3
+    - rails=5.2.2 grape=1.2.3 doorkeeper=4.4.3
+    - rails=5.2.2 grape=1.0.0 doorkeeper=5.0.2
+    - rails=5.2.2 grape=1.1.0 doorkeeper=5.0.2
+    - rails=5.2.2 grape=1.2.3 doorkeeper=5.0.2
+  global:
+    CC_TEST_REPORTER_ID=ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e
+script:
+  #- bundle exec rubocop -DESP           # Backend add in future.
+  - bundle exec rake                    # Backend specs
+
+# Pipe the coverage data to Code Climate
+after_script:
+  - ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.backend.json coverage/backend/.resultset.json # Format backend coverage
+  - ./cc-test-reporter sum-coverage coverage/codeclimate.*.json -p 2                  # Sum both coverage parts into coverage/codeclimate.json
+  - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi  # Upload coverage/codeclimate.json
 
 notifications:
   hipchat:

data/CHANGELOG.md

@@ -3,6 +3,11 @@ Changelog
 
 ## Unreleased
 
+## 1.0.4
+
+* [#78](https://github.com/antek-drzewiecki/wine_bouncer/pull/78): Grape support for 1.2.x. Thank you @eitoball
+* [#77](https://github.com/antek-drzewiecki/wine_bouncer/pull/77): Upgrade to doorkeeper 5.0. Thank you @JWesorick 
+
 ## 1.0.3
 * [#76](https://github.com/antek-drzewiecki/wine_bouncer/pull/76): Updated test matrix to test against recent versions.
 * [#74](https://github.com/antek-drzewiecki/wine_bouncer/pull/74): Support for Doorkeeper < 5.0. Thanks @stereoscott

data/Gemfile

@@ -4,18 +4,13 @@ source 'https://rubygems.org'
 
 ENV['grape'] ||= '1.1.0'
 ENV['rails'] ||= '5.0.0'
-ENV['doorkeeper'] ||= '4.0.0'
-
-ruby '>= 2.2.2' if ENV['rails'][0].to_i > 4
+ENV['doorkeeper'] ||= '5.0.0'
 
 gem 'rails', ENV['rails']
+gem 'sqlite3', '~> 1.3.6'
 
-gem 'activerecord'
 gem 'grape', ENV['grape']
 gem 'doorkeeper', ENV['doorkeeper']
 
-gem 'codeclimate-test-reporter', group: :test, require: nil
-gem 'simplecov', :require => false, :group => :test
-
 # Specify your gem's dependencies in wine_bouncer.gemspec
 gemspec

data/README.md

@@ -39,7 +39,7 @@ Please submit pull requests and Travis env bumps for newer dependency versions.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'wine_bouncer', '~> 1.0.3'
+gem 'wine_bouncer', '~> 1.0.4'
 ```
 
 And then execute:

data/lib/wine_bouncer/auth_methods/auth_methods.rb

@@ -2,7 +2,6 @@
 
 module WineBouncer
   module AuthMethods
-    attr_accessor :doorkeeper_access_token
 
     def protected_endpoint=(protected)
       @protected_endpoint = protected

data/lib/wine_bouncer/configuration.rb

@@ -41,12 +41,12 @@ module WineBouncer
   end
 
   def self.configuration
-    @configuration || raise(Errors::UnconfiguredError.new)
+    @config || raise(Errors::UnconfiguredError.new)
   end
 
   def self.configuration=(config)
-    @configuration = config
-    @configuration.require_strategies
+    @config = config
+    @config.require_strategies
   end
 
   ###
@@ -65,6 +65,6 @@ module WineBouncer
   # Returns a new configuration or existing one.
   ###
   def self.config
-    @configuration ||= Configuration.new
+    @config ||= Configuration.new
   end
 end

data/lib/wine_bouncer/extension.rb

@@ -17,6 +17,8 @@ module WineBouncer
       # end
     end
 
-    Grape::API.extend self
+    # Grape::API::Instance is defined in grape 1.2.0 or above
+    grape_api = defined?(Grape::API::Instance) ? Grape::API::Instance : Grape::API
+    grape_api.extend self
   end
 end

data/lib/wine_bouncer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WineBouncer
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

data/spec/dummy/config/application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 # Pick the frameworks you want:
 require 'active_record/railtie'

data/spec/dummy/db/schema.rb

@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(version: 20140915160601) do
     t.text 'redirect_uri', null: false
     t.datetime 'created_at'
     t.datetime 'updated_at'
+    t.boolean "confidential", default: true, null: false
   end
 
   add_index 'oauth_applications', ['uid'], name: 'index_oauth_applications_on_uid', unique: true

data/spec/factories/access_token.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :access_token, class: Doorkeeper::AccessToken do
     sequence(:resource_owner_id) { |n| n }
     application

data/spec/factories/application.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :application, class: Doorkeeper::Application do
     sequence(:name) { |n| "Application #{n}" }
     redirect_uri 'https://app.com/callback'

data/spec/factories/user.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :user do
     sequence(:name) { |n| "user-#{n}" }
   end

data/spec/intergration/oauth2_default_strategy_spec.rb

@@ -4,10 +4,10 @@ require 'rails_helper'
 require 'json'
 
 describe Api::MountedDefaultApiUnderTest, type: :api do
-  let(:user) { FactoryGirl.create :user }
-  let(:token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
-  let(:unscoped_token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
-  let(:custom_scope) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
+  let(:user) { FactoryBot.create :user }
+  let(:token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
+  let(:unscoped_token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
+  let(:custom_scope) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
 
   before(:example) do
     WineBouncer.configure do |c|
@@ -142,7 +142,7 @@ describe Api::MountedDefaultApiUnderTest, type: :api do
 
     context 'oauth2_dsl_multiple_scopes' do
       it 'allows call on the first scope' do
-        scope_token = FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'multiple'
+        scope_token = FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'multiple'
         get '/default_api/oauth2_dsl_multiple_scopes', nil, 'HTTP_AUTHORIZATION' => "Bearer #{scope_token.token}"
         expect(last_response.status).to eq(200)
         json = JSON.parse(last_response.body)
@@ -151,7 +151,7 @@ describe Api::MountedDefaultApiUnderTest, type: :api do
       end
 
       it 'allows call on the second scope' do
-        scope_token = FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'scopes'
+        scope_token = FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'scopes'
         get '/default_api/oauth2_dsl_multiple_scopes', nil, 'HTTP_AUTHORIZATION' => "Bearer #{scope_token.token}"
         expect(last_response.status).to eq(200)
         json = JSON.parse(last_response.body)

data/spec/intergration/oauth2_protected_strategy_spec.rb

@@ -4,10 +4,10 @@ require 'rails_helper'
 require 'json'
 
 describe Api::MountedProtectedApiUnderTest, type: :api do
-  let(:user) { FactoryGirl.create :user }
-  let(:token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
-  let(:unscoped_token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
-  let(:custom_scope) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
+  let(:user) { FactoryBot.create :user }
+  let(:token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
+  let(:unscoped_token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
+  let(:custom_scope) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
 
   before(:example) do
     WineBouncer.configure do |c|

data/spec/intergration/oauth2_swagger_strategy_spec.rb

@@ -4,10 +4,10 @@ require 'rails_helper'
 require 'json'
 
 describe Api::MountedSwaggerApiUnderTest, type: :api do
-  let(:user) { FactoryGirl.create :user }
-  let(:token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
-  let(:unscoped_token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
-  let(:custom_scope) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
+  let(:user) { FactoryBot.create :user }
+  let(:token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
+  let(:unscoped_token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: '' }
+  let(:custom_scope) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'custom_scope' } #not a default scope
 
   before(:example) do
     WineBouncer.configure do |c|

data/spec/lib/wine_bouncer/auth_methods/auth_methods_spec.rb

@@ -8,8 +8,8 @@ describe ::WineBouncer::AuthMethods do
       include ::WineBouncer::AuthMethods
     end.new
   end
-  let(:user) { FactoryGirl.create(:user) }
-  let(:token) { FactoryGirl.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
+  let(:user) { FactoryBot.create(:user) }
+  let(:token) { FactoryBot.create :clientless_access_token, resource_owner_id: user.id, scopes: 'public' }
 
   context 'doorkeeper_access_token' do
     it 'sets and gets a token' do

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 require File.expand_path('../dummy/config/environment', __FILE__)
 require 'rspec/rails'
 require 'wine_bouncer'
-require 'factory_girl'
+require 'factory_bot'
 require 'database_cleaner'
 
 # Add additional requires below this line. Rails is not loaded until this point!
@@ -46,7 +46,7 @@ end
 
 require "shared/orm/#{orm_name}"
 
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
@@ -56,7 +56,7 @@ RSpec.configure do |config|
   # examples within a transaction, remove the following line or assign false
   # instead of true.
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include ApiHelper, type: :api
 
   config.use_transactional_fixtures = false
@@ -67,7 +67,7 @@ RSpec.configure do |config|
 
   config.before do
     DatabaseCleaner.start
-    FactoryGirl.lint
+    FactoryBot.lint
    # Doorkeeper.configure { orm :active_record }
   end
 

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
 require 'simplecov'
 SimpleCov.start
 

data/wine_bouncer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Antek Drzewiecki']
   spec.email         = ['a.drzewiecki@devsquare.nl']
   spec.summary       = %q{A Ruby gem that allows Oauth2 protection with Doorkeeper for Grape Api's}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/antek-drzewiecki/wine_bouncer'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -17,17 +17,18 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'grape', '>= 0.10', '< 1.2'
-  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 5.0'
+  spec.add_runtime_dependency 'grape', '>= 0.10', '< 1.3'
+  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 6.0'
 
   spec.add_development_dependency 'railties'
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 11.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.5.0'
-  spec.add_development_dependency 'factory_girl', '~> 4.4.0'
+  spec.add_development_dependency 'factory_bot', '~> 4.8'
   spec.add_development_dependency 'generator_spec', '~> 0.9.0'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'database_cleaner', '~> 1.3.0'
+  spec.add_development_dependency 'database_cleaner', '~> 1.6'
   spec.add_development_dependency 'rubocop', '0.58.2'
   spec.add_development_dependency 'yard', '~> 0.9.16'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wine_bouncer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Antek Drzewiecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -19,7 +19,7 @@ dependencies:
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -107,19 +107,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
@@ -154,14 +154,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +190,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.16
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
 description: 
 email:
 - a.drzewiecki@devsquare.nl
@@ -286,7 +300,7 @@ files:
 - spec/shared/orm/active_record.rb
 - spec/spec_helper.rb
 - wine_bouncer.gemspec
-homepage: ''
+homepage: https://github.com/antek-drzewiecki/wine_bouncer
 licenses:
 - MIT
 metadata: {}