openapi_parser 0.1.5 → 0.1.6

data/lib/openapi_parser/version.rb

@@ -1,3 +1,3 @@
 module OpenAPIParser
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

data/openapi_parser.gemspec

@@ -24,9 +24,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'fincop'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-parameterized'
+  spec.add_development_dependency 'simplecov'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ota42y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2018-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,49 +39,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
+  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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-parameterized
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,7 +132,9 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_ignore.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -130,7 +146,22 @@ files:
 - lib/openapi_parser/concern.rb
 - lib/openapi_parser/concerns/expandable.rb
 - lib/openapi_parser/concerns/findable.rb
-- lib/openapi_parser/concerns/parseable.rb
+- lib/openapi_parser/concerns/media_type_selectable.rb
+- lib/openapi_parser/concerns/parser.rb
+- lib/openapi_parser/concerns/parser/core.rb
+- lib/openapi_parser/concerns/parser/hash.rb
+- lib/openapi_parser/concerns/parser/hash_body.rb
+- lib/openapi_parser/concerns/parser/list.rb
+- lib/openapi_parser/concerns/parser/object.rb
+- lib/openapi_parser/concerns/parser/value.rb
+- lib/openapi_parser/concerns/schema_loader.rb
+- lib/openapi_parser/concerns/schema_loader/base.rb
+- lib/openapi_parser/concerns/schema_loader/creator.rb
+- lib/openapi_parser/concerns/schema_loader/hash_body_loader.rb
+- lib/openapi_parser/concerns/schema_loader/hash_objects_loader.rb
+- lib/openapi_parser/concerns/schema_loader/list_loader.rb
+- lib/openapi_parser/concerns/schema_loader/objects_loader.rb
+- lib/openapi_parser/concerns/schema_loader/values_loader.rb
 - lib/openapi_parser/config.rb
 - lib/openapi_parser/errors.rb
 - lib/openapi_parser/parameter_validator.rb
@@ -138,6 +169,7 @@ files:
 - lib/openapi_parser/reference_expander.rb
 - lib/openapi_parser/request_operation.rb
 - lib/openapi_parser/schema_validator.rb
+- lib/openapi_parser/schema_validators/all_of_validator.rb
 - lib/openapi_parser/schema_validators/any_of_validator.rb
 - lib/openapi_parser/schema_validators/array_validator.rb
 - lib/openapi_parser/schema_validators/base.rb
@@ -185,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0.beta3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: OpenAPI3 parser

data/lib/openapi_parser/concerns/parseable.rb

@@ -1,238 +0,0 @@
-module OpenAPIParser::Parseable
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-  module ClassMethods
-    attr_reader :_openapi_attr_values,
-                :_openapi_attr_list_objects,
-                :_openapi_attr_objects,
-                :_openapi_attr_hash_objects,
-                :_openapi_attr_hash_body_objects
-
-    # no option support
-    def openapi_attr_values(*names)
-      names.each { |name| openapi_attr_value(name) }
-    end
-
-    def openapi_attr_value(name, options = {})
-      @_openapi_attr_values = {} unless defined?(@_openapi_attr_values)
-
-      attr_reader name
-      @_openapi_attr_values[name] =  options
-    end
-
-    # no option support
-    def openapi_attr_objects(*names, klass)
-      names.each { |name| openapi_attr_object(name, klass) }
-    end
-
-    def openapi_attr_object(name, klass, options = {})
-      @_openapi_attr_objects = {} unless defined?(@_openapi_attr_objects )
-
-      attr_reader name
-      @_openapi_attr_objects[name] = options.merge(klass: klass)
-    end
-
-    def openapi_attr_list_object(name, klass, options = {})
-      @_openapi_attr_list_objects = {} unless defined?(@_openapi_attr_list_objects)
-
-      attr_reader name
-      @_openapi_attr_list_objects[name] = options.merge(klass: klass)
-    end
-
-    def openapi_attr_hash_object(name, klass, options = {})
-      @_openapi_attr_hash_objects = {} unless defined?(@_openapi_attr_hash_objects)
-
-      attr_reader name
-      @_openapi_attr_hash_objects[name] = options.merge(klass: klass)
-    end
-
-    def openapi_attr_hash_body_objects(name, klass, options = {})
-      @_openapi_attr_hash_body_objects = {} unless defined?(@_openapi_attr_hash_body_objects)
-
-      options[:reject_keys] = options[:reject_keys] ? options[:reject_keys].map(&:to_s) : []
-
-      attr_reader name
-      @_openapi_attr_hash_body_objects[name] = options.merge(klass: klass)
-    end
-  end
-
-  def child_from_reference(reference)
-    _openapi_all_child_objects[reference]
-  end
-
-  def _openapi_all_child_objects
-    @_openapi_all_child_objects ||= {}
-  end
-
-  def _add_child_object(object)
-    return unless object.is_a?(OpenAPIParser::Parseable)
-    _openapi_all_child_objects[object.object_reference] = object
-  end
-
-  def _update_child_object(old, new)
-    _openapi_all_child_objects[old.object_reference] = new
-  end
-
-  def load_data
-    create_attr_values(self.class._openapi_attr_values)
-
-    create_attr_objects(self.class._openapi_attr_objects)
-    create_attr_list_objects(self.class._openapi_attr_list_objects)
-    create_attr_hash_objects(self.class._openapi_attr_hash_objects)
-    create_attr_hash_body_objects(self.class._openapi_attr_hash_body_objects)
-  end
-
-  def create_attr_list_objects(settings)
-    return unless settings
-
-    settings.each do |variable_name, options|
-      ref_name_base = options[:schema_key] ? options[:schema_key] : variable_name
-      klass = options[:klass]
-      allow_reference = options[:reference] || false
-      allow_data_type = options[:allow_data_type]
-      
-      create_attr_list_object(variable_name, raw_schema[ref_name_base.to_s], ref_name_base, klass, allow_reference, allow_data_type)
-    end
-  end
-
-  def create_attr_hash_objects(settings)
-    return unless settings
-
-    settings.each do |variable_name, options|
-      ref_name_base = options[:schema_key] ? options[:schema_key] : variable_name
-      klass = options[:klass]
-      allow_reference = options[:reference] || false
-      allow_data_type = options[:allow_data_type]
-      
-      create_attr_hash_object(variable_name, raw_schema[ref_name_base .to_s], ref_name_base, klass, allow_reference, allow_data_type)
-    end
-  end
-
-  def create_attr_objects(values)
-    return unless values
-
-    values.each do |name, options|
-      key = options[:schema_key] ? options[:schema_key] : name
-      klass = options[:klass]
-      allow_reference = options[:reference] || false
-      allow_data_type = options[:allow_data_type]
-      
-      obj = create_attr_object(name, key, raw_schema[key.to_s], klass, allow_reference, allow_data_type)
-      _add_child_object(obj)
-    end
-  end
-
-  def create_attr_hash_body_objects(values)
-    return unless values
-
-    values.each do |name, options|
-      klass = options[:klass]
-      allow_reference = options[:reference] || false
-      allow_data_type = options[:allow_data_type]
-      reject_keys = options[:reject_keys]
-
-      create_hash_body_objects(name, raw_schema, klass, allow_reference, allow_data_type, reject_keys)
-    end
-  end
-
-  def create_attr_values(values)
-    return unless values
-
-    values.each do |variable_name, options|
-      key = options[:schema_key] ? options[:schema_key] : variable_name
-
-      create_variable(variable_name, raw_schema[key.to_s])
-    end
-  end
-
-
-  # for responses and paths object
-  def create_hash_body_objects(name, schema, klass, allow_reference, allow_data_type, reject_keys)
-    unless schema
-      create_variable(name, nil)
-      return
-    end
-
-    objects = schema.reject{|k, _| reject_keys.include?(k)}.map do |name, child_schema|
-      [
-          name.to_s, # support string key only in OpenAPI3
-          build_openapi_object(escape_reference(name), child_schema, klass, allow_reference, allow_data_type)
-      ]
-    end.to_h
-
-    create_variable(name, objects)
-    objects.values.each { |o| _add_child_object(o) }
-  end
-
-  # @return [OpenAPIParser::Schemas::Base]
-  def create_attr_object(variable_name, ref_name, schema, klass, allow_reference, allow_data_type)
-    data = build_openapi_object(ref_name, schema, klass, allow_reference, allow_data_type)
-    create_variable(variable_name, data)
-    data
-  end
-
-  def create_attr_hash_object(variable_name, hash_schema, ref_name_base, klass, allow_reference, allow_data_type)
-    data = if hash_schema
-             hash_schema.map { |key, s| [key, build_openapi_object([ref_name_base, key], s, klass, allow_reference, allow_data_type) ]}.to_h
-           else
-             nil
-           end
-
-    create_variable(variable_name, data)
-    data.values.each { |obj| _add_child_object(obj) } if data
-  end
-
-  def create_attr_list_object(variable_name, array_schema, ref_name_base, klass, allow_reference, allow_data_type)
-    data = if array_schema
-             array_schema.map.with_index { |s, idx| build_openapi_object([ref_name_base, idx], s, klass, allow_reference, allow_data_type) }
-           else
-             nil
-           end
-
-    create_variable(variable_name, data)
-    data.each { |obj| _add_child_object(obj) } if data
-  end
-
-
-  # create instance variable @variable_name using data
-  # @param [String] variable_name
-  # @param [Object] data
-  def create_variable(variable_name, data)
-    instance_variable_set("@#{variable_name}", data)
-  end
-
-  # return nil, klass, Reference
-  def build_openapi_object(ref_names, schema, klass, allow_reference, allow_data_type)
-    return nil unless schema
-
-    if allow_data_type && !check_object_schema?(schema)
-      schema
-    elsif allow_reference && check_reference_schema?(schema)
-      OpenAPIParser::Schemas::Reference.new(build_object_reference(ref_names), self, self.root, schema)
-    else
-      klass.new(build_object_reference(ref_names), self, self.root, schema)
-    end
-  end
-
-  # @return Boolean
-  def check_reference_schema?(check_schema)
-    check_object_schema?(check_schema) && !check_schema['$ref'].nil?
-  end
-
-  def check_object_schema?(check_schema)
-    check_schema.is_a?(Hash)
-  end
-
-  def escape_reference(str)
-    str.to_s.gsub('/', '~1')
-  end
-
-  # @return [String]
-  def build_object_reference(names)
-    names = [names] unless names.is_a?(Array)
-    ref = names.map{ |n| escape_reference(n)}.join('/')
-
-    "#{object_reference}/#{ref}"
-  end
-end