apill 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3893065627f21a38207df0f237ef67613d0fbe
-  data.tar.gz: 9246e5feaba682181c5ad90e6f694351eabdf044
+  metadata.gz: 64584404ef059886afa2b62c3f93cec935403b70
+  data.tar.gz: 013020e5633701dad588d2ecfc560710e6c63052
 SHA512:
-  metadata.gz: 053e326bc6fd650e546df55c939d50b8198de7d1589e66bd5dd0c755cc7ba7752e37cd792b6ff56f1730241a1da3efeeaa5f161d903140ab71081be0ec3b17ca
-  data.tar.gz: 7ec2d27fc0da846a8c538fea7570cb63b2ddacc29da26d2e0acf65ae64595b7b5e12d06c42a1a179264d3183e416b27e461c0f1ca06720d29a62911b7634bd2b
+  metadata.gz: 1a221f3a0f1cf27bb149a08652107cfe1f0d4780d9fbcdae8dd357f4e54498822a7fb54b271e8d528ef1e888a8e6ad7710f770e78d5f750d3810d53093238344
+  data.tar.gz: 9984076eef45d1ede48945647204bda066214edf7dda7196906c8f07a7ef88cb8acc81601978be65ff8f875961273e0bba879726f2d13666315c25eecbc462c0

data/lib/apill/accept_header.rb

@@ -5,7 +5,7 @@ class   AcceptHeader
 
   def initialize(application:, header:)
     self.application       = application
-    self.raw_accept_header = header
+    self.raw_accept_header = header || ''
   end
 
   def version

data/lib/apill/matchers/generic_matcher.rb

@@ -13,10 +13,26 @@ module  GenericMatcher
   end
 
   def matches?(request)
-    raw_accept_header = request.headers['Accept'] || request.params['accept']
+    self.accept_header = get_accept_header(raw_header_from_headers: request.headers['Accept'],
+                                           raw_header_from_params:  request.params['accept'])
+  end
+
+  private
+
+  def get_accept_header(raw_header_from_headers:, raw_header_from_params:)
+    return accept_header_from_header if accept_header_from_header(raw_header_from_headers).valid? || raw_header_from_params.nil?
+
+    accept_header_from_params(raw_header_from_params)
+  end
+
+  def accept_header_from_header(raw_header_from_headers='')
+    @accept_header_from_header ||= Apill::AcceptHeader.new(application:  application,
+                                                           header:       raw_header_from_headers)
+  end
 
-    self.accept_header = Apill::AcceptHeader.new(application:  application,
-                                                 header:       raw_accept_header)
+  def accept_header_from_params(raw_header_from_params='')
+    @accept_header_from_params ||= Apill::AcceptHeader.new(application:  application,
+                                                           header:       raw_header_from_params)
   end
 end
 end

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'
 end

data/spec/lib/apill/accept_header_spec.rb

@@ -17,6 +17,18 @@ describe  AcceptHeader do
     expect(header).not_to be_valid
   end
 
+  it 'does not validate an accept header if it is not passed in' do
+    header = AcceptHeader.new(application:  '',
+                              header:       '')
+
+    expect(header).not_to be_valid
+
+    header = AcceptHeader.new(application:  '',
+                              header:       nil)
+
+    expect(header).not_to be_valid
+  end
+
   it 'does not validate an accept header without an application in the header' do
     header = AcceptHeader.new(application:  'matrix',
                               header:       'application/vnd.+zion;version=1.0.0')

data/spec/lib/apill/matchers/accept_header_matcher_spec.rb

@@ -7,6 +7,7 @@ module    Matchers
 describe  AcceptHeaderMatcher do
   it 'matches if the subdomain is API and the accept header is valid' do
     request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=1.0.0' },
+                             params:      {},
                              subdomains:  [ 'api' ])
 
     matcher = AcceptHeaderMatcher.new(application: 'matrix')
@@ -24,8 +25,42 @@ describe  AcceptHeaderMatcher do
     expect(matcher.matches?(request)).to be_truthy
   end
 
+  it 'matches the header accept header if the subdomain is API and the accept header is passed both as a valid header and as a parameter' do
+    request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=1.0.0' },
+                             params:      { 'accept' => 'application/vnd.matrix+zion;version=2.0.0'  },
+                             subdomains:  [ 'api' ])
+
+    matcher = AcceptHeaderMatcher.new(application: 'matrix')
+    matcher.matches?(request)
+
+    expect(matcher.accept_header.version).to eql '1.0.0'
+  end
+
+  it "matches the parameter's accept header if the subdomain is API and the accept header is passed both as an invalid header as well as as a parameter" do
+    request = OpenStruct.new(headers:     { 'Accept' => 'application/vndmatrix+zion;version=1.0.0' },
+                             params:      { 'accept' => 'application/vnd.matrix+zion;version=2.0.0'  },
+                             subdomains:  [ 'api' ])
+
+    matcher = AcceptHeaderMatcher.new(application: 'matrix')
+    matcher.matches?(request)
+
+    expect(matcher.accept_header.version).to eql '2.0.0'
+  end
+
+  it "matches the parameter's accept header if the subdomain is API and the accept header is passed both as an invalid header as well as as a parameter" do
+    request = OpenStruct.new(headers:     { 'Accept' => 'application/vndmatrix+zion;version=1.0.0' },
+                             params:      {},
+                             subdomains:  [ 'api' ])
+
+    matcher = AcceptHeaderMatcher.new(application: 'matrix')
+    matcher.matches?(request)
+
+    expect(matcher.accept_header.raw_accept_header).to eql 'application/vndmatrix+zion;version=1.0.0'
+  end
+
   it 'does not match if the subdomain is not API but the accept header is valid' do
     request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion' },
+                             params:      {},
                              subdomains:  [ 'not-api' ])
 
     matcher = AcceptHeaderMatcher.new(application: 'matrix')
@@ -35,6 +70,7 @@ describe  AcceptHeaderMatcher do
 
   it 'does not match if the subdomain is API but the accept header is invalid' do
     request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.' },
+                             params:      {},
                              subdomains:  [ 'api' ])
 
     matcher = AcceptHeaderMatcher.new(application: 'matrix')
@@ -44,6 +80,7 @@ describe  AcceptHeaderMatcher do
 
   it 'does not match if neither the subdomain is API nor the accept header is valid' do
     request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.' },
+                             params:      {},
                              subdomains:  [ 'not-api' ])
 
     matcher = AcceptHeaderMatcher.new(application: 'matrix')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - jfelchner