apill 3.1.3 → 4.0.0

data/spec/apill/requests/rack_spec.rb

@@ -0,0 +1,159 @@
+require 'spec_helper'
+require 'apill/requests/rack'
+
+module    Apill
+module    Requests
+describe  Rack do
+  it 'finds the accept header from the headers if it is valid' do
+    raw_request = {
+      'HTTP_ACCEPT'             => 'application/vnd.matrix+zion;version=10.0',
+      'QUERY_STRING'            => '',
+      'HTTP_X_APPLICATION_NAME' => 'matrix',
+    }
+    request     = Rack.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.matrix+zion;version=10.0'
+  end
+
+  it 'finds the accept header from the headers if it is invalid but there is no ' \
+     'accept header in the params' do
+
+    raw_request = {
+      'HTTP_ACCEPT'             => 'invalid/vnd.matrix+zion;version=10.0',
+      'QUERY_STRING'            => '',
+      'HTTP_X_APPLICATION_NAME' => 'matrix',
+    }
+    request     = Rack.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'invalid/vnd.matrix+zion;version=10.0'
+  end
+
+  it 'finds the accept header from the params if it is valid' do
+    raw_request = {
+      'HTTP_ACCEPT'             => '',
+      'QUERY_STRING'            => 'accept=application/vnd.matrix+zion;version=10.0',
+      'HTTP_X_APPLICATION_NAME' => 'matrix',
+    }
+    request     = Rack.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.matrix+zion;version=10.0'
+  end
+
+  # rubocop:disable Metrics/LineLength
+  it 'finds the accept header from the query string if it is encoded' do
+    raw_request = {
+      'HTTP_ACCEPT'             => '',
+      'QUERY_STRING'            => 'accept=application%2Fvnd.matrix%2Bzion%3Bversion%3D10.0',
+      'HTTP_X_APPLICATION_NAME' => 'matrix',
+    }
+    request     = Rack.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.matrix+zion;version=10.0'
+  end
+  # rubocop:enable Metrics/LineLength
+
+  it 'finds the authorization token from the header' do
+    raw_request = {
+      'HTTP_AUTHORIZATION' => "Token #{valid_token}",
+      'QUERY_STRING'       => '',
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'can process an authorization token if it is sent through incorrectly' do
+    raw_request = {
+      'HTTP_AUTHORIZATION' => "#{valid_token}",
+      'QUERY_STRING'       => '',
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).not_to  be_valid
+    expect(request.authorization_token.to_h).to eql({})
+  end
+
+  it 'finds the authorization token from the params if the authorization token from ' \
+     'the header is invalid and the authorization token from the params is valid' do
+
+    raw_request = {
+      'HTTP_AUTHORIZATION' => "Token #{invalid_token}",
+      'QUERY_STRING'       => "auth_token=#{valid_token}",
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'finds the authorization token from the params if the authorization token from ' \
+     'the header is not present and the authorization token from the params is valid' do
+
+    raw_request = {
+      'QUERY_STRING' => "auth_token=#{valid_token}",
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'is a null authorization token if neither authorization token is present' do
+    raw_request = {
+      'QUERY_STRING' => '',
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql({})
+  end
+
+  it 'finds the authorization token from the params' do
+    raw_request = {
+      'QUERY_STRING' => "auth_token=#{valid_token}",
+    }
+    request     = Rack.new(token_private_key: test_private_key,
+                           request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'defaults to the application name in the configuration if none is found in ' \
+     'the header' do
+
+    Apill.configuration.application_name = 'zion'
+
+    raw_request = {
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => 'accept=application/vnd.zion+zion;version=10.0',
+    }
+    request     = Rack.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.zion+zion;version=10.0'
+  end
+end
+end
+end

data/spec/apill/requests/rails_spec.rb

@@ -0,0 +1,151 @@
+require 'ostruct'
+require 'spec_helper'
+require 'apill/requests/rails'
+
+module    Apill
+module    Requests
+describe  Rails do
+  it 'finds the accept header from the headers if it is valid' do
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'X-Application-Name' => 'matrix',
+                      'Accept'             => 'application/vnd.matrix+zion;version=10.0',
+                    },
+                    params:  {})
+    request     = Rails.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.matrix+zion;version=10.0'
+  end
+
+  it 'finds the accept header from the headers if it is invalid but there is no ' \
+     'accept header in the params' do
+
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'X-Application-Name' => 'matrix',
+                      'Accept'             => 'invalid/vnd.matrix+zion;version=10.0',
+                    },
+                    params:  {})
+    request     = Rails.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'invalid/vnd.matrix+zion;version=10.0'
+  end
+
+  it 'finds the accept header from the params if it is valid' do
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'X-Application-Name' => 'matrix',
+                    },
+                    params:  { 'accept' => 'application/vnd.matrix+zion;version=10.0' })
+    request     = Rails.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.matrix+zion;version=10.0'
+  end
+
+  it 'finds the authorization token from the header' do
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'HTTP_AUTHORIZATION' => "Token #{valid_token}",
+                    },
+                    params:  {})
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'can process an authorization token if it is sent through incorrectly' do
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'HTTP_AUTHORIZATION' => "#{valid_token}",
+                    },
+                    params:  {})
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).not_to  be_valid
+    expect(request.authorization_token.to_h).to eql({})
+  end
+
+  it 'finds the authorization token from the params if the authorization token from ' \
+     'the header is invalid and the authorization token from the params is valid' do
+
+    raw_request = OpenStruct.new(
+                    headers: {
+                      'HTTP_AUTHORIZATION' => "Token #{invalid_token}",
+                    },
+                    params:  { 'auth_token' => valid_token })
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'finds the authorization token from the params if the authorization token from ' \
+     'the header is not present and the authorization token from the params is valid' do
+
+    raw_request = OpenStruct.new(
+                    headers: {},
+                    params:  { 'auth_token' => valid_token })
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'is a null authorization token if neither authorization token is present' do
+    raw_request = OpenStruct.new(
+                    headers: {},
+                    params:  {})
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql({})
+  end
+
+  it 'finds the authorization token from the params' do
+    raw_request = OpenStruct.new(
+                    headers: {},
+                    params:  { 'auth_token' => valid_token })
+    request     = Rails.new(token_private_key: test_private_key,
+                            request:           raw_request)
+
+    expect(request.authorization_token).to      be_valid
+    expect(request.authorization_token.to_h).to eql(
+      [
+        { 'bar' => 'baz' },
+        { 'typ' => 'JWT', 'alg' => 'RS256' },
+      ])
+  end
+
+  it 'defaults to the application name in the configuration if none is found in ' \
+     'the header' do
+
+    Apill.configuration.application_name = 'zion'
+
+    raw_request = OpenStruct.new(
+                    headers: {},
+                    params:  { 'accept' => 'application/vnd.zion+zion;version=10.0' })
+    request     = Rails.new(request: raw_request)
+
+    expect(request.accept_header.to_s).to eql 'application/vnd.zion+zion;version=10.0'
+  end
+end
+end
+end

data/spec/apill/resource/model_spec.rb

@@ -1,4 +1,4 @@
-require 'rspectacular'
+require 'spec_helper'
 require 'apill/resource/model'
 
 module    Apill

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

@@ -1,4 +1,4 @@
-require 'rspectacular'
+require 'spec_helper'
 require 'apill/resource/processors/filtering'
 
 module    Apill

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

@@ -1,4 +1,4 @@
-require 'rspectacular'
+require 'spec_helper'
 require 'apill/resource/processors/indexing'
 
 module Apill

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

@@ -1,4 +1,4 @@
-require 'rspectacular'
+require 'spec_helper'
 require 'apill/resource/processors/paging'
 
 module    Apill

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

@@ -1,4 +1,4 @@
-require 'rspectacular'
+require 'spec_helper'
 require 'apill/resource/processors/sorting'
 
 module    Apill

data/spec/apill/tokens/request_authorization_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+require 'apill/tokens/request_authorization'
+
+module    Apill
+module    Tokens
+describe  RequestAuthorization do
+  it 'can convert an empty token' do
+    token = RequestAuthorization.convert(token_private_key: test_private_key,
+                                         raw_token:         nil)
+
+    expect(token).to be_a NullRequestAuthorization
+  end
+
+  it 'can convert an invalid token' do
+    token = RequestAuthorization.convert(token_private_key: test_private_key,
+                                         raw_token:         invalid_token)
+
+    expect(token).to be_a InvalidRequestAuthorization
+  end
+
+  it 'can verify an expired token' do
+    expired_jwe = valid_token('exp' => 1.day.ago.to_i,
+                              'baz' => 'bar')
+    token       = RequestAuthorization.convert(
+                    token_private_key: test_private_key,
+                    raw_token:         expired_jwe)
+
+    expect(token).to be_a InvalidRequestAuthorization
+  end
+
+  it 'can convert an invalidly signed token' do
+    other_private_key = OpenSSL::PKey::RSA.new(2048)
+    token             = RequestAuthorization.convert(
+                          token_private_key: other_private_key,
+                          raw_token:         valid_token)
+
+    expect(token).to be_a InvalidRequestAuthorization
+  end
+
+  it 'can convert a valid token' do
+    token = RequestAuthorization.convert(token_private_key: test_private_key,
+                                         raw_token:         valid_token)
+
+    expect(token).to      be_a RequestAuthorization
+    expect(token.to_h).to eql([{ 'bar' => 'baz' }, { 'typ' => 'JWT', 'alg' => 'RS256' }])
+  end
+end
+end
+end

data/spec/fixtures/test_rsa_key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAzQNhPtJl68EAoLBh92nBpDlif2M61dS+HBoRinfWT5sD3CeJ
+eMPmlj9vqOdmBzBfMuoHkr3QPVjTAvsTMthoVFKVUEA28eglFABZYP99+VDIKJtr
+rpXMkwjKBXaXP58QZ1bkQfMdNHuKC9xY7w4tpZP3q3PcW7xqI2bR/APQPfW3xfhU
+8gDAVWkv0+LM76wcGdqfqXd/Z7P9ZtXb74qI575KZR6l+4v22ZYOn0yYL3wc0g3l
+jskF5qeTD4nuSqSzIanYAIo+0jy/BLY9gzFUQPS1Z4INtkEVwX9TO1IpwJvYpqYU
+0KpJSo5G5eyxM37iQWTTCbmq2byanRLlinXstQIDAQABAoIBAQChO+VBGQubTCEI
+P2/suznVxGPYt9vPzA7v3vioo/LijJGOlXGijr9MrvtMJSCyyrI0QqZOHAYoGTFr
+CLdip5v1pTVU9gvAWMjAYD3q8UTLzWJ9vS4FEj7f7GulvEzbdmfaPhYqX986JWa+
+ST+QUuBHdoW0S9ykMRxwVy8SOpWOA8YqfRbb9J4IYwbYXIDv7yJNE039x3cVqp1Q
+oSoOjW0rka0NObjjEJuJTZKpshze08B6gL1Vi7lcUWyeCXuDbMh18dSGEYU2YN2f
+9eMLXI981zgBP8BnnR6UuSR2PpsLRSkqC7ZPGZZXC/xP3Ln+I8YPmqMlUDtXeaMf
+zLmBGCoJAoGBAPl1sMFne3E4kFscjyYQytqED2h0DUF4zT4tefUL7wTwsTm6WTgW
+8xYlegW5kvdFsVq7PM1hLTNKK74QRoHFn+uwyCw9w9/fmU2FJ3BIB4MhFyQRu0MM
+J/3qJHHjILFz+gHYMtxsWEnAviWPPznxR0ocP+6eSE9HerZqOyBnpoP3AoGBANJj
+YDH1K8RneSTYDSqJ93yM2wE+Y0YutOeteJOyOtpA8Xdi7V81BcHo4aemjZ6kyjIF
+KydYbWh/9dekY89QrUOjQOwfFon7Gf3RHZAklgy4Kibkyt29fakP3m+CCdQJhPrM
+y/c5HpCG1M/pyizAg8O3l6bmn4QfNgH+DmOCTdGzAoGAEsvFV60+ZdeHOPY76vhU
+8IYGyy4DWa2KeWbfy5Dsn4irMdhSpKFGC6MjQI8s/aiopld5S1hJGZY7GYUMavbD
+B/U3/+1fdtzYJjkkMZebyUuS/MrBO1oNIVqlCFe+vOAqND1gB6+6L0Rwj0/tyaXe
+Yz0hrA8ND7wpCNmUPurQZx0CgYEAi3VYJIVx16UHRob4Y0RFCwiLe42RXMpFHHV+
+wdiY7meyKAMpeby57kmimvDqW0i8xt9qNZCGJYj8u0664oeF8pnaxSnuVNRf7EGb
+qRq3ZAMH3fQ3DTk4fMKKHbxDK4yL23u5kE0Kl57onlFItNWAAlJGclnZT0kpEbUI
+cKnFT8UCgYEApdfJ7GCA3vz45AWV9ya16BwfwTcmLnL2YsfbF+d1Rb3Frzl1G+kj
+UG8TuiRAF2oTQSlXaU1118Fty9DN5goC+N8NQuz6neVPD47on8J7BkjtfTVY7Jbi
+hDxOp9E0EpC5EfHarYyfst1/iWQqRbqJZe7414EhAlfL2T5a6Y05j/g=
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/test_rsa_key.pub

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzQNhPtJl68EAoLBh92nB
+pDlif2M61dS+HBoRinfWT5sD3CeJeMPmlj9vqOdmBzBfMuoHkr3QPVjTAvsTMtho
+VFKVUEA28eglFABZYP99+VDIKJtrrpXMkwjKBXaXP58QZ1bkQfMdNHuKC9xY7w4t
+pZP3q3PcW7xqI2bR/APQPfW3xfhU8gDAVWkv0+LM76wcGdqfqXd/Z7P9ZtXb74qI
+575KZR6l+4v22ZYOn0yYL3wc0g3ljskF5qeTD4nuSqSzIanYAIo+0jy/BLY9gzFU
+QPS1Z4INtkEVwX9TO1IpwJvYpqYU0KpJSo5G5eyxM37iQWTTCbmq2byanRLlinXs
+tQIDAQAB
+-----END PUBLIC KEY-----

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'rspectacular'
+
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }

data/spec/support/private_keys.rb

@@ -0,0 +1,19 @@
+require 'json/jwt'
+
+def test_private_key
+  OpenSSL::PKey::RSA.new File.read(File.expand_path('../fixtures/test_rsa_key', __dir__))
+end
+
+def valid_token(payload = { 'bar' => 'baz' })
+  @valid_token ||= begin
+                     jwt = JSON::JWT.new(payload)
+                     jws = jwt.sign(test_private_key, :RS256)
+                     jwe = jws.encrypt(test_private_key, :'RSA-OAEP', :A256GCM)
+
+                     jwe.to_s
+                   end
+end
+
+def invalid_token
+  @invalid_token ||= valid_token.tr('a', 'f')
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 4.0.0
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -64,12 +92,13 @@ files:
 - lib/apill.rb
 - lib/apill/accept_header.rb
 - lib/apill/configuration.rb
-- lib/apill/errors/invalid_api_request_error.rb
-- lib/apill/errors/invalid_subdomain_error.rb
-- lib/apill/matchers/accept_header_matcher.rb
-- lib/apill/matchers/generic_matcher.rb
-- lib/apill/matchers/subdomain_matcher.rb
-- lib/apill/matchers/version_matcher.rb
+- lib/apill/errors/invalid_api_request.rb
+- lib/apill/errors/invalid_subdomain.rb
+- lib/apill/errors/invalid_token.rb
+- lib/apill/matchers/accept_header.rb
+- lib/apill/matchers/generic.rb
+- lib/apill/matchers/subdomain.rb
+- lib/apill/matchers/version.rb
 - lib/apill/middleware/api_request.rb
 - lib/apill/parameters.rb
 - lib/apill/parameters/filter.rb
@@ -78,34 +107,45 @@ files:
 - lib/apill/parameters/sort.rb
 - lib/apill/processable_resource.rb
 - lib/apill/requests/base.rb
-- lib/apill/requests/rack_request.rb
-- lib/apill/requests/rails_request.rb
+- lib/apill/requests/rack.rb
+- lib/apill/requests/rails.rb
 - lib/apill/resource.rb
 - lib/apill/resource/model.rb
 - lib/apill/resource/processors/filtering.rb
 - lib/apill/resource/processors/indexing.rb
 - lib/apill/resource/processors/paging.rb
 - lib/apill/resource/processors/sorting.rb
-- lib/apill/responses/invalid_api_request_response.rb
-- lib/apill/responses/invalid_subdomain_response.rb
+- lib/apill/responses/invalid_api_request.rb
+- lib/apill/responses/invalid_subdomain.rb
+- lib/apill/responses/invalid_token.rb
 - lib/apill/serializers/json_api.rb
+- lib/apill/tokens/invalid_request_authorization.rb
+- lib/apill/tokens/null_request_authorization.rb
+- lib/apill/tokens/request_authorization.rb
 - lib/apill/version.rb
 - spec/apill/accept_header_spec.rb
-- spec/apill/errors/invalid_api_request_error_spec.rb
-- spec/apill/errors/invalid_subdomain_error_spec.rb
-- spec/apill/invalid_subdomain_response_spec.rb
-- spec/apill/matchers/accept_header_matcher_spec.rb
-- spec/apill/matchers/subdomain_matcher_spec.rb
-- spec/apill/matchers/version_matcher_spec.rb
+- spec/apill/errors/invalid_api_request_spec.rb
+- spec/apill/errors/invalid_subdomain_spec.rb
+- spec/apill/errors/invalid_token_spec.rb
+- spec/apill/invalid_subdomain_spec.rb
+- spec/apill/invalid_token_spec.rb
+- spec/apill/matchers/accept_header_spec.rb
+- spec/apill/matchers/subdomain_spec.rb
+- spec/apill/matchers/version_spec.rb
 - spec/apill/middleware/api_request_spec.rb
 - spec/apill/parameters_spec.rb
-- spec/apill/requests/rack_request_spec.rb
-- spec/apill/requests/rails_request_spec.rb
+- spec/apill/requests/rack_spec.rb
+- spec/apill/requests/rails_spec.rb
 - spec/apill/resource/model_spec.rb
 - spec/apill/resource/processors/filtering_spec.rb
 - spec/apill/resource/processors/indexing_spec.rb
 - spec/apill/resource/processors/paging_spec.rb
 - spec/apill/resource/processors/sorting_spec.rb
+- spec/apill/tokens/request_authorization_spec.rb
+- spec/fixtures/test_rsa_key
+- spec/fixtures/test_rsa_key.pub
+- spec/spec_helper.rb
+- spec/support/private_keys.rb
 homepage: https://github.com/jfelchner/apill
 licenses:
 - MIT
@@ -132,19 +172,25 @@ specification_version: 4
 summary: Common API functionality
 test_files:
 - spec/apill/accept_header_spec.rb
-- spec/apill/errors/invalid_api_request_error_spec.rb
-- spec/apill/errors/invalid_subdomain_error_spec.rb
-- spec/apill/invalid_subdomain_response_spec.rb
-- spec/apill/matchers/accept_header_matcher_spec.rb
-- spec/apill/matchers/subdomain_matcher_spec.rb
-- spec/apill/matchers/version_matcher_spec.rb
+- spec/apill/errors/invalid_api_request_spec.rb
+- spec/apill/errors/invalid_subdomain_spec.rb
+- spec/apill/errors/invalid_token_spec.rb
+- spec/apill/invalid_subdomain_spec.rb
+- spec/apill/invalid_token_spec.rb
+- spec/apill/matchers/accept_header_spec.rb
+- spec/apill/matchers/subdomain_spec.rb
+- spec/apill/matchers/version_spec.rb
 - spec/apill/middleware/api_request_spec.rb
 - spec/apill/parameters_spec.rb
-- spec/apill/requests/rack_request_spec.rb
-- spec/apill/requests/rails_request_spec.rb
+- spec/apill/requests/rack_spec.rb
+- spec/apill/requests/rails_spec.rb
 - spec/apill/resource/model_spec.rb
 - spec/apill/resource/processors/filtering_spec.rb
 - spec/apill/resource/processors/indexing_spec.rb
 - spec/apill/resource/processors/paging_spec.rb
 - spec/apill/resource/processors/sorting_spec.rb
-has_rdoc: 
+- spec/apill/tokens/request_authorization_spec.rb
+- spec/fixtures/test_rsa_key
+- spec/fixtures/test_rsa_key.pub
+- spec/spec_helper.rb
+- spec/support/private_keys.rb

data/lib/apill/matchers/accept_header_matcher.rb

@@ -1,15 +0,0 @@
-require 'apill/matchers/generic_matcher'
-
-module  Apill
-module  Matchers
-class   AcceptHeaderMatcher
-  include Apill::Matchers::GenericMatcher
-
-  def matches?(request)
-    super
-
-    accept_header.valid?
-  end
-end
-end
-end

data/lib/apill/requests/rack_request.rb

@@ -1,37 +0,0 @@
-require 'apill/configuration'
-require 'apill/requests/base'
-require 'apill/accept_header'
-
-module  Apill
-module  Requests
-class   RackRequest < Base
-  ACCEPT_PARAM_PATTERN = /(?:\A|&)accept=(.+?)(?=\z|&)/
-
-  attr_accessor :request
-
-  def initialize(request)
-    self.request = request
-  end
-
-  def accept_header_from_header
-    AcceptHeader.new(application: application_name,
-                     header:      request['HTTP_ACCEPT'] || '')
-  end
-
-  def accept_header_from_params
-    AcceptHeader.new(application: application_name,
-                     header:      raw_accept_header_from_params || '')
-  end
-
-  def application_name
-    request['HTTP_X_APPLICATION_NAME'] || Apill.configuration.application_name
-  end
-
-  private
-
-  def raw_accept_header_from_params
-    URI.unescape(request['QUERY_STRING'][ACCEPT_PARAM_PATTERN, 1] || '')
-  end
-end
-end
-end