promethee 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b518d1f83474f06c099c7714b4696d270cde07b
-  data.tar.gz: 5401b785dce334c87e2c3de4d005b91ee2ec9bb0
+  metadata.gz: 0446ad6a008e7f126a6bd3e691f2d9fb1cdf1164
+  data.tar.gz: faffb9120096340ab927218699794449beeb1b08
 SHA512:
-  metadata.gz: 117e2b926c3eca318925429f13c9013abf32d8f0345774747fbba7a7db084a3e2ef8f3d25b74a82839b9f3d61b85d43cbdceb48de7ebb0c35fa5a7dc8312d270
-  data.tar.gz: 4047603f08cc82901a66db5bd2a13d1f20f9f583668f995e8695d7b8e79fbab65ec7a256828c1fc1d86b8fd168ef7ad2eb53bc91ea7dba4893c4011e50a56d30
+  metadata.gz: f428c8ae156ddb16051a183f7b4e5b721891baa1b2cf1501bb219954d4b6e2756e794a9d60bf2d45a666ace2ccbe43956f32e7b2dadfa823271c575a06eb13d7
+  data.tar.gz: fea5fa53d6f350df3666b5eb656ff0ffb75e5209227a663236a3038a4705a68968b6242463e9a410220466b68e3fa8c4f141e1b6ff7d1b4ac63bc9b9c1170793

data/app/views/promethee/_edit.html.erb

@@ -1,4 +1,5 @@
 <%
+master_data ||= {}
 promethee_data = Promethee::Data.new master_data
 %>
 
@@ -25,12 +26,12 @@ promethee_data = Promethee::Data.new master_data
     });
 
   promethee.controller('PrometheeController', ['data', '$scope', 'definitions', '$http', function(data, $scope, definitions, $http) {
-    
+
     // Data (TODO use Adder and probably page definition to init)
     if (data === null || data === '') {
       data = {
         id: '',
-        type: 'page', 
+        type: 'page',
         version: 1,
         children: []
       };

data/lib/promethee/data.rb

@@ -73,19 +73,17 @@ module Promethee
       @master_data[:children]
     end
 
+    def flat_children
+      self.class.flatten_components @master_data_unlocalized[:children]
+    end
+
     def prepare_localization
       # TODO extract localizable components from master data, in the correct order, merged with existing ones
       # TODO update master_version
 
-      # Flattens master data, and select only text components
-      flat_master_data = self.class.flatten_components(@master_data_unlocalized[:children]).select do |component|
-        component[:type].to_sym === :text
-      end
-
-      # We add master reference
-      flat_master_data.each do |data|
-        data[:master] = data.clone
-      end
+      # Selects only text components within the children components flat array
+      # TODO think about a better way to handle localized attributes among all the components (not only text type)
+      flat_master_data = flat_children.select { |component| component[:type].to_sym === :text }
 
       if @localization_data
         # If localization_data has been provided, we merge flat_master_data components with its components
@@ -94,10 +92,9 @@ module Promethee
             localized_component[:id] == component[:id]
           end
 
-          # Update master reference
-          localized_component[:master] = component[:master] unless localized_component.nil?
-
-          localized_component || component
+          # If the localized_component isn't found, we create it with the master (component)
+          # Eventually, we add a reference to the master in the localized component
+          (localized_component || component).merge master: component.deep_dup
         end
       else
         # In the other case, localization_data components are flat_master_data components

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Julien Dargelos
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page