rack-parser 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b75afa920d500b395cfeb8e69fcd5b02940abf94
-  data.tar.gz: b2251334c07c80081ba9172e199787e927ad6c14
+  metadata.gz: 74f69a416e4aa2289dcad838a169cfce39ad19cd
+  data.tar.gz: a521face89c84772bf670a9a2ce783c2f4001caa
 SHA512:
-  metadata.gz: 52f7238b8cb20e48f7d851eabfef29bf976a9a3e712ebe6136ac74f3db73dcde736c7586f7367c87ca1f050f08e606dfa1d002d9b9064bccba56d4fa435be2cc
-  data.tar.gz: 82d88abe18e5b53880bf605331c84ada934e896e064d42ec64f210bc8a507147ff9b28f14a25b7f9dbf7c6b76558b5609da6bf184713508b98c2cb70fcb70831
+  metadata.gz: 564feba9cd26974578068efea5dfb8850cebf497f2e9935509d928dd5d2397c0934d0d98a46ad8339ce5a5291ddb4671f20d2d87e4c45db8bee79b69c1e2890b
+  data.tar.gz: 71c633ee487073bb5e3ab2e48a7a149dc266f75e3ef2f36b56215e8237de81e33bb6e8d58dc1770c2eff4219bbf23effeab495cca422de17b2b95839b5017653

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in rack-parser.gemspec
 gemspec

data/README.md

@@ -75,6 +75,8 @@ http://www.mikeperham.com/2012/03/03/the-perils-of-rescue-exception/
 With version `0.4.0`, you can specify regex matches for the content
 types that you want the `parsers` and `handlers` to match.
 
+NOTE: you need to explicitly pass a `Regexp` for it to regex match.
+
 ```ruby
 parser  = proc { |data| JSON.parse data }
 handler = proc { |e, type| [400, {}, 'boop'] }

data/lib/rack/parser.rb

@@ -4,6 +4,7 @@ module Rack
     POST_BODY  = 'rack.input'.freeze
     FORM_INPUT = 'rack.request.form_input'.freeze
     FORM_HASH  = 'rack.request.form_hash'.freeze
+    PARSER_RESULT  = 'rack.parser.result'.freeze
 
     JSON_PARSER   = proc { |data| JSON.parse data }
     ERROR_HANDLER = proc { |err, type| [400, {}, ['']] }
@@ -12,23 +13,24 @@ module Rack
 
     def initialize(app, options = {})
       @app      = app
-      @parsers  = options.delete(:parsers)  || { %r{json} => JSON_PARSER }
-      @handlers = options.delete(:handlers) || {}
-      @logger   = options.delete(:logger)
+      @parsers  = options[:parsers]  || { %r{json} => JSON_PARSER }
+      @handlers = options[:handlers] || {}
+      @logger   = options[:logger]
     end
 
     def call(env)
       type   = Rack::Request.new(env).media_type
-      parser = parsers.detect { |content_type, _| type.match(content_type) } if type
+      parser = match_content_types_for(parsers, type) if type
       return @app.call(env) unless parser
       body = env[POST_BODY].read ; env[POST_BODY].rewind
       return @app.call(env) unless body && !body.empty?
       begin
         parsed = parser.last.call body
-        env.update FORM_HASH => parsed, FORM_INPUT => env[POST_BODY]
+        env[PARSER_RESULT] = parsed
+        env.update FORM_HASH => parsed, FORM_INPUT => env[POST_BODY] if parsed.is_a?(Hash)
       rescue StandardError => e
         warn! e, type
-        handler   = handlers.detect { |content_type, _|  type.match(content_type) }
+        handler   = match_content_types_for handlers, type
         handler ||= ['default', ERROR_HANDLER]
         return handler.last.call(e, type)
       end
@@ -45,5 +47,17 @@ module Rack
       message = "[Rack::Parser] Error on %s : %s" % [type, error.to_s]
       logger.warn message
     end
+
+    # Private: matches content types for the given media type
+    #
+    # content_types - An array of the parsers or handlers options
+    # type          - The media type. gathered from the Rack::Request
+    #
+    # Returns The match from the parser/handler hash or nil
+    def match_content_types_for(content_types, type)
+      content_types.detect do |content_type, _|
+        content_type.is_a?(Regexp) ? type.match(content_type) : type == content_type
+      end
+    end
   end
 end

data/rack-parser.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rack-parser"
-  s.version     = "0.6.1"
+  s.version     = "0.7.0"
   s.authors     = ["Arthur Chiu"]
   s.email       = ["mr.arthur.chiu@gmail.com"]
   s.homepage    = "https://www.github.com/achiu/rack-parser"

data/spec/parser_spec.rb

@@ -3,12 +3,18 @@ require File.expand_path('../spec_helper', __FILE__)
 describe Rack::Parser do
 
   it "allows you to setup parsers for content types" do
-    middleware = Rack::Parser.new ParserApp, :parsers => { 'foo' => 'bar' } 
+    middleware = Rack::Parser.new ParserApp, :parsers => { 'foo' => 'bar' }
     assert_equal 'bar', middleware.parsers['foo']
   end
 
+  it "should not remove fields from options in setup" do
+    options = {:parsers => { 'foo' => 'bar' }}
+    middleware = Rack::Parser.new ParserApp, options
+    refute_nil options[:parsers]
+  end
+
   it "allows you to setup error handlers" do
-    stack = Rack::Parser.new ParserApp, :handlers => { 'foo' => 'bar' } 
+    stack = Rack::Parser.new ParserApp, :handlers => { 'foo' => 'bar' }
     assert_equal 'bar', stack.handlers['foo']
   end
 
@@ -42,6 +48,16 @@ describe Rack::Parser do
     assert_equal "{\"a\"=>2}", last_response.body
   end
 
+  it 'matches ambiguous string Content-Type and forces explicit regex' do
+    payload = JSON.dump(:a => 2)
+    parser = proc { |data| JSON.parse data }
+    stack Rack::Parser, :parsers => { 'application/vnd.foo+json' => parser }
+    post '/post', payload, { 'CONTENT_TYPE' => 'application/vnd.foo+json' }
+
+    assert last_response.ok?
+    assert_equal "{\"a\"=>2}", last_response.body
+  end
+
   it "handles upstream errors" do
     assert_raises StandardError, 'error!' do
       parser = proc { |data| JSON.parse data }
@@ -52,7 +68,7 @@ describe Rack::Parser do
 
   it "returns a default error" do
     parser  = proc { |data| raise StandardError, 'wah wah' }
-    stack Rack::Parser, :parsers  => { %r{json} => parser } 
+    stack Rack::Parser, :parsers  => { %r{json} => parser }
     post '/post', '{}', { 'CONTENT_TYPE' => 'application/vnd.foo+json' }
 
     assert_equal 400, last_response.status
@@ -61,11 +77,33 @@ describe Rack::Parser do
   it "returns a custom error message" do
     parser  = proc { |data| raise StandardError, "wah wah" }
     handler = proc { |err, type| [500, {}, "%s : %s"  % [type, err]] }
-    stack Rack::Parser, :parsers  => { %r{json} => parser }, 
+    stack Rack::Parser, :parsers  => { %r{json} => parser },
                         :handlers => { %r{json} => handler }
     post '/post', '{}', { 'CONTENT_TYPE' => 'application/vnd.foo+json' }
 
     assert_equal 500, last_response.status
     assert_equal 'application/vnd.foo+json : wah wah', last_response.body
   end
+
+  it 'returns a custome error for ambiguous string Content-Type and forces explicit regex' do
+    parser  = proc { |data| raise StandardError, "wah wah" }
+    handler = proc { |err, type| [500, {}, "%s : %s"  % [type, err]] }
+    stack Rack::Parser, :parsers  => { %r{json} => parser },
+                        :handlers => { 'application/vnd.foo+json' => handler }
+    post '/post', '{}', { 'CONTENT_TYPE' => 'application/vnd.foo+json' }
+
+    assert_equal 500, last_response.status
+    assert_equal 'application/vnd.foo+json : wah wah', last_response.body
+  end
+
+  it "parses an array but do not set it to params" do
+    payload = JSON.dump([1,2,3])
+    parser = proc { |data| JSON.parse data }
+    stack Rack::Parser, :parsers => { 'application/json' => parser }
+    post '/post', payload, { 'CONTENT_TYPE' => 'application/json' }
+
+    assert last_response.ok?
+    assert_equal last_request.env['rack.parser.result'], [1, 2, 3]
+    assert_equal last_request.env['rack.request.form_hash'], nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-parser
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Arthur Chiu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2016-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rack-parser
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Rack Middleware for parsing post body data