eunomia_gen 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce3812f21ae68491bad7b999532be18d0143842ed6d8a39b81843ec504594f5d
-  data.tar.gz: e951235481722af38a3519ccd188a56d78ea48c5060e4c10e8cac62b7f427151
+  metadata.gz: 248b5e7d766840c8b4f4410659e934c288d9f3c6098d76bd9496b7b30c142c63
+  data.tar.gz: 4d7db04e1470bfe4834dd40ac2fe661e14badfcd6f8ca060a6e456b27897f862
 SHA512:
-  metadata.gz: f433f2fa2f1d3ffafd4c3ce4416c03409a8c6128870086f805d7a9b92b72f8ffdba46ab8cf57189f379f04604fcd7436a05b268cb37a96ee0f2143053011b0d6
-  data.tar.gz: 6a14ec1008753b70930ca35f5ee67cc792f69b06b6412765993f97366446c194e4f1a49156b6ef5533ed03334da7eee1e6c3a059c5a0c843416a9de2c195ad6f
+  metadata.gz: cb7e64a5fd66e8098c4a327f7e5f28ae7972e4619b8b1b31bf732cb1302b45ab7d571f81b0d8c27b4cdaefc28c34cbf7806a9f133137d44da8e295eaaf09fda6
+  data.tar.gz: a122b89d072665edf883571ba0b4be02e7be961121f2cb0b2482a7567b07265b69df6701d138a9a752463468c133048a4fd641d3f59ffdf3cfaa108b4a4ef929

data/lib/eunomia/generator.rb

@@ -11,6 +11,7 @@ module Eunomia
                 :meta,
                 :functions,
                 :tags,
+                :item_tags,
                 :items,
                 :selector,
                 :sep
@@ -21,6 +22,7 @@ module Eunomia
       @alts = hash_field(hsh, :alts)
       @meta = meta_field(hsh)
       @tags = tags_field(hsh)
+      @item_tags = Set.new
       @selector = Eunomia::Selector.new(field_or_nil(hsh, :rng))
       @items = items_from(hsh)
       raise "Generators must have items" if @items.empty?
@@ -29,6 +31,9 @@ module Eunomia
     def items_from(hsh)
       list_field(hsh, :items).map do |item|
         item = { segments: item } if item.is_a?(String)
+        item_tags = item.fetch(:tags, [])
+        item_tags = [item_tags] unless item_tags.is_a?(Enumerable)
+        @item_tags += item_tags
         Eunomia::Item.new(@key, item, @tags)
       end
     end
@@ -44,7 +49,7 @@ module Eunomia
     def filter(tags)
       return items if tags.empty?
 
-      items.select { |item| (tags - item.tags).empty? }
+      items.select { |item| item.match_tags?(tags) || item.match_tags?(item_tags) }
     end
 
     def generate(request)

data/lib/eunomia/item.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Eunomia
+  # Item represents a single selectable row of a generator.
   class Item
     include Eunomia::HashHelpers
 
@@ -17,13 +18,25 @@ module Eunomia
       @key = key
       @weight = int_field(hsh, :weight).clamp(1, 1000)
       @value = int_field(hsh, :value).clamp(0, 1_000_000)
-      @tags = tags_field(hsh)
-      @tags += add_tags if add_tags
       @alts = alts_field(hsh)
       @meta = meta_field(hsh)
       @functions = list_field(hsh, :functions)
       @segments = scan(field_or_raise(hsh, :segments)).flatten
-      raise "Items must have segments" if @segments.empty?
+      @tags = tags_field(hsh)
+      @tags += add_tags if add_tags
+      @available_tags = nil
+    end
+
+    def available_tags
+      @available_tags ||= begin
+        s = Set.new
+        refs = segments.filter { |seg| seg.is_a?(Eunomia::Reference) }
+        unless refs.empty?
+          s = refs[0].item_tags
+          refs[1..].each { |ref| s &= ref.item_tags }
+        end
+        s
+      end
     end
 
     def scan(obj)
@@ -33,6 +46,12 @@ module Eunomia
       obj.map { |e| Eunomia::Segment.build(e) }.flatten
     end
 
+    def match_tags?(tags)
+      return true if tags.nil? || tags.empty?
+
+      true if (tags - self.tags).empty?
+    end
+
     def alt_for(key, segment)
       return segment unless key
       return segment unless alts[key]

data/lib/eunomia/segment/reference.rb

@@ -26,11 +26,19 @@ module Eunomia
         !label.nil?
       end
 
+      def generator
+        @generator ||= Eunomia.lookup(key)
+      end
+
+      def item_tags
+        generator.item_tags
+      end
+
       def generate(request)
         return Eunomia::Element.new(request.constants[lookup]) if request.constants.key?(lookup)
 
         request.increase_depth
-        Eunomia.generate(key, request)
+        generator.generate(request)
       end
 
       def lookup

data/lib/eunomia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Eunomia
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eunomia_gen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - G Palmer