isomorfeus-i18n 1.0.0.zeta23 → 2.0.0.rc2

data/lib/isomorfeus-i18n.rb

@@ -1,71 +1,72 @@
-require 'isomorfeus-transport'
-
-if RUBY_ENGINE == 'opal'
-  require 'isomorfeus/i18n/config'
-  require 'isomorfeus/i18n/reducer'
-  Isomorfeus::I18n::Reducer.add_reducer_to_store
-  require 'lucid_translation/mixin'
-  require 'isomorfeus/i18n/init'
-  if Isomorfeus.on_browser?
-    Isomorfeus.add_client_init_after_store_class_name('Isomorfeus::I18n::Init')
-  else
-    Isomorfeus.add_transport_init_class_name('Isomorfeus::I18n::Init')
-  end
-else
-  require 'active_support'
-  require 'oj'
-  require 'fast_gettext'
-  require 'http_accept_language/parser'
-  require 'http_accept_language/middleware'
-  require 'isomorfeus-data'
-  require 'isomorfeus/i18n/config'
-  require 'isomorfeus/i18n/init'
-  require 'lucid_translation/mixin'
-  require 'isomorfeus/i18n/handler/locale_handler'
-
-  Isomorfeus.add_middleware(HttpAcceptLanguage::Middleware)
-
-  Opal.append_path(__dir__.untaint) unless Opal.paths.include?(__dir__.untaint)
-
-  Isomorfeus.locale_path = File.expand_path(File.join('app', 'locales'))
-
-  # identify available locales
-  locales = []
-
-  Dir.glob("#{Isomorfeus.locale_path}/**/*.mo").each do |file|
-    locales << File.basename(file, '.mo')
-  end
-  Isomorfeus.i18n_type = :mo unless locales.empty?
-
-  unless Isomorfeus.i18n_type
-    locales = []
-    Dir.glob("#{Isomorfeus.locale_path}/**/*.po").each do |file|
-      locales << File.basename(file, '.po')
-    end
-    Isomorfeus.i18n_type = :po unless locales.empty?
-  end
-
-  unless Isomorfeus.i18n_type
-    locales = []
-    Dir.glob("#{Isomorfeus.locale_path}/**/*.yaml").each do |file|
-      locales << File.basename(file, '.yaml')
-    end
-    Dir.glob("#{Isomorfeus.locale_path}/**/*.yml").each do |file|
-      locales << File.basename(file, '.yml')
-    end
-    Isomorfeus.i18n_type = :yaml unless locales.empty?
-  end
-
-  Isomorfeus.available_locales = locales
-  Isomorfeus.available_locales = ['en'] if Isomorfeus.available_locales.empty?
-
-  if Isomorfeus.available_locales.include?('en')
-    Isomorfeus.locale = 'en'
-  else
-    Isomorfeus.locale = Isomorfeus.available_locales.first
-  end
-
-  Isomorfeus.i18n_domain = 'app'
-
-  Isomorfeus::I18n::Init.init
-end
+require 'isomorfeus-transport'
+
+if RUBY_ENGINE == 'opal'
+  require 'isomorfeus/i18n/config'
+  require 'isomorfeus/i18n/reducer'
+  Isomorfeus::I18n::Reducer.add_reducer_to_store
+  require 'lucid_translation/mixin'
+  require 'isomorfeus/i18n/init'
+  if Isomorfeus.on_browser?
+    Isomorfeus.add_client_init_after_store_class_name('Isomorfeus::I18n::Init')
+  else
+    Isomorfeus.add_transport_init_class_name('Isomorfeus::I18n::Init')
+  end
+else
+  require 'active_support'
+  require 'oj'
+  require 'fast_gettext'
+  require 'http_accept_language/parser'
+  require 'http_accept_language/middleware'
+  require 'isomorfeus-data'
+  require 'isomorfeus/i18n/config'
+  require 'isomorfeus/i18n/init'
+  require 'lucid_translation/mixin'
+  require 'isomorfeus/i18n/handler/locale_handler'
+
+  Isomorfeus.add_middleware(HttpAcceptLanguage::Middleware)
+
+  require 'iso_opal'
+  Opal.append_path(__dir__.untaint) unless IsoOpal.paths.include?(__dir__.untaint)
+
+  Isomorfeus.locale_path = File.expand_path(File.join('app', 'locales'))
+
+  # identify available locales
+  locales = []
+
+  Dir.glob("#{Isomorfeus.locale_path}/**/*.mo").each do |file|
+    locales << File.basename(file, '.mo')
+  end
+  Isomorfeus.i18n_type = :mo unless locales.empty?
+
+  unless Isomorfeus.i18n_type
+    locales = []
+    Dir.glob("#{Isomorfeus.locale_path}/**/*.po").each do |file|
+      locales << File.basename(file, '.po')
+    end
+    Isomorfeus.i18n_type = :po unless locales.empty?
+  end
+
+  unless Isomorfeus.i18n_type
+    locales = []
+    Dir.glob("#{Isomorfeus.locale_path}/**/*.yaml").each do |file|
+      locales << File.basename(file, '.yaml')
+    end
+    Dir.glob("#{Isomorfeus.locale_path}/**/*.yml").each do |file|
+      locales << File.basename(file, '.yml')
+    end
+    Isomorfeus.i18n_type = :yaml unless locales.empty?
+  end
+
+  Isomorfeus.available_locales = locales
+  Isomorfeus.available_locales = ['en'] if Isomorfeus.available_locales.empty?
+
+  if Isomorfeus.available_locales.include?('en')
+    Isomorfeus.locale = 'en'
+  else
+    Isomorfeus.locale = Isomorfeus.available_locales.first
+  end
+
+  Isomorfeus.i18n_domain = 'app'
+
+  Isomorfeus::I18n::Init.init
+end

data/lib/lucid_translation/mixin.rb

@@ -1,200 +1,194 @@
-module LucidTranslation
-  module Mixin
-    CONTEXT_SEPARATOR = "\004"
-    NAMESPACE_SEPARATOR = '|'
-    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
-        locale = Isomorfeus.locale
-        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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
-        block_given? ? block.call : keys.first
-      end
-
-      def n_(*keys, count, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.locale
-        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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
-        block_given? ? block.call : keys.last
-      end
-
-      def np_(context, plural_one, *args, separator: nil, &block)
-        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
-
-      def ns_(*args, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.locale
-        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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
-        block_given? ? block.call : n_(*args).split(NAMESPACE_SEPARATOR).last
-      end
-
-      def p_(namespace, key, separator = nil, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.locale
-        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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
-        block_given? ? block.call : key
-      end
-
-      def s_(key, separator = nil, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.locale
-        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)
-                `console.error(#{agent.response[:error].to_n})`
-                Isomorfeus.raise_error(message: agent.response[:error])
-              end
-              Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-            end
-          end
-        end
-        block_given? ? block.call : key.split(separator || NAMESPACE_SEPARATOR).last
-      end
-
-      def N_(translate)
-        translate
-      end
-
-      def Nn_(*keys)
-        keys
-      end
-
-      TRANSLATION_METHODS.each do |method|
-        define_method("d#{method}") do |domain, *args, &block|
-          old_domain = Isomorfeus.i18n_domain
-          begin
-            Isomorfeus.i18n_domain = domain
-            send(method, *args, &block)
-          ensure
-            Isomorfeus.i18n_domain = old_domain
-          end
-        end
-
-        define_method("D#{method}") do |*args, &block|
-          domain = Isomorfeus.i18n_domain
-          locale = Isomorfeus.locale
-          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)
-                  `console.error(#{agent.response[:error].to_n})`
-                  Isomorfeus.raise_error(message: agent.response[:error])
-                end
-                Isomorfeus.store.merge_and_defer_dispatch(type: 'I18N_LOAD', data: { domain => agent.response[domain] })
-              end
-            end
-          end
-          block_given? ? block.call : send(method, *args, &block)
-        end
-      end
-    else
-      TRANSLATION_METHODS.each do |method|
-        define_method(method) do |domain, *args, &block|
-          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
-          InternalTranslationProxy.send(method, domain, *args, &block)
-        end
-
-        define_method("d#{method}") do |domain, *args, &block|
-          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
-          InternalTranslationProxy.send("d#{method}", domain, *args, &block)
-        end
-
-        define_method("D#{method}") do |*args, &block|
-          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
-          InternalTranslationProxy.send("D#{method}", *args, &block)
-        end
-      end
-    end
-  end
-end
+module LucidTranslation
+  module Mixin
+    CONTEXT_SEPARATOR = "\004"
+    NAMESPACE_SEPARATOR = '|'
+    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
+        locale = Isomorfeus.locale
+        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
+        block_given? ? block.call : keys.first
+      end
+
+      def n_(*keys, count, &block)
+        domain = Isomorfeus.i18n_domain
+        locale = Isomorfeus.locale
+        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
+        block_given? ? block.call : keys.last
+      end
+
+      def np_(context, plural_one, *args, separator: nil, &block)
+        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
+
+      def ns_(*args, &block)
+        domain = Isomorfeus.i18n_domain
+        locale = Isomorfeus.locale
+        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
+        block_given? ? block.call : n_(*args).split(NAMESPACE_SEPARATOR).last
+      end
+
+      def p_(namespace, key, separator = nil, &block)
+        domain = Isomorfeus.i18n_domain
+        locale = Isomorfeus.locale
+        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
+        block_given? ? block.call : key
+      end
+
+      def s_(key, separator = nil, &block)
+        domain = Isomorfeus.i18n_domain
+        locale = Isomorfeus.locale
+        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
+        block_given? ? block.call : key.split(separator || NAMESPACE_SEPARATOR).last
+      end
+
+      def N_(translate)
+        translate
+      end
+
+      def Nn_(*keys)
+        keys
+      end
+
+      TRANSLATION_METHODS.each do |method|
+        define_method("d#{method}") do |domain, *args, &block|
+          old_domain = Isomorfeus.i18n_domain
+          begin
+            Isomorfeus.i18n_domain = domain
+            send(method, *args, &block)
+          ensure
+            Isomorfeus.i18n_domain = old_domain
+          end
+        end
+
+        define_method("D#{method}") do |*args, &block|
+          domain = Isomorfeus.i18n_domain
+          locale = Isomorfeus.locale
+          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
+          block_given? ? block.call : send(method, *args, &block)
+        end
+      end
+    else
+      TRANSLATION_METHODS.each do |method|
+        define_method(method) do |domain, *args, &block|
+          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
+          InternalTranslationProxy.send(method, domain, *args, &block)
+        end
+
+        define_method("d#{method}") do |domain, *args, &block|
+          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
+          InternalTranslationProxy.send("d#{method}", domain, *args, &block)
+        end
+
+        define_method("D#{method}") do |*args, &block|
+          Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
+          InternalTranslationProxy.send("D#{method}", *args, &block)
+        end
+      end
+    end
+  end
+end