isomorfeus-i18n 2.5.4 → 22.9.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879492d5b184943f94c7e664cb8c518d844ef4794bbf870b07fdffe86ff1237b
-  data.tar.gz: a07e5e4cee5fca2a3575b6847eb264d403c6af8a418de15184fdf310b778f9a3
+  metadata.gz: d3893f1f4b352b6e2e6cb2ff85eae4c8ea8a47ae277c169124b2ed2142358693
+  data.tar.gz: 782bf79faf33d6c4514f3e7d2cc3128a129d68ccbbb6c3849f783196079e37cc
 SHA512:
-  metadata.gz: 923247019c7f634e4940808af56b46a430bc160b48ecf7e781038f21396c574849296868bdbb1fafbef43cc84687f0efdbcf3dc12bbf15d0ad6669955891291e
-  data.tar.gz: 96096194c72e573d8dd833c335d7e6484bda4f0f79734451f375828ac1b8f7c8c30261cb0aa31ed49012461b29592467d6cd3b0bc016674ab9809a37ffb284ad
+  metadata.gz: dccc5bb3e1a44f8c7a5f7a68953b511390a9064d11ace5f7f23f840b25837034c084668384213843be64ec09491941265c38d097c6e7ab8ba36e14c29d91d2f6
+  data.tar.gz: 7db066fed00ba4c942e417102015a8a985e6392a9813e87012c2aed9d9b4f0471ae37f331567f58309ed92551b731f0845b097d178d4936d0065fc71a256df58

data/README.md

@@ -15,7 +15,7 @@ Using fast_gettext internally.
 
 In any class:
 ```
-  include LucidI18n::Mixin
+  include LucidI18nMixin
 ```
 after which the _ gettext methods are available for translation.
 See the [fast_gettext documentation](https://github.com/grosser/fast_gettext) or the
@@ -27,7 +27,7 @@ Also available is the `current_locale` helper, which provides the current locale
 
 In any class:
 ```
-  include LucidI18n::Mixin
+  include LucidI18nMixin
 ```
 after which the l method is available, which currently can localize Times, Dates and numbers.
 See the [R18n core documentation](https://github.com/r18n/r18n-core)

data/lib/isomorfeus/i18n/config.rb

@@ -5,12 +5,12 @@ module Isomorfeus
 
     if RUBY_ENGINE == 'opal'
       def available_locales
-        result = Redux.fetch_by_path(:i18n_state, :available_locales)
+        result = Isomorfeus.store.dig(:i18n_state, :available_locales)
         result ? result : ['en']
       end
 
       def i18n_domain
-        result = Redux.fetch_by_path(:i18n_state, :domain)
+        result = Isomorfeus.store.dig(:i18n_state, :domain)
         result ? result : 'app'
       end
 
@@ -20,7 +20,7 @@ module Isomorfeus
       end
 
       def default_locale
-        result = Redux.fetch_by_path(:i18n_state, :locale)
+        result = Isomorfeus.store.dig(:i18n_state, :locale)
         result ? result : available_locales.first
       end
 
@@ -57,7 +57,7 @@ module Isomorfeus
 
       def current_locale=(loc)
         FastGettext.locale = loc
-        R18n.thread_set(loc)
+        R18n.thread_set(R18n::I18n.new(loc, R18n.default_places))
         Thread.current[:isomorfeus_locale] = loc
       end
 

data/lib/isomorfeus/i18n/enhancer.rb

@@ -0,0 +1,55 @@
+module Isomorfeus
+  module I18n
+    if RUBY_ENGINE != 'opal'
+      class InternalTranslationProxy
+        extend FastGettext::Translation
+        extend FastGettext::TranslationMultidomain
+      end
+    end
+
+    module Enhancer
+      if RUBY_ENGINE == 'opal'
+        I18N_ACTION_TYPES = %w[I18N_LOAD I18N_INIT]
+        CLIENT_I18N_ENHANCER = proc do |action, next_enh|
+          Isomorfeus.store.promise_action(action) if I18N_ACTION_TYPES.include?(action[:type])
+          next_enh.call(action)
+        end
+
+        def self.add_enhancer_to_store
+          ::Redux::Store.add_middleware(CLIENT_I18N_ENHANCER)
+        end
+      else # RUBY_ENGINE
+        LOCALE_METHODS = %w[_ n_ np_ ns_ p_ s_ N_ Nn_ d_ dn_ dnp_ dns_ dp_ ds_ D_ Dn_ Dnp_ Dns_ Dp_ Ds_]
+
+        SERVER_I18N_ENHANCER = proc do |action, next_enh|
+          if action[:type] == 'I18N_LOAD'
+            Isomorfeus::I18n::Init.init
+            domain = action[:domain]
+            locale = action[:locale]
+            method = action[:method]
+            args = action[:args]
+            if LOCALE_METHODS.include?(method)
+              result = InternalTranslationProxy.send(method, *args)
+              action = { type: 'I18N_MERGE', data: { domain => { locale => { method => { Oj.dump(args, mode: :strict) => result }}}}}
+            end
+          elsif action[:type] == 'I18N_INIT'
+            locale = action[:locale]
+            available_locales = FastGettext.available_locales
+            domain = FastGettext.text_domain
+            ne_locale = if Isomorfeus.available_locales.include?(locale)
+                          Isomorfeus.current_locale = locale
+                        else
+                          Isomorfeus.current_locale = Isomorfeus.default_locale
+                        end
+            action = { type: 'I18N_MERGE', data: { available_locales: available_locales, domain: domain, locale: ne_locale }}
+          end
+          next_enh.call(action)
+        end
+
+        def self.add_enhancer_to_store
+          ::Redux::Store.add_middleware(SERVER_I18N_ENHANCER)
+        end
+      end # RUBY_ENGINE
+    end
+  end
+end

data/lib/isomorfeus/i18n/init.rb

@@ -1,41 +1,29 @@
 module Isomorfeus
   module I18n
+    class StoreInit
+      def self.init
+        root_element = `document.querySelector('div[data-iso-root]')`
+        if root_element
+          Isomorfeus.current_locale = root_element.JS.getAttribute('data-iso-nloc')
+        else
+          Isomorfeus.current_locale = Isomorfeus.default_locale
+        end
+      end
+    end
+
     class Init
       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]')`
-              if root_element
-                Isomorfeus.current_locale = root_element.JS.getAttribute('data-iso-nloc')
-              else
-                Isomorfeus.current_locale = Isomorfeus.default_locale
-              end
-            end
-            self.init_promise = init_from_server
+            init_from_server
+            promise { Isomorfeus.store.dig(:i18n_state, :locale) }
           end
 
           def init_from_server
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.current_locale).then do |agent|
-              agent.process do
-                @initializing = false
-                Isomorfeus.store.dispatch(type: 'I18N_LOAD', data: agent.response[:data])
-                @initialized = true
-              end
-            end
-          end
-
-          def reload_from_server
-            Isomorfeus::Transport.promise_send_path('Isomorfeus::I18n::Handler::LocaleHandler', :init, Isomorfeus.current_locale).then do |agent|
-              agent.process do
-                Isomorfeus.store.dispatch(type: 'I18N_STATE', set_state: agent.response[:data])
-              end
-            end
+            Isomorfeus.store.deferred_dispatch(type: 'I18N_INIT', locale: Isomorfeus.current_locale)
           end
 
           def initialized?
@@ -43,6 +31,11 @@ module Isomorfeus
           end
         else
           def init
+            return if Thread.current[:isomorfeus_i18n_initialized] == true
+            unless Dir.exist?(Isomorfeus.locale_path)
+              STDERR.puts "locale directory '#{Isomorfeus.locale_path}' not found, please create it if using I18n"
+              return
+            end
             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

data/lib/isomorfeus/i18n/reducer.rb

@@ -1,38 +1,47 @@
 module Isomorfeus
   module I18n
     module Reducer
-      def self.add_reducer_to_store
-        i18n_reducer = Redux.create_reducer do |prev_state, action|
+      if RUBY_ENGINE == 'opal'
+        CLIENT_REDUCER = proc 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
+          if action_type == 'I18N_STATE' && action.key?(:set_state)
+            action[:set_state]
+          elsif action_type == 'REDUX_MERGE'
+            red_state = action.dig(:state, :i18n_state)
+            if red_state
+              new_state = prev_state ? prev_state.deep_dup : {}
+              new_state.deep_merge!(red_state)
             else
-              prev_state
+              prev_state || {}
             end
           else
-            prev_state.nil? ? {} : prev_state
+            prev_state || {}
           end
         end
 
-        Redux::Store.preloaded_state_merge!(i18n_state: {})
-        Redux::Store.add_reducer(i18n_state: i18n_reducer)
-      end
+        def self.add_reducer_to_store
+          ::Redux::Store.preloaded_state_merge!(i18n_state: {})
+          ::Redux::Store.add_reducers(i18n_state: CLIENT_REDUCER)
+        end
+      else # RUBY_ENGINE
+        SERVER_REDUCER = proc do |prev_state, action|
+          action_type = action[:type]
+          if action_type == 'I18N_STATE' && action.key?(:set_state)
+            action[:set_state]
+          elsif action_type == 'I18N_MERGE'
+            new_state = prev_state ? prev_state.deep_dup : {}
+            new_state.deep_merge!(action[:data])
+            new_state
+          else
+            prev_state || {}
+          end
+        end
+
+        def self.add_reducer_to_store
+          ::Redux::Store.preloaded_state_merge!(i18n_state: {})
+          ::Redux::Store.add_reducers(i18n_state: SERVER_REDUCER)
+        end
+      end # RUBY_ENGINE
     end
   end
 end

data/lib/isomorfeus/i18n/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module I18n
-    VERSION = '2.5.4'
+    VERSION = '22.9.0.rc1'
   end
 end

data/lib/isomorfeus-i18n.rb

@@ -1,18 +1,16 @@
 require 'time' # which requires 'date'
-# require 'datetime' # for opal 1.5
 require 'isomorfeus-transport'
+require 'isomorfeus-redux'
+require 'isomorfeus/i18n/config'
+require 'isomorfeus/i18n/reducer'
+Isomorfeus::I18n::Reducer.add_reducer_to_store
+
+require 'lucid_i18n_mixin'
+require 'isomorfeus/i18n/init'
 
 if RUBY_ENGINE == 'opal'
-  require 'isomorfeus/i18n/config'
-  require 'isomorfeus/i18n/reducer'
-  Isomorfeus::I18n::Reducer.add_reducer_to_store
-  require 'lucid_i18n/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
+  Isomorfeus.add_client_init_after_store_class_name('Isomorfeus::I18n::StoreInit')
+  Isomorfeus.add_transport_init_class_name('Isomorfeus::I18n::Init')
 else
   require 'active_support'
   require 'oj'
@@ -20,13 +18,14 @@ else
   require 'fast_gettext'
   require 'isomorfeus/i18n/fast_gettext/cache'
   require 'isomorfeus/i18n/fast_gettext/translation_repository/base'
+end
+
+require 'isomorfeus/i18n/enhancer'
+Isomorfeus::I18n::Enhancer.add_enhancer_to_store
+
+if RUBY_ENGINE != 'opal'
   require 'http_accept_language/parser'
   require 'http_accept_language/middleware'
-  require 'isomorfeus-data'
-  require 'isomorfeus/i18n/config'
-  require 'isomorfeus/i18n/init'
-  require 'lucid_i18n/mixin'
-  require 'isomorfeus/i18n/handler/locale_handler'
   require 'isomorfeus/i18n/middleware'
 
   Isomorfeus.add_middleware(HttpAcceptLanguage::Middleware)

data/lib/lucid_i18n_mixin.rb

@@ -0,0 +1,169 @@
+module LucidI18nMixin
+  CONTEXT_SEPARATOR = "\004"
+  NAMESPACE_SEPARATOR = '|'
+  NIL_BLOCK = -> { nil }
+  TRANSLATION_METHODS = [:_, :n_, :np_, :ns_, :p_, :s_]
+
+  def i18n_domain
+    Isomorfeus.i18n_domain
+  end
+
+  def current_locale
+    Isomorfeus.current_locale
+  end
+
+  def _(*keys)
+    result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, '_', JSON.dump(keys))
+    return result if result
+    _send_i18n_method('_', keys)
+  end
+
+  def n_(*keys, count)
+    result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, 'n_', JSON.dump(keys.push(count)))
+    return result if result
+    _send_i18n_method('n_', keys + [count])
+  end
+
+  def np_(context, plural_one, *args, separator: nil)
+    nargs = ["#{context}#{separator || CONTEXT_SEPARATOR}#{plural_one}"] + args
+    translation = n_(*nargs, &NIL_BLOCK)
+    return translation if translation
+    n_(plural_one, *args)
+  end
+
+  def ns_(*args)
+    result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, 'ns_', JSON.dump(args))
+    return result if result
+    _send_i18n_method('ns_', args)
+  end
+
+  def p_(namespace, key, separator = nil)
+    args = separator ? [namespace, key, separator] : [namespace, key]
+    result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, 'p_', JSON.dump(args))
+    return result if result
+    _send_i18n_method('p_', args)
+  end
+
+  def s_(key, separator = nil)
+    args = separator ? [key, separator] : [key]
+    result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, 's_', JSON.dump(args))
+    return result if result
+    _send_i18n_method('s_', args)
+  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 = i18n_domain
+      begin
+        Isomorfeus.i18n_domain = domain
+        result = send(method, *args, &block)
+      ensure
+        Isomorfeus.i18n_domain = old_domain
+      end
+      result
+    end
+
+    define_method("D#{method}") do |*args|
+      result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, "D#{method}", JSON.dump(args))
+      return result if result
+      _send_i18n_method("D#{method}", args)
+    end
+  end
+
+  if RUBY_ENGINE == 'opal'
+    def _send_i18n_method(method, args)
+      Isomorfeus.something_loading!
+      Isomorfeus.store.deferred_dispatch(type: 'I18N_LOAD', domain: i18n_domain, locale: current_locale, method: method, args: args)
+      ''
+    end
+
+    def l(object, format = :standard, options = {})
+      c_name = object.class.to_s
+      options = {} unless options
+      locale = options.delete(:locale) { current_locale }
+      options = options.transform_keys { |k| k.camelize(:lower) }
+      if object.is_a?(Numeric)
+        options[:minimumFractionDigits] = 4 unless object.is_a?(Integer)
+        # options for number formatting:
+        # locale: locale string like 'de'
+        # currency: any currency code (like "EUR", "USD", "INR", etc.)
+        # currency_display or currencyDisplay: "symbol"(default) "code" "name"
+        # locale_matcher or localeMatcher: "best-fit"(default) "lookup"
+        # maximum_fraction_digits or maximumFractionDigits: A number from 0 to 20 (default is 3)
+        # maximum_significant_digits or maximumSignificantDigits: A number from 1 to 21 (default is 21)
+        # minimum_fraction_digits or minimumFractionDigits: A number from 0 to 20 (default is 3)
+        # minimum_integer_digits or minimumIntegerDigits:	A number from 1 to 21 (default is 1)
+        # minimum_significant_digits or minimumSignificantDigits:	A number from 1 to 21 (default is 21)
+        # style: "decimal"(default) "currency" "percent"
+        # use_grouping or useGrouping: true(default) false
+        `(object).toLocaleString(locale, #{options.to_n})`
+      elsif c_name == 'Date' || c_name == 'DateTime'
+        # options for date/time formating:
+        # format: "standard" "full"
+        # locale: locale string like 'de'
+        # time_zone or timeZone: timezone string like 'CET'
+        # time_zone_name or timeZoneName: "long" "short"
+        # date_style or dateStyle: "full" "long" "medium" "short"
+        # time_style or timeStyle: "full" "long" "medium" "short"
+        # format_matcher or formatMatcher: "best-fit"(default) "basic"
+        # locale_matcher or localeMatcher: "best-fit"(default) "lookup"
+        # hour12: false true
+        # hour_cycle hourCycle: "h11" "h12" "h23" "h24"
+        # hour:	   "2-digit" "numeric"
+        # minute:	 "2-digit" "numeric"
+        # second:	 "2-digit" "numeric"
+        # day	     "2-digit" "numeric"
+        # month:   "2-digit" "numeric" "long" "short" "narrow"
+        # weekday:                     "long" "short" "narrow"
+        # year:	   "2-digit" "numeric"
+        native_object = object.to_n
+        case format
+        when :standard
+          `native_object.toLocaleDateString(locale, #{options.to_n})`
+        when :full
+          options[:dateStyle] = 'long'
+          `native_object.toLocaleDateString(locale, #{options.to_n})`
+        when :custom
+          `native_object.toLocaleString(locale, #{options.to_n})`
+        else
+          `native_object.toLocaleDateString(locale, #{options.to_n})`
+        end
+      elsif c_name == 'Time'
+        native_object = object.to_n
+        case format
+        when :standard
+          `native_object.toLocaleString(locale, #{options.to_n})`
+        when :full
+          options[:dateStyle] = 'long'
+          options[:timeStyle] = 'short'
+          `native_object.toLocaleString(locale, #{options.to_n})`
+        when :custom
+          `native_object.toLocaleString(locale, #{options.to_n})`
+        else
+          `native_object.toLocaleString(locale, #{options.to_n})`
+        end
+      else
+        raise "Unknown object type #{object.class} given to #l!"
+      end
+    end
+  else # RUBY_ENGINE
+    def _send_i18n_method(method, args)
+      Isomorfeus.store.deferred_dispatch(type: 'I18N_LOAD', domain: i18n_domain, locale: current_locale, method: method, args: args)
+      result = Isomorfeus.store.dig(:i18n_state, i18n_domain, current_locale, method, JSON.dump(args))
+      result || ''
+    end
+
+    def l(object, format = :standard, _options = {})
+      Isomorfeus::I18n::Init.init
+      R18n.l(object, format)
+    end
+  end # RUBY_ENGINE
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-i18n
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 22.9.0.rc1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.2
+        version: 7.0.3
 - !ruby/object:Gem::Dependency
   name: fast_gettext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.13
+        version: 3.13.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.13.13
+        version: 3.13.21
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: opal-activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.24
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.24
-- !ruby/object:Gem::Dependency
-  name: isomorfeus-preact
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.7.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 10.7.2
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 22.9.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 22.9.0.rc1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 22.9.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 22.9.0.rc1
 - !ruby/object:Gem::Dependency
   name: r18n-core
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +156,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 22.9.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.4
+        version: 22.9.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,15 +202,15 @@ files:
 - README.md
 - lib/isomorfeus-i18n.rb
 - lib/isomorfeus/i18n/config.rb
+- lib/isomorfeus/i18n/enhancer.rb
 - lib/isomorfeus/i18n/fast_gettext/cache.rb
 - lib/isomorfeus/i18n/fast_gettext/translation_repository/base.rb
-- lib/isomorfeus/i18n/handler/locale_handler.rb
 - lib/isomorfeus/i18n/init.rb
 - lib/isomorfeus/i18n/middleware.rb
 - lib/isomorfeus/i18n/missing_keys.rb
 - lib/isomorfeus/i18n/reducer.rb
 - lib/isomorfeus/i18n/version.rb
-- lib/lucid_i18n/mixin.rb
+- lib/lucid_i18n_mixin.rb
 homepage: https://isomorfeus.com
 licenses:
 - MIT
@@ -242,9 +228,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key:

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

@@ -1,86 +0,0 @@
-# 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)
-                                                                Isomorfeus.current_locale = locale
-                                                              else
-                                                                Isomorfeus.current_locale = Isomorfeus.default_locale
-                                                              end
-            else
-              response_agent.agent_result[domain] = {}
-              begin
-                if Isomorfeus.development?
-                  Isomorfeus::I18n::Init.init
-                  FastGettext.cache.reload_all!
-                end
-                FastGettext.with_domain(domain) do
-                  response_agent.request[domain].each_key do |locale|
-                    response_agent.agent_result[domain][locale] = {}
-                    if Isomorfeus.current_locale != locale
-                      if Isomorfeus.available_locales.include?(locale)
-                        Isomorfeus.current_locale = locale
-                      else
-                        Isomorfeus.raise_error(message: "LocaleHandler: Locale #{locale} not available!")
-                      end
-                    end
-                    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/lucid_i18n/mixin.rb

