ruby_native 0.15.2 → 0.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a06223f80d171207b1eb5e0e56d67f3f02ba2737037fa06b7c16f4f3fbecad
-  data.tar.gz: 26c59be4e4848abb167cf45d39249609b888167aad3835eb367c70f4fc41f1ed
+  metadata.gz: 1be33272a96d8436b0384a2723f6661e349c873c8df954fadba80472bbfe565c
+  data.tar.gz: c547853c962c66b1c588185b54ca584ef2d9796fa735fcbe7ad560ba0644f159
 SHA512:
-  metadata.gz: b6a051041b02d7d87d2881b4ff279beed81d0f5291746611e601c1f68f8c46eb85539250fb34bb567394c4395b3ed99d44078132d6e0f6d894beb52f91694e25
-  data.tar.gz: 0cad8e6fac5dce1596ec40009a9e01f9ce1549b6ca3a89b3dee70205d40ff98ef5a6e99d112202e197d25d27ffb37fda4d268681e6137e8e0aa016b07b494414
+  metadata.gz: 5dda4cf2375e87449b8e64e81c07fe02cf2d671fdea7182fafd7f34436674bb633ff7823a19c7e2efd7414ff888af17c7d646e9652437e807f0c67458dd97972
+  data.tar.gz: ba5e2c1ee978774a81e7292cf6cd7b8e96fba7f80820d81483f0c64721e478205afc4167de8a8bc7064d96fc908a194699f9ebe03a35c1c4bad9e1a9da1c2a8f

data/lib/generators/ruby_native/templates/ruby_native.yml

@@ -102,6 +102,23 @@ tabs:
 
   # Per-tab options (add to any tab above):
   #
+  #   # Localize this tab's title. Put the copy in your app's own locale files
+  #   # under `ruby_native.tabs.<key>.title`, the same way the error screen uses
+  #   # `ruby_native.errors.*`, and the device's language picks the translation:
+  #   #
+  #   #   # config/locales/it.yml
+  #   #   it:
+  #   #     ruby_native:
+  #   #       tabs:
+  #   #         home:
+  #   #           title: Casa
+  #   #
+  #   # `title:` above stays the fallback for a language you have not
+  #   # translated. Once every tab has a key you can drop `title:` entirely and
+  #   # keep all of your copy in the locale files.
+  #   # https://rubynative.com/docs/tabs#localization
+  #   key: home
+  #
   #   # Load this tab on launch instead of lazily.
   #   # Default: false.
   #   eager: true

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.15.2"
+  VERSION = "0.15.3"
 end

data/lib/ruby_native.rb

@@ -62,6 +62,7 @@ module RubyNative
     normalize_linked_paths
     backfill_tab_icons
     backfill_error_icons
+    warn_on_duplicate_tab_keys
   end
 
   # config/ruby_native.yml is rendered as ERB before it is parsed, so a
@@ -95,6 +96,21 @@ module RubyNative
     end
   end
 
+  # A tab's `key` names its copy in the host app's locale files, so two tabs
+  # sharing one read the same translations and one of them is always
+  # mislabeled. Warn rather than raise: both tabs still render, and a typo in
+  # the config should never take down boot.
+  def self.warn_on_duplicate_tab_keys
+    keys = Array(self.config[:tabs]).filter_map { |tab| tab[:key] if tab.is_a?(Hash) }
+    duplicates = keys.tally.select { |_, count| count > 1 }.keys
+    return if duplicates.empty?
+
+    Rails.logger.warn(
+      "[RubyNative] Duplicate tab key(s) in config/ruby_native.yml " \
+      "(#{duplicates.join(", ")}). Each tab needs its own key, or they share a title."
+    )
+  end
+
   # Mirrors `backfill_tab_icons` for the error screen: fills a state's flat
   # `icon` from its per-platform `icons` (ios first, then android), so the iOS
   # app, which reads only the flat `icon`, still renders one. An explicit
@@ -134,6 +150,7 @@ module RubyNative
     # Shipped app binaries have required the `appearance` key at decode; keep
     # emitting it so they still boot when the YAML omits the block.
     payload[:appearance] ||= {}
+    localize_tab_titles(payload[:tabs])
     errors = error_screen_config(payload[:errors])
     if errors.empty?
       payload.delete(:errors)
@@ -143,6 +160,51 @@ module RubyNative
     payload
   end
 
+  # Fills each tab's `titles` from `ruby_native.tabs.<key>.title` in the host
+  # app's locale files, mirroring the `ruby_native.errors.*` namespace. The map
+  # is emitted beside the flat `title` rather than replacing it, the same
+  # additive shape as `icon`/`icons`: both platforms decode `title` as a plain
+  # String, so an app that does not read `titles` yet keeps rendering the YAML
+  # copy. Tabs without a `key` are left exactly as authored.
+  #
+  # `title:` is optional in the YAML so a localized app can keep all of its copy
+  # in locale files, but it is never optional on the wire: both platforms decode
+  # it as a required, non-optional String, so a tab missing one fails the whole
+  # config decode and drops the user on the error screen. Fill it from the
+  # default locale, then from any locale that was translated.
+  def self.localize_tab_titles(tabs)
+    Array(tabs).each do |tab|
+      next unless tab.is_a?(Hash)
+
+      key = tab[:key].to_s
+      titles = key.empty? ? {} : translations_for("tabs.#{key}.title")
+      tab[:titles] = titles unless titles.empty?
+      next unless tab[:title].to_s.empty?
+
+      tab[:title] = titles[I18n.default_locale] || titles.values.first || fallback_tab_title(key)
+    end
+  end
+
+  # Reached only when a tab has no `title:` and no translation in any locale,
+  # which would otherwise serve a payload that cannot decode. Names the tab
+  # after its key ("order_history" -> "Order history") so the bar still renders
+  # something recognizable, and says so, since the copy is missing everywhere.
+  def self.fallback_tab_title(key)
+    if key.empty?
+      Rails.logger.warn(
+        "[RubyNative] A tab in config/ruby_native.yml has no `title:`. Give it one, or a `key:` " \
+        "with copy under `ruby_native.tabs.<key>.title` in your locale files."
+      )
+      return "Untitled"
+    end
+
+    Rails.logger.warn(
+      "[RubyNative] Tab #{key.inspect} in config/ruby_native.yml has no `title:` and no " \
+      "`ruby_native.tabs.#{key}.title` translation in any locale. Falling back to a title from the key."
+    )
+    key.humanize
+  end
+
   # Merges per-state error-screen icons (from YAML) with localized copy (from
   # I18n) into the shape the native apps decode. Omits any state with neither an
   # icon nor copy, so an untouched app sends no `errors` block at all.
@@ -155,7 +217,7 @@ module RubyNative
         entry[:icons] = state_config[:icons] if state_config[:icons]
       end
       ERROR_SCREEN_COPY_KEYS.each do |key|
-        translations = error_screen_translations("#{state}.#{key}")
+        translations = translations_for("errors.#{state}.#{key}")
         entry[key] = translations unless translations.empty?
       end
       result[state] = entry unless entry.empty?
@@ -163,17 +225,17 @@ module RubyNative
 
     # The Retry button label is shared by both states, so it sits at the top of
     # the block rather than under a state.
-    retry_label = error_screen_translations("retry")
+    retry_label = translations_for("errors.retry")
     config[:retry] = retry_label unless retry_label.empty?
     config
   end
 
-  # Reads `ruby_native.errors.<subkey>` for every available locale, keeping only
-  # the locales the developer actually translated. Copy lives in the host app's
-  # own locale files; the gem ships none.
-  def self.error_screen_translations(subkey)
+  # Reads `ruby_native.<subkey>` for every available locale, keeping only the
+  # locales the developer actually translated. Copy lives in the host app's own
+  # locale files; the gem ships none.
+  def self.translations_for(subkey)
     I18n.available_locales.each_with_object({}) do |locale, result|
-      value = I18n.t("ruby_native.errors.#{subkey}", locale: locale, default: nil)
+      value = I18n.t("ruby_native.#{subkey}", locale: locale, default: nil)
       result[locale] = value unless value.nil?
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_native
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.15.3
 platform: ruby
 authors:
 - Joe Masilotti