openapi3_parser 0.7.0 → 0.8.0

data/lib/openapi3_parser/source_input/file.rb

@@ -39,6 +39,7 @@ module Openapi3Parser
       # @return [Boolean]
       def ==(other)
         return false unless other.instance_of?(self.class)
+
         path == other.path &&
           working_directory == other.working_directory
       end
@@ -66,6 +67,7 @@ module Openapi3Parser
                      end
 
         return path unless other_path
+
         other_path ? relative_path(other_path, path) : path
       end
 

data/lib/openapi3_parser/source_input/raw.rb

@@ -44,6 +44,7 @@ module Openapi3Parser
       # @return [Boolean]
       def ==(other)
         return false unless other.instance_of?(self.class)
+
         raw_input == other.raw_input &&
           base_url == other.base_url &&
           working_directory == other.working_directory
@@ -72,6 +73,7 @@ module Openapi3Parser
 
       def parse_contents
         return raw_input if raw_input.respond_to?(:keys)
+
         StringParser.call(
           input_to_string(raw_input),
           raw_input.respond_to?(:path) ? ::File.basename(raw_input.path) : nil
@@ -81,6 +83,7 @@ module Openapi3Parser
       def input_to_string(input)
         return input.read if input.respond_to?(:read)
         return input.to_s if input.respond_to?(:to_s)
+
         input
       end
     end

data/lib/openapi3_parser/source_input/resolve_next.rb

@@ -30,6 +30,7 @@ module Openapi3Parser
 
       def source_input
         return current_source_input if reference.only_fragment?
+
         if reference.absolute?
           SourceInput::Url.new(reference.resource_uri)
         else

data/lib/openapi3_parser/source_input/string_parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "yaml"
+require "psych"
 require "json"
 
 module Openapi3Parser
@@ -27,6 +27,7 @@ module Openapi3Parser
 
       def json?
         return false if filename && ::File.extname(filename) == ".yaml"
+
         json_filename = filename && ::File.extname(filename) == ".json"
         json_filename || input.strip[0] == "{"
       end
@@ -36,7 +37,7 @@ module Openapi3Parser
       end
 
       def parse_yaml
-        YAML.safe_load(input, [Date, Time], [], true)
+        Psych.safe_load(input, permitted_classes: [Date, Time], aliases: true)
       end
     end
   end

data/lib/openapi3_parser/source_input/url.rb

@@ -32,6 +32,7 @@ module Openapi3Parser
       # @return [Boolean]
       def ==(other)
         return false unless other.instance_of?(self.class)
+
         [request_url, resolved_url].include?(other.request_url) ||
           [request_url, resolved_url].include?(other.resolved_url)
       end
@@ -89,6 +90,7 @@ module Openapi3Parser
 
         def call
           return to_uri.to_s if different_hosts?
+
           relative_path
         end
 

data/lib/openapi3_parser/validation/error.rb

@@ -35,6 +35,7 @@ module Openapi3Parser
       def for_type
         return unless factory_class
         return "(anonymous)" unless factory_class.name
+
         factory_class.name.split("::").last
       end
 
@@ -47,6 +48,7 @@ module Openapi3Parser
       # @return [Boolean]
       def ==(other)
         return false unless other.instance_of?(self.class)
+
         message == other.message &&
           context == other.context &&
           factory_class == other.factory_class

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/
+      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/duplicate_parameters.rb

@@ -17,6 +17,7 @@ module Openapi3Parser
       def duplicate_names_by_in(resolved_input)
         potential_items = resolved_input.reject do |item|
           next true unless item.respond_to?(:keys)
+
           item["name"].nil? || item["in"].nil?
         end
 

data/lib/openapi3_parser/validators/email.rb

@@ -12,7 +12,7 @@ module Openapi3Parser
         [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
+      }x.freeze
 
       def self.call(input)
         message = %("#{input}" is not a valid email address)

data/lib/openapi3_parser/validators/media_type.rb

@@ -9,7 +9,7 @@ module Openapi3Parser
         / # separating slash
         ([-+.\w]+|\*) # word (with +, - & .) or asterisk
         \Z
-      }x
+      }x.freeze
 
       def self.call(input)
         message = %("#{input}" is not a valid media type)

data/lib/openapi3_parser/validators/mutually_exclusive_fields.rb

@@ -8,8 +8,8 @@ module Openapi3Parser
       using ArraySentence
       private_class_method :new
 
-      def self.call(*args)
-        new.call(*args)
+      def self.call(*args, **kwargs)
+        new.call(*args, **kwargs)
       end
 
       def call(validatable,

data/lib/openapi3_parser/validators/reference.rb

@@ -21,6 +21,7 @@ module Openapi3Parser
 
       def build_errors
         return "Expected a string" unless given_reference.is_a?(String)
+
         begin
           uri = URI.parse(given_reference)
         rescue URI::Error
@@ -31,6 +32,7 @@ module Openapi3Parser
 
       def check_fragment(uri)
         return if uri.fragment.nil? || uri.fragment.empty?
+
         first_char = uri.fragment[0]
 
         "Invalid JSON pointer, expected a root slash" if first_char != "/"

data/lib/openapi3_parser/validators/required_fields.rb

@@ -8,8 +8,8 @@ module Openapi3Parser
       using ArraySentence
       private_class_method :new
 
-      def self.call(*args)
-        new.call(*args)
+      def self.call(*args, **kwargs)
+        new.call(*args, **kwargs)
       end
 
       def call(validatable,

data/lib/openapi3_parser/validators/unexpected_fields.rb

@@ -8,8 +8,8 @@ module Openapi3Parser
       using ArraySentence
       private_class_method :new
 
-      def self.call(*args)
-        new.call(*args)
+      def self.call(*args, **kwargs)
+        new.call(*args, **kwargs)
       end
 
       def call(validatable,
@@ -38,6 +38,7 @@ module Openapi3Parser
       def unexpected_fields(input, allowed_fields, allow_extensions)
         extra_keys = input.keys - allowed_fields
         return extra_keys unless allow_extensions
+
         extra_keys.reject { |key| key =~ NodeFactory::EXTENSION_REGEX }
       end
     end

data/lib/openapi3_parser/version.rb

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

data/openapi3_parser.gemspec

@@ -27,11 +27,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.4.0"
 
   spec.add_dependency "commonmarker", "~> 0.17"
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "byebug", "~> 10.0"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 0.53.0"
-  spec.add_development_dependency "webmock", "~> 3.1"
+  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 "rspec", "~> 3.9"
+  spec.add_development_dependency "rubocop", "~> 0.79.0"
+  spec.add_development_dependency "simplecov", "~> 0.17"
+  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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kevin Dew
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker
@@ -25,89 +25,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.17'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
+        version: '3.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  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: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.79.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.53.0
+        version: 0.79.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
 description: |2
       A tool to parse and validate OpenAPI V3 files.
       Aims to provide complete compatibility with the OpenAPI specification and