@@ -1,224 +0,0 @@
-module LucidI18n
-  module Mixin
-    CONTEXT_SEPARATOR = "\004"
-    NAMESPACE_SEPARATOR = '|'
-    NIL_BLOCK = -> { nil }
-    TRANSLATION_METHODS = [:_, :n_, :np_, :ns_, :p_, :s_]
-
-    def current_locale
-      Isomorfeus.current_locale
-    end
-
-    if RUBY_ENGINE == 'opal'
-      def _(*keys, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.current_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
-        _promise_send_i18n_method(domain, locale, '_', keys)
-        block_given? ? block.call : ''
-      end
-
-      def n_(*keys, count, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.current_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
-        _promise_send_i18n_method(domain, locale, 'n_', keys + [count])
-        block_given? ? block.call : ''
-      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.current_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
-        _promise_send_i18n_method(domain, locale, 'ns_', args)
-        block_given? ? block.call : n_(*args).split(NAMESPACE_SEPARATOR).last
-      end
-
-      def p_(namespace, key, separator = nil, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.current_locale
-        args = separator ? [namespace, key, separator] : [namespace, key]
-        result = Redux.fetch_by_path(:i18n_state, domain, locale, 'p_', args)
-        return result if result
-        _promise_send_i18n_method(domain, locale, 'p_', args)
-        block_given? ? block.call : ''
-      end
-
-      def s_(key, separator = nil, &block)
-        domain = Isomorfeus.i18n_domain
-        locale = Isomorfeus.current_locale
-        args = separator ? [key, separator] : [key]
-        result = Redux.fetch_by_path(:i18n_state, domain, locale, 's_', args)
-        return result if result
-        _promise_send_i18n_method(domain, locale, 's_', args)
-        block_given? ? block.call : ''
-      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.current_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
-          _promise_send_i18n_method(domain, locale, "D#{method}", args)
-          block_given? ? block.call : send(method, *args, &block)
-        end
-      end
-
-      def l(object, format = :standard, options = {})
-        c_name = object.class.to_s
-        locale = options.delete(:locale) { Isomorfeus.current_locale }
-        options = options.transform_keys { |k| `Opal.Preact.lower_camelize(k)` }
-        if object.is_a?(Numeric)
-          # options for number formatting:
-          # locale: locale string like 'de'
-          # currency: any currency code (like "EUR", "USD", "INR", etc.)
-          # currency_display or currencyDisplay: "symbol"(default) "code" "name"
-          # locale_matcher or localeMatcher: "best-fit"(default) "lookup"
-          # maximum_fraction_digits or maximumFractionDigits: A number from 0 to 20 (default is 3)
-          # maximum_significant_digits or maximumSignificantDigits: A number from 1 to 21 (default is 21)
-          # minimum_fraction_digits or minimumFractionDigits: A number from 0 to 20 (default is 3)
-          # minimum_integer_digits or minimumIntegerDigits:	A number from 1 to 21 (default is 1)
-          # minimum_significant_digits or minimumSignificantDigits:	A number from 1 to 21 (default is 21)
-          # style: "decimal"(default) "currency" "percent"
-          # use_grouping or useGrouping: true(default) false
-          `(object).toLocaleString(locale, #{options.to_n})`
-        elsif c_name == 'Date' || c_name == 'DateTime'
-          # options for date/time formating:
-          # format: "standard" "full"
-          # locale: locale string like 'de'
-          # time_zone or timeZone: timezone string like 'CET'
-          # time_zone_name or timeZoneName: "long" "short"
-          # date_style or dateStyle: "full" "long" "medium" "short"
-          # time_style or timeStyle: "full" "long" "medium" "short"
-          # format_matcher or formatMatcher: "best-fit"(default) "basic"
-          # locale_matcher or localeMatcher: "best-fit"(default) "lookup"
-          # hour12: false true
-          # hour_cycle hourCycle: "h11" "h12" "h23" "h24"
-          # hour:	   "2-digit" "numeric"
-          # minute:	 "2-digit" "numeric"
-          # second:	 "2-digit" "numeric"
-          # day	     "2-digit" "numeric"
-          # month:   "2-digit" "numeric" "long" "short" "narrow"
-          # weekday:                     "long" "short" "narrow"
-          # year:	   "2-digit" "numeric"
-          native_object = object.to_n
-          case format
-          when :standard
-            `native_object.toLocaleDateString(locale, #{options.to_n})`
-          when :full
-            options[:dateStyle] = 'long'
-            `native_object.toLocaleDateString(locale, #{options.to_n})`
-          when :custom
-            `native_object.toLocaleString(locale, #{options.to_n})`
-          else
-            `native_object.toLocaleDateString(locale, #{options.to_n})`
-          end
-        elsif c_name == 'Time'
-          native_object = object.to_n
-          case format
-          when :standard
-            `native_object.toLocaleString(locale, #{options.to_n})`
-          when :full
-            options[:dateStyle] = 'long'
-            options[:timeStyle] = 'short'
-            `native_object.toLocaleString(locale, #{options.to_n})`
-          when :custom
-            `native_object.toLocaleString(locale, #{options.to_n})`
-          else
-            `native_object.toLocaleString(locale, #{options.to_n})`
-          end
-        else
-          raise "Unknown object type #{object.class} given to #l!"
-        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 # RUBY_ENGINE
-      class InternalTranslationProxy
-        extend FastGettext::Translation
-        extend FastGettext::TranslationMultidomain
-      end
-
-      def l(object, format = :standard, _options = {})
-        Isomorfeus::I18n::Init.init unless Thread.current[:isomorfeus_i18n_initialized] == true
-        R18n.l(object, format)
-      end
-
-      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 # RUBY_ENGINE
-  end
-end