openapi-sourcetools 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44ff7d64b4781fdfbab07060f6faa294a8092e342530e6cde786e50ff8f69db1
-  data.tar.gz: 893e593407c4734e67c83bffe77a67bb55b2ecef3970620a416580fd33109437
+  metadata.gz: 625fca7f208b4a1e4c041265a1b5aba0d0685bbda6dcdd831af5db701aff4de0
+  data.tar.gz: bfe98b2ef3fa42ca2edccdf7b57eda9d653637e23a6b6325e41297e00100e1b6
 SHA512:
-  metadata.gz: 741c12063a6d5df5d090f26b80c60a7810083537076573cb10f9ba5a3ca3afc8109ab6faa305707139c881a7efa1f478d7d0de562db67b44f93c0329ae8263e4
-  data.tar.gz: 9e1c2bc87442258d75517beb13f99c1e0b210b7074ee622db8057e1e4ebf17c253538ba52b893b0f148baa21188a306976a9783d778e92dd769caee6eb84aef6
+  metadata.gz: 7895833d61f1954c4d6b056e2b350c72d767c7ec031222bcec9f8aa2820836eced6e5432f14465f567967bce674006e699bc65180d73951a1ff63b7d40c5fc57
+  data.tar.gz: b86546e0d0cf07d19ba082e43f29b4f0c35bef6d05f6e678695f7d821bf38e1e761eaa95ecf10a7c0a00e0a41710fdf088eba13b8c3bd9f4b46a7bac7db49f49

data/bin/openapi-addschemas

@@ -48,10 +48,13 @@ def replace_inlines(obj, components, top_level_name = nil)
   when 'array'
     return false unless replace_inlines(obj['items'], components)
   when 'object'
-    props = obj.fetch('properties', {})
-    props.keys.sort!.each do |name|
-      return false unless replace_inlines(props[name], components)
+    %w[properties patternProperties].each do |prop_name|
+      props = obj.fetch(prop_name, {})
+      props.keys.sort!.each do |name|
+        return false unless replace_inlines(props[name], components)
+      end
     end
+    return false unless replace_inlines(obj['additionalProperties'], components)
   end
   r = components.ref_string(top_level_name) || components.reference(obj)
   components.store_anchor(obj, r)

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/bin/openapi-patterntests

@@ -21,6 +21,13 @@ def find_patterns(doc, pmm)
       pmm[key(doc)] = item
       return
     end
+    pps = doc['patternProperties']
+    unless pps.nil?
+      pps.keys.sort!.each do |pat|
+        item = { 'pattern' => pat }
+        pmm[key(item)] = item
+      end
+    end
     doc = doc.values
   end
   doc.each { |v| find_patterns(v, pmm) } if doc.is_a?(Array)

data/lib/openapi/sourcetools/version.rb

@@ -5,7 +5,7 @@
 
 module OpenAPISourceTools
   NAME = 'openapi-sourcetools'
-  VERSION = '0.9.0'
+  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.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-15 00:00:00.000000000 Z
+date: 2025-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge