text-gen 0.12.6 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d238eb66df5e222ca033cbdcbc4c96a24756e9d3a24b0fedaa3f8b8c71af7f
-  data.tar.gz: 2310d7a4f9b6d290d75fefe757be1a766198bed7d5fa6835327500f7f6c11171
+  metadata.gz: 2afbd1cd20f4be4fa1c6ebb125fda4894f46026a078b8b54f808ed1e9fb684e6
+  data.tar.gz: '043274280f1ff52837206196ee489932b64c85f1a2af037b9b29cf1127ae1236'
 SHA512:
-  metadata.gz: 24b4e5056f75e5c862ccf4ae21638af665a7ceb0f0a1bdc739ee0ce95f856b398e61a09cc450ed3e5e2329c2c7052765dff3e7ab8daf0dd0c87f91bbe754acff
-  data.tar.gz: 4c2b802d548be347b3e674fc174648554a4627944f600a30cd9dca3e6806aa014e71952221db0f0fcd329d154151c6583afdb51d40cf05b564bbb838457a0edf
+  metadata.gz: cce97e373664b52db5752f18d0a672041246486fdd4848aeb74febf96f099543ac04ac97c5609ea71877ac867afa9a805a51862d5099ddad3dc74be81f9579ea
+  data.tar.gz: 5762c3a92aca626f66e5127ab9aef91bc7a14bce1111e44836f7b083b7cc35ee387b4f8f5f0ea4351d38fad789a3bdde015dfce7f81257f78740f5627870f8c6

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [Unreleased]
+## [0.13.0] - 2026-06-20 
+
+- Builder items can be concatonated by using the `+` operator (e.g. `key1+key2`)
+- Cleaned up the strategy behavior to default to "weigted" and renamed "random" to "sample"  
 
 ## [0.1.0] - 2025-12-28
 

data/lib/text/gen/context.rb

@@ -4,6 +4,8 @@ module Text
   module Gen
     # Keep the context for one run.
     class Context
+      KNOWN_STRATEGIES = Set.new(%w[random weighted sequence sample])
+
       attr_reader :store, :depth
 
       def initialize(store:, filters: nil, meta: nil, max_recursion: 10)
@@ -22,10 +24,19 @@ module Text
       def descend!(builder)
         @depth += 1
         @keys << builder["key"]
-        @strategy_stack << (builder["strategy"] || "random").split(":", 2)
+        @strategy_stack << strategy_to_stack_item(builder)
         raise MaxRecursionError if @depth > @max_recursion
       end
 
+      def strategy_to_stack_item(builder)
+        strategy, modifier = builder.fetch("strategy", "weighted").split(":", 2)
+        unless KNOWN_STRATEGIES.include?(strategy)
+          modifier = strategy
+          strategy = "weighted"
+        end
+        [strategy, modifier]
+      end
+
       def ascend!
         @depth -= 1
         @keys.pop
@@ -50,7 +61,7 @@ module Text
       end
 
       def current_strategy
-        @strategy_stack.last&.first || "random"
+        @strategy_stack.last&.first || "weighted"
       end
 
       def current_modifier

data/lib/text/gen/runner.rb

@@ -68,12 +68,12 @@ module Text
         return if items.empty?
 
         case context.current_strategy
+        when "sample"
+          run_random_item(context, items)
         when "sequence"
           run_item_sequence(context, items)
-        when "weighted"
-          run_weighted_items(context, items)
         else
-          run_random_item(context, items)
+          run_weighted_items(context, items)
         end
       end
 
@@ -94,7 +94,7 @@ module Text
       end
 
       def run_weighted_items(context, items)
-        total_weight = items.sum { |item| [item.fetch("weight", 1).to_i, 1].max }
+        total_weight = calculate_total_weight(context, items)
         dice = context.current_modifier
         rand_weight = if dice.nil? || dice.empty? || dice == "*"
                         rand(total_weight)
@@ -104,6 +104,7 @@ module Text
                       end
         return if rand_weight > total_weight
 
+
         current_weight = 0
         item = items.find do |item|
           current_weight += [item.fetch("weight", 1).to_i, 1].max
@@ -201,6 +202,36 @@ module Text
         end
       end
 
+      def calculate_weight(context, item)
+        weight = item["weight"]
+        if weight == "*"
+          reference = item["segments"]&.find { |s| s["type"] == "reference" }
+          key = reference&.fetch("text")
+          weight = lookup_and_count_items(context, key)
+        end
+
+        weight.to_i < 1 ? 1 : weight.to_i
+      end
+
+      def lookup_and_count_items(context, key)
+        return 0 unless key
+
+        builder = context.store.fetch(key)
+        return 0 unless builder
+
+        builder["items"]&.size || 1
+      end
+
+      def calculate_total_weight(context, items)
+        sum = 0
+        items.each do |item|
+          weight = calculate_weight(context, item)
+          item["weight"] = weight
+          sum += weight
+        end
+        sum
+      end
+
       def random_from_dice(text)
         rolled = DiceNomShim.roll(text)
         parsed = JSON.parse(rolled).first["lhs"]

data/lib/text/gen/store.rb

@@ -6,6 +6,7 @@ module Text
     # to save time on database lookups or transformations.
     class Store
       NOT_FOUND_BUILDER = {
+        "strategy" => "sample",
         "filters" => [],
         "meta" => {},
         "items" => []
@@ -33,12 +34,30 @@ module Text
         builder = find(key)
         return builder if builder
 
-        builder = @lookup.call(key)
-        return not_found(key) unless builder
+        keys = key.split("+")
+        builders = keys.map do |key|
+          builder = @lookup.call(key)
+          builder = not_found(key) unless builder
+          builder
+        end
 
+        builder = merge_builders(builders) if builders.length > 1
         add(key, builder.merge("key" => key.to_s.downcase))
       end
 
+      def merge_builders(builders)
+        all_filters = builders.map { |b| b["filters"] }.flatten
+        all_meta = builders.inject({}) { |b, acc| acc = Text::Gen::Meta.merge_meta(acc, b["meta"]) }
+        all_items = builders.map { |b| b["items"] }.flatten
+        strategy = builders.all? {|b| b["strategy"] == "weighted" } ? "weighted" : "sample"
+        {
+          "strategy" => strategy,
+          "filters" => all_filters,
+          "meta" => all_meta,
+          "items" => all_items,
+        }
+      end
+
       def not_found(key)
         hsh = NOT_FOUND_BUILDER.dup
         hsh["key"] = key

data/lib/text/gen/version.rb

@@ -2,6 +2,6 @@
 
 module Text
   module Gen
-    VERSION = "0.12.6"
+    VERSION = "0.13.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-gen
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.13.0
 platform: ruby
 authors:
 - G Palmer