isomorfeus-i18n 2.0.10 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4bc737c68ff0c61721a12a27ae685ce04fafc1d9b9145b624671404a10a75d7
-  data.tar.gz: a0331414ad506e6ac33c612e9b08bbea957b25b64463d151829941911f31111d
+  metadata.gz: d605567bda1c6c15752e586e466070e8d66223bae3e798862a968c600cf20bcf
+  data.tar.gz: 81752f5ea8b565641e431545aa04aa7639610f2b1124bab1355a10bf209eb83f
 SHA512:
-  metadata.gz: 780a3e909248c1aebf214146629f74a7644820638cb224f99e582fce75195bf28dc6558d6dbef6c9134552b6a4d58cb63475f1e3af6571ffc3e5dafcfc84905f
-  data.tar.gz: 0e450a393d056c601cf742afde7ea0d4d75b5649c0c9ff7b78bdc0fc9d5833e000b2ba51a2eca3573bf11cebb9ef3987bc94460fe762c342efb0b5e1a1bdbbc3
+  metadata.gz: 6632f0a848dd398a0860417710f1f2d13ce1c5771969654aabcb9b34edd31ce634a01f52d278cf59174d145be89834a6474a02bca8f6065a6bd726ebfad61b01
+  data.tar.gz: b7aabeb918ab0c193210163c9e964a1cc8c517c3fb5ff6db38c3885a93b333aa8998562c66d015746fd7c4bf537bb9c9f6f6433aebeb1f4f49257d8000f3eb3e

data/lib/isomorfeus/i18n/handler/locale_handler.rb

@@ -18,12 +18,13 @@ module Isomorfeus
                                                       'domain' => FastGettext.text_domain }
               response_agent.agent_result['data']['locale'] = if Isomorfeus.available_locales.include?(locale)
                                                                 locale
-                                                             else
-                                                               FastGettext.locale
-                                                             end
+                                                              else
+                                                                FastGettext.locale
+                                                              end
             else
               response_agent.agent_result[domain] = {}
               begin
+                Isomorfeus::I18n::Init.init if Isomorfeus.development?
                 FastGettext.with_domain(domain) do
                   response_agent.request[domain].each_key do |locale|
                     response_agent.agent_result[domain][locale] = {}

data/lib/isomorfeus/i18n/init.rb

@@ -1,45 +1,50 @@
 module Isomorfeus
   module I18n
     class Init
-      if RUBY_ENGINE == 'opal'
-        def self.init
-          return if @initializing || initialized?
-          @initializing = true
-          if Isomorfeus.on_browser?
-            root_element = `document.querySelector('div[data-iso-root]')`
-            Isomorfeus.negotiated_locale = root_element.JS.getAttribute('data-iso-nloc') if root_element
-            init_from_server
-          else
-            init_from_server
+      class << self
+        if RUBY_ENGINE == 'opal'
+          attr_accessor :init_promise
+
+          def init
+            return if @initializing || initialized?
+            @initializing = true
+            @initialized = false
+            if Isomorfeus.on_browser?
+              root_element = `document.querySelector('div[data-iso-root]')`
+              Isomorfeus.negotiated_locale = root_element.JS.getAttribute('data-iso-nloc') if root_element
+            end
+            self.init_promise = init_from_server
           end
-        end
 
-        def self.init_from_server
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
+          def init_from_server
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |agent|
+              agent.process do
+                @initializing = false
+                Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: agent.response[:data])
+                @initialized = true
               end
-              @initializing = false
-              Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: agent.response[:data])
             end
           end
-        end
 
-        def self.initialized?
-          result = Redux.fetch_by_path(:i18n_state, :available_locales)
-          result ? true : false
-        end
-      else
-        def self.init
-          FastGettext.add_text_domain(Isomorfeus.i18n_domain, path: Isomorfeus.locale_path, type: Isomorfeus.i18n_type)
-          FastGettext.available_locales = Isomorfeus.available_locales
-          FastGettext.text_domain = Isomorfeus.i18n_domain
-          FastGettext.locale = Isomorfeus.locale
-          Thread.current[:isomorfeus_i18n_initialized] = true
+          def reload_from_server
+            Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.negotiated_locale).then do |agent|
+              agent.process do
+                Isomorfeus.store.dispatch(type: 'I18N_STATE', set_state: agent.response[:data])
+              end
+            end
+          end
+
+          def initialized?
+            @initialized
+          end
+        else
+          def init
+            FastGettext.add_text_domain(Isomorfeus.i18n_domain, path: Isomorfeus.locale_path, type: Isomorfeus.i18n_type)
+            FastGettext.available_locales = Isomorfeus.available_locales
+            FastGettext.text_domain = Isomorfeus.i18n_domain
+            FastGettext.locale = Isomorfeus.locale
+            Thread.current[:isomorfeus_i18n_initialized] = true
+          end
         end
       end
     end

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '2.0.10'
+    VERSION = '2.0.14'
   end
 end

data/lib/lucid_translation/mixin.rb

@@ -5,13 +5,6 @@ module LucidTranslation
     NIL_BLOCK = -> { nil }
     TRANSLATION_METHODS = [:_, :n_, :np_, :ns_, :p_, :s_]
 
-    if RUBY_ENGINE != 'opal'
-      class InternalTranslationProxy
-        extend FastGettext::Translation
-        extend FastGettext::TranslationMultidomain
-      end
-    end
-
     if RUBY_ENGINE == 'opal'
       def _(*keys, &block)
         domain = Isomorfeus.i18n_domain
@@ -19,19 +12,7 @@ module LucidTranslation
         Isomorfeus.raise_error(message: "I18n _(): no key given!") if keys.empty?
         result = Redux.fetch_by_path(:i18n_state, domain, locale, '_', keys)
         return result if result
-        if Isomorfeus::I18n::Init.initialized?
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, '_', keys).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
+        _promise_send_i18n_method(domain, locale, '_', keys)
         block_given? ? block.call : keys.first
       end
 
@@ -41,19 +22,7 @@ module LucidTranslation
         Isomorfeus.raise_error(message: "I18n n_(): no key given!") if keys.empty?
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 'n_', keys + [count])
         return result if result
-        if Isomorfeus::I18n::Init.initialized?
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, 'n_', keys + [count]).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
+        _promise_send_i18n_method(domain, locale, 'n_', keys + [count])
         block_given? ? block.call : keys.last
       end
 
@@ -61,7 +30,6 @@ module LucidTranslation
         nargs = ["#{context}#{separator || CONTEXT_SEPARATOR}#{plural_one}"] + args
         translation = n_(*nargs, &NIL_BLOCK)
         return translation if translation
-
         block_given? ? block.call : n_(plural_one, *args)
       end
 
@@ -71,19 +39,7 @@ module LucidTranslation
         Isomorfeus.raise_error(message: "I18n ns_(): no args given!") if args.empty?
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 'ns_', args)
         return result if result
-        if Isomorfeus::I18n::Init.initialized?
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, 'ns_', args).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
+        _promise_send_i18n_method(domain, locale, 'ns_', args)
         block_given? ? block.call : n_(*args).split(NAMESPACE_SEPARATOR).last
       end
 
@@ -93,19 +49,7 @@ module LucidTranslation
         args = separator ? [namespace, key, separator] : [namespace, key]
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 'p_', args)
         return result if result
-        if Isomorfeus::I18n::Init.initialized?
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, 'p_', args).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
+        _promise_send_i18n_method(domain, locale, 'p_', args)
         block_given? ? block.call : key
       end
 
@@ -115,19 +59,7 @@ module LucidTranslation
         args = separator ? [key, separator] : [key]
         result = Redux.fetch_by_path(:i18n_state, domain, locale, 's_', args)
         return result if result
-        if Isomorfeus::I18n::Init.initialized?
-          Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, 's_', args).then do |agent|
-            if agent.processed
-              agent.result
-            else
-              agent.processed = true
-              if agent.response.key?(:error)
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
+        _promise_send_i18n_method(domain, locale, 's_', args)
         block_given? ? block.call : key.split(separator || NAMESPACE_SEPARATOR).last
       end
 
@@ -156,23 +88,44 @@ module LucidTranslation
           Isomorfeus.raise_error(message: "I18n D#{method}(): no args given!") if args.empty?
           result = Redux.fetch_by_path(:i18n_state, domain, locale, "D#{method}", args)
           return result if result
-          if Isomorfeus::I18n::Init.initialized?
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, "D#{method}", args).then do |agent|
-              if agent.processed
-                agent.result
-              else
-                agent.processed = true
-                if agent.response.key?(:error)
-                  Isomorfeus.raise_error(message: agent.response[:error])
-                end
-                Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-              end
-            end
-          end
+          _promise_send_i18n_method(domain, locale, "D#{method}", args)
           block_given? ? block.call : send(method, *args, &block)
         end
       end
+
+      private
+
+      def _promise_send_i18n_method(domain, locale, method, args)
+        if Isomorfeus::I18n::Init.initialized?
+          _promise_send_i18n_request(domain, locale, method, args)
+        else
+          Isomorfeus::I18n::Init.init_promise.then do
+            _promise_send_i18n_request(domain, locale, method, args)
+          end
+        end
+      end
+
+      def _promise_send_i18n_request(domain, locale, method, args)
+        Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, method, args).then do |agent|
+          _handle_i18n_response(agent, domain)
+        end
+      end
+
+      def _handle_i18n_response(agent, domain)
+        agent.process do
+          if on_browser?
+            Isomorfeus.store.collect_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
+          else
+            Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
+          end
+        end
+      end
     else
+      class InternalTranslationProxy
+        extend FastGettext::Translation
+        extend FastGettext::TranslationMultidomain
+      end
+
       TRANSLATION_METHODS.each do |method|
         define_method(method) do |domain, *args, &block|
           Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.14
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.14.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.14.8
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.14
+        version: 10.6.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.14
+        version: 10.6.25
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +142,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: isomorfeus-data
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement