apill 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a7c0fbca0496aeea124a822878e016588313ce7
-  data.tar.gz: cec678014649e2cecab809f08b796aed030b4fce
+  metadata.gz: c6e916c78acf4e6b77bba21330da5ec51c64dc14
+  data.tar.gz: 5a52f7ab6a1ab045168db125dccf391fbde97e5b
 SHA512:
-  metadata.gz: 43de00df6f81a48bc49d0eaf567b0d2b6cd0987231bed6a66df0f8ae81fc9625a35b1a5edfbc5238858adc95537d4e682a9811b2405dc57c5733bb4464fd987c
-  data.tar.gz: f376b8f1f76281cce87392cfd45abeac90c266fbea707b1a70d44b4cdf07bc93ed7fb60de5e061fd3c6679d16c84c66cd40309cdcee0fcdfde8c0340b1afc6c7
+  metadata.gz: bbf3a7730599ec3d42223988e7e9732532dd72bde970aff017345c1cb4a3b959c7b7ae441f6b14795cac269fe944d9fbdfd92c2567e2f81ae76383bb523406dd
+  data.tar.gz: 882474601d4956b23b8aa815cc2ca91318639de79d26614e94694902db5c119332dfdfafa7b6ddf48ead4dab0a87a657320f0b4fca8d5766a720b39e92a7c07c

data/lib/apill/matchers/generic_matcher.rb

@@ -20,19 +20,21 @@ module  GenericMatcher
   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?
+    header_from_header = accept_header_from_header(raw_header_from_headers)
 
-    accept_header_from_params(raw_header_from_params)
+    return header_from_header if header_from_header.valid? || raw_header_from_params.nil?
+
+    accept_header_from_header(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)
+    Apill::AcceptHeader.new(application:  application,
+                            header:       raw_header_from_headers)
   end
 
   def accept_header_from_params(raw_header_from_params='')
-    @accept_header_from_params ||= Apill::AcceptHeader.new(application:  application,
-                                                           header:       raw_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.5.0'
+  VERSION = '1.6.0'
 end

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

@@ -7,7 +7,8 @@ module    Matchers
 describe  InvalidApiRequestMatcher do
   it 'is the inverse of whether the accept header matches' do
     request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=1.0.0' },
-                             subdomains:  [ 'api' ])
+                             subdomains:  [ 'api' ],
+                             params:      {})
 
     matcher = InvalidApiRequestMatcher.new(application: 'matrix')
 

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

@@ -7,7 +7,8 @@ module    Matchers
 describe  VersionMatcher do
   it 'raises an error when the accept header is not valid' do
     request = OpenStruct.new(headers:     { 'Accept' => 'matrix' },
-                             subdomains:  [ 'api' ])
+                             subdomains:  [ 'api' ],
+                             params:      {})
 
     matcher = VersionMatcher.new
 
@@ -17,7 +18,8 @@ describe  VersionMatcher do
   context 'when the version is passed in the accept header' do
     it 'does not match if the subdomain is not API but the request version is equal to the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=10.0' },
-                               subdomains:  [ 'not-api' ])
+                               subdomains:  [ 'not-api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.0')
@@ -27,7 +29,8 @@ describe  VersionMatcher do
 
     it 'does not match if the subdomain is API but the requested version does not equal the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=10.0' },
-                               subdomains:  [ 'api' ])
+                               subdomains:  [ 'api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.1')
@@ -37,7 +40,8 @@ describe  VersionMatcher do
 
     it 'does match if the subdomain is API and the requested version equals the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion;version=10.0' },
-                               subdomains:  [ 'api' ])
+                               subdomains:  [ 'api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.0')
@@ -49,7 +53,8 @@ describe  VersionMatcher do
   context 'when the version is not passed in the accept header' do
     it 'does not match if the subdomain is not API but the request version is equal to the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion' },
