openapi-sourcetools 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66fdcf15ec85b0fd84ac01e72665ced41cf0026cecf4bc36f62d316ff4089c87
-  data.tar.gz: 7b73b94b00c1d0ec2eeddcbd92055515dce3bdc2d33d1f3a4e82294c509b90e2
+  metadata.gz: 625fca7f208b4a1e4c041265a1b5aba0d0685bbda6dcdd831af5db701aff4de0
+  data.tar.gz: bfe98b2ef3fa42ca2edccdf7b57eda9d653637e23a6b6325e41297e00100e1b6
 SHA512:
-  metadata.gz: ecd07946cb028d9219aa00bc77507ec3e594b981b5fbb503c9142f2d7cd4f2248dabdfe706ef3a47f46a20377a81118d2125c3c94f8ad780ae58f07a346f0b0a
-  data.tar.gz: 21d343fdc926592defb63d521ad5245452036b39016e4cd97f4b3dcbc3319f5d03b592bca2a3006c01a5aee2295a6d2475f9029d2002d8dde689600d6cbb963c
+  metadata.gz: 7895833d61f1954c4d6b056e2b350c72d767c7ec031222bcec9f8aa2820836eced6e5432f14465f567967bce674006e699bc65180d73951a1ff63b7d40c5fc57
+  data.tar.gz: b86546e0d0cf07d19ba082e43f29b4f0c35bef6d05f6e678695f7d821bf38e1e761eaa95ecf10a7c0a00e0a41710fdf088eba13b8c3bd9f4b46a7bac7db49f49

data/bin/openapi-merge

@@ -6,9 +6,9 @@
 
 require_relative '../lib/openapi/sourcetools/common'
 require 'optparse'
-require 'set'
 include OpenAPISourceTools
 
+
 def raise_se(message)
   raise StandardError, message
 end
@@ -26,6 +26,14 @@ def too_deep(path, max_depths)
   max_depths.fetch(path.first) <= path.size
 end
 
+def add_missing(existing, incoming, field)
+  incoming.each do |t|
+    tv = t[field]
+    next if tv.nil?
+    existing.push(t) if existing.index { |e| e.key?(field) && e[field] == tv }.nil?
+  end
+end
+
 def add_undefined(merged, incoming, filename, path, max_depths)
   incoming.each_pair do |key, value|
     unless merged.key? key
@@ -40,9 +48,11 @@ def add_undefined(merged, incoming, filename, path, max_depths)
       add_undefined(m, value, filename, path, max_depths)
       path.pop
     elsif m.is_a? Array
-      value.each do |v|
-        next if m.include? v
-        m.push v
+      case key
+      when 'tags' then add_missing(m, value, 'name')
+      when 'servers' then add_missing(m, value, 'url')
+      else
+        value.each { |v| m.push(v) unless m.include?(v) }
       end
     else
       raise_se "Re-definition of #{key} #{path_combo(path)} in #{filename}"
@@ -65,10 +75,10 @@ def gather_refs(doc, found)
 end
 
 def has_refd_anchor(item, refs)
-  return !((item.index { |v| has_refd_anchor(v, refs) }).nil?) if item.is_a?(Array)
+  return !item.index { |v| has_refd_anchor(v, refs) }.nil? if item.is_a?(Array)
   return false unless item.is_a?(Hash)
-  return true if refs.member?('#' + item.fetch('$anchor', ''))
-  !((item.values.index { |v| has_refd_anchor(v, refs) }).nil?)
+  return true if refs.member?("##{item.fetch('$anchor', '')}")
+  !item.values.index { |v| has_refd_anchor(v, refs) }.nil?
 end
 
 def prune(merged)
@@ -83,7 +93,7 @@ def prune(merged)
     end
     # Add schema ref for all schemas that have referenced anchor somewhere.
     (merged.dig(*%w[components schemas]) || {}).each do |name, schema|
-      refs.add("#/components/Schemas/#{name}") if has_refd_anchor(schema, refs)
+      refs.add("#/components/schemas/#{name}") if has_refd_anchor(schema, refs)
     end
     used = {}
     all = merged.fetch('components', {})

data/lib/openapi/sourcetools/version.rb

@@ -5,7 +5,7 @@
 
 module OpenAPISourceTools
   NAME = 'openapi-sourcetools'
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 
   def self.info(separator = ': ')
     "#{NAME}#{separator}#{VERSION}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openapi-sourcetools
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-18 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge