isomorfeus-i18n 1.0.0.zeta23 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e69010c5deaf30f403d170dc57dba3020da4236ba40df78950cdb16e5b89b1a
-  data.tar.gz: 71ccc91befe2d5d699f9bac50ee3ce172c5499422697920f064907488d30b9c1
+  metadata.gz: da916597e3c7a4d88acf9e202d84202d61cd19dfaa6cd527dc3ecc071d95c013
+  data.tar.gz: 55fac42ff4cc421705127c0bc28060553d7f96ed19928499824a61af4fd8c022
 SHA512:
-  metadata.gz: 5b0b0aecd626e4c435db28edfd5931d4181fe0054add4ee076af200401265ba8385334149aefb35f7ae4eccb98b64575a648b6e9939fa434d4b6eaa863099dd3
-  data.tar.gz: '083e94aaa20be606d271c293cd124036c9ecae596e8bf1c18d4b4b91f96148b2c81da87d36c258b71d575fb673e9c139670b0ee66b8e091f537b6cf8c3626399'
+  metadata.gz: 751d1a5e11e8c45aab9943d01ee595ada7812e9be41fb8e1770b170715d9d3e87dbb6755051f42e1eb2997a5f30e54244f9959f98ee3eb2526fc131973743978
+  data.tar.gz: b786c55171b9d450c386885f22b4e68ae5b949cc3c4b89e72c0881b57657092b8e06be53abf5bee4604b89de06bdcad94073531363c06b7e40c8a0da5258a0e2

data/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2018-2019 Jan Biedermann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2018-2019 Jan Biedermann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,22 +1,22 @@
-# isomorfeus-i18n
-
-Internationalization for Isomorfeus.
-
-### Community and Support
-At the [Isomorfeus Framework Project](http://isomorfeus.com) 
-
-### Usage
-Locale files go in my_app/isomorfeus/locales.
-Supported formats: .mo, .po, .yml
-
-Using fast_gettext internally.
-
-## Usage
-
-In any class:
-```
-  include LucidTranslation::Mixin
-```
-
-after which the _ gettext methods are available for translation.
-See https://github.com/grosser/fast_gettext and https://rubydoc.info/gems/gettext/
+# isomorfeus-i18n
+
+Internationalization for Isomorfeus.
+
+### Community and Support
+At the [Isomorfeus Framework Project](http://isomorfeus.com) 
+
+### Usage
+Locale files go in my_app/isomorfeus/locales.
+Supported formats: .mo, .po, .yml
+
+Using fast_gettext internally.
+
+## Usage
+
+In any class:
+```
+  include LucidTranslation::Mixin
+```
+
+after which the _ gettext methods are available for translation.
+See https://github.com/grosser/fast_gettext and https://rubydoc.info/gems/gettext/

data/lib/isomorfeus/i18n/config.rb

@@ -1,78 +1,78 @@
-module Isomorfeus
-  # available settings
-  class << self
-    attr_accessor :i18n_type
-
-    if RUBY_ENGINE == 'opal'
-      def available_locales
-        result = Redux.fetch_by_path(:i18n_state, :available_locales)
-        result ? result : ['en']
-      end
-
-      def i18n_domain
-        result = Redux.fetch_by_path(:i18n_state, :domain)
-        result ? result : 'app'
-      end
-
-      def i18n_domain=(domain)
-        Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { domain: domain })
-        domain
-      end
-
-      def locale
-        result = Redux.fetch_by_path(:i18n_state, :locale)
-        result ? result : available_locales.first
-      end
-
-      def locale=(loc)
-        Isomorfeus.raise_error(message: "Locale #{loc} not available!") unless available_locales.include?(loc)
-        Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { locale: locale })
-        loc
-      end
-
-      def negotiated_locale
-        @negotiated_locale
-      end
-
-      def negotiated_locale=(l)
-        @negotiated_locale = l
-      end
-    else
-      def available_locales
-        @available_locales
-      end
-
-      def available_locales=(locs_arr)
-        FastGettext.available_locales = locs_arr
-        @available_locales = locs_arr
-      end
-
-      def i18n_domain
-        @i18n_domain
-      end
-
-      def i18n_domain=(domain)
-        FastGettext.text_domain = domain
-        @i18n_domain = domain
-      end
-
-      def locale
-        @locale
-      end
-
-      def locale=(loc)
-        Isomorfeus.raise_error(message: "Locale #{loc} not available!") unless available_locales.include?(loc)
-        FastGettext.locale = loc
-        @locale = loc
-      end
-
-      def locale_path
-        @locale_path
-      end
-
-      def locale_path=(path)
-        @locale_path = path
-      end
-    end
-  end
-end
+module Isomorfeus
+  # available settings
+  class << self
+    attr_accessor :i18n_type
+
+    if RUBY_ENGINE == 'opal'
+      def available_locales
+        result = Redux.fetch_by_path(:i18n_state, :available_locales)
+        result ? result : ['en']
+      end
+
+      def i18n_domain
+        result = Redux.fetch_by_path(:i18n_state, :domain)
+        result ? result : 'app'
+      end
+
+      def i18n_domain=(domain)
+        Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { domain: domain })
+        domain
+      end
+
+      def locale
+        result = Redux.fetch_by_path(:i18n_state, :locale)
+        result ? result : available_locales.first
+      end
+
+      def locale=(loc)
+        Isomorfeus.raise_error(message: "Locale #{loc} not available!") unless available_locales.include?(loc)
+        Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: { locale: locale })
+        loc
+      end
+
+      def negotiated_locale
+        @negotiated_locale
+      end
+
+      def negotiated_locale=(l)
+        @negotiated_locale = l
+      end
+    else
+      def available_locales
+        @available_locales
+      end
+
+      def available_locales=(locs_arr)
+        FastGettext.available_locales = locs_arr
+        @available_locales = locs_arr
+      end
+
+      def i18n_domain
+        @i18n_domain
+      end
+
+      def i18n_domain=(domain)
+        FastGettext.text_domain = domain
+        @i18n_domain = domain
+      end
+
+      def locale
+        @locale
+      end
+
+      def locale=(loc)
+        Isomorfeus.raise_error(message: "Locale #{loc} not available!") unless available_locales.include?(loc)
+        FastGettext.locale = loc
+        @locale = loc
+      end
+
+      def locale_path
+        @locale_path
+      end
+
+      def locale_path=(path)
+        @locale_path = path
+      end
+    end
+  end
+end

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

@@ -1,76 +1,76 @@
-# frozen_string_literal: true
-
-module Isomorfeus
-  module I18n
-    module Handler
-      class LocaleHandler < LucidHandler::Base
-        include FastGettext::Translation
-        include FastGettext::TranslationMultidomain
-
-        on_request do |response_agent|
-          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
-          response_agent.agent_result = {}
-          # promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, method, [args])
-          response_agent.request.each_key do |domain|
-            if domain == 'init'
-              locale = response_agent.request[domain]
-              response_agent.agent_result['data'] = { 'available_locales' => FastGettext.available_locales,
-                                                      'domain' => FastGettext.text_domain }
-              response_agent.agent_result['data']['locale'] = if Isomorfeus.available_locales.include?(locale)
-                                                                locale
-                                                             else
-                                                               FastGettext.locale
-                                                             end
-            else
-              response_agent.agent_result[domain] = {}
-              begin
-                FastGettext.with_domain(domain) do
-                  response_agent.request[domain].each_key do |locale|
-                    response_agent.agent_result[domain][locale] = {}
-                    Isomorfeus.raise_error(message: "Locale #{locale} not available!") unless Isomorfeus.available_locales.include?(locale)
-                    FastGettext.with_locale(locale) do
-                      response_agent.request[domain][locale].each_key do |locale_method|
-                        method_args = response_agent.request[domain][locale][locale_method]
-                        method_result = case locale_method
-                                        when '_' then _(*method_args)
-                                        when 'n_' then n_(*method_args)
-                                        when 'np_' then np_(*method_args)
-                                        when 'ns_' then ns_(*method_args)
-                                        when 'p_' then p_(*method_args)
-                                        when 's_' then s_(*method_args)
-                                        when 'N_' then N_(*method_args)
-                                        when 'Nn_' then Nn_(*method_args)
-                                        when 'd_' then d_(*method_args)
-                                        when 'dn_' then dn_(*method_args)
-                                        when 'dnp_' then dnp_(*method_args)
-                                        when 'dns_' then dns_(*method_args)
-                                        when 'dp_' then dp_(*method_args)
-                                        when 'ds_' then ds_(*method_args)
-                                        when 'D_' then D_(*method_args)
-                                        when 'Dn_' then Dn_(*method_args)
-                                        when 'Dnp_' then Dnp_(*method_args)
-                                        when 'Dns_' then Dns_(*method_args)
-                                        when 'Dp_' then Dp_(*method_args)
-                                        when 'Ds_' then Ds_(*method_args)
-                                        else
-                                          Isomorfeus.raise_error(message: "No such locale method #{locale_method}")
-                                        end
-                        response_agent.agent_result[domain][locale].deep_merge!(locale_method => { Oj.dump(method_args, mode: :strict) => method_result })
-                      end
-                    end
-                  end
-                end
-              rescue Exception => e
-                response_agent.error = if Isomorfeus.production?
-                                         { error: 'No such thing!' }
-                                       else
-                                         { error: "Isomorfeus::I18n::Handler::LocaleHandler: #{e.message}" }
-                                       end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Isomorfeus
+  module I18n
+    module Handler
+      class LocaleHandler < LucidHandler::Base
+        include FastGettext::Translation
+        include FastGettext::TranslationMultidomain
+
+        on_request do |response_agent|
+          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
+          response_agent.agent_result = {}
+          # promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', domain, locale, method, [args])
+          response_agent.request.each_key do |domain|
+            if domain == 'init'
+              locale = response_agent.request[domain]
+              response_agent.agent_result['data'] = { 'available_locales' => FastGettext.available_locales,
+                                                      'domain' => FastGettext.text_domain }
+              response_agent.agent_result['data']['locale'] = if Isomorfeus.available_locales.include?(locale)
+                                                                locale
+                                                             else
+                                                               FastGettext.locale
+                                                             end
+            else
+              response_agent.agent_result[domain] = {}
+              begin
+                FastGettext.with_domain(domain) do
+                  response_agent.request[domain].each_key do |locale|
+                    response_agent.agent_result[domain][locale] = {}
+                    Isomorfeus.raise_error(message: "Locale #{locale} not available!") unless Isomorfeus.available_locales.include?(locale)
+                    FastGettext.with_locale(locale) do
+                      response_agent.request[domain][locale].each_key do |locale_method|
+                        method_args = response_agent.request[domain][locale][locale_method]
+                        method_result = case locale_method
+                                        when '_' then _(*method_args)
+                                        when 'n_' then n_(*method_args)
+                                        when 'np_' then np_(*method_args)
+                                        when 'ns_' then ns_(*method_args)
+                                        when 'p_' then p_(*method_args)
+                                        when 's_' then s_(*method_args)
+                                        when 'N_' then N_(*method_args)
+                                        when 'Nn_' then Nn_(*method_args)
+                                        when 'd_' then d_(*method_args)
+                                        when 'dn_' then dn_(*method_args)
+                                        when 'dnp_' then dnp_(*method_args)
+                                        when 'dns_' then dns_(*method_args)
+                                        when 'dp_' then dp_(*method_args)
+                                        when 'ds_' then ds_(*method_args)
+                                        when 'D_' then D_(*method_args)
+                                        when 'Dn_' then Dn_(*method_args)
+                                        when 'Dnp_' then Dnp_(*method_args)
+                                        when 'Dns_' then Dns_(*method_args)
+                                        when 'Dp_' then Dp_(*method_args)
+                                        when 'Ds_' then Ds_(*method_args)
+                                        else
+                                          Isomorfeus.raise_error(message: "No such locale method #{locale_method}")
+                                        end
+                        response_agent.agent_result[domain][locale].deep_merge!(locale_method => { Oj.dump(method_args, mode: :strict) => method_result })
+                      end
+                    end
+                  end
+                end
+              rescue Exception => e
+                response_agent.error = if Isomorfeus.production?
+                                         { error: 'No such thing!' }
+                                       else
+                                         { error: "Isomorfeus::I18n::Handler::LocaleHandler: #{e.message}" }
+                                       end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/i18n/init.rb

@@ -1,48 +1,47 @@
-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
-          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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              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
-        end
-      end
-    end
-  end
-end
+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
+          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])
+              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
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus/i18n/reducer.rb

@@ -1,31 +1,38 @@
-module Isomorfeus
-  module I18n
-    module Reducer
-      def self.add_reducer_to_store
-        i18n_reducer = Redux.create_reducer do |prev_state, action|
-          action_type = action[:type]
-          if action_type.JS.startsWith('I18N_')
-            case action_type
-            when 'I18N_STATE'
-              if action.key?(:set_state)
-                action[:set_state]
-              else
-                prev_state
-              end
-            when 'I18N_LOAD'
-              result = prev_state.deep_merge(action[:data])
-              result == prev_state ? prev_state : result
-            else
-              prev_state
-            end
-          else
-            prev_state
-          end
-        end
-
-        Redux::Store.preloaded_state_merge!(i18n_state: {})
-        Redux::Store.add_reducer(i18n_state: i18n_reducer)
-      end
-    end
-  end
-end
+module Isomorfeus
+  module I18n
+    module Reducer
+      def self.add_reducer_to_store
+        i18n_reducer = Redux.create_reducer do |prev_state, action|
+          action_type = action[:type]
+          if action_type.JS.startsWith('I18N_')
+            case action_type
+            when 'I18N_STATE'
+              if action.key?(:set_state)
+                action[:set_state]
+              else
+                prev_state
+              end
+            when 'I18N_LOAD'
+              new_state = {}.merge!(prev_state)
+              if action.key?(:collected)
+                action[:collected].each do |act|
+                  new_state.deep_merge!(act[:data])
+                end
+              else
+                new_state.deep_merge!(action[:data])
+              end
+              new_state
+            else
+              prev_state
+            end
+          else
+            prev_state
+          end
+        end
+
+        Redux::Store.preloaded_state_merge!(i18n_state: {})
+        Redux::Store.add_reducer(i18n_state: i18n_reducer)
+      end
+    end
+  end
+end

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
-module Isomorfeus
-  module I18n
-    VERSION = '1.0.0.zeta23'
-  end
+module Isomorfeus
+  module I18n
+    VERSION = '2.0.0.rc2'
+  end
 end