-                               subdomains:  [ 'not-api' ])
+                               subdomains:  [ 'not-api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.0',
@@ -60,7 +65,8 @@ describe  VersionMatcher do
 
     it 'does not match if the subdomain is API but the requested version does not equal the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion' },
-                               subdomains:  [ 'api' ])
+                               subdomains:  [ 'api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.1',
@@ -71,7 +77,8 @@ describe  VersionMatcher do
 
     it 'does match if the subdomain is API and the requested version equals the version constraint' do
       request = OpenStruct.new(headers:     { 'Accept' => 'application/vnd.matrix+zion' },
-                               subdomains:  [ 'api' ])
+                               subdomains:  [ 'api' ],
+                               params:      {})
 
       matcher = VersionMatcher.new(application:        'matrix',
                                    version_constraint: '10.0',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apill
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - jfelchner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: human_error
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,6 @@ files:
 - lib/apill/matchers/invalid_api_request_matcher.rb
 - lib/apill/matchers/subdomain_matcher.rb
 - lib/apill/matchers/version_matcher.rb
-- lib/apill/rescuable_resource.rb
 - lib/apill/responses/invalid_api_request_response.rb
 - lib/apill/version.rb
 - spec/lib/apill/accept_header_spec.rb
@@ -80,7 +79,6 @@ files:
 - spec/lib/apill/matchers/invalid_api_request_matcher_spec.rb
 - spec/lib/apill/matchers/subdomain_matcher_spec.rb
 - spec/lib/apill/matchers/version_matcher_spec.rb
-- spec/lib/apill/rescuable_resource_spec.rb
 homepage: https://github.com/jfelchner/apill
 licenses: []
 metadata: {}
@@ -101,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: apill
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Common API functionality
@@ -112,4 +110,4 @@ test_files:
 - spec/lib/apill/matchers/invalid_api_request_matcher_spec.rb
 - spec/lib/apill/matchers/subdomain_matcher_spec.rb
 - spec/lib/apill/matchers/version_matcher_spec.rb
-- spec/lib/apill/rescuable_resource_spec.rb
+has_rdoc: 

data/lib/apill/rescuable_resource.rb

@@ -1,59 +0,0 @@
-require 'human_error'
-
-module  Apill
-module  RescuableResource
-  module ClassMethods
-    def rescue_resource(resource_name, from:, via:)
-      lookup_library = via
-
-      if from.include? 'persistence'
-        rescue_from HumanError::Errors::ResourcePersistenceError do |e|
-          error = lookup_library.fetch(
-                  'ResourcePersistenceError',
-                  resource_name: e.resource_name,
-                  attributes:    e.attributes,
-                  errors:        e.errors,
-                  action:        action_name)
-
-          render json:   error,
-                 status: error.http_status
-        end
-      end
-
-      if from.include? 'not_found'
-        rescue_from HumanError::Errors::ResourceNotFoundError do |e|
-
-          resource_id = e.resource_id.is_a?(Array) ? e.resource_id : [e.resource_id]
-
-          error = lookup_library.fetch(
-                  'ResourceNotFoundError',
-                  resource_name: e.resource_name,
-                  resource_id:   resource_id,
-                  action:        action_name)
-
-          render json:   error,
-                 status: error.http_status
-        end
-      end
-
-      if from.include? 'association'
-        rescue_from HumanError::Errors::AssociationError do |e|
-          error = lookup_library.fetch(
-                  'AssociationError',
-                  resource_name:    e.resource_name,
-                  association_name: e.association_name,
-                  association_id:   e.association_id,
-                  attributes:       e.attributes)
-
-          render json:   error,
-                 status: error.http_status
-        end
-      end
-    end
-  end
-
-  def self.included(base)
-    base.extend ClassMethods
-  end
-end
-end

data/spec/lib/apill/rescuable_resource_spec.rb

@@ -1,7 +0,0 @@
-require 'rspectacular'
-require 'apill/rescuable_resource'
-
-module    Apill
-describe  RescuableResource do
-end
-end