wine_bouncer 0.5.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6961476143d7f8be5bc53b9268c7950a374d31f
-  data.tar.gz: 0d507a032e778c40bc314fbd77e92b20e654004f
+  metadata.gz: 7299e034fff833ad12c89307d28b058eb9819902
+  data.tar.gz: 1792e3d936d4d74e0d0a1ff89194394e4fc4eb37
 SHA512:
-  metadata.gz: edce51422f46f91269b531449998f8bdaaf1489b3ad168fed239c7155623577a3ed02a457d0556c6f0c134baab2da84d74f9e8a318fc77bfc93917c2150ca236
-  data.tar.gz: ad1c4c0eb4b7cb6663bcd48425399ddbe74cb12b2001a7a9229b0b6c81fe9eb06f09d2ca6b8279293c4252193308ddab6aabeb39d4d48f0f3d99fc613dc6e501
+  metadata.gz: 8d5f7d22ecedf5c66140fc96aeed92ad174230279f160d451372f1471882d48f4ebab6d7ee8e97098dbd4f533dd6b989652d0e37ea68548795d6700ffe46ecbd
+  data.tar.gz: 0672c75da327503196e0f6243432788758355c8c12bfb81dd94f4f63d6aad8fda5df7d130be89772da8dbea377e3c9fe17ee3a26a9274c329032378e5f98b6d3

data/.travis.yml

@@ -5,17 +5,16 @@ before_install:
 language: ruby
 cache: bundler
 rvm:
-- 2.0.0
 - 2.1.0
-- 2.2.0
-- 2.3.0
+- 2.2.2
+- 2.2.5
+- 2.3.1
 env:
-- rails=4.1.1 grape=0.12.0 doorkeeper=2.0.1
-- 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.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
+
+- 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.16.2 doorkeeper=3.1.0
+- rails=5.0.0 grape=0.16.2 doorkeeper=4.0.0
 addons:
   code_climate:
     repo_token: ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e
@@ -23,3 +22,7 @@ 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

data/CHANGELOG.md

@@ -1,7 +1,11 @@
 Changelog
 =========
