promethee 1.3.13 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1776f27dd12b69eb4f7de5c420d938ba725e475b
-  data.tar.gz: 60fa948ad2a81f072baeabc0c36ed933f521a08c
+SHA256:
+  metadata.gz: 4d9b83829af4366f0438d7d7d07cfec271ebb96211ccba1629416f2dabd6ea61
+  data.tar.gz: a318d9d5ed598bfc51704b8c60837de5ae737c8e634b03f9e6641d1abb9faee0
 SHA512:
-  metadata.gz: ac8cfcf7ea0ed9d17207ac62580c7278ef8f20d9ed968729000476705f375610207fe911137bd01ff329fa6f17c32fa78a26659b803b3faec49671a193f92b95
-  data.tar.gz: 9bf0cc3f3104542b6f55472ee0c393ad60b8f4c198f68778e30e260597f4df82251a4c891c6b319e58bb621c0fd96d2f7351222c627482c0e45a0f6b6a29688a
+  metadata.gz: 437f8fbd6a87234df3d6894d51c259e8da71df8b05b56a9b3323bd7326384f50cd64fb4265b7016161fed77ec6616457b66817b16bc396662608d5a961dc4f6c
+  data.tar.gz: 722f0c987318b69cbd177052970c41f5983147ad112df02f0797c7a8917c78c18f528e1b687d349eba305fafd173d1e792039c842ed07d562c16d7927b7f75ac

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

@@ -15,7 +15,7 @@ promethee_data = Promethee::Data.new master_data, localization_data: localizatio
   prometheeLocalizer.controller('PrometheeLocalizerController', ['$scope', 'data', function($scope, data) {
 
     $scope.data = data;
-    $scope.component = data;
+    $scope.component = {children: data.components};
 
     $scope.options = {
       toolbar: [

data/lib/promethee/data.rb

@@ -52,7 +52,7 @@ module Promethee
         components: []
       }
       # We create a flat list of the children and all their child, in the master's order
-      master_components_flat = Promethee::Data.flatten_components @master_data.deep_dup[:children]
+      master_components_flat = Promethee::Data.flatten_components @master_data.deep_dup
       master_components_flat.each do |component|
         localized_component = Promethee::Data.find_localized_component component[:id], @localization_data_raw
         # We take either the localized, or the master component
@@ -93,12 +93,10 @@ module Promethee
     end
 
     # Takes an array of components and puts every component and their children into a unique flat array
-    def self.flatten_components(components)
-      return [] if components.nil?
-      components.reduce [] do |flat_components, component|
-        flat_components +
-        [component.except(:children)] +
-        flatten_components(component[:children] || [])
+    def self.flatten_components(component)
+      flat_components = [component.except(:children)]
+      (component[:children] || []).reduce flat_components do |flat_components, component|
+        flat_components + flatten_components(component)
       end
     end
   end

data/lib/promethee/rails/version.rb

@@ -1,5 +1,5 @@
 module Promethee
   module Rails
-    VERSION = '1.3.13'
+    VERSION = '1.3.15'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.15
 platform: ruby
 authors:
 - Julien Dargelos
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Bring fire to your page