apiphobic-middleware 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38f3144a28a7e5930de852652b7c9a41687dbc2fb2fd92b85e46c1eaa3bd68e5
-  data.tar.gz: 0d936500afb0ef3efd63978fbcf7bfc00bccfcfd7f6a2228cddcfa83e7dc3a7a
+  metadata.gz: '039dac832a93a77e67edf09b2e1e547a669e81af0f4ff8ef5e8a188a77398bf8'
+  data.tar.gz: b7e3a83fb112a41fb340a367ac1cca30a7de7f1b3c95d44a17a6a2c864ae63dc
 SHA512:
-  metadata.gz: efcb56a6173466a943720ae94eb095ece3f6c9aab8dffca330601976f95d820427d162ff6ffcdf7a840ca667ea2d25b5584c9561107665b1b8f74f32f2fec6dd
-  data.tar.gz: b817f214a07895839909625b838d6007d67a8bbf2f01537b9ccdf9359d4ac131cecf0459311d316aea865dd4a187914082db3574db0142d4cf0a4c5b259be330
+  metadata.gz: 7a979765e449b759eac028910d132fd7838f477b327cb7c950a2fb9bf9709225d9c4cf6229a3fef466eb5f2eaafb23d141b27366f7c1f3e96bb50494c43d05cc
+  data.tar.gz: 90368b2578d966f0d6190ed2e721f589c3aeb644b7ee3d06e03fc32c5a33f92edbc7359d57f5c62ecebdc4c869a2bfcbce3bffe59dd1c84e1ca8ee212d18e2d7

data.tar.gz.sig

@@ -1,2 +1,2 @@
-Ӊo�ò����KD�/�>z��.@�2����'�
-�a�b~U%*���O׸=W\G���3�Z���;)�(G
3'�K��H��"9ʅ��ј���6�
+lx���o!����"��ȿ����&����������O:2A��ѥ~*?��&�W�U�{�C����!��d�iu�I���&]��T|#�;�I�2x���oh�y�`����P���o�kPI�
�v@x�"0D
+$�e�qz�@�#D��ꃒ�������-_�9G���P�.��1��
v�/�;�B��CA�lr��'ݑi�~=_���cB>������K*��\>u�>H���T�	��Ǒ�X�!E���9_�B

data/lib/apiphobic-middleware.rb

@@ -4,6 +4,7 @@ require 'apiphobic/matchers/version'
 require 'apiphobic/middleware/configuration'
 require 'apiphobic/middleware/converters/content_type'
 require 'apiphobic/middleware/converters/json_api_parameters'
+require 'apiphobic/middleware/converters/request_method'
 require 'apiphobic/middleware/validators/accept_header'
 require 'apiphobic/middleware/validators/authorization_token'
 require 'apiphobic/middleware/validators/subdomain'

data/lib/apiphobic/middleware/configuration.rb

@@ -9,15 +9,17 @@ module  Middleware
 
     attr_accessor :application_name
     attr_writer   :allowed_api_subdomains,
+                  :allowed_method_overrides,
                   :allowed_subdomains,
                   :default_api_version
 
     def to_h
       {
-        allowed_api_subdomains: allowed_api_subdomains,
-        allowed_subdomains:     allowed_subdomains,
-        application_name:       application_name,
-        default_api_version:    default_api_version,
+        allowed_api_subdomains:   allowed_api_subdomains,
+        allowed_method_overrides: allowed_method_overrides,
+        allowed_subdomains:       allowed_subdomains,
+        application_name:         application_name,
+        default_api_version:      default_api_version,
       }
     end
 
@@ -25,6 +27,10 @@ module  Middleware
       @allowed_subdomains || ['api']
     end
 
+    def allowed_method_overrides
+      @allowed_method_overrides || {}
+    end
+
     def allowed_api_subdomains
       @allowed_api_subdomains || ['api']
     end

data/lib/apiphobic/middleware/converters/request_method.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'rack'
+require 'apiphobic/middleware/configurable'
+
+module  Apiphobic
+module  Middleware
+module  Converters
+class   RequestMethod
+  include Configurable
+
+  OVERRIDE_KEY = '_method'
+
+  attr_accessor :request
+
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    self.request      = Rack::Request.new(env)
+    allowed_overrides = configuration.allowed_method_overrides
+
+    allowed_overrides.each do |path_pattern, method_mappings|
+      path_pattern = path_pattern
+                       .gsub(':uuid', '[0-9a-f]{8}\\-(?:[0-9a-f]{4}\\-){3}[0-9a-f]{12}')
+
+      next unless env['PATH_INFO'] =~ Regexp.new("\\A#{path_pattern}\\z")
+
+      method_mappings.each do |from, to|
+        next unless from.include?(env['REQUEST_METHOD'].downcase)
+        next unless to.include?(overridden_method.downcase)
+
+        env['rack.methodoverride.original_method'] = env['REQUEST_METHOD']
+        env['REQUEST_METHOD']                      = overridden_method.upcase
+      end
+    end
+
+    @app.call(env)
+  end
+
+  private
+
+  def overridden_method
+    @overridden_method ||= (request.query_string && request.GET[OVERRIDE_KEY])  ||
+                           (request.body         && request.POST[OVERRIDE_KEY]) ||
+                           ''
+  end
+end
+end
+end
+end

data/lib/apiphobic/middleware/version.rb

@@ -2,6 +2,6 @@
 
 module Apiphobic
 module Middleware
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end
 end

data/lib/apiphobic/requests/transform_json_api.rb

@@ -20,8 +20,8 @@ class   TransformJsonApi
     request['QUERY_STRING'] = query_string_with_underscored_parameters
 
     if has_content? && json?
-      request[content_parameter] = request_body_with_underscored_json_keys
-      request['CONTENT_LENGTH']  = content_length.to_s
+      request['rack.input']     = request_body_with_underscored_json_keys
+      request['CONTENT_LENGTH'] = content_length.to_s
     end
 
     request
@@ -41,16 +41,8 @@ class   TransformJsonApi
     underscored_request_json.bytesize
   end
 
-  def content_parameter
-    request['rack.input'] ? 'rack.input' : 'RACK_INPUT'
-  end
-
   def request_body_with_underscored_json_keys
-    @request_body_with_underscored_json_keys ||= if content_parameter == 'rack.input'
-                                                   StringIO.new(underscored_request_json)
-                                                 else
-                                                   underscored_request_json
-                                                 end
+    @request_body_with_underscored_json_keys ||= StringIO.new(underscored_request_json)
   end
 
   def query_string_with_underscored_parameters
@@ -79,11 +71,9 @@ class   TransformJsonApi
   end
 
   def request_body
-    if request['rack.input']
-      request['rack.input'].read
-    else
-      request['RACK_INPUT'].to_s
-    end
+    request['rack.input']&.read.to_s
+  ensure
+    request['rack.input']&.rewind
   end
 
   def query_string

data/lib/apiphobic/responses/invalid_request_body.rb

@@ -8,7 +8,7 @@ module  Responses
 class   InvalidRequestBody < Responses::Invalid
   def self.call(env)
     error ||= Errors::InvalidRequestBody.new(
-                request_body: (env['rack.input'] || env['RACK_INPUT']).to_s,
+                request_body: env['rack.input'].read,
               )
 
     super(env, error: error)

data/lib/apiphobic/responses/transform_json_api.rb

@@ -24,19 +24,11 @@ class   TransformJsonApi
   private
 
   def transformed_headers
-    headers[content_parameter] = transformed_body
+    headers['rack.input'] = StringIO.new(transformed_json_body)
 
     headers
   end
 
-  def transformed_body
-    if content_parameter == 'rack.input'
-      StringIO.new(transformed_json_body)
-    else
-      transformed_json_body
-    end
-  end
-
   def transformed_json_body
     return request_body if request_body == '' || request_body.nil?
 
@@ -50,20 +42,12 @@ class   TransformJsonApi
     JSON.dump(request_hash)
   end
 
-  def content_parameter
-    headers['rack.input'] ? 'rack.input' : 'RACK_INPUT'
-  end
-
   def request_hash
     @request_hash ||= JSON.parse(request_body)
   end
 
   def request_body
-    @request_body ||= if headers['rack.input']
-                        headers['rack.input'].read
-                      else
-                        headers['RACK_INPUT'].to_s
-                      end
+    @request_body ||= headers['rack.input']&.read.to_s
   ensure
     headers['rack.input']&.rewind
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-middleware
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,42 +31,42 @@ cert_chain:
   Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
   iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
   -----END CERTIFICATE-----
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: apple_core
+  name: apiphobic-tokens
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: apiphobic-tokens
+  name: apple_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: erratum
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +87,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +164,7 @@ files:
 - lib/apiphobic/middleware/configuration.rb
 - lib/apiphobic/middleware/converters/content_type.rb
 - lib/apiphobic/middleware/converters/json_api_parameters.rb
+- lib/apiphobic/middleware/converters/request_method.rb
 - lib/apiphobic/middleware/validators/accept_header.rb
 - lib/apiphobic/middleware/validators/authorization_token.rb
 - lib/apiphobic/middleware/validators/subdomain.rb