text-gen 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdccd9be33604c3bff808d1f2811179f4f8c41945e727273ca6b4103473c995b
-  data.tar.gz: 1d6c60c2600e0ddd9189a3a767907e4b8614fae702b863acbc34e277c9addf56
+  metadata.gz: 3682ed7222eeacaa62e5b8f19fcdf17f467808fa872ba447c4d353484dcc2bb6
+  data.tar.gz: c32eb0d27c947fdd972d6be33f20a76958ed3294b9410c4c98182266caf6ee5a
 SHA512:
-  metadata.gz: 3468c4f9ec44542da51dced562f164c653eb60c5328660c3f80f259da3c280c79d340b20aab698cc21428c4337af2c1a7f9341d83c6d2fd2926163b811551ef3
-  data.tar.gz: a041435b7b371e868846d34604b4890a659b11bc74a443fedf64ad610e169a76ea06f4da738b94377b6b357a8b9cf0b4766e50881abbb4ca72288118c7e201ec
+  metadata.gz: bbb90e14bfd47f7ad676917951d7b758f350d7983702c0f3dc22330cc7a7e6abc1f1c4d6c154203013f40ecf82f1d9cb77f083482bc097a789683048a49f29fe
+  data.tar.gz: e33b2ef314b0d341abc39469b4e556c9253a81842f4a79575534f2304ee8fa6159b5a0131283be662ff9b3c5ec15834656bd3a73b38e7898d8e49145273d6343

data/lib/text/gen/context.rb

@@ -33,19 +33,15 @@ module Text
       end
 
       def with_filters(filters, offset: 0)
-        count = 0
-        (filters || []).each do |hsh|
-          filter = Filter.build(hsh, depth + offset)
-          next unless filter
+        filters_to_add = (filters || []).filter_map { |hsh| Filter.build(hsh, depth + offset) }
+        count = filters_to_add.size
 
-          count += 1
-          @filters << filter
-        end
+        @filters.unshift(*filters_to_add)
 
         begin
           yield
         ensure
-          @filters.pop(count)
+          @filters.shift(count)
         end
       end
 
@@ -118,7 +114,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

@@ -141,11 +141,12 @@ module Text
           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.2"
+    VERSION = "0.12.4"
   end
 end

metadata

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