+## 1.0
+* [#61](https://github.com/antek-drzewiecki/wine_bouncer/pull/61): Travis cleanup Rails 4.1.x is EOL. Ruby 2.0 is unsupported.
+* [#60](https://github.com/antek-drzewiecki/wine_bouncer/pull/60): Rails 5, Doorkeeper 4, grape 0.16.2 support. Thanks @texpert
+
 ## 0.5.1
-* [#56](https://github.com/antek-drzewiecki/wine_bouncer/pull/57): Removed locks for doorkeeper
+* [#57](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
 

data/Gemfile

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-ENV['grape'] ||= '0.14.0'
-ENV['rails'] ||= '4.2.0'
-ENV['doorkeeper'] ||= '3.1.0'
+ENV['grape'] ||= '0.16.2'
+ENV['rails'] ||= '5.0.0'
+ENV['doorkeeper'] ||= '4.0.0'
+
+ruby '>=2.2.2' if ENV['rails'][0].to_i > 4
 
 gem 'rails', ENV['rails']
 

data/README.md

@@ -29,7 +29,7 @@ Table of Contents
 
 ## Requirements
 - Ruby > 2.0
-- Doorkeeper > 1.4.0 and < 4.0
+- Doorkeeper > 1.4.0 and < 4.1
 - Grape > 0.10 and < 1.0
 Please submit pull requests and Travis env bumps for newer dependency versions.
 
@@ -38,7 +38,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', '~> 0.5.1'
+gem 'wine_bouncer', '~> 1.0.0'
 ```
 
 And then execute:
@@ -227,13 +227,13 @@ A full working sample app (or starter template) can be found at [grape-doorkeepe
 
 Since we want the gem tested against several rails versions we use the same way to prepare our development environment as Doorkeeper.
 
-To install the development environment for rails 3.2.18, you can also specify a different rails version to test against.
+To install the development environment for rails 4.2.6, you can also specify a different rails version to test against.
 
-`rails=3.2.18 bundle install`
+`rails=4.2.6 bundle install`
 
 To run the specs.
 
-`rails=3.2.18 bundle exec rake`
+`rails=4.2.6 bundle exec rake`
 
 ## Contributing
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'

data/UPGRADING.md

@@ -1,6 +1,12 @@
 Upgrading WineBouncer
 =====================
 
+
+## Upgrading to >= 1.0
+
+No DSL changes have been made. This is just a stability release from we can work to next releases.
+
+
 ## Upgrading to >= 0.5.0
 
 WineBouncer's exceptions `OAuthUnauthorizedError` and `OAuthForbiddenError` now come with a

data/lib/generators/templates/wine_bouncer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 WineBouncer.configure do |config|
   config.auth_strategy = :default
 

data/lib/generators/wine_bouncer/initializer_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module Generators
     class InitializerGenerator < ::Rails::Generators::Base

data/lib/wine_bouncer/auth_methods/auth_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module AuthMethods
     attr_accessor :doorkeeper_access_token

data/lib/wine_bouncer/auth_strategies/default.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module AuthStrategies
     class Default < ::WineBouncer::BaseStrategy

data/lib/wine_bouncer/auth_strategies/protected.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module AuthStrategies
     class Protected < WineBouncer::BaseStrategy

data/lib/wine_bouncer/auth_strategies/swagger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module AuthStrategies
     class Swagger < ::WineBouncer::BaseStrategy

data/lib/wine_bouncer/base_strategy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   class BaseStrategy
     attr_accessor :api_context

data/lib/wine_bouncer/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
 
   class << self

data/lib/wine_bouncer/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module Errors
     class UnconfiguredError < StandardError; end

data/lib/wine_bouncer/extension.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   module Extension
     def oauth2(*scopes)

data/lib/wine_bouncer/oauth2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
   class OAuth2 < Grape::Middleware::Base
     include Doorkeeper::Helpers::Controller

data/lib/wine_bouncer/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module WineBouncer
-  VERSION = '0.5.1'
+  VERSION = '1.0.0'
 end

data/lib/wine_bouncer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape'
 require 'doorkeeper'
 require 'wine_bouncer/version'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
 
   ###

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
 
   ###

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Api
 
   ###

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/spec/dummy/app/models/user.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
 end

data/spec/dummy/config/application.rb

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

data/spec/dummy/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 

data/spec/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require File.expand_path('../application', __FILE__)
 

data/spec/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/dummy/config/environments/production.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
@@ -14,7 +16,8 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.static_cache_control = 'public, max-age=3600' if Rails::VERSION::MAJOR < 5
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }  if Rails::VERSION::MAJOR >= 5
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Doorkeeper.configure do
   # Change the ORM that doorkeeper will use.
   # Currently supported options are :active_record, :mongoid2, :mongoid3, :mongo_mapper

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure sensitive parameters which will be filtered from the log file.

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

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

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Dummy::Application.config.secret_token = 'c65fd1ffec8275651d1fd06ec3a4914ba644bbeb87729594a3b35fb4b7ad4cccd298d77baf63f7a6513d437e5b95eef9637f9c37a9691c3ed41143d8b5f9a5ef'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, key: '_dummy_session'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/dummy/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   use_doorkeeper
   mount Api::DefaultApiUnderTest => '/default_api'

data/spec/dummy/db/migrate/20140915153344_create_users.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateDoorkeeperTables < ActiveRecord::Migration
   def change
     create_table :oauth_applications do |t|

data/spec/dummy/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to

data/spec/factories/access_token.rb

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

data/spec/factories/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryGirl.define do
   factory :application, class: Doorkeeper::Application do
     sequence(:name) { |n| "Application #{n}" }

data/spec/factories/user.rb

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

data/spec/intergration/oauth2_default_strategy_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'json'
 

data/spec/intergration/oauth2_protected_strategy_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'json'
 

data/spec/intergration/oauth2_swagger_strategy_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'json'
 

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'generator_spec'
 require 'rails_helper'
 require 'spec_helper'
 require 'generators/wine_bouncer/initializer_generator'
 
 describe WineBouncer::Generators::InitializerGenerator, type: :generator do
-  destination '/tmp'
+  destination '/tmp/wine_bouncer'
 
   before do
     prepare_destination

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe ::WineBouncer::AuthMethods do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'wine_bouncer/auth_strategies/default'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 require 'wine_bouncer/auth_strategies/swagger'
 

data/spec/rails_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
 ORM = (ENV['orm'] || :active_record).to_sym

data/spec/shared/orm/active_record.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # The generated `.rspec` file contains `--require spec_helper` which will cause this

data/wine_bouncer.gemspec

@@ -18,16 +18,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'grape', '~> 0.10', '< 1.0'
-  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 4.0'
+  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 4.1'
 
   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 '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 '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 'rubocop', '0.41.1'
   spec.add_development_dependency 'yard', '~> 0.8.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wine_bouncer
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Antek Drzewiecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -39,7 +39,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -84,28 +84,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.41.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.1
+        version: 0.41.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement