ruby_native 0.10.6 → 0.10.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0704fd207fd1ac26e9d3a39472bf7d87d864a793e7a2aa31725e3255caae4299
-  data.tar.gz: c2a5d06c063a3cf9bb1b3a7f4c446485aac8b5e3848d47fddf8133e04ec062be
+  metadata.gz: a84e26b885c93151197f1ae505a45b9cb99d8f3049df4b89dce036c431411a51
+  data.tar.gz: cba347806df4afc1f3e21c1b0201e616148633632c712eb44c432166b43f1115
 SHA512:
-  metadata.gz: f27087c2df549ec0f2ef9fad1d8e83a21ded83a160e074fa636b750a544d698fd836d46ed10b41859d638ae344330efd4267b64300d1b85c850c381b43f433c2
-  data.tar.gz: cb66d64470ea7820bc6aa58f31b64bb7b716440d3fd898a90d47b44c3671382540712076f1266ceebbfe5575564435dc6f9c027df692eacf1cc334a6d3131db0
+  metadata.gz: 7add53e3f05dc87ff5688b0b5714cb627c0a60facc70dde3322cf898d7d5128ffef60b64eca922fefee35441775e1b0ee18108499a795603081cd841ff4e0d70
+  data.tar.gz: 91bc86d031b25887d4c321ce50dbc10227ecc89f84c9fc2b695091289c1d128a10cecd398e19d5f0928ac40a03c6fac4884d815a21319b370ebe670684dfe561

data/app/controllers/ruby_native/config_controller.rb

@@ -3,7 +3,7 @@ module RubyNative
     def show
       RubyNative.load_config if Rails.env.local?
       response.set_header("X-Ruby-Native-Version", RubyNative::VERSION)
-      render json: RubyNative.config
+      render json: RubyNative.config_as_json
     end
   end
 end

data/lib/ruby_native/version.rb

@@ -1,3 +1,3 @@
 module RubyNative
-  VERSION = "0.10.6"
+  VERSION = "0.10.8"
 end

data/lib/ruby_native.rb

@@ -43,6 +43,7 @@ module RubyNative
     self.config[:auth] ||= {}
     normalize_oauth_paths
     backfill_tab_icons
+    backfill_error_icons
   end
 
   # Mirrors per-platform `icons:` into the legacy flat `icon:` field so native
@@ -59,6 +60,86 @@ module RubyNative
     end
   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
+  # `icon:` wins.
+  def self.backfill_error_icons
+    errors = self.config[:errors]
+    return unless errors.is_a?(Hash)
+
+    ERROR_SCREEN_STATES.each do |state|
+      state_config = errors[state]
+      next unless state_config.is_a?(Hash)
+
+      icons = state_config[:icons]
+      next unless icons.is_a?(Hash)
+
+      state_config[:icon] ||= icons[:ios] || icons[:android]
+    end
+  end
+
+  # The native fallback screen has two states: `offline` (no connectivity) and
+  # `generic` (any other load failure). Each can carry a per-platform icon and
+  # localized copy.
+  ERROR_SCREEN_STATES = %i[offline generic].freeze
+  ERROR_SCREEN_COPY_KEYS = %i[title message].freeze
+
+  # The JSON served at GET /native/config. Identical to `config`, except the
+  # `errors` block is enriched: per-state icons from config/ruby_native.yml are
+  # merged with localized title/message pulled from the host app's I18n
+  # (`ruby_native.errors.<state>.<key>`), one entry per available locale. Only
+  # values the developer actually provided are emitted; the native apps fall
+  # back to bundled English copy for anything missing. Built on a deep copy so
+  # the in-memory `config` the server reads for view helpers is never mutated.
+  def self.config_as_json
+    return config if config.nil?
+
+    payload = config.deep_dup
+    errors = error_screen_config(payload[:errors])
+    if errors.empty?
+      payload.delete(:errors)
+    else
+      payload[:errors] = errors
+    end
+    payload
+  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.
+  def self.error_screen_config(yaml_errors)
+    config = ERROR_SCREEN_STATES.each_with_object({}) do |state, result|
+      entry = {}
+      state_config = yaml_errors[state] if yaml_errors.is_a?(Hash)
+      if state_config.is_a?(Hash)
+        entry[:icon] = state_config[:icon] if state_config[:icon]
+        entry[:icons] = state_config[:icons] if state_config[:icons]
+      end
+      ERROR_SCREEN_COPY_KEYS.each do |key|
+        translations = error_screen_translations("#{state}.#{key}")
+        entry[key] = translations unless translations.empty?
+      end
+      result[state] = entry unless entry.empty?
+    end
+
+    # 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")
+    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)
+    I18n.available_locales.each_with_object({}) do |locale, result|
+      value = I18n.t("ruby_native.errors.#{subkey}", locale: locale, default: nil)
+      result[locale] = value unless value.nil?
+    end
+  end
+
   # `auth.oauth_paths` must list only OAuth authorize paths, never their
   # callbacks. The native app treats every listed path as a sign-in trigger and
   # derives the provider from the last path segment, so a callback entry like

metadata

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