isomorfeus-data 1.0.0.zeta13 → 1.0.0.zeta14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cee3d71649477f132cee03fd570b5fc5c4ef9430ccad0d40daab90e05525eff
-  data.tar.gz: 6839dfeb7ceebc8f7311073c31d69f11d73265ab0689d798d2c60754f4e65b72
+  metadata.gz: 93156d6e98ea25e9b5710ccfa92e5efadfa0e1f0f5e9e1fa2d9a1aa239a25693
+  data.tar.gz: ee280984d99c9a45734a29f99d1108f1da5b37083f6f861573ba3c1b4c40e0e2
 SHA512:
-  metadata.gz: 189425d916a46bda087d17a9d49afe58bf6334446605a0d631032aff08b44f0b651acad2dea727ca6499e170d602bfe6cc1dccd31eaf5172ad3b9e737bf6399f
-  data.tar.gz: bb087ac1acdf8887b28bea4b5c997c2fac9263c500c7e88d18a3ef66115bde41a93bdf2955ac1546bc85e947405720f4e22d36d19abf26dd9388c3956e518dbf
+  metadata.gz: 938d8e16c20f5cc9600397d30c9c95c2efaa2774391eda20131c94a0347ec5a724208f1cd2c83fe7d890ea16223c8d68ef9994cf14d495f1db90c00a3bf6627e
+  data.tar.gz: 58b5ad7dbe2a9ff0d73b4c86ec93ab62d8f4804a78de8ee22184693aa2cc7b9e6cac55ddb70038486de288f31e10949908557319507d9aa07de2c3082c36a69f

data/lib/isomorfeus/data/generic_class_api.rb

@@ -100,7 +100,7 @@ module Isomorfeus
           data = instance_exec(key: key, &@_load_block)
           return nil unless data
           return data if data.class == self
-          Isomorfeus.raise_error "#{self.to_s}: execute_load must return a instance of #{self.to_s} or nil. Returned was: #{data.class}." if data.class != self
+          Isomorfeus.raise_error(message: "#{self.to_s}: execute_load must return a instance of #{self.to_s} or nil. Returned was: #{data.class}.") if data.class != self
           data
         end
 
@@ -108,7 +108,7 @@ module Isomorfeus
           previous_key = instance.key
           data = instance_exec(instance: instance, &@_save_block)
           return nil unless data
-          Isomorfeus.raise_error "#{self.to_s}: execute_save must return a instance of #{self.to_s} or nil. Returned was: #{data.class}." if data.class != self
+          Isomorfeus.raise_error(message: "#{self.to_s}: execute_save must return a instance of #{self.to_s} or nil. Returned was: #{data.class}.") if data.class != self
           data.instance_variable_set(:@previous_key, previous_key) if data.key != previous_key
           data._unchange!
           data

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '1.0.0.zeta13'
+    VERSION = '1.0.0.zeta14'
   end
 end

data/lib/isomorfeus_data/lucid_data/collection/mixin.rb

@@ -461,18 +461,18 @@ module LucidData
             def instance_from_transport(instance_data, included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               nodes_sids = instance_data[self.name][key].key?('nodes') ? instance_data[self.name][key]['nodes'] : []
               nodes = []
               nodes_sids.each do |sid|
                 node_class_name = sid[0]
                 node_key = sid[1]
-                Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Not a valid LucidData class!" unless Isomorfeus.valid_data_class_name?(node_class_name)
+                Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Not a valid LucidData class!") unless Isomorfeus.valid_data_class_name?(node_class_name)
                 if included_items_data.key?(node_class_name) && included_items_data[node_class_name].key?(node_key)
                   node_class = Isomorfeus.cached_data_class(node_class_name)
-                  Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Cannot get class!" unless node_class
+                  Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Cannot get class!") unless node_class
                   node = node_class.instance_from_transport({ node_class_name => { node_key => included_items_data[node_class_name][node_key] }}, included_items_data)
-                  Isomorfeus.raise_error "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!" unless node
+                  Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!") unless node
                   nodes << node
                 end
               end

data/lib/isomorfeus_data/lucid_data/composition/mixin.rb

@@ -176,18 +176,18 @@ module LucidData
             def instance_from_transport(instance_data, included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               source_parts = instance_data[self.name][key].key?('parts') ? instance_data[self.name][key]['parts'] : {}
               parts = {}
               source_parts.each do |part_name, sid|
                 part_class_name = sid[0]
                 part_key = sid[1]
-                Isomorfeus.raise_error "#{self.name}: #{part_class_name}: Not a valid LucidData class!" unless Isomorfeus.valid_data_class_name?(part_class_name)
+                Isomorfeus.raise_error(message: "#{self.name}: #{part_class_name}: Not a valid LucidData class!") unless Isomorfeus.valid_data_class_name?(part_class_name)
                 if included_items_data.key?(part_class_name) && included_items_data[part_class_name].key?(part_key)
                   part_class = Isomorfeus.cached_data_class(part_class_name)
-                  Isomorfeus.raise_error "#{self.name}: #{part_class_name}: Cannot get class!" unless part_class
+                  Isomorfeus.raise_error(message: "#{self.name}: #{part_class_name}: Cannot get class!") unless part_class
                   part = part_class.instance_from_transport({ part_class_name => { part_key => included_items_data[part_class_name][part_key] }}, included_items_data)
-                  Isomorfeus.raise_error "#{self.name}: #{part_class_name} with key #{part_key} could not be extracted from transport data!" unless part
+                  Isomorfeus.raise_error(message: "#{self.name}: #{part_class_name} with key #{part_key} could not be extracted from transport data!") unless part
                   parts[part_name.to_sym] = part
                 end
               end

data/lib/isomorfeus_data/lucid_data/edge/mixin.rb

@@ -173,7 +173,7 @@ module LucidData
             def instance_from_transport(instance_data, included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               from_node_sid = instance_data[self.name][key].key?('from') ? instance_data[self.name][key]['from'] : nil
               to_node_sid = instance_data[self.name][key].key?('to') ? instance_data[self.name][key]['to'] : nil
               from_to = []
@@ -181,12 +181,12 @@ module LucidData
                 [from_node_sid, to_node_sid].each do |sid|
                   node_class_name = sid[0]
                   node_key = sid[1]
-                  Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Not a valid LucidData class!" unless Isomorfeus.valid_data_class_name?(node_class_name)
+                  Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Not a valid LucidData class!") unless Isomorfeus.valid_data_class_name?(node_class_name)
                   if included_items_data.key?(node_class_name) && included_items_data[node_class_name].key?(node_key)
                     node_class = Isomorfeus.cached_data_class(node_class_name)
-                    Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Cannot get class!" unless node_class
+                    Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Cannot get class!") unless node_class
                     node = node_class.instance_from_transport({ node_class_name => { node_key => included_items_data[node_class_name][node_key] }}, included_items_data)
-                    Isomorfeus.raise_error "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!" unless node
+                    Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!") unless node
                     from_to << node
                   end
                 end

data/lib/isomorfeus_data/lucid_data/edge_collection/mixin.rb

@@ -470,18 +470,18 @@ module LucidData
             def instance_from_transport(instance_data, included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               edges_sids = instance_data[self.name][key].key?('edges') ? instance_data[self.name][key]['edges'] : []
               edges = []
               edges_sids.each do |sid|
                 edge_class_name = sid[0]
                 edge_key = sid[1]
-                Isomorfeus.raise_error "#{self.name}: #{edge_class_name}: Not a valid LucidData class!" unless Isomorfeus.valid_data_class_name?(edge_class_name)
+                Isomorfeus.raise_error(message: "#{self.name}: #{edge_class_name}: Not a valid LucidData class!") unless Isomorfeus.valid_data_class_name?(edge_class_name)
                 if included_items_data.key?(edge_class_name) && included_items_data[edge_class_name].key?(edge_key)
                   edge_class = Isomorfeus.cached_data_class(edge_class_name)
-                  Isomorfeus.raise_error "#{self.name}: #{edge_class_name}: Cannot get class!" unless edge_class
+                  Isomorfeus.raise_error(message: "#{self.name}: #{edge_class_name}: Cannot get class!") unless edge_class
                   edge = edge_class.instance_from_transport({ edge_class_name => { edge_key => included_items_data[edge_class_name][edge_key] }}, included_items_data)
-                  Isomorfeus.raise_error "#{self.name}: #{edge_class_name} with key #{edge_key} could not be extracted from transport data!" unless edge
+                  Isomorfeus.raise_error(message: "#{self.name}: #{edge_class_name} with key #{edge_key} could not be extracted from transport data!") unless edge
                   edges << edge
                 end
               end

data/lib/isomorfeus_data/lucid_data/graph/mixin.rb

@@ -392,23 +392,27 @@ module LucidData
             def instance_from_transport(instance_data, included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
-
-              nodes_sids = instance_data[self.name][key].key?('nodes') ? instance_data[self.name][key]['nodes'] : []
-              edges_sids = instance_data[self.name][key].key?('edges') ? instance_data[self.name][key]['edges'] : []
-
-              nodes_edges = [[],[]]
-              [nodes_sids, edges_sids].each_with_index do |sids, nodes_edges_index|
-                sids.each do |sid|
-                  node_class_name = sid[0]
-                  node_key = sid[1]
-                  Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Not a valid LucidData class!" unless Isomorfeus.valid_data_class_name?(node_class_name)
-                  if included_items_data.key?(node_class_name) && included_items_data[node_class_name].key?(node_key)
-                    node_class = Isomorfeus.cached_data_class(node_class_name)
-                    Isomorfeus.raise_error "#{self.name}: #{node_class_name}: Cannot get class!" unless node_class
-                    node = node_class.instance_from_transport({ node_class_name => { node_key => included_items_data[node_class_name][node_key] }}, included_items_data)
-                    Isomorfeus.raise_error "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!" unless node
-                    nodes_edges[nodes_edges_index] << node
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
+
+              nodes_hash = instance_data[self.name][key].key?('nodes') ? instance_data[self.name][key]['nodes'] : {}
+              edges_hash = instance_data[self.name][key].key?('edges') ? instance_data[self.name][key]['edges'] : {}
+
+              nodes_edges = [{},{}]
+              [nodes_hash, edges_hash].each_with_index do |hash, hash_index|
+                hash.each do |name, value|
+                  namsy = name.to_sym
+                  nodes_edges[namsy] = []
+                  hash[name].each do |sid|
+                    node_class_name = sid[0]
+                    node_key = sid[1]
+                    Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Not a valid LucidData class!") unless Isomorfeus.valid_data_class_name?(node_class_name)
+                    if included_items_data.key?(node_class_name) && included_items_data[node_class_name].key?(node_key)
+                      node_class = Isomorfeus.cached_data_class(node_class_name)
+                      Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name}: Cannot get class!") unless node_class
+                      node = node_class.instance_from_transport({ node_class_name => { node_key => included_items_data[node_class_name][node_key] }}, included_items_data)
+                      Isomorfeus.raise_error(message: "#{self.name}: #{node_class_name} with key #{node_key} could not be extracted from transport data!") unless node
+                      nodes_edges[namsy] << node
+                    end
                   end
                 end
               end

data/lib/isomorfeus_data/lucid_data/hash/mixin.rb

@@ -287,7 +287,7 @@ module LucidData
             def instance_from_transport(instance_data, _included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               new(key: key, revision: revision, attributes: attributes)
             end
           end

data/lib/isomorfeus_data/lucid_data/node/mixin.rb

@@ -45,8 +45,8 @@ module LucidData
         end
 
         def to_transport
-          hash = _get_selected_attributes
-          hash.merge!("revision" => revision) if revision
+          hash = { 'attributes' => _get_selected_attributes }
+          hash.merge!('revision' => revision) if revision
           result = { @class_name => { @key => hash }}
           result.deep_merge!(@class_name => { @previous_key => { new_key: @key}}) if @previous_key
           result
@@ -86,7 +86,7 @@ module LucidData
           end
 
           def _update_paths
-            @_store_path = [:data_state, @class_name, @key]
+            @_store_path = [:data_state, @class_name, @key, :attributes]
           end
 
           def each(&block)
@@ -149,7 +149,7 @@ module LucidData
             def instance_from_transport(instance_data, _included_items_data)
               key = instance_data[self.name].keys.first
               revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
-              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'] : nil
+              attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
               new(key: key, revision: revision, attributes: attributes)
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta13
+  version: 1.0.0.zeta14
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta13
+        version: 1.0.0.zeta14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta13
+        version: 1.0.0.zeta14
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta13
+        version: 1.0.0.zeta14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta13
+        version: 1.0.0.zeta14
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement