apill 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41dbbd09521bd427f70a8dfc9bfb7c7411baca58
-  data.tar.gz: 5b179a4f48e2d04540e619b8345076c0c11f0913
+  metadata.gz: 84cdbb1edbe6823c31603457adf4e28647ae92d4
+  data.tar.gz: ce3b2f2cd39ab8c954bb8f969dce56ee632a82c3
 SHA512:
-  metadata.gz: f906c4e6e315ff6736bf19ac93979c61e86ef91943306ec030c82232a755077cd99bee527361453c6d01c69d8211891bc6300ae6d883ff16767def3c5a38e338
-  data.tar.gz: be25e897202fd0fe8fbc9b835cfddcb231fc76489b979b3362374adc952530995fb0caa2e775e9689006e52e0e4f16ee94c889a11aa9788b01e9f4688f071da0
+  metadata.gz: 14ac59381e4af74ed3712e93eaecdcd4b3ddb0ca45e625726020e8151e71ccba9e5ec442a3c1a67bf0680b38343929c3da6a437399899dc855d4edfe2381935c
+  data.tar.gz: cea48add76380d77070d4ca115d29910a495e13d50a0d0bb2399dec04131b7393ecee3fd294eb2939091d079f2efaa51395cb0883d1da4fb98c9416997da36ab

data/lib/apill/configuration.rb

@@ -2,20 +2,26 @@ module  Apill
   class Configuration
     attr_accessor \
       :allowed_subdomains,
+      :allowed_api_subdomains,
       :application_name,
       :default_api_version
 
     def to_h
       {
-        allowed_subdomains:  allowed_subdomains,
-        application_name:    application_name,
-        default_api_version: api_version,
+        allowed_subdomains:     allowed_subdomains,
+        allowed_api_subdomains: allowed_api_subdomains,
+        application_name:       application_name,
+        default_api_version:    default_api_version,
       }
     end
-  end
 
-  def allowed_subdomains
-    @allowed_subdomains || ['api']
+    def allowed_subdomains
+      @allowed_subdomains || ['api']
+    end
+
+    def allowed_api_subdomains
+      @allowed_api_subdomains || ['api']
+    end
   end
 
   def self.configure

data/lib/apill/matchers/subdomain_matcher.rb

@@ -1,19 +1,34 @@
 module  Apill
 module  Matchers
 class   SubdomainMatcher
-  def initialize(allowed_subdomains: Apill.configuration.allowed_subdomains)
-    self.allowed_subdomains = Array(allowed_subdomains)
-  end
+  def initialize(allowed_subdomains:     Apill.configuration.allowed_subdomains,
+                 allowed_api_subdomains: Apill.configuration.allowed_api_subdomains,
+                 request:)
 
-  def matches?(request)
-    request_subdomain = request['HTTP_HOST'][/\A([a-z\-]+)/i, 1]
+    self.allowed_subdomains     = Array(allowed_subdomains)
+    self.allowed_api_subdomains = Array(allowed_api_subdomains)
+    self.request                = request
+  end
 
+  def matches?
     allowed_subdomains.include? request_subdomain
   end
 
+  def matches_api_subdomain?
+    allowed_api_subdomains.include? request_subdomain
+  end
+
   protected
 
-  attr_accessor :allowed_subdomains
+  attr_accessor :allowed_subdomains,
+                :allowed_api_subdomains,
+                :request
+
+  private
+
+  def request_subdomain
+    @request_subdomain ||= request['HTTP_HOST'][/\A([a-z\-]+)/i, 1]
+  end
 end
 end
 end

data/lib/apill/middleware/api_request.rb

@@ -14,8 +14,12 @@ class   ApiRequest
   def call(env)
     env['HTTP_X_APPLICATION_NAME'] = Apill.configuration.application_name
 
-    if Matchers::SubdomainMatcher.new.matches?(env)
-      if Matchers::AcceptHeaderMatcher.new.matches?(env)
+    subdomain_matcher = Matchers::SubdomainMatcher.new(request: env)
+
+    if subdomain_matcher.matches?
+      if !subdomain_matcher.matches_api_subdomain? ||
+          Matchers::AcceptHeaderMatcher.new.matches?(env)
+
         @app.call(env)
       else
         Responses::InvalidApiRequestResponse.call(env)

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/spec/apill/matchers/subdomain_matcher_spec.rb

@@ -1,49 +1,71 @@
 require 'rspectacular'
 require 'apill/matchers/subdomain_matcher'
+require 'apill/configuration'
 
 module    Apill
 module    Matchers
 describe  SubdomainMatcher do
   before(:each) do
-    Apill.configuration.allowed_subdomains = %w{api}
+    Apill.configuration.allowed_subdomains     = %w{api}
+    Apill.configuration.allowed_api_subdomains = %w{api}
   end
 
   it 'matches if the subdomain is API' do
-    matcher = SubdomainMatcher.new
     request = { 'HTTP_HOST' => 'api.example.com' }
+    matcher = SubdomainMatcher.new(request: request)
 
-    expect(matcher.matches?(request)).to be_a TrueClass
+    expect(matcher.matches?).to be_a TrueClass
   end
 
   it 'matches if the first subdomain is API' do
-    matcher = SubdomainMatcher.new
     request = { 'HTTP_HOST' => 'api.matrix.example.com' }
+    matcher = SubdomainMatcher.new(request: request)
 
-    expect(matcher.matches?(request)).to be_a TrueClass
+    expect(matcher.matches?).to be_a TrueClass
   end
 
   it 'does not match if the first subdomain is not API' do
-    matcher = SubdomainMatcher.new
     request = { 'HTTP_HOST' => 'matrix.example.com' }
+    matcher = SubdomainMatcher.new(request: request)
 
-    expect(matcher.matches?(request)).to be_a FalseClass
+    expect(matcher.matches?).to be_a FalseClass
   end
 
   it 'allows the matched subdomain to be specified' do
-    matcher = SubdomainMatcher.new(allowed_subdomains: 'matrix')
     request = { 'HTTP_HOST' => 'matrix.example.com' }
+    matcher = SubdomainMatcher.new(allowed_subdomains: 'matrix',
+                                   request:            request)
 
-    expect(matcher.matches?(request)).to be_a TrueClass
+    expect(matcher.matches?).to be_a TrueClass
   end
 
   it 'allows more than one subdomain to be matched' do
-    matcher = SubdomainMatcher.new(allowed_subdomains: %w{api matrix})
+    request = { 'HTTP_HOST' => 'matrix.example.com' }
+    matcher = SubdomainMatcher.new(allowed_subdomains: %w{api matrix},
+                                   request:            request)
+
+    expect(matcher.matches?).to be_a TrueClass
 
+    request = { 'HTTP_HOST' => 'api.example.com' }
+    matcher = SubdomainMatcher.new(allowed_subdomains: %w{api matrix},
+                                   request:            request)
+
+    expect(matcher.matches?).to be_a TrueClass
+  end
+
+  it 'can match only the api subdomain' do
     request = { 'HTTP_HOST' => 'matrix.example.com' }
-    expect(matcher.matches?(request)).to be_a TrueClass
+    matcher = SubdomainMatcher.new(allowed_api_subdomains: %w{matrix},
+                                   request:                request)
+
+    expect(matcher.matches_api_subdomain?).to be_a TrueClass
+  end
 
+  it 'matches "api" as an api subdomain by default' do
     request = { 'HTTP_HOST' => 'api.example.com' }
-    expect(matcher.matches?(request)).to be_a TrueClass
+    matcher = SubdomainMatcher.new(request: request)
+
+    expect(matcher.matches_api_subdomain?).to be_a TrueClass
   end
 end
 end

data/spec/apill/middleware/api_request_spec.rb

@@ -14,11 +14,28 @@ describe  ApiRequest do
     end
 
     Apill.configure do |config|
-      config.allowed_subdomains = %w{api}
-      config.application_name   = 'matrix'
+      config.allowed_subdomains     = %w{api matrix}
+      config.allowed_api_subdomains = %w{api}
+      config.application_name       = 'matrix'
     end
   end
 
+  it 'allows requests for allowed subdomains without accept headers' do
+    api_request_middleware = ApiRequest.new(app)
+
+    request = {
+      'HTTP_HOST'    => 'matrix.example.com',
+      'HTTP_ACCEPT'  => '',
+      'QUERY_STRING' => '',
+    }
+
+    status, headers, response = api_request_middleware.call(request)
+
+    expect(status).to   eql 200
+    expect(headers).to  eql({})
+    expect(response).to eql 'response'
+  end
+
   it 'does not allow requests if they are not for an allowed subdomain' do
     api_request_middleware = ApiRequest.new(app)
 
@@ -31,7 +48,7 @@ describe  ApiRequest do
     status, headers, response = api_request_middleware.call(request)
 
     expect(status).to   eql 404
-    expect(headers).to  eql Hash.new
+    expect(headers).to  eql({})
     expect(response).to eql(
       [
         '{' \
@@ -72,7 +89,7 @@ describe  ApiRequest do
     status, headers, response = api_request_middleware.call(request)
 
     expect(status).to   eql 400
-    expect(headers).to  eql Hash.new
+    expect(headers).to  eql({})
     expect(response).to eql(
       [
         '{' \
@@ -111,7 +128,7 @@ describe  ApiRequest do
     status, headers, response = api_request_middleware.call(request)
 
     expect(status).to   eql 200
-    expect(headers).to  eql Hash.new
+    expect(headers).to  eql({})
     expect(response).to eql 'response'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error