tater 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5ec34021f3488e2ef8ef3365abc37258813e5d9a79b8dbd0a49fb8254c946a
-  data.tar.gz: 8613b2a54d59d0b4a64f84790e60f55316447714d6013a6751041a2aa9dada6a
+  metadata.gz: 51644f41d80e87d20ed43b9e8c6b4797fb7aeb4258c94d5d9f9d7a50eb5ee5c6
+  data.tar.gz: 1fe43b99fbc2f24cdc342ec4278ff7140ee6b9579dd51d236fcc713907f1455d
 SHA512:
-  metadata.gz: f65062d798ace02b68084b1a9189f09c092e32f2a819bd88909d651038a205a36b60816f8c6e890614c9aaea1a17e074b89a7f3a5163969bf10c6f35a8eac56e
-  data.tar.gz: cf3ae7da9a2d911f90aa93dd1f2e088425becf21d2b5558c485d86002bcccf09a4bdccfed39385442a7865a27e76196aa68bf90b259ea30f5b8beeda8eb1807c
+  metadata.gz: d4c059fdc696d39c489e61d3e53954fe921feaba78055bd5e62c944d45daf10dfa178b76e4e836d326ba61be0dbf7bbec13b63f52b95e13f23da9ca5be4d3b8c
+  data.tar.gz: 6b12ffa8f2a1186f2de92c9c16bb5c2e1027f93ab5ee2c877dbad297777274b9f4f38882255490db3c555a0dafb129ed876bd784d3a872e07a4e7e9f6e0e24ec

data/lib/tater.rb

@@ -109,7 +109,6 @@ class Tater
   # @param path [String]
   #   A path to search for YAML or Ruby files to load messages from.
   def initialize(cascade: false, locale: nil, messages: nil, path: nil)
-    @cache = {}
     @cascade = cascade
     @locale = locale
     @messages = {}
@@ -167,8 +166,10 @@ class Tater
 
     # Not only does this clear our cache but it establishes the basic structure
     # that we rely on in other methods.
+    @cache = {}
+
     @messages.each_key do |key|
-      @cache[key] = { true => {}, false => {} }
+      @cache[key] = { false => {}, true => {} }
     end
   end
 
@@ -223,37 +224,45 @@ class Tater
 
   # Lookup a key in the messages hash, using the current locale or an override.
   #
+  # @example Using the default locale, look up a key's value.
+  #   i18n = Tater.new(locale: 'en', messages: { 'en' => { 'greeting' => { 'world' => 'Hello, world!' } } })
+  #   i18n.lookup('greeting.world') # => "Hello, world!"
+  #
   # @param key [String]
+  #   The period-separated key path to look for within our messages.
   # @param locale [String]
-  #   A locale to use instead of our current one.
+  #   A locale to use instead of our current one, if any.
   # @param cascade [Boolean]
   #   A boolean to forcibly set the cascade option for this lookup.
   #
   # @return
   #   Basically anything that can be stored in your messages Hash.
   def lookup(key, locale: nil, cascade: nil)
-    locale = locale.nil? ? @locale : locale
-    cascade = cascade.nil? ? @cascade : cascade
-
-    cached(key, locale, cascade) || begin
-      return nil unless @messages.key?(locale.to_s)
+    locale =
+      if locale.nil?
+        @locale
+      else
+        locale.to_s
+      end
 
-      path = key.split(SEPARATOR).prepend(locale).map(&:to_s)
+    cascade = @cascade if cascade.nil?
 
-      message =
-        if cascade
-          while path.length >= 2
-            attempt = @messages.dig(*path)
+    @cache[locale][cascade][key] ||= begin
+      path = key.split(SEPARATOR)
 
-            break attempt unless attempt.nil?
+      message = @messages[locale].dig(*path)
 
+      if message.nil? && cascade
+        message =
+          while path.length > 1
             path.delete_at(path.length - 2)
+            attempt = @messages[locale].dig(*path)
+
+            break attempt unless attempt.nil?
           end
-        else
-          @messages.dig(*path)
-        end
+      end
 
-      cache(key, locale, cascade, message)
+      message
     end
   end
 
@@ -338,32 +347,6 @@ class Tater
 
   private
 
-  # @param key [String]
-  #   The cache key, often in the form "something.nested.like.this"
-  # @param locale [String]
-  #   The locale to store the value for.
-  # @param cascade [Boolean]
-  #   Was this a cascading lookup?
-  # @param message [String]
-  #   The message being cached, often a String.
-  # @return [String]
-  #   Whatever value is being cached, often a String.
-  def cache(key, locale, cascade, message)
-    @cache[locale][cascade][key] = message
-  end
-
-  # @param key [String]
-  #   The cache key, often in the form "something.nested.like.this"
-  # @param locale [String]
-  #   The locale to store the value for.
-  # @param cascade [Boolean]
-  #   Was this a cascading lookup?
-  # @return [String, nil]
-  #   The cached message or nil.
-  def cached(key, locale, cascade)
-    @cache.dig(locale, cascade, key)
-  end
-
   # Localize an Array object.
   #
   # @param object [Array<String>]

data/test/tater_test.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
-require_relative '../lib/tater'
-require 'minitest/autorun'
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
+
 require 'date'
+require 'minitest/autorun'
+require 'tater'
 
 describe Tater do
   describe Tater::Utils do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tater
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Evan Lecklider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2021-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '2.0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Minimal internationalization and localization library.