hanami-router 1.3.0.beta1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55265d04629210abb763c78a81bd4507cbe271cb0a5da1662bb938a3fca9d409
-  data.tar.gz: c11974f4d0f047d1ae21342d936faba59125080e1ce093ef9d63ce7a0cf672a9
+  metadata.gz: e727bfc99155018c990faf3ad9621cc547413259bee1cedbe632b9c1d7695247
+  data.tar.gz: 768a8bf1afd0c5b97a3d2fd2011502d42bb3655f5978343f6c486ce4fbc30e6c
 SHA512:
-  metadata.gz: 75ca87dadac5a3eb8c099aa4a1977c271f1b24dcdd55cfd16a8fdf77c4e990ac074a84e651ad347bad9d202b2bed5e53f7dc43a64feaea96a8cb09adefd9428c
-  data.tar.gz: 685771d96a9c584a6bfee63ee90916648bf851c94b2dd1c1be69513b2f9b8b2ab6975b321fe4454047216e05a99c6431dc0c354309812ad260f2c8af058c86f9
+  metadata.gz: 5a5934e82c544acbb3cb44e78955b8863a61341a8a1fef0208ad4b3e8d0a5303480b160e10fdbc4326a58276d21c2a9b5a79b4819047139a4a477ce97937b9fb
+  data.tar.gz: ea8369f2333217e336f525f0826db1212b0d42398b1b0c8fa8c70a011a1461e71dce54b59be0703e14bd55c990f1ffb8ca88491916fe1ec6f5f0016440164129

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Hanami::Router
 Rack compatible HTTP router for Ruby
 
+## v1.3.0 - 2018-10-24
+### Fixed
+- [Tim Riley] Skip attempting to parse unknown types in `Hanami::Middleware::BodyParser`
+
 ## v1.3.0.beta1 - 2018-08-08
 ### Added
 - [Luca Guidi] Official support for JRuby 9.2.0.0

data/hanami-router.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'rack',         '~> 2.0'
   spec.add_dependency 'http_router',  '0.11.2'
-  spec.add_dependency 'hanami-utils', '~> 1.3.beta'
+  spec.add_dependency 'hanami-utils', '~> 1.3'
 
   spec.add_development_dependency 'bundler',   '~> 1.5'
   spec.add_development_dependency 'rake',      '~> 12'

data/lib/hanami/middleware/body_parser.rb

@@ -1,5 +1,5 @@
-require 'hanami/middleware/body_parser/parser'
 require 'hanami/utils/hash'
+require_relative 'body_parser/class_interface'
 
 module Hanami
   module Middleware
@@ -8,7 +8,7 @@ module Hanami
     class BodyParser
       # @since 1.3.0
       # @api private
-      CONTENT_TYPE       = 'CONTENT_TYPE'.freeze
+      CONTENT_TYPE = 'CONTENT_TYPE'.freeze
 
       # @since 1.3.0
       # @api private
@@ -16,7 +16,7 @@ module Hanami
 
       # @since 1.3.0
       # @api private
-      RACK_INPUT    = 'rack.input'.freeze
+      RACK_INPUT = 'rack.input'.freeze
 
       # @since 1.3.0
       # @api private
@@ -26,7 +26,9 @@ module Hanami
       ROUTER_PARSED_BODY = 'router.parsed_body'.freeze
 
       # @api private
-      FALLBACK_KEY  = '_'.freeze
+      FALLBACK_KEY = '_'.freeze
+
+      extend ClassInterface
 
       def initialize(app, parsers)
         @app = app
@@ -37,32 +39,29 @@ module Hanami
         body = env[RACK_INPUT].read
         return @app.call(env) if body.empty?
 
-        env[RACK_INPUT].rewind    # somebody might try to read this stream
+        env[RACK_INPUT].rewind # somebody might try to read this stream
 
-        env[ROUTER_PARAMS] ||= {} # prepare params
-        env[ROUTER_PARSED_BODY] = _parse(env, body)
-        env[ROUTER_PARAMS]      = _symbolize(env[ROUTER_PARSED_BODY]).merge(env[ROUTER_PARAMS])
+        if (parser = @parsers[media_type(env)])
+          env[ROUTER_PARSED_BODY] = parser.parse(body)
+          env[ROUTER_PARAMS] = _symbolize(env[ROUTER_PARSED_BODY])
+        end
 
         @app.call(env)
       end
 
       private
 
-      def build_parsers(parsers)
-        result  = Hash.new
-        args    = Array(parsers)
-        return result if args.empty?
+      def build_parsers(parser_names)
+        parser_names = Array(parser_names)
+        return {} if parser_names.empty?
 
-        args.each do |arg|
-          parser = Parser.for(arg)
+        parser_names.each_with_object({}) { |name, parsers|
+          parser = self.class.for(name)
 
           parser.mime_types.each do |mime|
-            result[mime] = parser
+            parsers[mime] = parser
           end
-        end
-
-        result.default = Parser.new
-        result
+        }
       end
 
       # @api private

data/lib/hanami/middleware/body_parser/class_interface.rb

@@ -0,0 +1,56 @@
+require 'hanami/utils/class'
+require 'hanami/utils/string'
+require_relative 'errors'
+
+ module Hanami
+   module Middleware
+     class BodyParser
+       # @api private
+       # @since 1.3.0
+       module ClassInterface
+         # @api private
+         # @since 1.3.0
+         def for(parser)
+           parser =
+             case parser
+             when String, Symbol
+               require_parser(parser)
+             when Class
+               parser.new
+             else
+               parser
+             end
+
+           ensure_parser parser
+
+           parser
+         end
+
+         private
+
+         # @api private
+         # @since 1.3.0
+         PARSER_METHODS = %i[mime_types parse].freeze
+
+         # @api private
+         # @since 1.3.0
+         def ensure_parser(parser)
+           unless PARSER_METHODS.all? { |method| parser.respond_to?(method) }
+             raise InvalidParserError.new(parser)
+           end
+         end
+
+         # @api private
+         # @since 1.3.0
+         def require_parser(parser)
+           require "hanami/middleware/body_parser/#{parser}_parser"
+
+           parser = Utils::String.classify(parser)
+           Utils::Class.load!("Hanami::Middleware::BodyParser::#{parser}Parser").new
+         rescue LoadError, NameError
+           raise UnknownParserError.new(parser)
+         end
+       end
+     end
+   end
+ end

data/lib/hanami/middleware/body_parser/errors.rb

@@ -0,0 +1,23 @@
+require 'hanami/routing/error'
+
+module Hanami
+  module Middleware
+    # @since 1.3.0
+    # @api private
+    class BodyParser
+      # Body parsing error
+      # This is raised when parser fails to parse the body
+      #
+      # @since 1.3.0
+      class BodyParsingError < Hanami::Routing::Parsing::BodyParsingError
+      end
+
+      # @since 1.3.0
+      class UnknownParserError < Hanami::Routing::Parsing::UnknownParserError
+      end
+
+      class InvalidParserError < Hanami::Routing::Error
+      end
+    end
+  end
+end

data/lib/hanami/middleware/body_parser/json_parser.rb

@@ -1,11 +1,12 @@
 require 'hanami/utils/json'
+require_relative 'errors'
 
 module Hanami
   module Middleware
     class BodyParser
       # @since 1.3.0
       # @api private
-      class JsonParser < Parser
+      class JsonParser
         # @since 1.3.0
         # @api private
         def mime_types

data/lib/hanami/router/version.rb

@@ -1,6 +1,6 @@
 module Hanami
   class Router
     # @since 0.1.0
-    VERSION = '1.3.0.beta1'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hanami-router
 version: !ruby/object:Gem::Version
-  version: 1.3.0.beta1
+  version: 1.3.0
 platform: ruby
 authors:
 - Luca Guidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-08 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.beta
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -121,8 +121,9 @@ files:
 - hanami-router.gemspec
 - lib/hanami-router.rb
 - lib/hanami/middleware/body_parser.rb
+- lib/hanami/middleware/body_parser/class_interface.rb
+- lib/hanami/middleware/body_parser/errors.rb
 - lib/hanami/middleware/body_parser/json_parser.rb
-- lib/hanami/middleware/body_parser/parser.rb
 - lib/hanami/router.rb
 - lib/hanami/router/version.rb
 - lib/hanami/routing/endpoint.rb
@@ -159,9 +160,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/lib/hanami/middleware/body_parser/parser.rb

@@ -1,61 +0,0 @@
-require 'hanami/utils/class'
-require 'hanami/utils/string'
-require 'hanami/routing/parsing/parser'
-
-module Hanami
-  module Middleware
-    class BodyParser
-      # Body parsing error
-      # This is raised when parser fails to parse the body
-      #
-      # @since 1.3.0
-      class BodyParsingError < Hanami::Routing::Parsing::BodyParsingError
-      end
-
-      # @since 1.3.0
-      class UnknownParserError < Hanami::Routing::Parsing::UnknownParserError
-      end
-
-      # @since 1.3.0
-      class Parser
-        # @since 1.3.0
-        # @api private
-        def self.for(parser)
-          case parser
-          when String, Symbol
-            require_parser(parser)
-          else
-            raise UnknownParserError.new(parser) unless parser?(parser)
-            parser.new
-          end
-        end
-
-        # @since 1.3.0
-        def mime_types
-          raise NotImplementedError
-        end
-
-        # @since 1.3.0
-        def parse(body)
-          body
-        end
-
-        private
-        # @since 1.3.0
-        # @api private
-        def self.require_parser(parser)
-          require "hanami/middleware/body_parser/#{ parser }_parser"
-
-          parser = Utils::String.classify(parser)
-          Utils::Class.load!("Hanami::Middleware::BodyParser::#{ parser }Parser").new
-        rescue LoadError, NameError
-          raise UnknownParserError.new(parser)
-        end
-
-        def self.parser?(parser)
-          parser.is_a?(Class) && parser < Parser
-        end
-      end
-    end
-  end
-end