wine_bouncer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299201a8f63ac4bed10ec110973b6e2ec18bea37
-  data.tar.gz: dfabf1fc17dc210d45203bb4863b125404930009
+  metadata.gz: 0f4668d91c8511bd195dbf27385e218c42799f80
+  data.tar.gz: 8eb68bc10c6c78b5bff560b31f0c182c0f9eac6c
 SHA512:
-  metadata.gz: e391ed6c1c712348a50c6469186005b8f8e08a709dc78e0074a2cab67d39f0ca729151448032152d987f93d2bc646ff876f9d2bd0558c3445cb457c0a99f7c02
-  data.tar.gz: a0220927a4f5e7f5ae85094c8cf0d04b7b2bd6fcf9ecdd1bf1be658f09ae09d012bb8dd7b20d39709a78327ff0320f90d566d14d34d2d883ff661e8edb4f522f
+  metadata.gz: 4bf782163f97d90df75e4600eaea58d00f23c1103f93e85f34096597ca26a08fe0402d3931588c7341e6f89ce645b9fe9dc5aa1e5db7bd32a2c86befc5a6f388
+  data.tar.gz: f858a9f25eeafc06e88f8c9acc0c96e2126cb8b823ea264031814f29d790ae819408843c3cd8223118cf686ec39b82b0764f9d1dded5799ff626d65bbfaf1c0a

data/.travis.yml

@@ -5,33 +5,25 @@ before_install:
 language: ruby
 cache: bundler
 rvm:
-- 2.1.0
 - 2.2.2
 - 2.2.5
-- 2.3.1
+- 2.3.3
 env:
 
 - rails=4.2.6 grape=0.15.0 doorkeeper=3.1.0
-- rails=4.2.6 grape=0.15.0 doorkeeper=4.0.0
-- rails=4.2.6 grape=0.15.0 doorkeeper=4.1.0
-- rails=4.2.6 grape=0.15.0 doorkeeper=4.2.0
-- rails=4.2.6 grape=0.16.2 doorkeeper=3.1.0
+- rails=4.2.6 grape=1.0.0 doorkeeper=3.1.0
+- rails=4.2.6 grape=0.16.2 doorkeeper=4.2.0
 - rails=5.0.0 grape=0.16.2 doorkeeper=4.0.0
 - rails=5.0.0 grape=0.16.2 doorkeeper=4.1.0
 - rails=5.0.0 grape=0.16.2 doorkeeper=4.2.0
+- rails=5.0.0 grape=1.0.0 doorkeeper=4.2.0
 
 addons:
   code_climate:
     repo_token: ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e
+  after_success:
+    - bundle exec codeclimate-test-reporter
 notifications:
   hipchat:
     rooms:
       secure: SUWenlDzlDbpryO1QzD+rN4MxIBpAAzwsFqnnkyRQ11thRVdvKuT2TUd+RlYImLXDNkvNjqmpXh7mihtcro9g8unR3nF1UKbuAPIv2kCklsio0jAnjVn7+h1l56hsa90Jy9t/YpKtoLx2QNWLz70n8VrtGJMAt53T6tZdgNUp58=
-matrix:
-  exclude:
-    - rvm: 2.1.0
-      env: rails=5.0.0 grape=0.16.2 doorkeeper=4.0.0
-    - rvm: 2.1.0
-      env: rails=5.0.0 grape=0.16.2 doorkeeper=4.1.0
-    - rvm: 2.1.0
-      env: rails=5.0.0 grape=0.16.2 doorkeeper=4.2.0

data/CHANGELOG.md

@@ -4,6 +4,9 @@ Changelog
 ## Unreleased
 
 
+## 1.0.2
+* [#68](https://github.com/antek-drzewiecki/wine_bouncer/pull/68): Update dependency to allow grape v1. Thanks @chandeeland
+
 ## 1.0.1
 * [#65](https://github.com/antek-drzewiecki/wine_bouncer/pull/65): Support for Doorkeeper 4.1 and 4.2. Thanks @daveallie
 

data/Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ENV['grape'] ||= '0.16.2'
+ENV['grape'] ||= '1.0.0'
 ENV['rails'] ||= '5.0.0'
 ENV['doorkeeper'] ||= '4.0.0'
 
@@ -15,6 +15,7 @@ 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

@@ -28,9 +28,10 @@ Table of Contents
 
 
 ## Requirements
-- Ruby > 2.0
-- Doorkeeper > 1.4.0 and < 4.1
-- Grape > 0.10 and < 1.0
+- Ruby > 2.1
+- Doorkeeper > 1.4.0 and < 4.3
+- Grape > 0.10 and < 1.1
+
 Please submit pull requests and Travis env bumps for newer dependency versions.
 
 ## Installation
@@ -38,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.1'
+gem 'wine_bouncer', '~> 1.0.2'
 ```
 
 And then execute:

data/lib/wine_bouncer/configuration.rb

@@ -20,12 +20,12 @@ module WineBouncer
     end
 
     def define_resource_owner &block
-      fail(ArgumentError, 'define_resource_owner expects a block in the configuration') unless block_given?
+      raise(ArgumentError, 'define_resource_owner expects a block in the configuration') unless block_given?
       @defined_resource_owner = block
     end
 
     def defined_resource_owner
-      fail(Errors::UnconfiguredError, 'Please define define_resource_owner to configure the resource owner') unless @defined_resource_owner
+      raise(Errors::UnconfiguredError, 'Please define define_resource_owner to configure the resource owner') unless @defined_resource_owner
       @defined_resource_owner
     end
 
@@ -41,7 +41,7 @@ module WineBouncer
   end
 
   def self.configuration
-    @configuration || fail(Errors::UnconfiguredError.new)
+    @configuration || raise(Errors::UnconfiguredError.new)
   end
 
   def self.configuration=(config)
@@ -59,7 +59,7 @@ module WineBouncer
     config
   end
 
-  private
+  private_class_method
 
   ###
   # Returns a new configuration or existing one.

data/lib/wine_bouncer/oauth2.rb

@@ -100,7 +100,7 @@ module WineBouncer
     private
 
     def set_auth_strategy(strategy)
-      @auth_strategy = WineBouncer::AuthStrategies.const_get("#{strategy.to_s.capitalize}").new
+      @auth_strategy = WineBouncer::AuthStrategies.const_get(strategy.to_s.capitalize.to_s).new
     end
   end
 end

data/lib/wine_bouncer/version.rb

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

data/spec/lib/wine_bouncer/auth_strategies/default_spec.rb

@@ -15,14 +15,14 @@ describe ::WineBouncer::AuthStrategies::Default do
       context_double = double()
       allow(context_double).to receive(:options) { auth_context }
       klass.api_context = context_double
-      expect(klass.send :endpoint_authorizations).to eq(scopes_hash)
+      expect(klass.send(:endpoint_authorizations)).to eq(scopes_hash)
     end
 
     it 'returns nil when the authentication key has no hash key.' do
       context_double = double()
       allow(context_double).to receive(:options) { { route_options: { some: scopes_hash } } }
       klass.api_context = context_double
-      expect(klass.send :endpoint_authorizations).to eq(nil)
+      expect(klass.send(:endpoint_authorizations)).to eq(nil)
     end
   end
 

data/spec/lib/wine_bouncer/auth_strategies/swagger_spec.rb

@@ -15,14 +15,14 @@ describe ::WineBouncer::AuthStrategies::Swagger do
       context_double = double()
       allow(context_double).to receive(:options) { auth_context }
       klass.api_context = context_double
-      expect(klass.send :endpoint_authorizations).to eq(scopes_map)
+      expect(klass.send(:endpoint_authorizations)).to eq(scopes_map)
     end
 
     it 'returns nil when the authentication key has no hash key.' do
       context_double = double()
       allow(context_double).to receive(:options) { { route_options: { some: scopes_map } } }
       klass.api_context = context_double
-      expect(klass.send :endpoint_authorizations).to eq(nil)
+      expect(klass.send(:endpoint_authorizations)).to eq(nil)
     end
   end
 
@@ -31,14 +31,14 @@ describe ::WineBouncer::AuthStrategies::Swagger do
       context_double = double()
       allow(context_double).to receive(:options) { auth_context }
       klass.api_context = context_double
-      expect(klass.send :has_authorizations?).to eq(true)
+      expect(klass.send(:has_authorizations?)).to eq(true)
     end
 
     it 'returns false when there is no authentication key.' do
       context_double = double()
       allow(context_double).to receive(:options) { { route_options: { some: scopes_map } } }
       klass.api_context = context_double
-      expect(klass.send :has_authorizations?).to eq(false)
+      expect(klass.send(:has_authorizations?)).to eq(false)
     end
   end
 
@@ -47,14 +47,14 @@ describe ::WineBouncer::AuthStrategies::Swagger do
       context_double = double()
       allow(context_double).to receive(:options) { auth_context }
       klass.api_context = context_double
-      expect(klass.send :authorization_type_oauth2).to eq(scopes)
+      expect(klass.send(:authorization_type_oauth2)).to eq(scopes)
     end
 
     it 'returns nil when there is no oauth2 key.' do
       context_double = double()
       allow(context_double).to receive(:options) { { route_options: { authorizations: { no_oauth: scopes } } } }
       klass.api_context = context_double
-      expect(klass.send :authorization_type_oauth2).to eq(nil)
+      expect(klass.send(:authorization_type_oauth2)).to eq(nil)
     end
   end
 

data/spec/spec_helper.rb

@@ -16,8 +16,8 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate

data/wine_bouncer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'wine_bouncer'
   spec.version       = WineBouncer::VERSION
   spec.authors       = ['Antek Drzewiecki']
-  spec.email         = ['antek.drzewiecki@altran.com']
+  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.license       = 'MIT'
@@ -17,7 +17,7 @@ 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.0'
+  spec.add_runtime_dependency 'grape', '>= 0.10', '< 1.1'
   spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 4.3'
 
   spec.add_development_dependency 'railties'

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: wine_bouncer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Antek Drzewiecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-30 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: 0.8.7
 description: 
 email:
-- antek.drzewiecki@altran.com
+- a.drzewiecki@devsquare.nl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -306,7 +306,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby gem that allows Oauth2 protection with Doorkeeper for Grape Api's
@@ -374,3 +374,4 @@ test_files:
 - spec/rails_helper.rb
 - spec/shared/orm/active_record.rb
 - spec/spec_helper.rb
+has_rdoc: