text-gen 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2afbd1cd20f4be4fa1c6ebb125fda4894f46026a078b8b54f808ed1e9fb684e6
-  data.tar.gz: '043274280f1ff52837206196ee489932b64c85f1a2af037b9b29cf1127ae1236'
+  metadata.gz: 5581ccb42efa3604510e17f8af69e6d5b804cc60702f6e1f7001cebf8def8c54
+  data.tar.gz: 840ffc9473992cb64850991e4ee442c774acee38ddbdf40e81257be9c69b756d
 SHA512:
-  metadata.gz: cce97e373664b52db5752f18d0a672041246486fdd4848aeb74febf96f099543ac04ac97c5609ea71877ac867afa9a805a51862d5099ddad3dc74be81f9579ea
-  data.tar.gz: 5762c3a92aca626f66e5127ab9aef91bc7a14bce1111e44836f7b083b7cc35ee387b4f8f5f0ea4351d38fad789a3bdde015dfce7f81257f78740f5627870f8c6
+  metadata.gz: 511f34f2a2a29d8c50a85d8b63f504b420047db4e219783525ab855ccd41582b6e9673b3f02bcbb5c2ea1ed9fdf515160a5a6e3b18b251686f55cf0ee3cb10fd
+  data.tar.gz: 1b74d7812ff49c5026afd623630435921b7f366c754388439e628a00e0766919458cebf6a22f93bd914f307d8016138b1bcab15104cb01bac3cc132c454d5eb5

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

@@ -12,7 +12,7 @@ module Text
         end
 
         def component_key
-          "fn(#{to_s})"
+          "fn(#{self})"
         end
 
         # Shared utilities
@@ -33,8 +33,9 @@ module Text
         end
 
         def to_s
-          return "#{ type }:#{ key }:#{ value }" if value
-          return "#{ type }:#{ key }" if key
+          return "#{type}:#{key}:#{value}" if value
+          return "#{type}:#{key}" if key
+
           type
         end
 

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

@@ -52,9 +52,13 @@ module Text
 
         def pluralize_by_key(str, multiplier, result)
           tokens = tokenize(str)
-          word_tokens = tokens.select { |t| t.match?(/\w/) }
+          word_tokens = tokens.grep(/\w/)
           idx = word_tokens.rindex { |s| to_num(s) }
-          num = multiplier > 1 ? multiplier : (idx ? to_num(word_tokens[idx]) : nil)
+          num = if multiplier > 1
+                  multiplier
+                else
+                  (idx ? to_num(word_tokens[idx]) : nil)
+                end
           return str if num.nil? || num <= 1
 
           component = find_component(result, key)
@@ -68,7 +72,8 @@ module Text
           return str unless last_word_idx
 
           dc = component_tokens[last_word_idx].downcase
-          component_tokens[last_word_idx] = exceptions(dc) || single_letter(dc) || others(dc) || ends_with_y(dc) || simple(dc)
+          component_tokens[last_word_idx] =
+            exceptions(dc) || single_letter(dc) || others(dc) || ends_with_y(dc) || simple(dc)
           str.sub(component_text, component_tokens.join)
         end
 
@@ -84,9 +89,13 @@ module Text
 
         def substitute(str, multiplier = 1)
           tokens = tokenize(str)
-          word_tokens = tokens.select { |t| t.match?(/\w/) }
+          word_tokens = tokens.grep(/\w/)
           idx = word_tokens.rindex { |s| to_num(s) }
-          num = multiplier > 1 ? multiplier : (idx ? to_num(word_tokens[idx]) : nil)
+          num = if multiplier > 1
+                  multiplier
+                else
+                  (idx ? to_num(word_tokens[idx]) : nil)
+                end
           return str if num.nil? || num <= 1
 
           tokens.map! { |t| t.match?(/\A#{Regexp.escape(key)}\z/i) ? value : t }
@@ -97,13 +106,17 @@ module Text
           return str if str.empty?
 
           tokens = tokenize(str)
-          word_tokens = tokens.select { |t| t.match?(/\w/) }
+          word_tokens = tokens.grep(/\w/)
           return str if word_tokens.length < 2
 
           idx = word_tokens.rindex { |s| to_num(s) }
 
           # Use the multiplier if available, otherwise parse from text
-          num = multiplier > 1 ? multiplier : (idx ? to_num(word_tokens[idx]) : nil)
+          num = if multiplier > 1
+                  multiplier
+                else
+                  (idx ? to_num(word_tokens[idx]) : nil)
+                end
 
           return str if num.nil? || num <= 1
           return str if idx && idx >= word_tokens.length - 1

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

@@ -4,7 +4,7 @@ module Text
   module Gen
     module Filter
       class Replace < Base
-        def builder(context, builder)
+        def builder(_context, builder)
           return builder unless builder["key"] == key
 
           Result.new(text: value, type: "replace")

data/lib/text/gen/filter.rb

@@ -14,7 +14,7 @@ module Text
         def build(hsh_or_key, depth)
           hsh = hsh_or_key.is_a?(Hash) ? hsh_or_key : key_to_hsh(hsh_or_key)
           filter_class = available_filters.find { |f| f.filter_key == hsh["type"] }
-          filter_class.new(hsh, depth) if filter_class
+          filter_class&.new(hsh, depth)
         end
 
         def key_to_hsh(key)

data/lib/text/gen/meta.rb

@@ -33,7 +33,7 @@ module Text
           else
             hsh.each_key do |k|
               if hsh.key?(k)
-                new_hsh[k] = k == key ? hsh[k].select { |v| v != val } : hsh[k].dup
+                new_hsh[k] = k == key ? hsh[k].reject { |v| v == val } : hsh[k].dup
               end
             end
           end

data/lib/text/gen/runner.rb

@@ -104,7 +104,6 @@ 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
@@ -143,10 +142,10 @@ module Text
           return if results.any?(&:nil?) || results.empty?
 
           result = Result.merge(results,
-                       value: item["value"],
-                       multiplier: item["multiplier"],
-                       meta: item["meta"],
-                       type: context.current_key)
+                                value: item["value"],
+                                multiplier: item["multiplier"],
+                                meta: item["meta"],
+                                type: context.current_key)
           context.apply_result_filters(result)
         end
       end
@@ -210,7 +209,7 @@ module Text
           weight = lookup_and_count_items(context, key)
         end
 
-        weight.to_i < 1 ? 1 : weight.to_i
+        [weight.to_i, 1].max
       end
 
       def lookup_and_count_items(context, key)

data/lib/text/gen/segment/reference.rb

@@ -4,7 +4,7 @@ module Text
   module Gen
     module Segment
       class Reference
-        REFERENCE_MATCHER = /\[\s*([a-z0-9-]+(?::[a-z0-9-]+)*)\s*\]/
+        REFERENCE_MATCHER = /\[\s*([a-z0-9-]+(?:(?:>>|>|:)[a-z0-9-]+)*)\s*\]/
         class << self
           def scan(scanner)
             str = scanner.scan(REFERENCE_MATCHER)

data/lib/text/gen/store.rb

@@ -37,7 +37,7 @@ module Text
         keys = key.split("+")
         builders = keys.map do |key|
           builder = @lookup.call(key)
-          builder = not_found(key) unless builder
+          builder ||= not_found(key)
           builder
         end
 
@@ -47,14 +47,14 @@ module Text
 
       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_meta = builders.inject({}) { |b, 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 = builders.all? { |b| b["strategy"] == "weighted" } ? "weighted" : "sample"
         {
           "strategy" => strategy,
           "filters" => all_filters,
           "meta" => all_meta,
-          "items" => all_items,
+          "items" => all_items
         }
       end
 

data/lib/text/gen/version.rb

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

metadata

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