wine_bouncer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f574523e9139e98523e7ee4fa55f53c08d523d5
-  data.tar.gz: 57f194faf3e53dd0382c9ad5d55193510eca3646
+  metadata.gz: e5dc6cf97cd8da451dc4702e223895ef8936bdf3
+  data.tar.gz: fb785eaeb2dbaee4f862f83cad1480fc5a024c42
 SHA512:
-  metadata.gz: 8f15e202eff6141fef5a1717ab23a542b63ab49ca8558aa98dfebb3f91b8a00512893720b1c8e0858cde16d55158334522c17997b0a9411051ad2c86af60f46f
-  data.tar.gz: a232f4bc101f50924f4c794071c1c4411498da7a45b6558994471569441cc61b7a55ff12de8480a76c0094f6fa417f75585d101d982c572a064c76d1d39741e4
+  metadata.gz: 3b9613742574c2c306212a77e39709c4d493f543e11358927d70aaf2d034a40e6cdb9a90677e98bbaf3d4f0c0d4ee75c3909869e195e32e3be2e685d6cfdcc02
+  data.tar.gz: 46032cd2d3121fe7ecdb5f251da88a23f52e75c6d4ad8efa6307c3bd35a81fafd1d6b4b2ac6fe6e2084680ba04588b3975301d63be8040af0ccf201c4b80b0ac

data/.travis.yml

@@ -1,27 +1,24 @@
+sudo: false
 before_install:
-  - gem update bundler
-  - bundle --version
+- gem update bundler
+- bundle --version
 language: ruby
 cache: bundler
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+- 2.0
+- 2.1
+- 2.2
 env:
-  - rails=3.2.18 grape=0.10.0
-  - rails=3.2.18 grape=0.12.0
-  - 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.2.0 grape=0.10.0 doorkeeper=2.2.1
-  - rails=4.2.0 grape=0.11.0 doorkeeper=2.2.1
-  - rails=4.2.0 grape=0.12.0 doorkeeper=2.2.1
-matrix:
-  exclude:
-    - env: rails=3.2.18 grape=0.10.0
-      rvm: 2.2
-
-    - env: rails=3.2.18 grape=0.12.0
-      rvm: 2.2
+- 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.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
 addons:
   code_climate:
     repo_token: ab1b6ce5f973da033f80ae2e99fadbb32b2f9c37892703956d8ef954c8e8134e
+notifications:
+  hipchat:
+    rooms:
+      secure: SUWenlDzlDbpryO1QzD+rN4MxIBpAAzwsFqnnkyRQ11thRVdvKuT2TUd+RlYImLXDNkvNjqmpXh7mihtcro9g8unR3nF1UKbuAPIv2kCklsio0jAnjVn7+h1l56hsa90Jy9t/YpKtoLx2QNWLz70n8VrtGJMAt53T6tZdgNUp58=

data/CHANGELOG.md

@@ -1,8 +1,12 @@
 Changelog
 =========
-
 ## Next
 
+## 0.5.0
+* [#50](https://github.com/antek-drzewiecki/wine_bouncer/pull/50): Grape 0.13.x support
+* [#48](https://github.com/antek-drzewiecki/wine_bouncer/pull/48): Bind Doorkeeper error response into WineBouncer errors
+* [#47](https://github.com/antek-drzewiecki/wine_bouncer/pull/47): Doorkeeper 3.0.x support
+
 ## 0.4.0
 * [#42](https://github.com/antek-drzewiecki/wine_bouncer/pull/42): Added support for Doorkeeper 2.2
 * [#41](https://github.com/antek-drzewiecki/wine_bouncer/pull/41): Added support for Grape 0.12.0, Removed support for Grape 0.8 and 0.9 (though they still work).

data/Gemfile

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

data/README.md

@@ -28,15 +28,15 @@ Table of Contents
 
 ## Requirements
 - Ruby > 2.0
-- Doorkeeper > 1.4.0 and < 3
-- Grape > 0.10 and < 0.13
+- Doorkeeper > 1.4.0 and < 3.1
+- Grape > 0.10 and < 0.14
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'wine_bouncer', '~> 0.4.0'
+gem 'wine_bouncer', '~> 0.5.0'
 ```
 
 And then execute:
@@ -215,6 +215,9 @@ This gem raises the following exceptions which can be handled in your Grape API,
 * `WineBouncer::Errors::OAuthForbiddenError`
    when the token is found but scopes do not match.
 
+Detailed doorkeeper error response can be found in the error's `response` attribute. You could use
+it to compose the actual HTTP response to API users.
+
 ## Example/Template Application
 
 A full working sample app (or starter template) can be found at [grape-doorkeeper on github](https://github.com/sethherr/grape-doorkeeper). It has one click deploy to Heroku and [a live example](https://grape-doorkeeper.herokuapp.com/).

data/UPGRADING.md

@@ -1,6 +1,13 @@
 Upgrading WineBouncer
 =====================
 
+## Upgrading to >= 0.5.0
+
+WineBouncer's exceptions `OAuthUnauthorizedError` and `OAuthForbiddenError` now come with a
+corresponding Doorkeeper's error response. You can access it via `response` method of the exception.
+For backward compatible, you can still use `message` but the content will be provided by Doorkeeper
+error response's description.
+
 ## Upgrading to >=  0.3.0
 
 An new DSL has been introduced to WineBouncer. This DSL will become the preferred way to authorize your endpoints.

data/lib/wine_bouncer/errors.rb

@@ -1,7 +1,21 @@
 module WineBouncer
   module Errors
     class UnconfiguredError < StandardError; end
-    class OAuthUnauthorizedError < StandardError; end
-    class OAuthForbiddenError < StandardError; end
+
+    class OAuthUnauthorizedError < StandardError
+      attr_reader :response
+      def initialize(response)
+        super(response.try(:description))
+        @response = response
+      end
+    end
+
+    class OAuthForbiddenError < StandardError
+      attr_reader :response
+      def initialize(response)
+        super(response.try(:description))
+        @response = response
+      end
+    end
   end
 end

data/lib/wine_bouncer/oauth2.rb

@@ -62,12 +62,10 @@ module WineBouncer
       unless valid_doorkeeper_token?(*scopes)
         if !doorkeeper_token || !doorkeeper_token.accessible?
           error = Doorkeeper::OAuth::InvalidTokenResponse.from_access_token(doorkeeper_token)
-          # TODO: localization and better error reporting
-          raise WineBouncer::Errors::OAuthUnauthorizedError, 'unauthorized'
+          raise WineBouncer::Errors::OAuthUnauthorizedError, error
         else
           error = Doorkeeper::OAuth::ForbiddenTokenResponse.from_scopes(scopes)
-          # TODO: localization and better error reporting
-          raise WineBouncer::Errors::OAuthForbiddenError, "missing permissions"
+          raise WineBouncer::Errors::OAuthForbiddenError, error
         end
       end
     end

data/lib/wine_bouncer/version.rb

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

data/wine_bouncer.gemspec

@@ -17,8 +17,8 @@ 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', '< 0.13'
-  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 3.0'
+  spec.add_runtime_dependency 'grape', '~> 0.10', '< 0.14'
+  spec.add_runtime_dependency 'doorkeeper', '>= 1.4', '< 3.1'
 
   spec.add_development_dependency "railties"
   spec.add_development_dependency "bundler", "~> 1.7"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wine_bouncer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Antek Drzewiecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-08-31 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: '0.13'
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.10'
     - - <
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '1.4'
     - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.4'
     - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement