diagrammatron 0.4.3 → 0.5.1

data/lib/subset.yaml

@@ -0,0 +1,55 @@
+type: object
+properties:
+  expressions:
+    type: array
+    minItems: 0
+    default: []
+    items:
+      type: object
+      required:
+      - name
+      properties:
+        name:
+          type: string
+        expression:
+          type: string
+          default: ''
+  sets:
+    type: array
+    items:
+      $ref: "#/$defs/SetRules"
+    minItems: 0
+    default: []
+$defs:
+  SetRules:
+    type: object
+    required:
+    - name
+    properties:
+      name:
+        type: string
+      nodes:
+        $ref: "#/$defs/Rules"
+      edges:
+        $ref: "#/$defs/Rules"
+      any:
+        $ref: "#/$defs/Rules"
+  Rules:
+    type: array
+    items:
+      $ref: "#/$defs/FieldRules"
+    minItems: 0
+    default: []
+  FieldRules:
+    type: object
+    required:
+    - name
+    - rules
+    properties:
+      name:
+        type: string
+      rules:
+        type: array
+        items:
+          type: string
+        minItems: 0

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,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: diagrammatron
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - Ismo Kärkkäinen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
-dependencies: []
+date: 2023-12-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json_schemer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: |2
 
   Generates diagrams in SVG format from input material. Split into multiple
@@ -22,6 +42,8 @@ executables:
 - diagrammatron-place
 - diagrammatron-prune
 - diagrammatron-render
+- diagrammatron-schema
+- diagrammatron-subset
 - diagrammatron-template
 - dot_json2diagrammatron
 extensions: []
@@ -34,16 +56,25 @@ files:
 - bin/diagrammatron-place
 - bin/diagrammatron-prune
 - bin/diagrammatron-render
+- bin/diagrammatron-schema
+- bin/diagrammatron-subset
 - bin/diagrammatron-template
 - bin/dot_json2diagrammatron
 - lib/common.rb
+- 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
 homepage: https://xn--ismo-krkkinen-gfbd.fi/diagrammatron/index.html
 licenses:
 - UPL-1.0
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -52,14 +83,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Generates diagrams from input graph.