apill 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a868c1d22d4ed7815afb667e309f54dafcbf70c9
-  data.tar.gz: 70eb9a1d4ea3c9b061febe6eeb6c1fd975abc43f
+  metadata.gz: 03e1a8c3d7621029eab5a87a4180786a121230f9
+  data.tar.gz: 434bd913e8c60b006c33f4144a22a5ac5917ae28
 SHA512:
-  metadata.gz: 92c289f7396d2523847834b5f7a25074c71384387434d987b8eb65fc174d44df7487adde5004eac3521d1493d410bea739588b7fd0ba9e867ad0b897194d9c95
-  data.tar.gz: d63a1ec7bbfa94244eba6c3f706c6fa71dee5260bd51c7c40cf8042f148ebf24787f73c4a2f2a47a8f45730c2a57772dd4c009d6d05f69e5d56981ce6a6cc9f6
+  metadata.gz: b9ac29a6cc63975df8d0b54b3b369fd54be33c675a81fad922221877c65812cf681d40346363c4b249341e3b91e78d8bc0b012c25e095a9be01a2d8a3340995a
+  data.tar.gz: 79b641b0689d7ae9e4c2ed79f17c370b212ac775ae09a701e5c6563901d291088b9f8be4ce63cd19dc7052d1f72d3730467b503ecda8e25bf6f433b24be095ff

data/lib/apill/matchers/accept_header.rb

@@ -5,7 +5,9 @@ module  Matchers
 class   AcceptHeader
   include Generic
 
-  def matches?
+  def matches?(request)
+    super
+
     accept_header.valid?
   end
 end

data/lib/apill/matchers/generic.rb

@@ -5,14 +5,22 @@ module  Generic
                 :accept_header,
                 :request
 
-  def initialize(request:, **args)
+  def initialize(**args)
     args.each do |variable, value|
       __send__("#{variable}=", value)
     end
+  end
+
+  def matches?(request)
+    self.request = request
+  end
+
+  def application
+    request.application_name
+  end
 
-    self.request       = request
-    self.application   = request.application_name
-    self.accept_header = request.accept_header
+  def accept_header
+    request.accept_header
   end
 end
 end

data/lib/apill/matchers/subdomain.rb

@@ -2,19 +2,21 @@ module  Apill
 module  Matchers
 class   Subdomain
   def initialize(allowed_subdomains:     Apill.configuration.allowed_subdomains,
-                 allowed_api_subdomains: Apill.configuration.allowed_api_subdomains,
-                 request:)
+                 allowed_api_subdomains: Apill.configuration.allowed_api_subdomains)
 
     self.allowed_subdomains     = Array(allowed_subdomains)
     self.allowed_api_subdomains = Array(allowed_api_subdomains)
-    self.request                = request
   end
 
-  def matches?
+  def matches?(request)
+    self.request = request
+
     allowed_subdomains.include? request.subdomain
   end
 
-  def matches_api_subdomain?
+  def matches_api_subdomain?(request)
+    self.request = request
+
     allowed_api_subdomains.include? request.subdomain
   end
 

data/lib/apill/matchers/version.rb

@@ -9,7 +9,9 @@ class   Version
   attr_accessor :version_constraint,
                 :default_version
 
-  def matches?
+  def matches?(request)
+    super
+
     requested_version == version_constraint
   end
 

data/lib/apill/middleware/api_request.rb

@@ -19,13 +19,13 @@ class   ApiRequest
     env['HTTP_X_APPLICATION_NAME'] = Apill.configuration.application_name
 
     request               = Requests::Base.resolve(env)
-    subdomain_matcher     = Matchers::Subdomain.new(request: request)
-    accept_header_matcher = Matchers::AcceptHeader.new(request: request)
+    subdomain_matcher     = Matchers::Subdomain.new
+    accept_header_matcher = Matchers::AcceptHeader.new
     token                 = request.authorization_token
 
-    return Responses::InvalidSubdomain.call(env)  unless subdomain_matcher.matches?
-    return Responses::InvalidApiRequest.call(env) unless !subdomain_matcher.matches_api_subdomain? ||
-                                                         accept_header_matcher.matches?
+    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)      unless token.valid?
 
     env['HTTP_X_JSON_WEB_TOKEN'] = token.to_h

data/lib/apill/version.rb

@@ -1,3 +1,3 @@
 module Apill
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.0.1'.freeze
 end

data/spec/apill/matchers/accept_header_spec.rb

@@ -12,9 +12,9 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
+    matcher = AcceptHeader.new
 
-    expect(matcher).to be_matches
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'matches if the subdomain is API and the accept header is passed in as ' \
@@ -26,9 +26,9 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
+    matcher = AcceptHeader.new
 
-    expect(matcher).to be_matches
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'matches if the subdomain is API and the accept header is passed in as a ' \
@@ -41,9 +41,9 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
+    matcher = AcceptHeader.new
 
-    expect(matcher).to be_matches
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'matches the header accept header if the subdomain is API and the accept header ' \
@@ -56,8 +56,8 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
-    matcher.matches?
+    matcher = AcceptHeader.new
+    matcher.matches?(request)
 
     expect(matcher.accept_header.version).to eql '1.0.0'
   end
@@ -72,8 +72,8 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
-    matcher.matches?
+    matcher = AcceptHeader.new
+    matcher.matches?(request)
 
     expect(matcher.accept_header.version).to eql '2.0.0'
   end
@@ -88,8 +88,8 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
-    matcher.matches?
+    matcher = AcceptHeader.new
+    matcher.matches?(request)
 
     expect(matcher.accept_header.raw_accept_header).to eql \
       'application/vndmatrix+zion;version=1.0.0'
@@ -103,9 +103,9 @@ describe  AcceptHeader do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = AcceptHeader.new(request: request)
+    matcher = AcceptHeader.new
 
-    expect(matcher).not_to be_matches
+    expect(matcher.matches?(request)).to be_a FalseClass
   end
 end
 end

data/spec/apill/matchers/subdomain_spec.rb

@@ -14,67 +14,63 @@ describe  Subdomain do
   it 'matches if the subdomain is API' do
     env     = { 'HTTP_HOST' => 'api.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(request: request)
+    matcher = Subdomain.new
 
-    expect(matcher.matches?).to be_a TrueClass
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'matches if the first subdomain is API' do
     env     = { 'HTTP_HOST' => 'api.matrix.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(request: request)
+    matcher = Subdomain.new
 
-    expect(matcher.matches?).to be_a TrueClass
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'does not match if the first subdomain is not API' do
     env     = { 'HTTP_HOST' => 'matrix.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(request: request)
+    matcher = Subdomain.new
 
-    expect(matcher.matches?).to be_a FalseClass
+    expect(matcher.matches?(request)).to be_a FalseClass
   end
 
   it 'allows the matched subdomain to be specified' do
     env     = { 'HTTP_HOST' => 'matrix.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(allowed_subdomains: 'matrix',
-                            request:            request)
+    matcher = Subdomain.new(allowed_subdomains: 'matrix')
 
-    expect(matcher.matches?).to be_a TrueClass
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'allows more than one subdomain to be matched' do
     env     = { 'HTTP_HOST' => 'matrix.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(allowed_subdomains: %w{api matrix},
-                            request:            request)
+    matcher = Subdomain.new(allowed_subdomains: %w{api matrix})
 
-    expect(matcher.matches?).to be_a TrueClass
+    expect(matcher.matches?(request)).to be_a TrueClass
 
     env     = { 'HTTP_HOST' => 'api.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(allowed_subdomains: %w{api matrix},
-                            request:            request)
+    matcher = Subdomain.new(allowed_subdomains: %w{api matrix})
 
-    expect(matcher.matches?).to be_a TrueClass
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 
   it 'can match only the api subdomain' do
     env     = { 'HTTP_HOST' => 'matrix.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(allowed_api_subdomains: %w{matrix},
-                            request:                request)
+    matcher = Subdomain.new(allowed_api_subdomains: %w{matrix})
 
-    expect(matcher.matches_api_subdomain?).to be_a TrueClass
+    expect(matcher.matches_api_subdomain?(request)).to be_a TrueClass
   end
 
   it 'matches "api" as an api subdomain by default' do
     env     = { 'HTTP_HOST' => 'api.example.com' }
     request = Requests::Base.resolve(env)
-    matcher = Subdomain.new(request: request)
+    matcher = Subdomain.new
 
-    expect(matcher.matches_api_subdomain?).to be_a TrueClass
+    expect(matcher.matches_api_subdomain?(request)).to be_a TrueClass
   end
 end
 end

data/spec/apill/matchers/version_spec.rb

@@ -15,10 +15,9 @@ describe  Version do
       }
       request = Requests::Base.resolve(env)
 
-      matcher = Version.new(request:            request,
-                            version_constraint: '10.1')
+      matcher = Version.new(version_constraint: '10.1')
 
-      expect(matcher).not_to be_matches
+      expect(matcher.matches?(request)).to be_a FalseClass
     end
 
     it 'does match if the subdomain is API and the requested version equals the ' \
@@ -30,10 +29,9 @@ describe  Version do
       }
       request = Requests::Base.resolve(env)
 
-      matcher = Version.new(request:            request,
-                            version_constraint: '10.0')
+      matcher = Version.new(version_constraint: '10.0')
 
-      expect(matcher).to be_matches
+      expect(matcher.matches?(request)).to be_a TrueClass
     end
   end
 
@@ -47,11 +45,10 @@ describe  Version do
       }
       request = Requests::Base.resolve(env)
 
-      matcher = Version.new(request:            request,
-                            version_constraint: '10.1',
+      matcher = Version.new(version_constraint: '10.1',
                             default_version:    '10.0')
 
-      expect(matcher).not_to be_matches
+      expect(matcher.matches?(request)).to be_a FalseClass
     end
 
     it 'does match if the subdomain is API and the requested version equals the ' \
@@ -63,11 +60,10 @@ describe  Version do
       }
       request = Requests::Base.resolve(env)
 
-      matcher = Version.new(request:            request,
-                            version_constraint: '10.0',
+      matcher = Version.new(version_constraint: '10.0',
                             default_version:    '10.0')
 
-      expect(matcher).to be_matches
+      expect(matcher.matches?(request)).to be_a TrueClass
     end
   end
 
@@ -80,10 +76,9 @@ describe  Version do
     }
     request = Requests::Base.resolve(env)
 
-    matcher = Version.new(request:            request,
-                          version_constraint: '100.0')
+    matcher = Version.new(version_constraint: '100.0')
 
-    expect(matcher).to be_matches
+    expect(matcher.matches?(request)).to be_a TrueClass
   end
 end
 end

metadata

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