drillbit 1.1.0 → 2.0.0

data/spec/drillbit/requests/rack_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 require 'drillbit/requests/rack'
 
 # rubocop:disable Metrics/LineLength
-module          Drillbit
-module          Requests
-RSpec.describe  Rack do
+module    Drillbit
+module    Requests
+describe  Rack do
   it 'finds the accept header from the headers if it is valid' do
     raw_request = {
       'HTTP_ACCEPT'             => 'application/vnd.westeros+redkeep;version=10.0',

data/spec/drillbit/requests/rails_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 require 'drillbit/requests/rails'
 
 # rubocop:disable Metrics/LineLength
-module          Drillbit
-module          Requests
-RSpec.describe  Rails do
+module    Drillbit
+module    Requests
+describe  Rails do
   it 'finds the accept header from the headers if it is valid' do
     raw_request = OpenStruct.new(
                     headers: {

data/spec/drillbit/resource/model_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 require 'drillbit/resource/model'
 
-module          Drillbit
-module          Resource
-RSpec.describe  Model do
+module    Drillbit
+module    Resource
+describe  Model do
   it 'can chain multiple processors together' do
     resource           = double
     processed_resource = double

data/spec/drillbit/resource/processors/filtering_spec.rb

@@ -2,10 +2,10 @@
 require 'spec_helper'
 require 'drillbit/resource/processors/filtering'
 
-module          Drillbit
-module          Resource
-module          Processors
-RSpec.describe  Filtering do
+module    Drillbit
+module    Resource
+module    Processors
+describe  Filtering do
   let(:filtering_resource) { double }
 
   it 'can return the resource if not filtered parameters are passed in' do

data/spec/drillbit/resource/processors/indexing_spec.rb

@@ -9,10 +9,10 @@ class  TestIndexClass
 end
 end
 
-module          Drillbit
-module          Resource
-module          Processors
-RSpec.describe  Indexing do
+module    Drillbit
+module    Resource
+module    Processors
+describe  Indexing do
   let(:indexing_resource) { double }
 
   it 'does not do anything if indexing params are not passed in' do

data/spec/drillbit/resource/processors/paging_spec.rb

@@ -2,10 +2,10 @@
 require 'spec_helper'
 require 'drillbit/resource/processors/paging'
 
-module          Drillbit
-module          Resource
-module          Processors
-RSpec.describe  Paging do
+module    Drillbit
+module    Resource
+module    Processors
+describe  Paging do
   let(:paging_resource)    { double }
   let(:processed_resource) { double }
 

data/spec/drillbit/resource/processors/sorting_spec.rb

@@ -2,10 +2,10 @@
 require 'spec_helper'
 require 'drillbit/resource/processors/sorting'
 
-module          Drillbit
-module          Resource
-module          Processors
-RSpec.describe  Sorting do
+module    Drillbit
+module    Resource
+module    Processors
+describe  Sorting do
   let(:sorting_resource) { double }
 
   it 'can return an ascending sort' do

data/spec/drillbit/tokens/base64_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 require 'drillbit/tokens/base64'
 
-module          Drillbit
-module          Tokens
-RSpec.describe  Base64 do
+module    Drillbit
+module    Tokens
+describe  Base64 do
   it 'is valid' do
     expect(Base64.new(token: 'foo')).to be_valid
   end

data/spec/drillbit/tokens/json_web_token_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 require 'drillbit/tokens/json_web_token'
 
-module          Drillbit
-module          Tokens
-RSpec.describe  JsonWebToken do
+module    Drillbit
+module    Tokens
+describe  JsonWebToken do
   it 'can convert an empty encrypted token' do
     token = JsonWebToken.from_jwe(nil,
                                   private_key: test_private_key)
@@ -61,6 +61,14 @@ RSpec.describe  JsonWebToken do
     expect(token).to be_a JsonWebTokens::Null
   end
 
+  it 'can convert a token with no data' do
+    token = JsonWebToken.build_from_request([{}, {}])
+
+    expect(token).to     be_empty
+    expect(token).not_to be_present
+    expect(token).to     be_blank
+  end
+
   it 'can verify an expired signed token' do
     expired_jws = valid_jws_token('exp' => 1.day.ago.to_i,
                                   'baz' => 'bar')

data/spec/drillbit/tokens/json_web_tokens/password_reset_spec.rb

@@ -2,10 +2,10 @@
 require 'spec_helper'
 require 'drillbit/tokens/json_web_tokens/password_reset'
 
-module          Drillbit
-module          Tokens
-module          JsonWebTokens
-RSpec.describe  PasswordReset do
+module    Drillbit
+module    Tokens
+module    JsonWebTokens
+describe  PasswordReset do
   it 'can build a token that expires during the password reset timeframe', :time_mock do
     token = JsonWebToken.build(id:                'test_id',
                                subject_id:        'subject_id',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drillbit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   zRIv8lqQM8QFT76rzP5SBCERwN+ltKAFbQ5/FwmZNGWYnmCP3RZMQiRnbh+9H9lh
   mlbwaYZTjgsXq6cy8N38EecewgBbZYS1IYJraE/M
   -----END CERTIFICATE-----
-date: 2016-05-21 00:00:00.000000000 Z
+date: 2016-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erratum
@@ -136,14 +136,16 @@ files:
 - lib/drillbit/authorizers/scope.rb
 - lib/drillbit/configuration.rb
 - lib/drillbit/errors/invalid_api_request.rb
+- lib/drillbit/errors/invalid_request_body.rb
 - lib/drillbit/errors/invalid_subdomain.rb
 - lib/drillbit/errors/invalid_token.rb
 - lib/drillbit/matchers/accept_header.rb
 - lib/drillbit/matchers/generic.rb
 - lib/drillbit/matchers/subdomain.rb
 - lib/drillbit/matchers/version.rb
-- lib/drillbit/middleware/api_request.rb
-- lib/drillbit/parameters.rb
+- lib/drillbit/middleware/api_request_validator.rb
+- lib/drillbit/middleware/parameter_parser.rb
+- lib/drillbit/middleware/token_processor.rb
 - lib/drillbit/parameters/filter.rb
 - lib/drillbit/parameters/index.rb
 - lib/drillbit/parameters/page.rb
@@ -159,6 +161,7 @@ files:
 - lib/drillbit/resource/processors/paging.rb
 - lib/drillbit/resource/processors/sorting.rb
 - lib/drillbit/responses/invalid_api_request.rb
+- lib/drillbit/responses/invalid_request_body.rb
 - lib/drillbit/responses/invalid_subdomain.rb
 - lib/drillbit/responses/invalid_token.rb
 - lib/drillbit/serializers/json_api.rb
@@ -179,6 +182,7 @@ files:
 - spec/drillbit/authorizers/query_spec.rb
 - spec/drillbit/authorizers/scope_spec.rb
 - spec/drillbit/errors/invalid_api_request_spec.rb
+- spec/drillbit/errors/invalid_request_body_spec.rb
 - spec/drillbit/errors/invalid_subdomain_spec.rb
 - spec/drillbit/errors/invalid_token_spec.rb
 - spec/drillbit/invalid_subdomain_spec.rb
@@ -186,8 +190,9 @@ files:
 - spec/drillbit/matchers/accept_header_spec.rb
 - spec/drillbit/matchers/subdomain_spec.rb
 - spec/drillbit/matchers/version_spec.rb
-- spec/drillbit/middleware/api_request_spec.rb
-- spec/drillbit/parameters_spec.rb
+- spec/drillbit/middleware/api_request_validator_spec.rb
+- spec/drillbit/middleware/parameter_parser_spec.rb
+- spec/drillbit/middleware/token_processor_spec.rb
 - spec/drillbit/requests/base_spec.rb
 - spec/drillbit/requests/rack_spec.rb
 - spec/drillbit/requests/rails_spec.rb
@@ -235,6 +240,7 @@ test_files:
 - spec/drillbit/authorizers/query_spec.rb
 - spec/drillbit/authorizers/scope_spec.rb
 - spec/drillbit/errors/invalid_api_request_spec.rb
+- spec/drillbit/errors/invalid_request_body_spec.rb
 - spec/drillbit/errors/invalid_subdomain_spec.rb
 - spec/drillbit/errors/invalid_token_spec.rb
 - spec/drillbit/invalid_subdomain_spec.rb
@@ -242,8 +248,9 @@ test_files:
 - spec/drillbit/matchers/accept_header_spec.rb
 - spec/drillbit/matchers/subdomain_spec.rb
 - spec/drillbit/matchers/version_spec.rb
-- spec/drillbit/middleware/api_request_spec.rb
-- spec/drillbit/parameters_spec.rb
+- spec/drillbit/middleware/api_request_validator_spec.rb
+- spec/drillbit/middleware/parameter_parser_spec.rb
+- spec/drillbit/middleware/token_processor_spec.rb
 - spec/drillbit/requests/base_spec.rb
 - spec/drillbit/requests/rack_spec.rb
 - spec/drillbit/requests/rails_spec.rb

data/lib/drillbit/middleware/api_request.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-require 'drillbit/configuration'
-require 'drillbit/parameters'
-require 'drillbit/matchers/subdomain'
-require 'drillbit/matchers/accept_header'
-require 'drillbit/requests/base'
-require 'drillbit/responses/invalid_api_request'
-require 'drillbit/responses/invalid_subdomain'
-require 'drillbit/responses/invalid_token'
-
-module  Drillbit
-module  Middleware
-class   ApiRequest
-  JSON_API_MIME_TYPE_PATTERN = %r{application/vnd\.api\+json(?=\z|;)}
-
-  def initialize(app)
-    @app = app
-  end
-
-  # rubocop:disable Metrics/LineLength
-  # :reek:FeatureEnvy
-  def call(env)
-    env['HTTP_X_APPLICATION_NAME'] = Drillbit.configuration.application_name
-
-    request               = Requests::Base.resolve(env)
-    subdomain_matcher     = Matchers::Subdomain.new
-    accept_header_matcher = Matchers::AcceptHeader.new
-    token                 = request.authorization_token
-
-    return Responses::InvalidSubdomain.call(env)      unless subdomain_matcher.matches?(request)
-    return Responses::InvalidApiRequest.call(env)     unless !subdomain_matcher.matches_api_subdomain?(request) ||
-                                                             accept_header_matcher.matches?(request)
-    return Responses::InvalidToken.call(env,
-                                        application_name: request.application_name) \
-           unless token.valid?
-
-    env['X_DECRYPTED_JSON_WEB_TOKEN'] = token.to_h
-    env['QUERY_STRING']               = Parameters.process(env['QUERY_STRING'])
-    env['CONTENT_TYPE']               = env['CONTENT_TYPE'].
-                                        to_s.
-                                        gsub JSON_API_MIME_TYPE_PATTERN,
-                                             'application/json'
-
-    @app.call(env)
-  end
-  # rubocop:enable Metrics/LineLength
-end
-end
-end

data/lib/drillbit/parameters.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module  Drillbit
-class   Parameters
-  attr_accessor :query_string
-
-  def initialize(query_string)
-    self.query_string = query_string
-  end
-
-  def self.process(query_string)
-    new(query_string).process
-  end
-
-  def process
-    return query_string unless query_string.respond_to? :gsub
-
-    query_string.gsub(/(?<=\A|&|\?)[^=&]+/) do |match|
-      match.tr('-', '_')
-    end
-  end
-end
-end

data/spec/drillbit/parameters_spec.rb

@@ -1,49 +0,0 @@
-# frozen_string_literal: true
-require 'spec_helper'
-require 'drillbit/parameters'
-
-module          Drillbit
-RSpec.describe  Parameters do
-  it 'can underscore the first parameter' do
-    query_params = 'hello-there=bob-jones'
-
-    expect(Parameters.process(query_params)).to eql 'hello_there=bob-jones'
-  end
-
-  it 'does not touch params with no dashes' do
-    query_params = 'hello_there=bob-jones'
-
-    expect(Parameters.process(query_params)).to eql 'hello_there=bob-jones'
-  end
-
-  it 'can underscore a middle parameter and a parameter at the end' do
-    query_params = 'hello-there=bob-jones&nice-to-meet=you-bob&hows-the-weather=today-bob'
-
-    expect(Parameters.process(query_params)).to eql 'hello_there=bob-jones&'     \
-                                                    'nice_to_meet=you-bob&'      \
-                                                    'hows_the_weather=today-bob'
-  end
-
-  it 'can handle weirdly formatted parameters' do
-    query_params = 'hello-there=bob-jones&nice-to-meet=you-bob&='
-
-    expect(Parameters.process(query_params)).to eql 'hello_there=bob-jones&'     \
-                                                    'nice_to_meet=you-bob&='
-  end
-
-  it 'can handle parameters with no values' do
-    query_params = 'hello-there&nice-to-meet=you-bob&='
-
-    expect(Parameters.process(query_params)).to eql 'hello_there&' \
-                                                    'nice_to_meet=you-bob&='
-  end
-
-  it 'can handle values with no parameter name' do
-    query_params = 'hello-there=bob-jones&=you-bob&nice-to-meet=you-bob&='
-
-    expect(Parameters.process(query_params)).to eql 'hello_there=bob-jones&' \
-                                                    '=you-bob&'              \
-                                                    'nice_to_meet=you-bob&='
-  end
-end
-end