diagrammatron 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c51dc3c8502bd1626d2a78bccd7e772e60fb25a26e6327879f42144849db598
-  data.tar.gz: 78548d0ad0af86031afecb81bf4fedca42da58420d0de3a0d5063f07cb68538e
+  metadata.gz: 6d1116130a55f28418c67f0522150a80ab39e275e0a473518052758a3b6959c7
+  data.tar.gz: 16447cd371aa60d1834356d7f712356400e2ae649124fa46ee6cef683072bc86
 SHA512:
-  metadata.gz: 03d48ecd6c7e586007dcb470655fff6814e21d32f1921dcb828b35602bea208e48f58d9ba2ea5cdf5f16fb8f633a242a9d43a599c21fbf61d5ffaa631282c827
-  data.tar.gz: 5ed263d065a49d69a031fa140ac0159d58301da26f4b51807573e5b8eefbeca6238301f6953cca5c8b44423a83fec18903a7e9d960a5b3fcf1d4702f1b671233
+  metadata.gz: 07c0d08e9244fcb9f05910a0513c9efe33e2dab58fa3860d7b168d06e53c8fbda3261aeca58258ec5e00f48568495cec99f5106bedefabe5d04ba59e7b80eaff
+  data.tar.gz: fbe5b2147cb128c398bdae0ca4e3afc681683947601d0f2b0034dfa26b253cc26be3328c3c526dcc17ef00f2024e9870dd345f048f093e194ec1b56c1c76f4eb

data/bin/diagrammatron-copy

@@ -0,0 +1,103 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# Copyright © 2023 Ismo Kärkkäinen
+# Licensed under Universal Permissive License. See LICENSE.txt.
+
+require_relative '../lib/common'
+require 'optparse'
+
+def make_dst2src(args)
+  dst2src = {}
+  (0...args.size).step(2) do |sidx|
+    src = args[sidx]
+    dst = args[sidx + 1]
+    dst2src[dst] = src
+  end
+  dst2src
+end
+
+def invert(dst2src)
+  src2dst = {}
+  dst2src.each do |dst, src|
+    src2dst[src] = src2dst.fetch(src, []).push(dst)
+  end
+  src2dst
+end
+
+def gather_values(item, src2dst)
+  vals = {}
+  src2dst.each_key do |src|
+    v = item.fetch(src, nil)
+    vals[src] = v unless v.nil?
+  end
+  vals
+end
+
+def copy_fields(item, src2dst)
+  vals = gather_values(item, src2dst)
+  copied = {}
+  vals.each do |src, v|
+    src2dst[src].each do |dst|
+      copied[dst] = v
+    end
+  end
+  copied
+end
+
+def main
+  input = nil
+  output = nil
+  input_output_schema = 'copy'
+  ENV['POSIXLY_CORRECT'] = '1' # Leaves field name pairs as they are.
+  parser = OptionParser.new do |opts|
+    opts.summary_indent = '  '
+    opts.summary_width = 20
+    opts.banner = 'Usage: diagrammatron-copy [options] source destination ...'
+    opts.separator ''
+    opts.separator 'Options:'
+    opts.on('-i', '--input FILE', 'Input file name. Read from stdin if not given.') do |filename|
+      input = filename
+    end
+    opts.on('-o', '--output FILE', 'Output file name. Write to stdout if not given.') do |filename|
+      output = filename
+    end
+    opts.on('-h', '--help', 'Print this help and exit.') do
+      $stdout.puts %(#{opts}
+Source and destination are field names in pairs.
+
+Input and output YAML file schema is returned by:
+diagrammatron-schema #{input_output_schema}
+
+Output is the input file with fields in nodes and edges copied from source,
+when present, to destination field name. All copies are made at the same
+time, so you can swap field contents, but chaining the copying is not
+supported. In such case, provide the same source field in multiple pairs.
+)
+      exit 0
+    end
+  end
+  parser.parse! ARGV
+
+  return aargh('Field name count is not multiple of 2', 1) if ARGV.size.odd?
+
+  # Same source can be copied to multiple destinations.
+  # Same destination copied to multiple times, last copy remains.
+  # Make destination from source mapping and then invert it for actual use.
+  src2dst = invert(make_dst2src(ARGV))
+
+  doc = load_verified(input, input_output_schema)
+  return 2 if doc.nil?
+
+  %w[edges nodes].each do |category|
+    items = doc.fetch(category, nil)
+    next if items.nil?
+    items.each do |item|
+      copies = copy_fields(item, src2dst)
+      item.merge!(copies)
+    end
+  end
+  save_verified(output, doc, 4, input_output_schema)
+end
+
+exit(main) if (defined? $unit_test).nil?

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/copy.yaml

@@ -0,0 +1,13 @@
+type: object
+properties:
+  edges:
+    type: array
+    minItems: 0
+    items:
+      type: object
+  nodes:
+    type: array
+    minItems: 0
+    items:
+      type: object
+additionalProperties: true

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.6.0
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2023-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schemer
@@ -36,6 +36,7 @@ description: |2
   programs that each perform one stage.
 email: ismokarkkainen@icloud.com
 executables:
+- diagrammatron-copy
 - diagrammatron-get
 - diagrammatron-edges
 - diagrammatron-nodes
@@ -50,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
+- bin/diagrammatron-copy
 - bin/diagrammatron-edges
 - bin/diagrammatron-get
 - bin/diagrammatron-nodes
@@ -61,11 +63,13 @@ files:
 - bin/diagrammatron-template
 - bin/dot_json2diagrammatron
 - lib/common.rb
+- lib/copy.yaml
 - lib/edges.yaml
 - lib/nodes.yaml
 - lib/place.yaml
 - lib/render.yaml
 - lib/subset.yaml
+- lib/subsets.rb
 - template/internal.yaml
 - template/root.yaml
 - template/svg_1.1.erb