apill 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4978fd82cf24f21bcbedf34a5086842fd0c82f8a
-  data.tar.gz: 45e18274d4ed90d8d7d377c2746eb0a858ff311d
+  metadata.gz: fc3893065627f21a38207df0f237ef67613d0fbe
+  data.tar.gz: 9246e5feaba682181c5ad90e6f694351eabdf044
 SHA512:
-  metadata.gz: 687871c4ad8068fddd8317dc19845677ec74bba3b70700a2a2b1eace782738984944bc440ba864b9fc7eef27d237896856a5de433fdba7e9f94bc34d8d72db28
-  data.tar.gz: c22b38830eeaab0fae13aa878258eb4acc7e913cd179a2174da2e09669ed12717f0bbfdac2c5a50730a107eb756833e258243efec5f88ddd1554aca5a7b46b48
+  metadata.gz: 053e326bc6fd650e546df55c939d50b8198de7d1589e66bd5dd0c755cc7ba7752e37cd792b6ff56f1730241a1da3efeeaa5f161d903140ab71081be0ec3b17ca
+  data.tar.gz: 7ec2d27fc0da846a8c538fea7570cb63b2ddacc29da26d2e0acf65ae64595b7b5e12d06c42a1a179264d3183e416b27e461c0f1ca06720d29a62911b7634bd2b

data/lib/apill/matchers/generic_matcher.rb

@@ -13,8 +13,10 @@ module  GenericMatcher
   end
 
   def matches?(request)
+    raw_accept_header = request.headers['Accept'] || request.params['accept']
+
     self.accept_header = Apill::AcceptHeader.new(application:  application,
-                                                 header:       request.headers['Accept'])
+                                                 header:       raw_accept_header)
   end
 end
 end

data/lib/apill/version.rb

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

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

@@ -14,6 +14,16 @@ describe  AcceptHeaderMatcher do
     expect(matcher.matches?(request)).to be_truthy
   end
 
+  it 'matches if the subdomain is API and the accept header is passed in as a parameter' do
+    request = OpenStruct.new(headers:     {},
+                             params:      { 'accept' => 'application/vnd.matrix+zion;version=1.0.0'  },
+                             subdomains:  [ 'api' ])
+
+    matcher = AcceptHeaderMatcher.new(application: 'matrix')
+
+    expect(matcher.matches?(request)).to be_truthy
+  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' },
                              subdomains:  [ 'not-api' ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error