tater 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bce1afa07abcf6f94618ca249808f14d4a16b107c112bc074b4f0e6e2703b86d
-  data.tar.gz: 3f481fbb8e9551fee057472c3bef0fbc2420c9e267a37e09bf353a19e9877130
+  metadata.gz: '00580e7b14eb0c1f1bc26b9a8cc2470638aa06f2f9800b4a4c542de913fffcb4'
+  data.tar.gz: f807ce661a2bed8ca9526f309c1548ddf292f034cbcaeae4223a385f89296c86
 SHA512:
-  metadata.gz: 9096e096441db2696735213dd21c313aa333877062f3094680a2ff7bbb14c5e3e699d817a8df59626f570eff345b5b69a942ec99cd19ab3bc74cbdee0cb9b398
-  data.tar.gz: 8511e008cf509bd76869aef9957e98e7f73bb60b50649abe811f09ad4ee01447553689ffe52451f8073110d1338ad430ef7848f25a4e3fce1614c22d60153dc3
+  metadata.gz: 8ff891fe31f924f41c5bd20aaa0b58c39659a2e0e72cabd4cfd55df79d2e237daaabe2bb717415eca782f814dcd1322737a861f23fd37449e4f8516a71ea197e
+  data.tar.gz: f231dcbca0ca5826a4c99f92afa6c98514985c262a66f473ddb8696d754e849e6c50d371cf82c056e395565b199d6179d665b28b580cade63aa24932c4a378e6

data/lib/tater.rb

@@ -91,6 +91,8 @@ class Tater
     load(messages: messages) if messages
   end
 
+  # Do lookups cascade by default?
+  #
   # @return [Boolean]
   def cascades?
     @cascade
@@ -114,7 +116,7 @@ class Tater
   # files or a collection of messages.
   #
   # @param path [String]
-  #   A path to search for YAML files to load messages from.
+  #   A path to search for YAML or Ruby files to load messages from.
   # @param messages [Hash]
   #   A hash of messages ready to be loaded in.
   def load(path: nil, messages: nil)
@@ -143,6 +145,17 @@ class Tater
   #
   # @param object [Date, Time, DateTime, Numeric]
   #   The object to localize.
+  # @param options [Hash]
+  #   Options to configure localization.
+  #
+  # @option options [String] :format
+  #   The key or format string to use for localizing the current object.
+  # @option options [String] :locale
+  #   The locale to use in lieu of the current default.
+  # @option options [String] :delimiter
+  #   The delimiter to use when localizing numberic values.
+  # @option options [String] :separator
+  #   The separator to use when localizing numberic values.
   #
   # @return [String]
   #   A localized version of the object passed in.
@@ -156,10 +169,10 @@ class Tater
     when Numeric
       delimiter = options.delete(:delimiter) || lookup('numeric.delimiter', locale_override)
       separator = options.delete(:separator) || lookup('numeric.separator', locale_override)
-      precision = options.fetch(:precision) { 2 }
+      precision = options.delete(:precision) || 2
 
-      raise(MissingLocalizationFormat, "Numeric localization delimiter ('numeric.delimiter') missing") unless delimiter
-      raise(MissingLocalizationFormat, "Numeric localization separator ('numeric.separator') missing") unless separator
+      raise(MissingLocalizationFormat, "Numeric localization delimiter ('numeric.delimiter') missing or not passed as option :delimiter") unless delimiter
+      raise(MissingLocalizationFormat, "Numeric localization separator ('numeric.separator') missing or not passed as option :separator") unless separator
 
       # Heavily cribbed from Rails.
       integer, fraction = Utils.string_from_numeric(object).split('.')
@@ -205,6 +218,8 @@ class Tater
   # @param key [String]
   # @param locale_override [String]
   #   A locale to use instead of our current one.
+  # @param cascade_override [Boolean]
+  #   A boolean to forcibly set the cascade option for this lookup.
   #
   # @return
   #   Basically anything that can be stored in YAML, including nil.
@@ -234,23 +249,31 @@ class Tater
   #
   # @param key [String]
   #   The period-separated key path to look within our messages for.
+  # @param options [Hash]
+  #   Options, including values to interpolate to any found string.
+  #
   # @option options [Boolean] :cascade
+  #   Should this lookup cascade or not? Can override @cascade.
   # @option options [String] :default
+  #   A default string to return, should lookup fail.
   # @option options [String] :locale
+  #   A specific locale to lookup within. This will take precedence over the
+  #   :locales option.
+  # @option options [Array<String>] :locales
+  #   An array of locales to look within.
   #
   # @return [String]
   #   The translated and interpreted string, if found, or any data at the
   #   defined key.
   def translate(key, options = {})
     cascade_override = options.delete(:cascade)
-    default = options.delete(:default)
     locale_override = options.delete(:locale)
     locales = options.delete(:locales)
 
     message =
       if locale_override || !locales
         lookup(key, locale_override, cascade_override)
-      elsif locales
+      else
         locales.find do |accept|
           found = lookup(key, accept, cascade_override)
 
@@ -263,7 +286,7 @@ class Tater
       message = message.call(key, options)
     end
 
-    Utils.interpolate(message, options) || default || "Tater lookup failed: #{ locale_override || locales || locale }.#{ key }"
+    Utils.interpolate(message, options) || options.delete(:default) { "Tater lookup failed: #{ locale_override || locales || locale }.#{ key }" }
   end
   alias t translate
 end

data/test/tater_test.rb

@@ -116,6 +116,7 @@ describe Tater do
     it 'cascades' do
       assert_equal 'Delicious', i18n.lookup('cascade.nope.tacos', nil, true)
       assert_equal 'Whoaa', i18n.lookup('cascade.another.nope.crazy', nil, true)
+      assert_nil i18n.lookup('cascade.another.nope.crazy', nil, false)
       assert_nil i18n.lookup('cascade.nahhhhhh')
     end
   end
@@ -156,6 +157,7 @@ describe Tater do
     end
 
     it 'cascades lookups' do
+      assert_equal 'Tater lookup failed: en.cascade.another.nope.crazy', i18n.translate('cascade.another.nope.crazy', cascade: false)
       assert_equal 'Tater lookup failed: en.cascade.nope.tacos', i18n.translate('cascade.nope.tacos')
       assert_equal 'Delicious', i18n.translate('cascade.nope.tacos', cascade: true)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tater
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Evan Lecklider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest