openapi3_parser 0.8.2 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 370efdcfee85cad9520504280a4d34bddb5580df
-  data.tar.gz: b28c58e9f45cf1c710f04d4b107d9e57c1502efa
+SHA256:
+  metadata.gz: 235f373ec4962d88f12123599e593440027d21029afb5b234689a9b5a452b25f
+  data.tar.gz: 34bb8ef23dda618a8d8e00b7bb50c6192ff64725e3c7c7cc31d91c41bc30ecdd
 SHA512:
-  metadata.gz: 41442d7730efd30d1e0d24dc78727f344c4ed46d37830cb205c9507d23190d39e1b88e6bd2691500e72d2647407c11242f321f6115bb40d46c5cfc1b6431fe9d
-  data.tar.gz: c70c7b03895bfa441b1433acece362f0792c8436785361ac6b568bbe16866fba863d559f3c376149a958c1d3e2cde4f66cd50c53125203578e9397c798d23932
+  metadata.gz: 5fa9a10c3bec7fd12478cd18afbb89125a05078e8234b2112af93c8fbedc0b3b7e51f7adcd8d25737af9df6692ec135f1a3034fe8b89bbcfd35acb5b8348515e
+  data.tar.gz: 6ee1b372abe88a4931d1dd294a7c125da5c88d98c21c383264c3d47aa323bb5a2fc3fffae8e8966eb357085b89797cfc9bad5510cdf983f2c3ad6b11d63cf2ff

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      matrix:
+        ruby: [2.6, 2.7, 3.0, 3.1]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby }}
+      - name: Test Ruby ${{ matrix.ruby }}
+        run: bundle exec rake
+        if: matrix.ruby != '2.6'
+      - name: Test and publish coverage for Ruby ${{ matrix.ruby }}
+        uses: paambaati/codeclimate-action@v2.7.5
+        env:
+          CC_TEST_REPORTER_ID: 8bc2d8e54331569aeb442094c21cb64a58d6efa0670f65ff00d9ae887f63c0b4
+        with:
+          coverageCommand: bundle exec rake
+        if: matrix.ruby == '2.6'

data/.rubocop.yml

@@ -1,13 +1,30 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+AllCops:
+  NewCops: enable
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 Metrics/MethodLength:
   Max: 30
 Metrics/AbcSize:
   Max: 30
+RSpec/ExampleLength:
+  Max: 30
 Style/Documentation:
   Enabled: false
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*.rb'
-Style/BracesAroundHashParameters:
+    - '*.gemspec'
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/integration/**/*.rb'
+# I'd rather have multiple expectations than lots of duplicate tests
+RSpec/MultipleExpectations:
+  Enabled: false
+# The default arbitrary number (5) is a little painful
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+RSpec/MessageSpies:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.6
+2.6.9

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# 0.9.2
+
+- No longer require a specific Psych dependency to instead use Ruby stdlib
+
+# 0.9.1
+
+- Fix Schema#requires? incorrectly returning true for referenced properties -
+  https://github.com/kevindew/openapi3_parser/issues/20
+- Drop support for Ruby 2.5
+
+# 0.9.0
+
+- Fix unexpected fields error when using Example nodes inside a Parameter -
+  https://github.com/kevindew/openapi3_parser/pull/19
+- Drop support for Ruby 2.4
+
 # 0.8.2
 
 - Fix bug falling into recursive loop on Array/Map nodes -

data/README.md

@@ -1,6 +1,6 @@
 # OpenAPI 3 Parser
 
