text-gen 0.13.3 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76b0dea6048d936bc09ab210403b77972ff3308e3b5e7de9a6e799f842d39649
-  data.tar.gz: 1256216ab450d78408515eab81cd351a8e421d935c4a3d5e26f49fafbab2a147
+  metadata.gz: 2cd85012d5325af6f44024e4daad366ef314984fd424d8f3d640d47a5532fe82
+  data.tar.gz: 22568b81be8920c10cf3892faf2da9ababc70623295d6e70a5d4437f0360bc1b
 SHA512:
-  metadata.gz: 43164ff0dd4db90302168a1dc577962812d1c58b75fbd96e278455c20e44647d270b94f88e6025548457efd53dc05b22785f336bd7626e7b7cc9f18a73ccc05e
-  data.tar.gz: ffe458f004ca8fe129ff6c9df4dd06f6acf36908dd17b8abbeaae071a4e746d60b402f2cd0d7d03525f406d3357940f6161223fb7e87491644f23d580cfb44df
+  metadata.gz: 86b79b0b2c861175fca0fd380064df1317ee44031577bb80292e3ccca01fceabaed964d766d39243675917e748dfee149a38c84cdeaf2d8a19463471bca0a5d0
+  data.tar.gz: 56cbb70e4a223f39de5f3457b7fd34067a10ccbff03195483df105b404931a7480e33b8f4b59c9bb5512c6ccf3442fb9a91a272e72fc109899bc785e2ef219e6

data/lib/text/gen/context.rb

@@ -60,6 +60,10 @@ module Text
         @keys.last
       end
 
+      def current_key_without_category
+        current_key.split(">")&.last
+      end
+
       def current_strategy
         @strategy_stack.last&.first || "weighted"
       end
@@ -69,12 +73,12 @@ module Text
       end
 
       def remember(result)
-        @remembered << [current_key, result]
+        @remembered << [current_key_without_category, result]
         result
       end
 
       def remembered(key = nil)
-        key ||= current_key
+        key ||= current_key_without_category
         @remembered.select { |k, _r| k == key }.map(&:last)
       end
 

data/lib/text/gen/filter/distinct.rb

@@ -6,9 +6,9 @@ module Text
       # Return nil if the text value has already been generated
       class Distinct < Base
         def result(context, result)
-          return result if key != context.current_key
+          return result if key != context.current_key && key != context.current_key_without_category
 
-          previous = context.remembered(key)
+          previous = context.remembered
           return if previous.any? { |r| r.text.strip.downcase == result.text.strip.downcase }
 
           result

data/lib/text/gen/filter/remember.rb

@@ -7,7 +7,7 @@ module Text
         def result(context, result)
           return result if key != context.current_key && key != context.current_key_without_category
 
-          previous = context.remembered(key)
+          previous = context.remembered
           return previous.sample unless previous.nil? || previous.empty?
 
           result

data/lib/text/gen/filter/store.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Text
+  module Gen
+    module Filter
+      # Store appends a meta value based on the current historic stack of the
+      # result. The key names a component in the result's component tree (a
+      # builder key such as `nation-name`, with or without a category prefix)
+      # and the value is the meta key that the component's text is appended to.
+      #
+      # For example `store:nation-name:short-name` on a `nation` builder that
+      # generates "The Kingdom of Boring" appends "Boring" to
+      # `result.meta["short-name"]` so it can be referenced later with
+      # `match`/`select` or read from the final result.
+      class Store < Base
+        def result(context, result)
+          return result if @depth && context.depth != @depth
+          return result if key.nil? || value.nil?
+
+          component = find_component(result)
+          return result if component.nil?
+
+          new_meta = Text::Gen::Meta.append_kv(result.meta.dup, value, component.text)
+          return result if new_meta == result.meta
+
+          Result.from(result, type: component_key, meta: new_meta)
+        end
+
+        private
+
+        # Depth-first search of the result and its components for the first
+        # component whose type matches the key
+        def find_component(result)
+          return result if type_matches?(result.type)
+
+          result.components.each do |component|
+            found = find_component(component)
+            return found if found
+          end
+
+          nil
+        end
+
+        def type_matches?(type)
+          return false if type.nil?
+
+          type == key || type.split(">").last == key
+        end
+      end
+    end
+  end
+end

data/lib/text/gen/version.rb

@@ -2,6 +2,6 @@
 
 module Text
   module Gen
-    VERSION = "0.13.3"
+    VERSION = "0.14.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-gen
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.14.0
 platform: ruby
 authors:
 - G Palmer
@@ -58,6 +58,7 @@ files:
 - lib/text/gen/filter/remember.rb
 - lib/text/gen/filter/replace.rb
 - lib/text/gen/filter/select.rb
+- lib/text/gen/filter/store.rb
 - lib/text/gen/filter/swap.rb
 - lib/text/gen/filter/titleize.rb
 - lib/text/gen/filter/upcase.rb