promethee 4.1.4 → 4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b869c8cec07785cdb8427016f34e55e5612a5a2dce7b1dbae9acd17bd59b865f
-  data.tar.gz: 2509a1cbad91a556c0c1aef60f86e04697544aeca4a944ebe3f8a3654c5c9307
+  metadata.gz: b7d821ae071c08da48380617b5ca9f0f601256a00dd8e27b553ede3475785217
+  data.tar.gz: c7eeabfdbfdcad6b7ef5fb2e19989e5bdb72c7dc75ec88cadfa90ef98e8315ff
 SHA512:
-  metadata.gz: bbfdedf786eb854e48ad92d3342f0242d4b22499b20a82cf3b4cfe5d55deccb45881979c93833516f54304645b762b6f54f36f1c00533dc8ff6958ee1f23781e
-  data.tar.gz: 55a68a0dc69657784d2d7d6dd45651b18c4835eea3295688f886d3cadf2bb41058285453bd10d00a61b94c1ffd3a84dbdebd2ce65050fb5b5ab479c8924f20be
+  metadata.gz: d4562917821c9211f589d2a6dcd457e1af5451b8ccd1e00daf087f88464720e97e2b3ff35c1eb4f6b0b25150f256040dc739ef3f2260ad4f819df4c7f183bba8
+  data.tar.gz: 0a35e27bb871f285a213bae214f7c177e36028c3a86e94f8805f17aea4fba2104f33f9c6a9327a3f2e86253878a793c6ee8e17f9562840c51d206e4253bb1557

data/lib/promethee/data/localization.rb

@@ -11,11 +11,13 @@ class Promethee::Data::Localization < Promethee::Data
 
   # We want to be up to date with the master, so this method will:
   # 1.take the master's components flattened
-  # 2 substitute what's already localized, based on the component id
+  # 2 substitute values of what's already localized, based on the component id
   # Consequences of step 1 are:
   # 1 it adds new components from the master
   # 2 it removes components not in the master anymore
   # 3 it takes the order from the master
+  # 4 use all translatable attributes from the master
+  # 5 merge them with translation values if they exist
   def merge
     @data_before_merge = @data.deep_dup
     @data = {
@@ -23,11 +25,10 @@ class Promethee::Data::Localization < Promethee::Data
       components: []
     }
     @master_data.flat.each do |master_component|
+      translatable_master_component = get_component_without_attributes_values(master_component)
       localized_component = find_localized_component master_component[:id]
-      # We take the localized component if it exists, the master component otherwise
-      component = localized_component || get_component_without_attributes_values(master_component)
-      component[:attributes] ||= {}
-      # We add it to the list of localized components
+
+      component = get_merged_translatable_component(translatable_master_component, localized_component)
       @data[:components] << component
     end
   end
@@ -43,6 +44,21 @@ class Promethee::Data::Localization < Promethee::Data
     clean_component
   end
 
+  def get_merged_translatable_component(master_component, localized_component)
+    # Not found in translation, we use the prepared master component
+    return master_component if localized_component.nil?
+
+    master_component[:attributes] ||= {}
+    localized_component[:attributes] ||= {}
+
+    # Merge values with the prepared master, allowing to add missing attributes from translation
+    master_component[:attributes].each do |attr_key, attr_value|
+      attr_value[:value] = localized_component.dig(:attributes, attr_key, :value) || ''
+    end
+
+    master_component
+  end
+
   def find_localized_component(id)
     return unless @data_before_merge
     return unless @data_before_merge.include? :components

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '4.1.4'
+    VERSION = '4.1.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.1.5
 platform: ruby
 authors:
 - Sébastien Gaya
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails