text-gen 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4b6dac1a3fe31b9d98c79834a4fc69af77a06e5206d8051e6e6fe5d6e2742f
-  data.tar.gz: bbf696d52a9838d6c9caccb1d8ae2772ed75cde64a82325db1d9a673eb664d38
+  metadata.gz: fdccd9be33604c3bff808d1f2811179f4f8c41945e727273ca6b4103473c995b
+  data.tar.gz: 1d6c60c2600e0ddd9189a3a767907e4b8614fae702b863acbc34e277c9addf56
 SHA512:
-  metadata.gz: 6f5bfbc0ad2b052980ad177dea9f0f9eb688447defd40cc0f352025e881b57a408510e50f5788bfd17a45b2996cd597e06d05d56c50a9d28b8444a1b54ae9ee1
-  data.tar.gz: '089919fc1c912b1ec0ddb13a25c6ca32e55d6a64d05afe368c5b93b97b6c6377603b255ce0c74f5f650fc88943c4b74f3e1b8cd448690427fdbff39c78279540'
+  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/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.1"
+    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.1
+  version: 0.12.2
 platform: ruby
 authors:
 - G Palmer