text-gen 0.12.0 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a96a06698a3f29093011dac3d0f9311741ffa92707ee42d685837480efaf458e
-  data.tar.gz: 3d6a85c17d38b8e2f13c203744e088efe7ff12d1f8d0eebc26551d9b94a0d9c7
+  metadata.gz: fdccd9be33604c3bff808d1f2811179f4f8c41945e727273ca6b4103473c995b
+  data.tar.gz: 1d6c60c2600e0ddd9189a3a767907e4b8614fae702b863acbc34e277c9addf56
 SHA512:
-  metadata.gz: bbcf087725fc5fa33da6427ddd0ff10e0482083a1e8193c37a2a609e63bf2a1932c4763bae0811ff29d489e70736a6e47e46503b0010f1a90db84dbd18f5fc0f
-  data.tar.gz: c4cc7a812869a52bab81fcd78dfcebea2c64951b09299ccdb9c7f1cda7cc05b65635082cb15c03d0ff61ae248eb031f166edce39c3da52cbe1e4ce379a3d47b9
+  metadata.gz: 3468c4f9ec44542da51dced562f164c653eb60c5328660c3f80f259da3c280c79d340b20aab698cc21428c4337af2c1a7f9341d83c6d2fd2926163b811551ef3
+  data.tar.gz: a041435b7b371e868846d34604b4890a659b11bc74a443fedf64ad610e169a76ea06f4da738b94377b6b357a8b9cf0b4766e50881abbb4ca72288118c7e201ec

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)

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

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

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

@@ -5,7 +5,7 @@ module Text
     module Filter
       class Remember < Base
         def result(context, result)
-          return result if @depth && context.depth != @depth
+          return result if key != context.current_key
 
           previous = context.remembered(key)
           return previous.sample unless previous.nil? || previous.empty?

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,8 +138,8 @@ 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,
                        value: item["value"],

data/lib/text/gen/version.rb

@@ -2,6 +2,6 @@
 
 module Text
   module Gen
-    VERSION = "0.12.0"
+    VERSION = "0.12.2"
   end
 end

metadata

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