rack-jsonparser 0.1.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d34d28f12f5fbada826a128a5d6d7003e19886a2
-  data.tar.gz: 847559f7291cbabcb224056d9f0c1bb59b877266
+  metadata.gz: eac921ff3af56183ab2ba111c35a5c82fc33ea28
+  data.tar.gz: e4f9a9e559aaa76d37f104f427acd18a5da57f3f
 SHA512:
-  metadata.gz: 7e71bb61d3ed06f5ca9449b1140938fa3578a1661023d3fea4fdb10a08a8f2bfaa0fb10898c7a17ae01b9d63ca1e264edff3adfa645d380f79877fbc9ab11f18
-  data.tar.gz: d9742358907b79ca3c8f735ffaf772d300762dd288d89424036425c2442aa41c3b748ca1f9a290b5092e6f29bba5e1787a22118c9d89594ba7116b242d760611
+  metadata.gz: 70389f5d95ac35207a28afd28aa8ec4e24d3c441a026958546da59e5ad104f3311f74382367ef352434c9414a90f67f06ee1be48f9308158a5ec35ef90933495
+  data.tar.gz: 3275436b113a6640515274ebd3ec6aa0a473e6cb894d062b2cca4de7531b52acae0261f051856b7a9c4f323f0e4285f38254e7e59e8df22dd779bc6234c386f9

data/README.md

@@ -39,15 +39,15 @@ Below is a sample rack app which uses the middleware to send and receive JSON:
 ```ruby
 require 'rack/json_parser'
 
-# Notice how the `payload` is a Hash, not a JSON string
+# Notice how the `request.payload` is a Hash, not a JSON string
 # We return a Hash instance (or any Ruby object) for the response body
 # We can turn off the request/response parsing via the `use` method (defaults to true)
-# Parsing will only occur if enabled AND the Content-Type is `application/json`
+# Parsing will only occur if enabled AND the `Content-Type` is `application/json`
 handler = proc do |env|
-  payload = env['payload']
+  payload = env['request.payload']
   full_name = payload['forenames'].push(payload['surname']).join(' ')
   res_hash = { 'full_name' => full_name }
-  [200, { 'CONTENT_TYPE' => 'application/json' }, res_hash]
+  [200, { 'Content-Type' => 'application/json' }, res_hash]
 end
 
 app = Rack::Builder.new do

data/lib/rack/json_parser.rb

@@ -1,4 +1,5 @@
 require 'oj'
+require 'rack'
 
 module Rack
   # Rack middleware which transforms JSON during the request and response.
@@ -8,7 +9,14 @@ module Rack
   # served by the application without interference by this middleware. This
   # however requires the client and app to set the 'Content-Type' correctly.
   class JSONParser
-    ENV_PAYLOAD_KEY = 'payload'.freeze
+    CONTENT_TYPE_KEY     = 'Content-Type'.freeze
+    CONTENT_TYPE_ALT_KEY = 'CONTENT_TYPE'.freeze
+    CONTENT_LENGTH_KEY   = 'Content-Length'.freeze
+
+    CONTENT_TYPE_JSON    = 'application/json'.freeze
+
+    ENV_PAYLOAD_KEY      = 'request.payload'.freeze
+    ENV_RACK_INPUT_KEY   = 'rack.input'.freeze
 
     # Called via the rack `use` method. Used to register the middleware and
     # optionally toggle request and response processing of JSON to Object.
@@ -22,19 +30,22 @@ module Rack
     # Loads the request JSON string into a Hash instance.
     # Expects the app response body to be an object instance e.g. Hash,
     # putting the object in an array will likely cause unexpected JSON.
-    # If the response body is processed then the `CONTENT_LENGTH` header will
-    # be set to the body.length.
+    # If the response body is processed then the `Content-Length` header will
+    # be set to the body#length.
     def call(env)
+      env = Rack::Utils::HeaderHash.new(env)
+
       if transform_request?(env)
-        env[ENV_PAYLOAD_KEY] = Oj.load(env['rack.input'])
+        env[ENV_PAYLOAD_KEY] = Oj.load(env[ENV_RACK_INPUT_KEY])
       end
 
       status, headers, body = @app.call(env)
+      headers = Rack::Utils::HeaderHash.new(headers)
 
       if transform_response?(headers, body)
         body = Oj.dump(body)
-        headers['CONTENT_LENGTH'] = body.length.to_s
-        body = [body] unless body.is_a?(Array)
+        headers[CONTENT_LENGTH_KEY] = body.length.to_s
+        body = [body] unless body.respond_to?(:each)
       end
 
       [status, headers, body]
@@ -47,8 +58,8 @@ module Rack
     # request parameters such as headers and request body.
     def transform_request?(env)
       @transform_request &&
-        env['CONTENT_TYPE'] == 'application/json' &&
-        env['rack.input'] &&
+        json_content_type?(env) &&
+        env[ENV_RACK_INPUT_KEY] &&
         true # so the return value is true if all prior conditions are true
     end
 
@@ -57,9 +68,24 @@ module Rack
     # and response parameters such as headers and response body.
     def transform_response?(headers, body)
       @transform_response &&
-        headers['CONTENT_TYPE'] == 'application/json' &&
+        json_content_type?(headers) &&
         body &&
         true # so the return value is true if all prior conditions are true
     end
+
+    # Determine whether or not the 'Content-Type' is 'application/json'.
+    # The content type value assertion is always case insensitive and supports
+    # both a dash/hyphen and an underscore. The content type key assertion
+    # depends on the env parameter. A Hash is case sensitive by default whereas
+    # a Rack::Utils::HeaderHash is case insensitive.
+    def json_content_type?(env)
+      if env.include?(CONTENT_TYPE_KEY)
+        env[CONTENT_TYPE_KEY].downcase == CONTENT_TYPE_JSON.downcase
+      elsif env.include?(CONTENT_TYPE_ALT_KEY)
+        env[CONTENT_TYPE_ALT_KEY].downcase == CONTENT_TYPE_JSON.downcase
+      else
+        false
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-jsonparser
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Telford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2017-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj