apiphobic-middleware 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5fc848c052df27e6f94826ab6401718c276e1d24f1055b3eda185591cee5362
-  data.tar.gz: 9a20b4f0002aa360ec928e7cc501721b85b75afd28463c629e6f78be4c942b89
+  metadata.gz: 38f3144a28a7e5930de852652b7c9a41687dbc2fb2fd92b85e46c1eaa3bd68e5
+  data.tar.gz: 0d936500afb0ef3efd63978fbcf7bfc00bccfcfd7f6a2228cddcfa83e7dc3a7a
 SHA512:
-  metadata.gz: 9a079597f41bebd6ada817d9470b974f86f3e66678bc2a342bfe6e3bd1adcf8333cc9e635456aa6a6f54637bcb7a7e8582bd8e39f5f34517854a18bcc1b4a713
-  data.tar.gz: 78bcf6c812b9017d35172a3dc0e494311227b0f8df6321bbc3e9b6afa7fdfdf8ea561f8a8f6d4b46014be9c249095cdd342c9e128549a486fda07a9f6b542d57
+  metadata.gz: efcb56a6173466a943720ae94eb095ece3f6c9aab8dffca330601976f95d820427d162ff6ffcdf7a840ca667ea2d25b5584c9561107665b1b8f74f32f2fec6dd
+  data.tar.gz: b817f214a07895839909625b838d6007d67a8bbf2f01537b9ccdf9359d4ac131cecf0459311d316aea865dd4a187914082db3574db0142d4cf0a4c5b259be330

data/lib/apiphobic/matchers/version.rb

@@ -22,8 +22,8 @@ class   Version
     self.version_constraint = version_constraint
   end
 
-  def matches?(request)
-    self.request       = request
+  def matches?(raw_request)
+    self.request       = ::Apiphobic::Requests::AcceptHeader.resolve(raw_request)
     self.accept_header = ::Apiphobic::AcceptHeader.new(request.accept_header,
                                                        application_name: application_name)
 

data/lib/apiphobic/middleware/version.rb

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

data/lib/apiphobic/requests/accept_header.rb

@@ -13,6 +13,12 @@ class   AcceptHeader
     self.request = request
   end
 
+  def self.resolve(request)
+    return request if request.class == self
+
+    new(request)
+  end
+
   def accept_header
     if accept_header_from_header.valid? || accept_header_from_params.invalid?
       raw_accept_header_from_header

data/lib/apiphobic/requests/transform_json_api.rb

@@ -21,7 +21,7 @@ class   TransformJsonApi
 
     if has_content? && json?
       request[content_parameter] = request_body_with_underscored_json_keys
-      request['CONTENT_LENGTH']  = content_length
+      request['CONTENT_LENGTH']  = content_length.to_s
     end
 
     request
@@ -67,7 +67,7 @@ class   TransformJsonApi
   end
 
   def underscored_request_json
-    JSON.dump(underscored_request_hash)
+    @underscored_request_json ||= JSON.dump(underscored_request_hash)
   end
 
   def underscored_request_hash

data/lib/apiphobic/responses/transform_json_api.rb

@@ -30,6 +30,14 @@ class   TransformJsonApi
   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?
 
     relationships = request_hash.dig('data', 'relationships') || {}
@@ -51,11 +59,13 @@ class   TransformJsonApi
   end
 
   def request_body
-    if headers['rack.input']
-      headers['rack.input'].read
-    else
-      headers['RACK_INPUT'].to_s
-    end
+    @request_body ||= if headers['rack.input']
+                        headers['rack.input'].read
+                      else
+                        headers['RACK_INPUT'].to_s
+                      end
+  ensure
+    headers['rack.input']&.rewind
   end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiphobic-middleware
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - thegranddesign
@@ -31,7 +31,7 @@ cert_chain:
   Y2GAoHKstmfIVhc4XHOPpmTd2o/C29O9oaRgjrkfQEhF/KvJ/PhoV5hvokzsCyI5
   iUeXPfvrGD/itYIBCgk+fnzyQQ4QtE5hTQaWQ3o2
   -----END CERTIFICATE-----
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apple_core