promethee 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0446ad6a008e7f126a6bd3e691f2d9fb1cdf1164
-  data.tar.gz: faffb9120096340ab927218699794449beeb1b08
+  metadata.gz: ff47d2fab2501f64ec51b21f530d35a1132d1819
+  data.tar.gz: 3ec913a94a54255692cab5058afe015c5d3dd5d0
 SHA512:
-  metadata.gz: f428c8ae156ddb16051a183f7b4e5b721891baa1b2cf1501bb219954d4b6e2756e794a9d60bf2d45a666ace2ccbe43956f32e7b2dadfa823271c575a06eb13d7
-  data.tar.gz: fea5fa53d6f350df3666b5eb656ff0ffb75e5209227a663236a3038a4705a68968b6242463e9a410220466b68e3fa8c4f141e1b6ff7d1b4ac63bc9b9c1170793
+  metadata.gz: d372fe3fd96e76820fb167ddd1927ea91773162cde7abf3606db752eabbfcdae4a56ecfcf476a268a77752b6ca1464abd4c400479b83121ddf18f676c800b787
+  data.tar.gz: cdb2fdd8b69026dfb5673108f2a659e2a866b9f1efff49438bd4b04493f6787f0cdfe354082614d5181e505d8d7520d0bffcacbc74b55dcbf2f9924e3f54ac7c

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

@@ -1,5 +1,5 @@
 <%
-master_data ||= {}
+master_data ||= nil
 promethee_data = Promethee::Data.new master_data
 %>
 

data/lib/promethee/data.rb

@@ -30,8 +30,27 @@ module Promethee
 
     protected
 
-    def convert_if_necessary(string_or_hash)
-      string_or_hash.is_a?(String) ? JSON.parse(string_or_hash, symbolize_names: true) : string_or_hash
+    def convert_if_necessary(string_or_hash_or_anything)
+      # string_or_hash_or_anything could be a string a hash or anything so we need to handle potential exception to keep this method safe
+      begin
+        converted = string_or_hash_or_anything.is_a?(String) ? JSON.parse(string_or_hash_or_anything, symbolize_names: true) : string_or_hash_or_anything
+      rescue
+        converted = {}
+      end
+
+      # The parsed json could be anything: "\"hey\"" => "hey", "[\"hey\"]" => ["hey"], "null" => nil, ...
+      converted = {} unless converted.is_a? Hash
+
+      # The data might not be a json string so the "symbolize_names" options wouldn't do anything on a ruby hash because JSON.parse wouldn't be called
+      converted.deep_symbolize_keys!
+
+      # The children array is required in order to make this class work
+      converted[:children] = [] unless converted[:children].is_a?(Array)
+
+      # The type is required in order to make this class work
+      converted[:type] = converted[:type].is_a?(String) || converted[:type].is_a?(Symbol) ? converted[:type].to_s : 'page'
+
+      converted
     end
 
     def deep_clone(hash)

data/lib/promethee/rails/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: promethee
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Julien Dargelos