drillbit 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff6783291e2ae6b5b73150c9a659d79e67106a2
-  data.tar.gz: 1c1aa5dc858c37392fbc489c427b216b4814a209
+  metadata.gz: 477a99cfe9c988e804d76c42b67dd503d71716ca
+  data.tar.gz: 2cbc77f50321b0d52b0209df5228c564a68f7993
 SHA512:
-  metadata.gz: a6bbdaae49c34e01db771bb71a0288055046d396448a6c0eaf19bada4c36fb350b18d94e901b2340fec6f93f34f36fd4b7b02c44f31381ae90c9ffdc96e12677
-  data.tar.gz: e4cb14a97e830d7abbc0fdd482eaa1c376431e7dcce3a48749c521cc9f9f76fda89579fe73e6f1a1eef15875dd3958dc2d5006aa15cf7a971e915fdcad97b7dc
+  metadata.gz: 0a2cf2c6301d8d29a8936e3c73334f074ab0c27087a326ee8228c627dad73c55d8eb39b84bf741ddb3b458d595ff287cc8fe4fd95d6d570decf357c0fe04a140
+  data.tar.gz: cd9c47f410eeda20b0ff09b0ede87c8febb5cc9a971853cb59b71e2f567fc370887022eda8519a87688ed40a5f78b2055e061f6f4700deacac6f976421ce8ea7

data/lib/drillbit/accept_header.rb

@@ -35,9 +35,11 @@ class   AcceptHeader
     raw_accept_header.match(accept_header_format)
   end
 
+  # rubocop:disable Metrics/LineLength
   def accept_header_format
-    %r{\Aapplication/#{application_vendor}(?:\+(\w+))?(?:;version=(#{version_format}))?\z}
+    %r{(?:(?<=\A)|(?<=,))application/#{application_vendor}(?:\+(\w+))?(?:;version=(#{version_format}))?(?:(?=\z)|(?=,))}
   end
+  # rubocop:enable Metrics/LineLength
 
   def application_vendor
     "vnd\\.#{application}"

data/lib/drillbit/configuration.rb

@@ -8,11 +8,12 @@ module  Drillbit
       :available_token_roles,
       :default_api_version,
       :default_token_audience,
-      :default_token_roles,
       :default_token_expiration_in_minutes,
       :default_token_issuer,
+      :default_token_roles,
       :default_token_subject,
-      :token_private_key
+      :token_private_key,
+      :token_type
 
     attr_accessor \
       :application_name
@@ -71,6 +72,10 @@ module  Drillbit
 
       OpenSSL::PKey::RSA.new(@token_private_key)
     end
+
+    def token_type
+      @token_type || 'JWE'
+    end
   end
 
   def self.configure

data/lib/drillbit/errors/invalid_subdomain.rb

@@ -17,8 +17,7 @@ class   InvalidSubdomain < RuntimeError
   end
 
   def detail
-    'The resource you attempted to access is either not authorized for the ' \
-    'authenticated user or does not exist.'
+    'The subdomain you attempted to access is not valid.  Please try again.'
   end
 
   def source

data/lib/drillbit/requests/base.rb

@@ -93,7 +93,8 @@ class   Base
   def authorization_token_from_header
     case raw_authorization_header
     when JSON_WEB_TOKEN_HEADER_PATTERN
-      Tokens::JsonWebToken.from_jwe(
+      Tokens::JsonWebToken.__send__(
+        "from_#{Drillbit.configuration.token_type.downcase}",
         raw_authorization_header[JSON_WEB_TOKEN_HEADER_PATTERN, 1],
         private_key: token_private_key,
       )

data/lib/drillbit/requests/rack.rb

@@ -15,7 +15,8 @@ class   Rack < Base
   def authorization_token_from_params
     case request['QUERY_STRING']
     when JSON_WEB_TOKEN_PARAM_PATTERN
-      Tokens::JsonWebToken.from_jwe(
+      Tokens::JsonWebToken.__send__(
+        "from_#{Drillbit.configuration.token_type.downcase}",
         request['QUERY_STRING'][JSON_WEB_TOKEN_PARAM_PATTERN, 1] || '',
         private_key: token_private_key,
       )

data/lib/drillbit/requests/rails.rb

@@ -11,7 +11,8 @@ class   Rails < Base
   def authorization_token_from_params
     case
     when request.params.key?(JSON_WEB_TOKEN_PARAM_NAME)
-      Tokens::JsonWebToken.from_jwe(
+      Tokens::JsonWebToken.__send__(
+        "from_#{Drillbit.configuration.token_type.downcase}",
         request.params[JSON_WEB_TOKEN_PARAM_NAME] || '',
         private_key: token_private_key,
       )

data/lib/drillbit/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Drillbit
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/spec/drillbit/accept_header_spec.rb

@@ -12,6 +12,13 @@ RSpec.describe  AcceptHeader do
     expect(header).to be_valid
   end
 
+  it 'can validate an accept header with multiple accept options' do
+    header = AcceptHeader.new(application: 'westeros',
+                              header:      'application/json,application/vnd.westeros+redkeep;version=1.0.0,application/json')
+
+    expect(header).to be_valid
+  end
+
   it 'does not validate an accept header without passing an application' do
     header = AcceptHeader.new(application: '',
                               header:      'application/vnd.westeros+redkeep;version=1.0.0')
@@ -94,7 +101,7 @@ RSpec.describe  AcceptHeader do
   it 'can extract version information from an accept header' do
     header = AcceptHeader.new(
               application: 'westeros',
-              header:      'application/vnd.westeros+redkeep;version=10.0.0beta1',
+              header:      'application/json,application/vnd.westeros+redkeep;version=10.0.0beta1,application/json',
     )
 
     expect(header.version).to eql '10.0.0beta1'

data/spec/drillbit/errors/invalid_subdomain_spec.rb

@@ -17,8 +17,7 @@ RSpec.describe  InvalidSubdomain do
 
   it 'can output the detail' do
     expect(error.detail).to eql \
-      'The resource you attempted to access is either not authorized for the ' \
-      'authenticated user or does not exist.'
+      'The subdomain you attempted to access is not valid.  Please try again.'
   end
 
   it 'can output the source' do

data/spec/drillbit/invalid_subdomain_spec.rb

@@ -2,7 +2,6 @@
 require 'spec_helper'
 require 'drillbit/responses/invalid_subdomain'
 
-# rubocop:disable Metrics/LineLength
 module          Drillbit
 module          Responses
 RSpec.describe  InvalidSubdomain, singletons: Erratum::Configuration do
@@ -32,8 +31,8 @@ RSpec.describe  InvalidSubdomain, singletons: Erratum::Configuration do
                       'status' => 404,
                       'code'   => 'errors.invalid_subdomain',
                       'title'  => 'Invalid Subdomain',
-                      'detail' => 'The resource you attempted to access is either not authorized ' \
-                                  'for the authenticated user or does not exist.',
+                      'detail' => 'The subdomain you attempted to access is not valid.' \
+                                  '  Please try again.',
                       'source' => {
                         'http_host' => 'api.example.com',
                       },

data/spec/drillbit/middleware/api_request_spec.rb

@@ -65,8 +65,8 @@ RSpec.describe  ApiRequest, singletons: Erratum::Configuration do
                       'status' => 404,
                       'code'   => 'errors.invalid_subdomain',
                       'title'  => 'Invalid Subdomain',
-                      'detail' => 'The resource you attempted to access is either not authorized ' \
-                                  'for the authenticated user or does not exist.',
+                      'detail' => 'The subdomain you attempted to access is not valid.' \
+                                  '  Please try again.',
                       'source' => {
                         'http_host' => 'notvalid.example.com',
                       },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drillbit
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   zRIv8lqQM8QFT76rzP5SBCERwN+ltKAFbQ5/FwmZNGWYnmCP3RZMQiRnbh+9H9lh
   mlbwaYZTjgsXq6cy8N38EecewgBbZYS1IYJraE/M
   -----END CERTIFICATE-----
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erratum