text-gen 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4b6dac1a3fe31b9d98c79834a4fc69af77a06e5206d8051e6e6fe5d6e2742f
-  data.tar.gz: bbf696d52a9838d6c9caccb1d8ae2772ed75cde64a82325db1d9a673eb664d38
+  metadata.gz: 12d84160917c876af0a100f744ce2b515ef484095ea3794e65f2152e04ac1697
+  data.tar.gz: 8f8b796ad33686f65b063d8295151f31e0a24ad6553a8bfd1aa0a1c2c0455edd
 SHA512:
-  metadata.gz: 6f5bfbc0ad2b052980ad177dea9f0f9eb688447defd40cc0f352025e881b57a408510e50f5788bfd17a45b2996cd597e06d05d56c50a9d28b8444a1b54ae9ee1
-  data.tar.gz: '089919fc1c912b1ec0ddb13a25c6ca32e55d6a64d05afe368c5b93b97b6c6377603b255ce0c74f5f650fc88943c4b74f3e1b8cd448690427fdbff39c78279540'
+  metadata.gz: eb91a5639b2ab5fa6d976787e47929e4a07ab34f13315819266c840851aa752869f5d9f28671c0d5019d8b333eea45942c4121b60d2d3ac06c6c66779500fbef
+  data.tar.gz: f6ebfd6b89edf90181c1b50f5bb991397dfa4b6c33111e8a923a72d442f2f41f19167299a7b67ed9aa199a7e4217085dcc36e7f77aa5c376857a45126ab4476f

data/lib/text/gen/context.rb

@@ -15,7 +15,7 @@ module Text
         @meta = meta
         @keys = []
         @strategy_stack = []
-        @remember = Hash.new { |h, k| h[k] = [] }
+        @remembered = []
         @max_recursion = max_recursion
       end
 
@@ -42,10 +42,11 @@ module Text
           @filters << filter
         end
 
-        result = yield
-
-        @filters.pop(count)
-        result
+        begin
+          yield
+        ensure
+          @filters.pop(count)
+        end
       end
 
       def current_key
@@ -61,12 +62,21 @@ module Text
       end
 
       def remember(result)
-        @remember[current_key] << result
+        @remembered << [current_key, result]
         result
       end
 
       def remembered(key = nil)
-        @remember[key || current_key]
+        key ||= current_key
+        @remembered.select {|k, _r| k == key }.map(&:last)
+      end
+
+      def remember_checkpoint
+        @remembered.length
+      end
+
+      def restore_remember(checkpoint)
+        @remembered = @remembered[0...checkpoint]
       end
 
       def apply_builder_filters(builder)
@@ -108,7 +118,10 @@ module Text
 
       def apply_result_filters(result)
         @filters.each do |filter|
-          result = filter.result(self, result) if filter.respond_to?(:result)
+          next unless filter.respond_to?(:result)
+          next if result.filter_match?(filter.component_key)
+
+          result = filter.result(self, result)
           return unless result
         end
 

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

@@ -12,7 +12,7 @@ module Text
         end
 
         def component_key
-          "function:#{type}"
+          "fn(#{to_s})"
         end
 
         # Shared utilities
@@ -32,6 +32,12 @@ module Text
           @type ||= @filter["type"]
         end
 
+        def to_s
+          return "#{ type }:#{ key }:#{ value }" if value
+          return "#{ type }:#{ key }" if key
+          type
+        end
+
         class << self
           def filter_name
             @filter_name ||= name.split("::").last.downcase

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

@@ -30,10 +30,16 @@ module Text
             case key
             when "_digit_"
               swap_digit(s)
+            when "_digit_without_one_"
+              if s == "1"
+                nil
+              else
+                swap_digit(s)
+              end
             else
               swap_any(s, key, val.to_s)
             end
-          end
+          end.compact
           arr.join(" ")
         end
 

data/lib/text/gen/result.rb

@@ -29,6 +29,17 @@ module Text
         }
       end
 
+      def filter?
+        type.start_with?("fn(")
+      end
+
+      def filter_match?(component_key)
+        return true if type == component_key
+        return false unless filter?
+
+        components.any? { |c| c.filter_match?(component_key) }
+      end
+
       def merge_all_meta(results)
         (results || []).each { |r| @meta = Text::Gen::Meta.merge_meta(meta, r.meta) }
       end
@@ -69,7 +80,7 @@ module Text
             text: results.map(&:text).join(sep),
             type: type,
             value: val * mul,
-            multiplier: 1
+            multiplier: val.zero? ? mul : 1
           ).tap do |s|
             s.components.append(*results)
             s.merge_all_meta(results)

data/lib/text/gen/runner.rb

@@ -32,20 +32,31 @@ module Text
       # A builder is hash with a key field, items, filters, and meta
       def run_builder(context, builder)
         context.descend!(builder)
+        checkpoint = context.remember_checkpoint
         context.with_filters(builder["filters"]) do
           builder = context.apply_builder_filters(builder)
-          return unless builder
+          unless builder
+            context.restore_remember(checkpoint)
+            return
+          end
 
           # Filter mapping of builder to result is allowed
           return builder if builder.is_a?(Result)
 
           result = builder.is_a?(Result) ? builder : run_items(context, builder["items"])
-          return unless result
+          unless result
+            context.restore_remember(checkpoint)
+            return
+          end
 
           result.merge_meta(builder["meta"])
           result = context.apply_result_filters(result)
-          return unless result
+          unless result
+            context.restore_remember(checkpoint)
+            return
+          end
 
+          context.restore_remember(checkpoint)
           context.remember(result)
         end
       ensure
@@ -127,14 +138,15 @@ module Text
         return item if item.is_a?(Result)
 
         context.with_filters(item["filters"]) do
-          results = item["segments"].map { |seg| run_segment(context, seg) }.compact
-          return if results.empty?
+          results = item["segments"].map { |seg| run_segment(context, seg) }
+          return if results.any?(&:nil?) || results.empty?
 
-          Result.merge(results,
+          result = Result.merge(results,
                        value: item["value"],
                        multiplier: item["multiplier"],
                        meta: item["meta"],
                        type: context.current_key)
+          context.apply_result_filters(result)
         end
       end
 

data/lib/text/gen/version.rb

@@ -2,6 +2,6 @@
 
 module Text
   module Gen
-    VERSION = "0.12.1"
+    VERSION = "0.12.3"
   end
 end

metadata

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