text-gen 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd9670884657a6180bafe5eb9afdd1625cba971f3f713b5d176c6dccad309d37
-  data.tar.gz: e236d1dda136729987647f723d6428ac5899c0f2109435e49b185eee978fde11
+  metadata.gz: fa9bc639bc212fcea40f4d4203eb6c1efe3d8a306d1731da627e2361949c6316
+  data.tar.gz: 67e2819d32009c0ed84f8dcfdf4c166ac970167716234b5744d534dd6e9f6ee3
 SHA512:
-  metadata.gz: 8f6714227cf6ca68ac3514d1138ed4d24973eab26ab89ee363ccd68a9896bfc2f5cd826c85884def446d1b7a7c11489c304bbfc29d4a06e430ca239de90eb5b2
-  data.tar.gz: db65c0508e82bc14714ed80e7308f879bac3d5e07e7035a41eeb8eb17a4d809c4d195dfdbc5402c2cbafff8be92d9ee71cce4014b9f7f00d03e1f304a4d1d447
+  metadata.gz: 2012f28cd368ca0415c936424371b40dff77c59c7eccd9b2ed958daca83ba598afb6c8dfe480e7e194fec9801237580dc44fac831b6220363740ecce007e3abc
+  data.tar.gz: 56892e85ef8c3641437a8ad5d3a0ef4167ce50bae8090cf05e20ea32f374bc9bcade4c26cdb89ca7b7d023eb2684b40b75adb51763d70e06cd19a8c2631eedd6

data/lib/text/gen/filter/item/locale.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require_relative "../item_filter"
+
+module Text
+  module Gen
+    module Filter
+      module Item
+        class Locale < ItemFilter
+          def apply(items)
+            items.map { |item| locale_item(item) || item }
+          end
+
+          private
+
+          def locale_item(item)
+            meta = item["meta"]
+            return if meta.nil? || meta.empty?
+
+            locale_text = meta[key.downcase]&.sample
+            return unless locale_text
+
+            Filter.constant_item(locale_text, item)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/text/gen/filter.rb

@@ -18,6 +18,7 @@ require_relative "filter/result/titleize"
 require_relative "filter/result/upcase"
 
 # Item filters
+require_relative "filter/item/locale"
 require_relative "filter/item/select"
 require_relative "filter/item/reject"
 
@@ -41,6 +42,7 @@ module Text
       }.freeze
 
       ITEM_FILTER_CLASSES = {
+        "locale" => Filter::Item::Locale,
         "select" => Filter::Item::Select,
         "reject" => Filter::Item::Reject
       }.freeze
@@ -60,6 +62,14 @@ module Text
           result
         end
 
+        def filter_locale(items, filters)
+          locale_filters = filters_by_type(filters, "locale")
+          return items if locale_filters.empty?
+
+          filter_instance = ITEM_FILTER_CLASSES["locale"].new(locale_filters.first)
+          filter_instance.apply(items)
+        end
+
         def filter_select(items, filters)
           select_filters = filters_by_type(filters, "select")
           return items if select_filters.empty?
@@ -129,24 +139,6 @@ module Text
           citem
         end
 
-        # Replace locale is used on an item; if the item is selected and has
-        # associated meta value of "locale" and the request is using that locale value
-        # then replace the item text with the value of the meta. If there is
-        # more than one value, select at random.
-        # Returns a new item with locale text and preserved value/multiplier, or nil
-        def replace_locale(item, locale)
-          return if locale.nil?
-          return if item.nil?
-
-          meta = item["meta"]
-          return if meta.nil? || meta.empty?
-
-          locale_text = meta[locale.downcase]&.sample
-          return unless locale_text
-
-          constant_item(locale_text, item)
-        end
-
         def separator(filters)
           return "" unless filters
 
@@ -186,6 +178,7 @@ module Text
 
         # Define which filters require explicit parameters
         FILTERS_WITH_PARAMETERS = {
+          "locale" => ["key"],
           "swap" => ["key", "value"],
           "meta" => ["key", "value"],
           "censor" => ["key", "value"],

data/lib/text/gen/runner.rb

@@ -8,12 +8,11 @@ module Text
     # Runner generates results from the builder that is found with the given key.
     class Runner
       attr_reader :key, :lookup, :max_attempts, :max_recursion
-      attr_accessor :unique, :locale, :store
+      attr_accessor :unique, :store
 
       def initialize(key:, lookup:, max_recursion: 10, max_attempts: 10, request_filters: [])
         @key = key.to_s.downcase
         @lookup = lookup
-        @locale = nil
         @store = Store.new
         @unique = false
         @request_filters = request_filters
@@ -153,9 +152,6 @@ module Text
       end
 
       def run_item(key, item, depth)
-        locale_item = Filter.replace_locale(item, locale)
-        item = locale_item || item
-
         results = item["segments"].map { |seg| run_segment(seg, depth) }
         result = Result.merge(results,
                               value: item["value"],
@@ -218,6 +214,7 @@ module Text
       end
 
       def apply_item_filters(items, filters)
+        items = Filter.filter_locale(items, @request_filters + filters)
         items = Filter.filter_select(items, filters)
         items = Filter.filter_reject(items, filters)
         raise FilterError if items.empty?

data/lib/text/gen/version.rb

@@ -2,6 +2,6 @@
 
 module Text
   module Gen
-    VERSION = "0.9.1"
+    VERSION = "0.10.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text-gen
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - G Palmer
@@ -43,6 +43,7 @@ files:
 - lib/text/gen.rb
 - lib/text/gen/filter.rb
 - lib/text/gen/filter/base.rb
+- lib/text/gen/filter/item/locale.rb
 - lib/text/gen/filter/item/reject.rb
 - lib/text/gen/filter/item/select.rb
 - lib/text/gen/filter/item_filter.rb