openapi3_parser 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e48a69a367595cb50a68fbfef79e0d9fc925c61
-  data.tar.gz: a53afad6f342b79d622201e9b87cd014be1eeac8
+  metadata.gz: b49ddc5e4db7f288ea2c27f4cbdd40642b86b037
+  data.tar.gz: 3c391e226bf011a8e1c4b726201ea82b594b1112
 SHA512:
-  metadata.gz: 2d772db41130444cbb1bfae66508ec1bde2ae21ba583da15b9cf3776d68dee5864f061e5e333a7cd2676361f9ac3bd6362efc4afaccaa0967b47c1fcbc00c781
-  data.tar.gz: 79df18c70a0e16b3d509c669a37be4b421b8b2504e36ff97b4144cbb982123c6d146c77a190eda794abb7ecd8282d41397006ba3284452ba65220e2952f6b6a4
+  metadata.gz: 5bb0981638b6f39307638fafa63a2cb184eb09117063cdba579d350e3fc369f433646c73f7d324ada7a06e947d69550be601ca2c8fda89297470de9c9360c0da
+  data.tar.gz: c9867350e4f9253ee0b18d1d97a9a4b67bf1cb6b7081957fe650caad86e915ff9956941be6a18ffdfad800d0fd5fd562a801e7a6d9e8bb5ed37d608c921e879e

data/CHANGELOG.md

@@ -1,4 +1,8 @@
-# Unreleased
+# 0.5.1
+
+- Bugfix for allowing maps to have extension like field names
+
+# 0.5.0
 
 - Support for recursive references - fixes: https://github.com/kevindew/openapi3_parser/issues/4
 - `node_at` method on nodes and document to allow looking up nodes by string

data/lib/openapi3_parser/node_factory/map.rb

@@ -12,7 +12,7 @@ module Openapi3Parser
   module NodeFactory
     class Map
       attr_reader :allow_extensions, :context, :data, :default,
-                  :key_input_type, :value_input_type, :value_factory,
+                  :value_input_type, :value_factory,
                   :validation
 
       # rubocop:disable Metrics/ParameterLists
@@ -20,7 +20,6 @@ module Openapi3Parser
         context,
         allow_extensions: false,
         default: {},
-        key_input_type: String,
         value_input_type: nil,
         value_factory: nil,
         validate: nil
@@ -28,7 +27,6 @@ module Openapi3Parser
         @context = context
         @allow_extensions = allow_extensions
         @default = default
-        @key_input_type = key_input_type
         @value_input_type = value_input_type
         @value_factory = value_factory
         @validation = validate
@@ -77,7 +75,7 @@ module Openapi3Parser
 
       def process_data(data)
         data.each_with_object({}) do |(key, value), memo|
-          memo[key] = if EXTENSION_REGEX =~ key || !value_factory
+          memo[key] = if EXTENSION_REGEX =~ key.to_s || !value_factory
                         value
                       else
                         next_context = Context.next_field(context, key)
@@ -136,7 +134,6 @@ module Openapi3Parser
           return default_value if factory.nil_input?
 
           TypeChecker.raise_on_invalid_type(factory.context, type: ::Hash)
-          check_unexpected_fields(raise_on_invalid: true)
           check_keys(raise_on_invalid: true)
           check_values(raise_on_invalid: true)
           validate(raise_on_invalid: true)
@@ -153,7 +150,6 @@ module Openapi3Parser
         attr_reader :factory, :validatable
 
         def collate_errors
-          check_unexpected_fields(raise_on_invalid: false)
           check_keys(raise_on_invalid: false)
           check_values(raise_on_invalid: false)
           validate(raise_on_invalid: false)
@@ -171,24 +167,13 @@ module Openapi3Parser
           end
         end
 
-        def check_unexpected_fields(raise_on_invalid: false)
-          Validators::UnexpectedFields.call(
-            validatable,
-            allowed_fields: nil,
-            raise_on_invalid: raise_on_invalid,
-            allow_extensions: factory.allow_extensions
-          )
-        end
-
         def check_keys(raise_on_invalid: false)
-          return unless factory.key_input_type
-
           if raise_on_invalid
             TypeChecker.raise_on_invalid_keys(factory.context,
-                                              type: factory.key_input_type)
+                                              type: ::String)
           else
             TypeChecker.validate_keys(validatable,
-                                      type: factory.key_input_type,
+                                      type: ::String,
                                       context: factory.context)
           end
         end
@@ -197,6 +182,8 @@ module Openapi3Parser
           return unless factory.value_input_type
 
           factory.context.input.keys.each do |key|
+            next if factory.allow_extensions && key.to_s =~ EXTENSION_REGEX
+
             check_field_type(
               Context.next_field(factory.context, key), raise_on_invalid
             )

data/lib/openapi3_parser/validators/unexpected_fields.rb

@@ -14,8 +14,8 @@ module Openapi3Parser
       end
 
       def call(validatable,
+               allowed_fields:,
                allow_extensions: true,
-               allowed_fields: nil,
                raise_on_invalid: true)
         fields = unexpected_fields(validatable.input,
                                    allowed_fields,
@@ -37,15 +37,9 @@ module Openapi3Parser
       private
 
       def unexpected_fields(input, allowed_fields, allow_extensions)
-        if allowed_fields
-          extra_keys = input.keys - allowed_fields
-          return extra_keys unless allow_extensions
-          extra_keys.reject { |key| key =~ NodeFactory::EXTENSION_REGEX }
-        elsif !allow_extensions
-          input.keys.select { |key| key =~ NodeFactory::EXTENSION_REGEX }
-        else
-          []
-        end
+        extra_keys = input.keys - allowed_fields
+        return extra_keys unless allow_extensions
+        extra_keys.reject { |key| key =~ NodeFactory::EXTENSION_REGEX }
       end
     end
   end

data/lib/openapi3_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Openapi3Parser
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi3_parser
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Kevin Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-30 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker