diagrammatron 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c51dc3c8502bd1626d2a78bccd7e772e60fb25a26e6327879f42144849db598
-  data.tar.gz: 78548d0ad0af86031afecb81bf4fedca42da58420d0de3a0d5063f07cb68538e
+  metadata.gz: f070bf8480ad655c260869aa9854d7553456491c68379403a16b50572ede42f4
+  data.tar.gz: ee33a1019e9d512c0a6afd7e70528b5bfaad8d53de1b00f3087d0e3945af1d0a
 SHA512:
-  metadata.gz: 03d48ecd6c7e586007dcb470655fff6814e21d32f1921dcb828b35602bea208e48f58d9ba2ea5cdf5f16fb8f633a242a9d43a599c21fbf61d5ffaa631282c827
-  data.tar.gz: 5ed263d065a49d69a031fa140ac0159d58301da26f4b51807573e5b8eefbeca6238301f6953cca5c8b44423a83fec18903a7e9d960a5b3fcf1d4702f1b671233
+  metadata.gz: c5fb77d00c5ddf0ac067793357ad3dd961d37d47a0fedf152a1c90fe3b1013c35c88ca6496c5265389ca8f14927b77ce8f88a3def1c384e6938aae5617f78016
+  data.tar.gz: 665945789543418c34fe598e4aca5796bcabb0dfebcd19dced9da2c9fab1850136f8b6c76dbec180800f1478aac3e7f74fa10cc2cb9c1b30c1f1bf98a38d5de8

data/bin/diagrammatron-schema

@@ -50,7 +50,7 @@ def main
       output = filename
     end
     opts.on('-l', '--list', 'List available schemas and exit.') do
-      $stdout.puts list_schemas.join("\n")
+      $stdout.puts list_schemas.sort.join("\n")
       exit 0
     end
     opts.on('-h', '--help', 'Print this help and exit.') do

data/lib/subsets.rb

@@ -0,0 +1,147 @@
+# frozen_string_literal: true
+
+# Copyright © 2023 Ismo Kärkkäinen
+# Licensed under Universal Permissive License. See LICENSE.txt.
+
+require_relative '../lib/common'
+require 'ostruct'
+require 'set'
+
+def split_expression_string(expression_string)
+  out = []
+  remaining = expression_string.lstrip
+  until remaining.empty?
+    item, sep, rest = remaining.partition(/[\s+-]/)
+    out << item unless item.empty?
+    sep.strip!
+    unless sep.empty?
+      out << :plus if sep == '+'
+      out << :minus if sep == '-'
+    end
+    remaining = rest.lstrip
+  end
+  out
+end
+
+def identifier?(item)
+  item.is_a?(String)
+end
+
+def expression_array_errors(expression_array)
+  errors = []
+  previous_item_type = :symbol
+  unless expression_array.empty?
+    errors << 'Expression must start with an identifier' unless identifier?(expression_array.first)
+    errors << 'Expression must end with an identifier' unless identifier?(expression_array.last)
+  end
+  expression_array.each_with_index do |item, index|
+    current_item_type = identifier?(item) ? :identifier : :symbol
+    if current_item_type == previous_item_type
+      errors << "Invalid item '#{item}' at index #{index}. Expected #{current_item_type == :identifier ? 'operator' : 'identifier'}."
+    end
+    previous_item_type = current_item_type
+  end
+  errors.empty? ? nil : errors
+end
+
+def check_rules(r, filename)
+  ok = true
+  c = {}
+  r.fetch('sets', []).each do |setrules|
+    name = setrules.delete('name')
+    if c.key?(name)
+      aargh("#{filename} duplicate set name: #{name}")
+      ok = false
+      next
+    end
+    cats = {}
+    %i[any nodes edges].each do |category|
+      fr = {}
+      setrules.fetch(category.to_s, []).each do |fieldrules|
+        frn = fieldrules['name']
+        res = fr.fetch(frn, [])
+        res.concat(fieldrules['rules'].map { |str| Regexp.new(str) })
+        fr[frn] = res
+      rescue StandardError => e
+        aargh("#{filename} #{name} #{category} #{frn} rule error:\n#{e}")
+        ok = false
+      end
+      cats[category] = fr
+    end
+    c[name] = cats
+  end
+  r['sets'] = c
+  c = {}
+  r.fetch('expressions', []).each do |ne|
+    name = ne.delete('name')
+    if c.key?(name)
+      aargh("#{filename} duplicate expression name: #{name}")
+      ok = false
+      next
+    end
+    ea = split_expression_string(ne['expression'])
+    errs = expression_array_errors(ea)
+    unless errs.nil?
+      aargh("#{filename} expressions #{name}:\n#{errs.join("\n")}")
+      ok = false
+    end
+    c[name] = ea
+  end
+  r['expressions'] = c
+  ok
+end
+
+# Values in any are used if there is no existing value.
+def merge_any(r)
+  r.fetch('sets', {}).each_value do |rules|
+    any = rules.delete(:any)
+    next if any.nil?
+    %i[edges nodes].each do |category|
+      c = rules.fetch(category, {})
+      any.each do |field, patterns|
+        next if c.key?(field)
+        c[field] = patterns
+      end
+      rules[category] = c
+    end
+  end
+end
+
+# sets:
+#   name:
+#     nodes/edges: # Merge here.
+#       name: []
+# expressions: # Merge here.
+#   name: string
+
+def merge_rules(full, overwriting)
+  full['expressions'] = {} unless full.key? 'expressions'
+  full['expressions'].merge!(overwriting.fetch('expressions', {}))
+  sets = full.fetch('sets', {})
+  ow = overwriting.fetch('sets', {})
+  sets.each do |name, rules|
+    %i[nodes edges].each do |category|
+      m = ow.dig(name, category)
+      next if m.nil?
+      rules[category] = {} unless rules.key? category
+      rules[category].merge!(m)
+    end
+  end
+  sets.merge!(ow) { |_key, merged, _used| merged } # Adds new sets.
+  full['sets'] = sets
+end
+
+def match_item(item, rules)
+  rules.each do |field, patterns|
+    vals = item.fetch(field, nil)
+    next if vals.nil?
+    vals = [ vals ] unless vals.is_a?(Array)
+    patterns.each do |p|
+      vals.each do |v|
+        next unless v.is_a?(String)
+        return true if p.match?(v)
+      end
+    end
+  end
+  false
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -66,6 +66,7 @@ files:
 - lib/place.yaml
 - lib/render.yaml
 - lib/subset.yaml
+- lib/subsets.rb
 - template/internal.yaml
 - template/root.yaml
 - template/svg_1.1.erb