openapi_contracts 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf01b7d7bc32b8559fd622dd8b4f5e8853b34f6c0b022bc62d6bbc0763ac3ef
-  data.tar.gz: 5f50c088ce2a94e09461b425ed5aeffb939e43de36e6eb151a85b613e61a2643
+  metadata.gz: f218118990cd1c4d1d2933bcb42a84a84492226a1a075d2cb92a5acd026b3478
+  data.tar.gz: 072bf7fd56d4a22adacb31706e8773888588e3e466b9783653065a335de4a063
 SHA512:
-  metadata.gz: e79b4e22603f9af923cae9bbea448b371b6927e9bc4db1a35935dc3967e33f99df3f76463803a5ec609f0de660790f8496768d40a166755293b6f3d9d4b9808b
-  data.tar.gz: afdbc680208de55cc64e298a72bc44b792e1a63be8c0247a6271ec1734fb13b15a43168308cb441fa835f5ebc8ef041912a4a54b5cce002f65b32c1509f43fa0
+  metadata.gz: 54e760ebff2c63b357bad2f47b1ad741405fbe23997af447079361e377cda3419d7befa4717cc193e0f7f11fe56ce719dc93c3dc198e70b9257b30b3d8e3e1db
+  data.tar.gz: b706d606ec874409f5b1cdae4dd3b166b036cbc009f4d288f423cfae870c4db8d58e5751ebc38607e7b1349b189c4441bb78256d349a9739653966c7490b751c

data/README.md

@@ -16,7 +16,7 @@ First parse your api documentation:
 
 ```ruby
 # This must point to the folder where the "openapi.yaml" file is
-$doc = OpenapiContracts::Doc.parse(Rails.root.join('spec', 'fixtures', 'openapi', 'api-docs', 'openapi'))
+$doc = OpenapiContracts::Doc.parse(Rails.root.join('spec/fixtures/openapi/api-docs/openapi'))
 ```
 
 Ideally you do this once in a RSpec `before(:suite)` hook.

data/lib/openapi_contracts/doc/parser.rb

@@ -12,14 +12,15 @@ module OpenapiContracts
       abs_path = @dir.join(path)
       data = parse_file(abs_path, translate: false)
       data.deep_merge! merge_components
-      join_partials(abs_path.dirname, data)
+      data = join_partials(abs_path.dirname, data)
+      nullable_to_type!(data)
     end
 
     private
 
     def parse_file(path, translate: true)
       schema = YAML.safe_load(File.read(path))
-      translate ? translate_paths(schema, Pathname(path).parent) : schema
+      translate ? translate_paths!(schema, Pathname(path).parent) : schema
     end
 
     def join_partials(cwd, data)
@@ -34,10 +35,23 @@ module OpenapiContracts
       end
     end
 
+    def nullable_to_type!(object)
+      case object
+      when Hash
+        if object['type'] && object['nullable']
+          object['type'] = [object['type'], 'null']
+          object.delete 'nullable'
+        else
+          object.each_value { |o| nullable_to_type! o }
+        end
+      when Array
+        object.each { |o| nullable_to_type! o }
+      end
+    end
+
     def merge_components
       data = {}
       Dir[File.expand_path('components/**/*.yaml', @dir)].each do |file|
-        # pn = Pathname(file).relative_path_from(@dir)
         pointer = json_pointer(Pathname(file)).split('/')
         i = 0
         pointer.reduce(data) do |h, p|
@@ -53,14 +67,17 @@ module OpenapiContracts
       data
     end
 
-    def translate_paths(data, cwd)
-      data.each_with_object({}) do |(key, val), m|
-        if val.is_a?(Hash)
-          m[key] = translate_paths(val, cwd)
-        elsif key == '$ref' && val !~ %r{^#/}
-          m[key] = json_pointer(cwd.join(val), '#/')
-        else
-          m[key] = val
+    def translate_paths!(data, cwd)
+      case data
+      when Array
+        data.each { |v| translate_paths!(v, cwd) }
+      when Hash
+        data.each_pair do |k, v|
+          if k == '$ref' && v !~ %r{^#/}
+            v.replace json_pointer(cwd.join(v), '#/')
+          else
+            translate_paths!(v, cwd)
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi_contracts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - mkon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.29.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.0
+        version: 1.29.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="