-[![Build Status](https://travis-ci.org/kevindew/openapi3_parser.svg?branch=master)](https://travis-ci.org/kevindew/openapi3_parser)
+[![Build Status](https://travis-ci.org/kevindew/openapi3_parser.svg?branch=main)](https://travis-ci.org/kevindew/openapi3_parser)
 
 This a Ruby based parser/validator for [OpenAPI 3][openapi-3]. It is used to
 convert an OpenAPI file (can be a local file, a URL, a string or even a Ruby
@@ -47,7 +47,7 @@ parser in [How to write an OpenAPI 3 parser][blog].
 
 ```ruby
 # by URL
-Openapi3Parser.load_url("https://raw.githubusercontent.com/kevindew/openapi3_parser/master/spec/support/examples/petstore-expanded.yaml")
+Openapi3Parser.load_url("https://raw.githubusercontent.com/kevindew/openapi3_parser/main/spec/support/examples/petstore-expanded.yaml")
 
 # by path to file
 Openapi3Parser.load_file("spec/support/examples/uber.yaml")
@@ -76,7 +76,7 @@ document.errors
 ### Traversing
 
 ```ruby
-document = Openapi3Parser.load_url("https://raw.githubusercontent.com/kevindew/openapi3_parser/master/spec/support/examples/petstore-expanded.yaml")
+document = Openapi3Parser.load_url("https://raw.githubusercontent.com/kevindew/openapi3_parser/main/spec/support/examples/petstore-expanded.yaml")
 
 # by objects
 
@@ -121,7 +121,7 @@ You can install this gem into your bundler application by adding this line to
 your Gemfile:
 
 ```
-gem "openapi3_parser", "~> 0.8.0"
+gem "openapi3_parser", "~> 0.9.0"
 ```
 
 and then running `$ bundle install`

data/lib/openapi3_parser/array_sentence.rb

@@ -6,7 +6,7 @@ module Openapi3Parser
       def sentence_join
         return join if count < 2
 
-        self[0..-2].join(", ") + " and " + self[-1]
+        "#{self[0..-2].join(', ')} and #{self[-1]}"
       end
     end
   end

data/lib/openapi3_parser/error.rb

@@ -7,32 +7,42 @@ module Openapi3Parser
     # at runtime when we have tried to access that resource it is not available
     # for whatever reason.
     class InaccessibleInput < Error; end
+
     # Raised in cases where we provided data that we expected to be parsable
     # (such as a string of JSON data) but when we tried to parse it an error
     # is raised
     class UnparsableInput < Error; end
+
     # Raised in cases where an object that is in an immutable state is modified
     #
     # Typically this would occur when a component that is frozen is modififed.
     # Some components are mutable during the construction of a document and
     # then frozen afterwards.
     class ImmutableObject < Error; end
-    # Raised when a type that is not a whitelist of valid types is used
+
+    # Raised when a node is provided data as a type that is outside the allowed
+    # list
     class InvalidType < Error; end
+
     # Raised when we have to abort creating an object due to invalid data
     class InvalidData < Error; end
+
     # Used when there are fields that are missing from an object which prevents
     # us from creating a node
     class MissingFields < Error; end
+
     # Used when there are extra fields that are not expected in the data for
     # a node
     class UnexpectedFields < Error; end
+
     # Used when a method we expect to be able to call (through symbol or proc)
     # is not callable
     class NotCallable < Error; end
+
     # Raised when we in a recursive data structure and can't perform an
     # operation
     class InRecursiveStructure < Error; end
+
     # Used when we're trying to validate that a type is something that is not
     # validatable, most likely a sign that we're in a bug
     class UnvalidatableType < Error; end

data/lib/openapi3_parser/node/context.rb

@@ -107,9 +107,7 @@ module Openapi3Parser
       def location_summary
         summary = document_location.to_s
 
-        if document_location != source_location
-          summary += " (#{source_location})"
-        end
+        summary += " (#{source_location})" if document_location != source_location
 
         summary
       end

data/lib/openapi3_parser/node/placeholder.rb

@@ -21,8 +21,8 @@ module Openapi3Parser
       def self.each(node_data, &block)
         resolved =
           if node_data.respond_to?(:keys)
-            node_data.each_with_object({}) do |(key, value), memo|
-              memo[key] = resolve(value)
+            node_data.transform_values do |value|
+              resolve(value)
             end
           else
             node_data.map { |item| resolve(item) }
@@ -32,6 +32,7 @@ module Openapi3Parser
       end
 
       attr_reader :node_factory, :field, :parent_context
+
       def_delegators :node_factory, :nil_input?
 
       def initialize(node_factory, field, parent_context)
@@ -42,11 +43,11 @@ module Openapi3Parser
 
       def node
         @node ||= begin
-                    node_context = Context.next_field(parent_context,
-                                                      field,
-                                                      node_factory.context)
-                    node_factory.node(node_context)
-                  end
+          node_context = Context.next_field(parent_context,
+                                            field,
+                                            node_factory.context)
+          node_factory.node(node_context)
+        end
       end
     end
   end

data/lib/openapi3_parser/node/schema.rb

@@ -120,9 +120,11 @@ module Openapi3Parser
       # @return [Boolean]
       def requires?(property)
         if property.is_a?(Schema)
+          # compare node_context of objects to ensure references aren't treated
+          # as equal - only direct properties of this object will pass.
           properties.to_h
                     .select { |k, _| required.to_a.include?(k) }
-                    .any? { |_, schema| schema == property }
+                    .any? { |_, schema| schema.node_context == property.node_context }
         else
           required.to_a.include?(property)
         end

data/lib/openapi3_parser/node_factory/map.rb

@@ -90,12 +90,12 @@ module Openapi3Parser
       def build_resolved_input
         return unless data
 
-        data.each_with_object({}) do |(key, value), memo|
-          memo[key] = if value.respond_to?(:resolved_input)
-                        value.resolved_input
-                      else
-                        value
-                      end
+        data.transform_values do |value|
+          if value.respond_to?(:resolved_input)
+            value.resolved_input
+          else
+            value
+          end
         end
       end
 

data/lib/openapi3_parser/node_factory/object_factory/dsl.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require "ostruct"
 require "openapi3_parser/node_factory/object_factory/field_config"
 
 module Openapi3Parser
   module NodeFactory
     module ObjectFactory
       module Dsl
+        MutuallyExclusiveField = Struct.new(:fields, :required, keyword_init: true)
+
         def field(name, **options)
           @field_configs ||= {}
           @field_configs[name] = FieldConfig.new(**options)
@@ -30,8 +31,9 @@ module Openapi3Parser
 
         def mutually_exclusive(*fields, required: false)
           @mutually_exclusive_fields ||= []
-          @mutually_exclusive_fields << OpenStruct.new(
-            fields: fields, required: required
+          @mutually_exclusive_fields << MutuallyExclusiveField.new(
+            fields: fields,
+            required: required
           )
         end
 
@@ -41,7 +43,7 @@ module Openapi3Parser
 
         def validate(*items, &block)
           @validations ||= []
-          @validations = @validations.concat(items)
+          @validations.concat(items)
           @validations << block if block
         end
 

data/lib/openapi3_parser/node_factory/object_factory/field_config.rb

@@ -22,10 +22,11 @@ module Openapi3Parser
           !given_factory.nil?
         end
 
-        def initialize_factory(context, parent_factory)
-          if given_factory.is_a?(Class)
+        def initialize_factory(context, parent_factory = nil)
+          case given_factory
+          when Class
             given_factory.new(context)
-          elsif given_factory.is_a?(Symbol)
+          when Symbol
             parent_factory.send(given_factory, context)
           else
             given_factory.call(context)
@@ -36,7 +37,7 @@ module Openapi3Parser
           given_required
         end
 
-        def check_input_type(validatable, building_node)
+        def check_input_type(validatable, building_node: false)
           return true if !given_input_type || validatable.input.nil?
 
           if building_node
@@ -47,7 +48,7 @@ module Openapi3Parser
           end
         end
 
-        def validate_field(validatable, building_node)
+        def validate_field(validatable, building_node: false)
           return true if !given_validate || validatable.input.nil?
 
           run_validation(validatable)
@@ -61,9 +62,9 @@ module Openapi3Parser
                 "Invalid data for #{location_summary}: #{error.message}"
         end
 
-        def default(factory)
+        def default(factory = nil)
           return given_default.call if given_default.is_a?(Proc)
-          return factory.send(given_default) if given_default.is_a?(Symbol)
+          return factory&.send(given_default) if given_default.is_a?(Symbol)
 
           given_default
         end

data/lib/openapi3_parser/node_factory/object_factory/node_builder.rb

@@ -8,8 +8,8 @@ module Openapi3Parser
           new(factory).errors
         end
 
-        def self.node_data(factory, parent_context)
-          new(factory).node_data(parent_context)
+        def self.node_data(factory, node_context)
+          new(factory).node_data(node_context)
         end
 
         def initialize(factory)
@@ -22,19 +22,17 @@ module Openapi3Parser
 
           TypeChecker.validate_type(validatable, type: ::Hash)
 
-          if validatable.errors.empty?
-            validatable.add_errors(validate(raise_on_invalid: false))
-          end
+          validatable.add_errors(validate(raise_on_invalid: false)) if validatable.errors.empty?
 
           validatable.collection
         end
 
-        def node_data(parent_context)
-          return build_node_data(parent_context) if empty_and_allowed_to_be?
+        def node_data(node_context)
+          return build_node_data(node_context) if empty_and_allowed_to_be?
 
           TypeChecker.raise_on_invalid_type(factory.context, type: ::Hash)
           validate(raise_on_invalid: true)
-          build_node_data(parent_context)
+          build_node_data(node_context)
         end
 
         private_class_method :new
@@ -48,22 +46,22 @@ module Openapi3Parser
         end
 
         def validate(raise_on_invalid:)
-          Validator.call(factory, raise_on_invalid)
+          Validator.call(factory, raise_on_invalid: raise_on_invalid)
         end
 
-        def build_node_data(parent_context)
+        def build_node_data(node_context)
           return if factory.nil_input? && factory.data.nil?
 
           factory.data.each_with_object({}) do |(key, value), memo|
-            memo[key] = resolve_value(key, value, parent_context)
+            memo[key] = resolve_value(key, value, node_context)
           end
         end
 
-        def resolve_value(key, value, parent_context)
+        def resolve_value(key, value, node_context)
           resolved = determine_value_or_default(key, value)
 
           if resolved.respond_to?(:node)
-            Node::Placeholder.new(value, key, parent_context)
+            Node::Placeholder.new(value, key, node_context)
           else
             resolved
           end

data/lib/openapi3_parser/node_factory/object_factory/validator.rb

@@ -7,15 +7,15 @@ module Openapi3Parser
     module ObjectFactory
       class Validator
         private_class_method :new
-        attr_reader :factory, :validatable, :building_node
+        attr_reader :factory, :validatable, :raise_on_invalid
 
-        def self.call(*args)
-          new(*args).call
+        def self.call(*args, **kwargs)
+          new(*args, **kwargs).call
         end
 
-        def initialize(factory, building_node)
+        def initialize(factory, raise_on_invalid: false)
           @factory = factory
-          @building_node = building_node
+          @raise_on_invalid = raise_on_invalid
           @validatable = Validation::Validatable.new(factory)
         end
 
@@ -34,7 +34,7 @@ module Openapi3Parser
           Validators::RequiredFields.call(
             validatable,
             required_fields: factory.required_fields,
-            raise_on_invalid: building_node
+            raise_on_invalid: raise_on_invalid
           )
         end
 
@@ -43,7 +43,7 @@ module Openapi3Parser
             validatable,
             allow_extensions: factory.allowed_extensions?,
             allowed_fields: factory.allowed_fields,
-            raise_on_invalid: building_node
+            raise_on_invalid: raise_on_invalid
           )
         end
 
@@ -51,7 +51,7 @@ module Openapi3Parser
           Validators::MutuallyExclusiveFields.call(
             validatable,
             mutually_exclusive_fields: factory.mutually_exclusive_fields,
-            raise_on_invalid: building_node
+            raise_on_invalid: raise_on_invalid
           )
         end
 
@@ -66,7 +66,8 @@ module Openapi3Parser
         class CheckInvalidFields
           extend Forwardable
           attr_reader :validator
-          def_delegators :validator, :factory, :building_node, :validatable
+
+          def_delegators :validator, :factory, :raise_on_invalid, :validatable
           private_class_method :new
 
           def self.call(validator)
@@ -88,16 +89,14 @@ module Openapi3Parser
 
               # We don't add errors when we're building a node as they will
               # be raised when that child node is built
-              validatable.add_errors(field.errors) unless building_node
+              validatable.add_errors(field.errors) unless raise_on_invalid
             end
           end
 
           private
 
           def handle_factory_checks(name)
-            field_errors = if factory.field_configs[name]
-                             check_field(name, factory.field_configs[name])
-                           end
+            field_errors = (check_field(name, factory.field_configs[name]) if factory.field_configs[name])
 
             (field_errors || []).any?
           end
@@ -115,11 +114,14 @@ module Openapi3Parser
             field_validatable = Validation::Validatable.new(factory,
                                                             context: context)
 
-            valid_input_type = field_config.check_input_type(field_validatable,
-                                                             building_node)
+            valid_input_type = field_config.check_input_type(
+              field_validatable,
+              building_node: raise_on_invalid
+            )
 
             if valid_input_type
-              field_config.validate_field(field_validatable, building_node)
+              field_config.validate_field(field_validatable,
+                                          building_node: raise_on_invalid)
             end
 
             validatable.add_errors(field_validatable.errors)
@@ -139,7 +141,7 @@ module Openapi3Parser
 
             errors = validator.validatable.errors
 
-            return if errors.empty? || !validator.building_node
+            return if errors.empty? || !validator.raise_on_invalid
 
             location_summary = errors.first.context.location_summary
             raise Error::InvalidData,

data/lib/openapi3_parser/node_factory/operation.rb

@@ -25,9 +25,7 @@ module Openapi3Parser
       private
 
       def build_object(data, context)
-        if data["servers"].node.empty?
-          data["servers"] = path_item_server_data(context)
-        end
+        data["servers"] = path_item_server_data(context) if data["servers"].node.empty?
 
         Node::Operation.new(data, context)
       end

data/lib/openapi3_parser/node_factory/parameter_like.rb

@@ -13,7 +13,7 @@ module Openapi3Parser
       end
 
       def examples_factory(context)
-        factory = NodeFactory::OptionalReference.new(NodeFactory::Schema)
+        factory = NodeFactory::OptionalReference.new(NodeFactory::Example)
         NodeFactory::Map.new(context,
                              default: nil,
                              value_factory: factory)

data/lib/openapi3_parser/node_factory/path_item.rb

@@ -68,7 +68,7 @@ module Openapi3Parser
 
       def merge_data(base, priority)
         base.merge(priority) do |_, old, new|
-          if new.nil? || new.respond_to?(:nil_input?) && new.nil_input?
+          if new.nil? || (new.respond_to?(:nil_input?) && new.nil_input?)
             old
           else
             new

data/lib/openapi3_parser/node_factory/paths.rb

@@ -36,9 +36,7 @@ module Openapi3Parser
       end
 
       def validate(validatable)
-        paths = validatable.input.keys.reject do |key|
-          NodeFactory::EXTENSION_REGEX =~ key
-        end
+        paths = validatable.input.keys.grep_v(NodeFactory::EXTENSION_REGEX)
         validate_paths(validatable, paths)
       end
 

data/lib/openapi3_parser/node_factory/reference.rb

@@ -44,7 +44,7 @@ module Openapi3Parser
 
       def build_node(node_context)
         TypeChecker.raise_on_invalid_type(context, type: ::Hash)
-        ObjectFactory::Validator.call(self, true)
+        ObjectFactory::Validator.call(self, raise_on_invalid: true)
         data["$ref"].node(node_context)
       end
 

data/lib/openapi3_parser/node_factory/request_body.rb

@@ -32,11 +32,9 @@ module Openapi3Parser
         def call(validatable)
           # This validation isn't actually mentioned in the spec, but it
           # doesn't seem to make sense if this is an empty hash.
-          if validatable.input.size.zero?
-            return validatable.add_error("Expected to have at least 1 item")
-          end
+          return validatable.add_error("Expected to have at least 1 item") if validatable.input.size.zero?
 
-          validatable.input.keys.each do |key|
+          validatable.input.each_key do |key|
             message = Validators::MediaType.call(key)
             next unless message
 

data/lib/openapi3_parser/source/pointer.rb

@@ -8,7 +8,7 @@ module Openapi3Parser
     # provide common means to convert it into different representations.
     class Pointer
       def self.from_fragment(fragment)
-        fragment = fragment[1..-1] if fragment.start_with?("#")
+        fragment = fragment[1..] if fragment.start_with?("#")
         absolute = fragment[0] == "/"
         segments = fragment.split("/").map do |part|
           next if part == ""
@@ -16,7 +16,7 @@ module Openapi3Parser
           unescaped = CGI.unescape(part.gsub("%20", "+"))
           unescaped.match?(/\A\d+\z/) ? unescaped.to_i : unescaped
         end
-        new(segments.compact, absolute)
+        new(segments.compact, absolute: absolute)
       end
 
       def self.merge_pointers(base_pointer, new_pointer)
@@ -27,7 +27,7 @@ module Openapi3Parser
 
       # @param [::Array] segments
       # @param [Boolean] absolute
-      def initialize(segments, absolute = true)
+      def initialize(segments, absolute: true)
         @segments = segments.freeze
         @absolute = absolute
       end
@@ -39,7 +39,7 @@ module Openapi3Parser
       def fragment
         fragment = segments.map { |s| CGI.escape(s.to_s).gsub("+", "%20") }
                            .join("/")
-        "#" + (absolute ? fragment.prepend("/") : fragment)
+        "##{absolute ? fragment.prepend('/') : fragment}"
       end
 
       def to_s
@@ -80,7 +80,7 @@ module Openapi3Parser
         def create_pointer(pointer_like)
           case pointer_like
           when Pointer then pointer_like
-          when ::Array then Pointer.new(pointer_like, false)
+          when ::Array then Pointer.new(pointer_like, absolute: false)
           when ::String then Pointer.from_fragment(pointer_like)
           when nil then nil
           else raise Openapi3Parser::Error, "Unexpected type for pointer"
@@ -93,7 +93,7 @@ module Openapi3Parser
 
           joined = File.expand_path("/#{fragment_a}/#{fragment_b}", "/")
 
-          joined = joined[1..-1] unless pointer_a.absolute
+          joined = joined[1..] unless pointer_a.absolute
 
           Pointer.from_fragment("##{joined}")
         end

data/lib/openapi3_parser/source/resolved_reference.rb

@@ -29,13 +29,9 @@ module Openapi3Parser
       end
 
       def factory
-        @factory ||= begin
-          reference_registry
-            .factory(object_type, source_location)
-            .tap do |factory|
-              message = "Unregistered node factory at #{source_location}"
-              raise Openapi3Parser::Error, message unless factory
-            end
+        @factory ||= reference_registry.factory(object_type, source_location).tap do |factory|
+          message = "Unregistered node factory at #{source_location}"
+          raise Openapi3Parser::Error, message unless factory
         end
       end
 

data/lib/openapi3_parser/source_input/file.rb

@@ -24,7 +24,7 @@ module Openapi3Parser
         @path = ::File.absolute_path(path)
         working_directory ||= resolve_working_directory
         @working_directory = ::File.absolute_path(working_directory)
-        initialize_contents
+        super()
       end
 
       # @see SourceInput#resolve_next

data/lib/openapi3_parser/source_input/raw.rb

@@ -26,7 +26,7 @@ module Openapi3Parser
         @base_url = base_url
         working_directory ||= resolve_working_directory
         @working_directory = ::File.absolute_path(working_directory)
-        initialize_contents
+        super()
       end
 
       # @see SourceInput#resolve_next

data/lib/openapi3_parser/source_input/url.rb

@@ -17,7 +17,7 @@ module Openapi3Parser
       # @param [String, URI] request_url
       def initialize(request_url)
         @request_url = request_url.to_s
-        initialize_contents
+        super()
       end
 
       # @see SourceInput#resolve_next

data/lib/openapi3_parser/source_input.rb

@@ -20,6 +20,14 @@ module Openapi3Parser
   class SourceInput
     attr_reader :access_error, :parse_error
 
+    def initialize
+      return if access_error
+
+      @contents = parse_contents
+    rescue ::StandardError => e
+      @parse_error = Error::UnparsableInput.new(e.message)
+    end
+
     # Indicates that the data within this input is suitable (i.e. can parse
     # underlying JSON or YAML) for trying to use as part of a Document
     def available?
@@ -57,15 +65,5 @@ module Openapi3Parser
     def relative_to(_source_input)
       ""
     end
-
-    private
-
-    def initialize_contents
-      return if access_error
-
-      @contents = parse_contents
-    rescue ::StandardError => e
-      @parse_error = Error::UnparsableInput.new(e.message)
-    end
   end
 end

data/lib/openapi3_parser/validation/error_collection.rb

@@ -56,7 +56,7 @@ module Openapi3Parser
         grouped.each_with_object({}) do |(_, items), memo|
           items.each do |item|
             key = item.location_summary(with_type: items.count > 1)
-            memo[key] = (memo[key] || []) + item.errors.map(&:to_s)
+            memo[key] = memo.fetch(key, []) + item.errors.map(&:to_s)
           end
         end
       end

data/lib/openapi3_parser/validation/input_validator.rb

@@ -10,7 +10,7 @@ module Openapi3Parser
       end
 
       def call(validatable)
-        error = @callable.call(validatable.input)
+        error = callable.call(validatable.input)
         validatable.add_error(error) if error
       end
     end

data/lib/openapi3_parser/validators/component_keys.rb

@@ -6,7 +6,7 @@ module Openapi3Parser
     # defined for a Components node.
     # As defined: https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.1.md#components-object
     class ComponentKeys
-      REGEX = /\A[a-zA-Z0-9\.\-_]+\Z/.freeze
+      REGEX = /\A[a-zA-Z0-9.\-_]+\Z/.freeze
 
       def self.call(input)
         invalid = input.keys.reject { |key| REGEX.match(key) }

data/lib/openapi3_parser/validators/email.rb

@@ -7,10 +7,10 @@ module Openapi3Parser
       # https://html.spec.whatwg.org/#e-mail-state-(type=email)
       REGEX = %r{
         \A
-        [a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+
+        [a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+
         @
         [a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?
-        (?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*
+        (?:.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*
         \Z
       }x.freeze
 

data/lib/openapi3_parser/validators/mutually_exclusive_fields.rb

@@ -78,12 +78,12 @@ module Openapi3Parser
 
         def errors
           @errors ||= begin
-                        default = { required: [], exclusive: [] }
-                        mutually_exclusive_fields
-                          .each_with_object(default) do |exclusive, errors|
-                            add_error(errors, exclusive)
-                          end
-                      end
+            default = { required: [], exclusive: [] }
+            mutually_exclusive_fields
+              .each_with_object(default) do |exclusive, errors|
+                add_error(errors, exclusive)
+              end
+          end
         end
 
         private

data/lib/openapi3_parser/validators/unexpected_fields.rb

@@ -39,7 +39,7 @@ module Openapi3Parser
         extra_keys = input.keys - allowed_fields
         return extra_keys unless allow_extensions
 
-        extra_keys.reject { |key| key =~ NodeFactory::EXTENSION_REGEX }
+        extra_keys.grep_v(NodeFactory::EXTENSION_REGEX)
       end
     end
   end

data/lib/openapi3_parser/validators/url.rb

@@ -4,14 +4,9 @@ module Openapi3Parser
   module Validators
     class Url
       def self.call(input)
-        message = %("#{input}" is not a valid URL)
-        uri = URI.parse(input)
-
-        message if !uri.relative? &&
-                   !uri.is_a?(URI::HTTP) &&
-                   !uri.is_a?(URI::HTTPS)
+        URI.parse(input) && nil
       rescue URI::InvalidURIError
-        message
+        %("#{input}" is not a valid URL)
       end
     end
   end

data/lib/openapi3_parser/version.rb

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

data/openapi3_parser.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |spec|
   spec.version       = Openapi3Parser::VERSION
   spec.author        = "Kevin Dew"
   spec.email         = "kevindew@me.com"
+  spec.metadata      = { "rubygems_mfa_required" => "true" }
 
   spec.summary       = "An OpenAPI V3 parser for Ruby"
   spec.description   = <<-DESCRIPTION
@@ -24,16 +25,17 @@ Gem::Specification.new do |spec|
     f.match(%r{^spec/})
   end
 
-  spec.required_ruby_version = ">= 2.4.0"
+  spec.required_ruby_version = ">= 2.6.0"
 
   spec.add_dependency "commonmarker", "~> 0.17"
-  spec.add_dependency "psych", "~> 3.1"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug", "~> 11.0"
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 3.9"
-  spec.add_development_dependency "rubocop", "~> 0.79.0"
-  spec.add_development_dependency "simplecov", "~> 0.17"
+  spec.add_development_dependency "rubocop", "~> 1"
+  spec.add_development_dependency "rubocop-rake", "~> 0.5"
+  spec.add_development_dependency "rubocop-rspec", "~> 2"
+  spec.add_development_dependency "simplecov", "~> 0.19"
   spec.add_development_dependency "webmock", "~> 3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi3_parser
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.2
 platform: ruby
 authors:
 - Kevin Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -25,21 +25,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: psych
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
+        version: '11.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,75 +67,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -145,11 +159,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENCE
@@ -272,7 +286,8 @@ files:
 homepage: https://github.com/kevindew/openapi_parser
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -281,15 +296,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: An OpenAPI V3 parser for Ruby

data/.travis.yml

@@ -1,22 +0,0 @@
-language: ruby
-sudo: false
-env:
-  global:
-    CC_TEST_REPORTER_ID=8bc2d8e54331569aeb442094c21cb64a58d6efa0670f65ff00d9ae887f63c0b4
-    CC_RUBY_VERSION=ruby-2.4.6
-rvm:
-  - 2.4.6
-  - 2.5.5
-  - 2.6.4
-  - 2.7.0
-  - ruby-head
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-  fast_finish: true
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - if [ $(rvm current) = $CC_RUBY_VERSION ]; then ./cc-test-reporter before-build; fi
-after_script:
-    - if [ $(rvm current) = $CC_RUBY_VERSION ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi