wine_bouncer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5dc6cf97cd8da451dc4702e223895ef8936bdf3
-  data.tar.gz: fb785eaeb2dbaee4f862f83cad1480fc5a024c42
+  metadata.gz: e6961476143d7f8be5bc53b9268c7950a374d31f
+  data.tar.gz: 0d507a032e778c40bc314fbd77e92b20e654004f
 SHA512:
-  metadata.gz: 3b9613742574c2c306212a77e39709c4d493f543e11358927d70aaf2d034a40e6cdb9a90677e98bbaf3d4f0c0d4ee75c3909869e195e32e3be2e685d6cfdcc02
-  data.tar.gz: 46032cd2d3121fe7ecdb5f251da88a23f52e75c6d4ad8efa6307c3bd35a81fafd1d6b4b2ac6fe6e2084680ba04588b3975301d63be8040af0ccf201c4b80b0ac
+  metadata.gz: edce51422f46f91269b531449998f8bdaaf1489b3ad168fed239c7155623577a3ed02a457d0556c6f0c134baab2da84d74f9e8a318fc77bfc93917c2150ca236
+  data.tar.gz: ad1c4c0eb4b7cb6663bcd48425399ddbe74cb12b2001a7a9229b0b6c81fe9eb06f09d2ca6b8279293c4252193308ddab6aabeb39d4d48f0f3d99fc613dc6e501

data/.rubocop.yml

@@ -0,0 +1,9 @@
+# This is the configuration used to check the rubocop source code.
+
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - 'vendor/**/*'
+    - 'spec/fixtures/**/*'
+    - 'spec/dummy/**/*'

data/.rubocop_todo.yml

@@ -0,0 +1,182 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-01-07 10:02:02 +0100 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 29
+
+# Offense count: 164
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 198
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 32
+
+# Offense count: 1
+Style/AccessorMethodName:
+  Exclude:
+    - 'lib/wine_bouncer/oauth2.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/BlockComments:
+  Exclude:
+    - 'spec/spec_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/CommentIndentation:
+  Exclude:
+    - 'spec/rails_helper.rb'
+
+# Offense count: 14
+# Configuration parameters: Exclude.
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/generators/wine_bouncer/initializer_generator.rb'
+    - 'lib/wine_bouncer.rb'
+    - 'lib/wine_bouncer/auth_methods/auth_methods.rb'
+    - 'lib/wine_bouncer/auth_strategies/default.rb'
+    - 'lib/wine_bouncer/auth_strategies/protected.rb'
+    - 'lib/wine_bouncer/auth_strategies/swagger.rb'
+    - 'lib/wine_bouncer/base_strategy.rb'
+    - 'lib/wine_bouncer/configuration.rb'
+    - 'lib/wine_bouncer/errors.rb'
+    - 'lib/wine_bouncer/extension.rb'
+    - 'lib/wine_bouncer/oauth2.rb'
+    - 'lib/wine_bouncer/version.rb'
+
+# Offense count: 6
+Style/DoubleNegation:
+  Exclude:
+    - 'lib/wine_bouncer/auth_methods/auth_methods.rb'
+    - 'lib/wine_bouncer/auth_strategies/default.rb'
+    - 'lib/wine_bouncer/auth_strategies/protected.rb'
+    - 'lib/wine_bouncer/auth_strategies/swagger.rb'
+
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'lib/wine_bouncer/configuration.rb'
+    - 'spec/dummy/app/api/default_api.rb'
+    - 'spec/dummy/app/api/protected_api.rb'
+    - 'spec/dummy/app/api/swagger_api.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Style/ExtraSpacing:
+  Exclude:
+    - 'spec/dummy/bin/rails'
+    - 'spec/dummy/config.ru'
+    - 'spec/dummy/db/migrate/20140915160601_create_doorkeeper_tables.rb'
+    - 'spec/dummy/db/schema.rb'
+
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/wine_bouncer/oauth2.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: Width.
+Style/IndentationWidth:
+  Exclude:
+    - 'lib/wine_bouncer/auth_methods/auth_methods.rb'
+    - 'lib/wine_bouncer/auth_strategies/default.rb'
+    - 'lib/wine_bouncer/auth_strategies/swagger.rb'
+
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/LeadingCommentSpace:
+  Exclude:
+    - 'lib/wine_bouncer/oauth2.rb'
+    - 'spec/dummy/config/environments/test.rb'
+    - 'spec/intergration/oauth2_default_strategy_spec.rb'
+    - 'spec/intergration/oauth2_protected_strategy_spec.rb'
+    - 'spec/intergration/oauth2_swagger_strategy_spec.rb'
+    - 'spec/rails_helper.rb'
+
+# Offense count: 21
+# Cop supports --auto-correct.
+Style/MethodCallParentheses:
+  Exclude:
+    - 'spec/lib/wine_bouncer/auth_strategies/default_spec.rb'
+    - 'spec/lib/wine_bouncer/auth_strategies/swagger_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MethodDefParentheses:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/MultilineOperationIndentation:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/NumericLiterals:
+  MinDigits: 15
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'wine_bouncer.gemspec'
+
+# Offense count: 7
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+Style/PredicateName:
+  Exclude:
+    - 'lib/wine_bouncer/auth_methods/auth_methods.rb'
+    - 'lib/wine_bouncer/auth_strategies/default.rb'
+    - 'lib/wine_bouncer/auth_strategies/protected.rb'
+    - 'lib/wine_bouncer/auth_strategies/swagger.rb'
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/RaiseArgs:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/SignalException:
+  Exclude:
+    - 'lib/wine_bouncer/oauth2.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/SpaceAfterComma:
+  Exclude:
+    - 'spec/lib/wine_bouncer/auth_strategies/swagger_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoredMethods.
+Style/SymbolProc:
+  Exclude:
+    - 'lib/wine_bouncer/extension.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/UnneededPercentQ:
+  Exclude:
+    - 'wine_bouncer.gemspec'

data/.travis.yml

@@ -5,16 +5,17 @@ before_install:
 language: ruby
 cache: bundler
 rvm:
-- 2.0
-- 2.1
-- 2.2
+- 2.0.0
+- 2.1.0
+- 2.2.0
+- 2.3.0
 env:
 - rails=4.1.1 grape=0.12.0 doorkeeper=2.0.1
-- rails=4.1.1 grape=0.12.0 doorkeeper=2.1.4
+- rails=4.1.1 grape=0.13.0 doorkeeper=2.1.4
 - rails=4.2.0 grape=0.10.0 doorkeeper=2.2.1
-- rails=4.2.0 grape=0.11.0 doorkeeper=3.0.0
-- rails=4.2.0 grape=0.12.0 doorkeeper=3.0.0
-- rails=4.2.0 grape=0.13.0 doorkeeper=3.0.0
+- rails=4.2.0 grape=0.11.0 doorkeeper=3.1.0
+- rails=4.2.0 grape=0.13.0 doorkeeper=3.1.0
+- rails=4.2.0 grape=0.14.0 doorkeeper=3.1.0
 addons:
   code_climate:
     repo_token: ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 Changelog
 =========
-## Next
+## 0.5.1
+* [#56](https://github.com/antek-drzewiecki/wine_bouncer/pull/57): Removed locks for doorkeeper
+* [#56](https://github.com/antek-drzewiecki/wine_bouncer/pull/56): Grape 0.14.x support, removed locks.
+* Tested against ruby 2.3.0
 
 ## 0.5.0
 * [#50](https://github.com/antek-drzewiecki/wine_bouncer/pull/50): Grape 0.13.x support

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-ENV['grape'] ||= '0.13.0'
+ENV['grape'] ||= '0.14.0'
 ENV['rails'] ||= '4.2.0'
-ENV['doorkeeper'] ||= '2.2.1'
+ENV['doorkeeper'] ||= '3.1.0'
 
 gem 'rails', ENV['rails']
 

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/antek-drzewiecki/wine_bouncer.svg?branch=master)](https://travis-ci.org/antek-drzewiecki/wine_bouncer)
 [![Code Climate](https://codeclimate.com/github/antek-drzewiecki/wine_bouncer/badges/gpa.svg)](https://codeclimate.com/github/antek-drzewiecki/wine_bouncer)
 [![Gem Version](https://badge.fury.io/rb/wine_bouncer.svg)](http://badge.fury.io/rb/wine_bouncer)
+[![Documentation](https://inch-ci.org/github/antek-drzewiecki/wine_bouncer.svg)](https://inch-ci.org/github/antek-drzewiecki/wine_bouncer)
 
 Protect your precious Grape API with Doorkeeper.
 WineBouncer uses minimal modification, to make the magic happen.
@@ -28,15 +29,16 @@ Table of Contents
 
 ## Requirements
 - Ruby > 2.0
-- Doorkeeper > 1.4.0 and < 3.1
-- Grape > 0.10 and < 0.14
+- Doorkeeper > 1.4.0 and < 4.0
+- Grape > 0.10 and < 1.0
+Please submit pull requests and Travis env bumps for newer dependency versions.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'wine_bouncer', '~> 0.5.0'
+gem 'wine_bouncer', '~> 0.5.1'
 ```
 
 And then execute:
@@ -158,13 +160,12 @@ Then you can start protecting your API like the example below.
 
 ``` ruby
 desc 'This method needs the public or private scope.',
-  :entity => Api::Entities::Response,
-  http_codes: [
-      [200, 'OK', Api::Entities::Response],
+  success: Api::Entities::Response,
+  failure: [
       [401, 'Unauthorized', Api::Entities::Error],
       [403, 'Forbidden', Api::Entities::Error]
   ],
-  :notes => <<-NOTE
+  notes: <<-NOTE
   Marked down notes!
   NOTE
 oauth2 'public', 'write'

data/Rakefile

@@ -1,10 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 
-
 desc 'Default: Run all specs.'
-task :default => :spec
+task default: :spec
 
-desc "Run all specs"
-RSpec::Core::RakeTask.new(:spec)
+desc 'Run all specs'
+RSpec::Core::RakeTask.new(:spec)

data/lib/wine_bouncer/auth_methods/auth_methods.rb

@@ -3,7 +3,7 @@ module WineBouncer
     attr_accessor :doorkeeper_access_token
 
     def protected_endpoint=(protected)
-      @protected_endpoint= protected
+      @protected_endpoint = protected
     end
 
     def protected_endpoint?
@@ -27,7 +27,7 @@ module WineBouncer
     end
 
     def has_doorkeeper_token?
-      !!@_doorkeeper_access_token
+      !@_doorkeeper_access_token.nil?
     end
 
     def has_resource_owner?

data/lib/wine_bouncer/auth_strategies/default.rb

@@ -1,14 +1,13 @@
 module WineBouncer
   module AuthStrategies
     class Default < ::WineBouncer::BaseStrategy
-
       def endpoint_protected?
         !!endpoint_authorizations
       end
 
       def has_auth_scopes?
         !!endpoint_authorizations &&
-            endpoint_authorizations.has_key?(:scopes) &&
+            endpoint_authorizations.key?(:scopes) &&
             !endpoint_authorizations[:scopes].empty?
       end
 

data/lib/wine_bouncer/auth_strategies/protected.rb

@@ -1,14 +1,13 @@
 module WineBouncer
   module AuthStrategies
     class Protected < WineBouncer::BaseStrategy
-
       def endpoint_protected?
         has_authorizations?
       end
 
       def has_auth_scopes?
         endpoint_authorizations &&
-          endpoint_authorizations.has_key?(:scopes) &&
+          endpoint_authorizations.key?(:scopes) &&
           endpoint_authorizations[:scopes].any?
       end
 
@@ -22,7 +21,6 @@ module WineBouncer
         endpoint_authorizations.nil?
       end
 
-
       # returns true if an authorization hash has been found
       # First it checks for the old syntax, then for the new.
       def has_authorizations?

data/lib/wine_bouncer/auth_strategies/swagger.rb

@@ -1,7 +1,6 @@
 module WineBouncer
   module AuthStrategies
     class Swagger < ::WineBouncer::BaseStrategy
-
       def endpoint_protected?
         has_authorizations? && !!authorization_type_oauth2
       end

data/lib/wine_bouncer/configuration.rb

@@ -5,13 +5,9 @@ module WineBouncer
   end
 
   class Configuration
-
     attr_accessor :auth_strategy
     attr_accessor :defined_resource_owner
-
-    def auth_strategy=(strategy)
-      @auth_strategy= strategy
-    end
+    attr_writer :auth_strategy
 
     def auth_strategy
       @auth_strategy || :default
@@ -42,12 +38,12 @@ module WineBouncer
     end
   end
 
-   def self.configuration
+  def self.configuration
     @configuration || fail(Errors::UnconfiguredError.new)
   end
 
   def self.configuration=(config)
-    @configuration= config
+    @configuration = config
     @configuration.require_strategies
   end
 

data/lib/wine_bouncer/extension.rb

@@ -3,15 +3,15 @@ module WineBouncer
     def oauth2(*scopes)
       scopes = Doorkeeper.configuration.default_scopes.all if scopes.all? { |x| x.nil? }
       description = if respond_to?(:route_setting) # >= grape-0.10.0
-        route_setting(:description) || route_setting(:description, {})
-      else
-        @last_description ||= {}
-      end
+                      route_setting(:description) || route_setting(:description, {})
+                    else
+                      @last_description ||= {}
+                    end
       # case WineBouncer.configuration.auth_strategy
       # when :default
       description[:auth] = { scopes: scopes }
       # when :swagger
-      description[:authorizations] = { oauth2: scopes.map{|x| {scope: x}} }
+      description[:authorizations] = { oauth2: scopes.map { |x| { scope: x } } }
       # end
     end
 

data/lib/wine_bouncer/oauth2.rb

@@ -1,6 +1,5 @@
 module WineBouncer
   class OAuth2 < Grape::Middleware::Base
-
     include Doorkeeper::Helpers::Controller
     ###
     # returns the api context
@@ -86,23 +85,20 @@ module WineBouncer
       context.extend(WineBouncer::AuthMethods)
       context.protected_endpoint = endpoint_protected?
       return unless context.protected_endpoint?
-      self.doorkeeper_request= env # set request for later use.
-      doorkeeper_authorize! *auth_scopes
+      self.doorkeeper_request = env # set request for later use.
+      doorkeeper_authorize!(*auth_scopes)
       context.doorkeeper_access_token = doorkeeper_token
     end
 
     ###
     # Strategy
     ###
-    def auth_strategy
-      @auth_strategy
-    end
+    attr_reader :auth_strategy
 
     private
 
     def set_auth_strategy(strategy)
       @auth_strategy = WineBouncer::AuthStrategies.const_get("#{strategy.to_s.capitalize}").new
     end
-
   end
 end

data/lib/wine_bouncer/version.rb

@@ -1,3 +1,3 @@
 module WineBouncer
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/dummy/app/api/default_api.rb

@@ -58,7 +58,6 @@ module Api
     get '/oauth2_dsl_multiple_scopes' do
       { hello: 'oauth2 dsl multiple scopes' }
     end
-
   end
 
   class DefaultApiUnderTest < Grape::API
@@ -68,4 +67,3 @@ module Api
     mount MountedDefaultApiUnderTest
   end
 end
-

data/spec/dummy/app/api/swagger_api.rb

@@ -33,7 +33,6 @@ module Api
       { hello: 'non described world' }
     end
 
-
     desc 'oauth2 dsl'
     oauth2 'public'
     get '/oauth2_dsl' do
@@ -49,7 +48,6 @@ module Api
     get '/oauth2_dsl_custom_scopes' do
       { hello: 'oauth dsl custom scopes' }
     end
-
   end
 
   class SwaggerApiUnderTest < Grape::API

data/spec/dummy/config/application.rb

@@ -1,18 +1,17 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "action_view/railtie"
-require "sprockets/railtie"
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'action_mailer/railtie'
+require 'action_view/railtie'
+require 'sprockets/railtie'
 
-require "wine_bouncer"
+require 'wine_bouncer'
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)
 
-
 module Dummy
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
@@ -28,4 +27,3 @@ module Dummy
     # config.i18n.default_locale = :de
   end
 end
-

data/spec/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
+Rails.application.config.action_dispatch.cookies_serializer = :json

data/spec/dummy/config/initializers/doorkeeper.rb

@@ -41,7 +41,7 @@ Doorkeeper.configure do
   # Define access token scopes for your provider
   # For more information go to
   # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
-  default_scopes  :public, :default
+  default_scopes :public, :default
   optional_scopes :write, :update
 
   # Change the way client credentials are retrieved from the request object.

data/spec/dummy/config/initializers/secret_token.rb

@@ -1 +1 @@
-Dummy::Application.config.secret_token = 'c65fd1ffec8275651d1fd06ec3a4914ba644bbeb87729594a3b35fb4b7ad4cccd298d77baf63f7a6513d437e5b95eef9637f9c37a9691c3ed41143d8b5f9a5ef'
+Dummy::Application.config.secret_token = 'c65fd1ffec8275651d1fd06ec3a4914ba644bbeb87729594a3b35fb4b7ad4cccd298d77baf63f7a6513d437e5b95eef9637f9c37a9691c3ed41143d8b5f9a5ef'

data/spec/dummy/db/migrate/20140915160601_create_doorkeeper_tables.rb

@@ -1,37 +1,37 @@
 class CreateDoorkeeperTables < ActiveRecord::Migration
   def change
     create_table :oauth_applications do |t|
-      t.string  :name,         null: false
-      t.string  :uid,          null: false
-      t.string  :secret,       null: false
-      t.text    :redirect_uri, null: false
+      t.string :name,         null: false
+      t.string :uid,          null: false
+      t.string :secret,       null: false
+      t.text :redirect_uri, null: false
       t.timestamps
     end
 
     add_index :oauth_applications, :uid, unique: true
 
     create_table :oauth_access_grants do |t|
-      t.integer  :resource_owner_id, null: false
-      t.integer  :application_id,    null: false
-      t.string   :token,             null: false
-      t.integer  :expires_in,        null: false
-      t.text     :redirect_uri,      null: false
+      t.integer :resource_owner_id, null: false
+      t.integer :application_id,    null: false
+      t.string :token,             null: false
+      t.integer :expires_in,        null: false
+      t.text :redirect_uri,      null: false
       t.datetime :created_at,        null: false
       t.datetime :revoked_at
-      t.string   :scopes
+      t.string :scopes
     end
 
     add_index :oauth_access_grants, :token, unique: true
 
     create_table :oauth_access_tokens do |t|
-      t.integer  :resource_owner_id
-      t.integer  :application_id
-      t.string   :token,             null: false
-      t.string   :refresh_token
-      t.integer  :expires_in
+      t.integer :resource_owner_id
+      t.integer :application_id
+      t.string :token,             null: false
+      t.string :refresh_token
+      t.integer :expires_in
       t.datetime :revoked_at
       t.datetime :created_at,        null: false
-      t.string   :scopes
+      t.string :scopes
     end
 
     add_index :oauth_access_tokens, :token, unique: true

data/spec/dummy/db/schema.rb

@@ -12,50 +12,48 @@
 # It's strongly recommended that you check this file into your version control system.
 
 ActiveRecord::Schema.define(version: 20140915160601) do
-
-  create_table "oauth_access_grants", force: true do |t|
-    t.integer  "resource_owner_id", null: false
-    t.integer  "application_id",    null: false
-    t.string   "token",             null: false
-    t.integer  "expires_in",        null: false
-    t.text     "redirect_uri",      null: false
-    t.datetime "created_at",        null: false
-    t.datetime "revoked_at"
-    t.string   "scopes"
+  create_table 'oauth_access_grants', force: true do |t|
+    t.integer 'resource_owner_id', null: false
+    t.integer 'application_id',    null: false
+    t.string 'token',             null: false
+    t.integer 'expires_in',        null: false
+    t.text 'redirect_uri',      null: false
+    t.datetime 'created_at',        null: false
+    t.datetime 'revoked_at'
+    t.string 'scopes'
   end
 
-  add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true
-
-  create_table "oauth_access_tokens", force: true do |t|
-    t.integer  "resource_owner_id"
-    t.integer  "application_id"
-    t.string   "token",             null: false
-    t.string   "refresh_token"
-    t.integer  "expires_in"
-    t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
-    t.string   "scopes"
+  add_index 'oauth_access_grants', ['token'], name: 'index_oauth_access_grants_on_token', unique: true
+
+  create_table 'oauth_access_tokens', force: true do |t|
+    t.integer 'resource_owner_id'
+    t.integer 'application_id'
+    t.string 'token',             null: false
+    t.string 'refresh_token'
+    t.integer 'expires_in'
+    t.datetime 'revoked_at'
+    t.datetime 'created_at',        null: false
+    t.string 'scopes'
   end
 
-  add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
-  add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
-  add_index "oauth_access_tokens", ["token"], name: "index_oauth_access_tokens_on_token", unique: true
-
-  create_table "oauth_applications", force: true do |t|
-    t.string   "name",         null: false
-    t.string   "uid",          null: false
-    t.string   "secret",       null: false
-    t.text     "redirect_uri", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  add_index 'oauth_access_tokens', ['refresh_token'], name: 'index_oauth_access_tokens_on_refresh_token', unique: true
+  add_index 'oauth_access_tokens', ['resource_owner_id'], name: 'index_oauth_access_tokens_on_resource_owner_id'
+  add_index 'oauth_access_tokens', ['token'], name: 'index_oauth_access_tokens_on_token', unique: true
+
+  create_table 'oauth_applications', force: true do |t|
+    t.string 'name',         null: false
+    t.string 'uid',          null: false
+    t.string 'secret',       null: false
+    t.text 'redirect_uri', null: false
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  add_index "oauth_applications", ["uid"], name: "index_oauth_applications_on_uid", unique: true
+  add_index 'oauth_applications', ['uid'], name: 'index_oauth_applications_on_uid', unique: true
 
-  create_table "users", force: true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'users', force: true do |t|
+    t.string 'name'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
-
 end

data/spec/factories/access_token.rb

@@ -8,4 +8,4 @@ FactoryGirl.define do
       application nil
     end
   end
-end
+end

data/spec/factories/application.rb

@@ -3,4 +3,4 @@ FactoryGirl.define do
     sequence(:name) { |n| "Application #{n}" }
     redirect_uri 'https://app.com/callback'
   end
-end
+end

data/spec/factories/user.rb

@@ -2,4 +2,4 @@ FactoryGirl.define do
   factory :user do
     sequence(:name) { |n| "user-#{n}" }
   end
-end
+end

data/spec/intergration/oauth2_default_strategy_spec.rb

@@ -2,13 +2,12 @@ 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
 
-  before (:example) do
+  before(:example) do
     WineBouncer.configure do |c|
       c.auth_strategy = :default
 
@@ -71,7 +70,6 @@ describe Api::MountedDefaultApiUnderTest, type: :api do
   end
 
   context 'protected_without_scopes' do
-
     it 'allows to call an protected endpoint without scopes' do
       get '/default_api/protected_without_scope', nil, 'HTTP_AUTHORIZATION' => "Bearer #{token.token}"
 
@@ -141,7 +139,6 @@ describe Api::MountedDefaultApiUnderTest, type: :api do
     end
 
     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'
         get '/default_api/oauth2_dsl_multiple_scopes', nil, 'HTTP_AUTHORIZATION' => "Bearer #{scope_token.token}"
@@ -163,7 +160,6 @@ describe Api::MountedDefaultApiUnderTest, type: :api do
       it 'raises an error scope does not match any of the scopes' do
         expect { get '/default_api/oauth2_dsl_multiple_scopes' }.to raise_exception(WineBouncer::Errors::OAuthUnauthorizedError)
       end
-
     end
   end
 

data/spec/intergration/oauth2_protected_strategy_spec.rb

@@ -2,13 +2,12 @@ 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
 
-  before (:example) do
+  before(:example) do
     WineBouncer.configure do |c|
       c.auth_strategy = :protected
 

data/spec/intergration/oauth2_swagger_strategy_spec.rb

@@ -2,14 +2,12 @@ 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
 
-
-  before (:example) do
+  before(:example) do
     WineBouncer.configure do |c|
       c.auth_strategy = :swagger
 
@@ -21,7 +19,6 @@ describe Api::MountedSwaggerApiUnderTest, type: :api do
 
   context 'tokens and scopes' do
     it 'gives access when the token and scope are correct' do
-
       get '/swagger_api/protected', nil, 'HTTP_AUTHORIZATION' => "Bearer #{token.token}"
 
       expect(last_response.status).to eq(200)
@@ -64,7 +61,6 @@ describe Api::MountedSwaggerApiUnderTest, type: :api do
   end
 
   context 'protected_without_scopes' do
-
     it 'allows to call an protected endpoint without scopes' do
       get '/swagger_api/protected_without_scope', nil, 'HTTP_AUTHORIZATION' => "Bearer #{token.token}"
 
@@ -155,5 +151,4 @@ describe Api::MountedSwaggerApiUnderTest, type: :api do
       expect(json['hello']).to eq(user.name)
     end
   end
-
 end

data/spec/lib/generators/wine_bouncer/initializer_generator_spec.rb

@@ -15,4 +15,3 @@ describe WineBouncer::Generators::InitializerGenerator, type: :generator do
     assert_file 'config/initializers/wine_bouncer.rb', /WineBouncer\.configure/
   end
 end
-

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

@@ -1,7 +1,6 @@
 require 'rails_helper'
 
 describe ::WineBouncer::AuthMethods do
-
   let(:tested_class) do
     Class.new do
       include ::WineBouncer::AuthMethods
@@ -25,7 +24,6 @@ describe ::WineBouncer::AuthMethods do
     end
 
     it 'gives false when the class an no token' do
-
       expect(tested_class.has_resource_owner?).to be false
     end
 
@@ -63,19 +61,19 @@ describe ::WineBouncer::AuthMethods do
 
     it 'return false if the token has a resource_owner' do
       token.resource_owner_id = 2
-      tested_class.doorkeeper_access_token= token
+      tested_class.doorkeeper_access_token = token
       expect(tested_class.client_credential_token?).to be false
     end
   end
 
   context 'protected_endpoint?' do
     it 'when set true it returns true' do
-      tested_class.protected_endpoint= true
+      tested_class.protected_endpoint = true
       expect(tested_class.protected_endpoint?).to be true
     end
 
     it 'when set false it returns false' do
-      tested_class.protected_endpoint= false
+      tested_class.protected_endpoint = false
       expect(tested_class.protected_endpoint?).to be false
     end
 
@@ -84,22 +82,21 @@ describe ::WineBouncer::AuthMethods do
     end
   end
 
-
   context 'resource_owner' do
     it 'runs the configured block' do
       result = 'called block'
-      foo = Proc.new { result }
+      foo = proc { result }
 
       WineBouncer.configure do |c|
         c.auth_strategy = :default
-        c.define_resource_owner &foo
+        c.define_resource_owner(&foo)
       end
 
       expect(tested_class.resource_owner).to be(result)
     end
 
     it 'raises an argument error when the block is not configured' do
-      WineBouncer.configuration= WineBouncer::Configuration.new
+      WineBouncer.configuration = WineBouncer::Configuration.new
       expect { tested_class.resource_owner }.to raise_error(WineBouncer::Errors::UnconfiguredError)
     end
   end

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

@@ -8,7 +8,6 @@ describe ::WineBouncer::AuthStrategies::Default do
   let(:scopes_hash) { { scopes: scopes } }
   let(:auth_context) { { route_options: { auth: scopes_hash } } }
 
-
   context 'endpoint_authorizations' do
     it 'returns the auth key of the authentication hash.' do
       context_double = double()
@@ -57,7 +56,6 @@ describe ::WineBouncer::AuthStrategies::Default do
     end
 
     it 'returns false when the auth scopes contain a blank scope array' do
-
       context_double = double()
       allow(context_double).to receive(:options) { { route_options: { auth: { scopes: [] } } } }
       klass.api_context = context_double

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

@@ -8,7 +8,6 @@ describe ::WineBouncer::AuthStrategies::Swagger do
   let(:scopes_map) { { oauth2: scopes } }
   let(:auth_context) { { route_options: { authorizations: scopes_map } } }
 
-
   context 'endpoint_authorizations' do
     it 'returns the auth key of the authentication hash.' do
       context_double = double()

data/spec/rails_helper.rb

@@ -55,11 +55,10 @@ RSpec.configure do |config|
   # instead of true.
 
   config.include FactoryGirl::Syntax::Methods
-  config.include ApiHelper, :type=>:api
+  config.include ApiHelper, type: :api
 
   config.use_transactional_fixtures = false
 
-
   config.infer_spec_type_from_file_location!
 
   config.infer_base_class_for_anonymous_controllers = false
@@ -76,5 +75,3 @@ RSpec.configure do |config|
 
   config.order = 'random'
 end
-
-

data/spec/shared/orm/active_record.rb

@@ -1,2 +1,2 @@
 ActiveRecord::Migration.verbose = false
-load Rails.root + 'db/schema.rb'
+load Rails.root + 'db/schema.rb'

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@
 # users commonly want.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-require "codeclimate-test-reporter"
+require 'codeclimate-test-reporter'
 CodeClimate::TestReporter.start
 
 RSpec.configure do |config|

data/wine_bouncer.gemspec

@@ -4,28 +4,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'wine_bouncer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "wine_bouncer"
+  spec.name          = 'wine_bouncer'
   spec.version       = WineBouncer::VERSION
-  spec.authors       = ["Antek Drzewiecki"]
-  spec.email         = ["antek.drzewiecki@altran.com"]
+  spec.authors       = ['Antek Drzewiecki']
+  spec.email         = ['antek.drzewiecki@altran.com']
   spec.summary       = %q{A Ruby gem that allows Oauth2 protection with Doorkeeper for Grape Api's}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'grape', '~> 0.10', '< 0.14'
-  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 3.1'
+  spec.add_runtime_dependency 'grape', '~> 0.10', '< 1.0'
+  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 4.0'
 
-  spec.add_development_dependency "railties"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec-rails", '~> 3.2.0'
+  spec.add_development_dependency 'railties'
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.2.0'
   spec.add_development_dependency 'factory_girl', '~> 4.4.0'
-  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 'generator_spec', '~> 0.9.0'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'database_cleaner', '~> 1.3.0'
+  spec.add_development_dependency 'rubocop', '0.35.1'
+  spec.add_development_dependency 'yard', '~> 0.8.7'
 end

metadata

@@ -1,167 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: wine_bouncer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Antek Drzewiecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2016-01-14 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: '0.14'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.10'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.1
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: 
 email:
 - antek.drzewiecki@altran.com
@@ -169,9 +197,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -266,17 +296,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby gem that allows Oauth2 protection with Doorkeeper for Grape Api's
@@ -344,3 +374,4 @@ test_files:
 - spec/rails_helper.rb
 - spec/shared/orm/active_record.rb
 - spec/spec_helper.rb
+has_rdoc: