isomorfeus-data 1.0.0.zeta12 → 1.0.0.zeta13

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

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

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

@@ -3,7 +3,6 @@ module LucidData
     module Mixin
       def self.included(base)
         base.include(Enumerable)
-        base.extend(LucidPropDeclaration::Mixin)
         base.include(Isomorfeus::Data::AttributeSupport)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
@@ -101,7 +100,9 @@ module LucidData
         def to_transport
           hash = { 'attributes' => _get_selected_attributes, 'edges' => edges_as_sids }
           hash.merge!('revision' => revision) if revision
-          { @class_name => { @key => hash }}
+          result = { @class_name => { @key => hash }}
+          result.deep_merge!(@class_name => { @previous_key => { new_key: @key}}) if @previous_key
+          result
         end
 
         def included_items_to_transport
@@ -117,8 +118,7 @@ module LucidData
             @key = key.to_s
             @class_name = self.class.name
             @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
-            @_store_path = [:data_state, @class_name, @key, :attributes]
-            @_edges_path = [:data_state, @class_name, @key, :edges]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_graph = graph
             @_composition = composition
@@ -163,6 +163,11 @@ module LucidData
             @_changed_collection = nil
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+            @_edges_path = [:data_state, @class_name, @key, :edges]
+          end
+
           def edges
             edges_as_sids.map do |edge_sid|
               edge = Isomorfeus.instance_from_sid(edge_sid)
@@ -459,33 +464,28 @@ module LucidData
           end
           alias prepend unshift
         else # RUBY_ENGINE
-          unless base == LucidData::EdgeCollection::Base || base == LucidData::LinkCollection::Base
-            Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
-          end
+          Isomorfeus.add_valid_data_class(base) unless base == LucidData::EdgeCollection::Base || base == LucidData::LinkCollection::Base
 
           base.instance_exec do
-            def load(key:, pub_sub_client: nil, current_user: nil)
-              data = instance_exec(key: key, pub_sub_client: pub_sub_client, current_user: current_user, &@_load_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              edges = data.delete(:edges)
-              links = data.delete(:links)
-              self.new(key: key, revision: revision, attributes: attributes, edges: edges, links: links)
-            end
-
-            def save(key:, revision: nil, attributes: nil, edges: nil, links: nil, pub_sub_client: nil, current_user: nil)
-              val_edges = edges || links
-              _validate_attributes(attributes) if attributes
-              _validate_edges(val_edges)
-              data = instance_exec(key: key, revision: revision, attributes: attributes, edges: edges, links: links,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              edges = data.delete(:edges)
-              links = data.delete(:links)
-              self.new(key: key, revision: revision, attributes: attributes, edges: edges, links: links)
+            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
+              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)
+                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
+                  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
+                  edges << edge
+                end
+              end
+              new(key: key, revision: revision, attributes: attributes, edges: edges)
             end
           end
 
@@ -512,6 +512,10 @@ module LucidData
             @_raw_collection = edges
           end
 
+          def _unchange!
+            @changed = false
+          end
+
           def edges
             @_raw_collection
           end

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

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

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

@@ -3,7 +3,6 @@ module LucidData
     module Mixin
       def self.included(base)
         base.include(Enumerable)
-        base.extend(LucidPropDeclaration::Mixin)
         base.include(Isomorfeus::Data::AttributeSupport)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
@@ -55,7 +54,7 @@ module LucidData
 
           def _validate_node_collection(access_name, collection)
             unless node_collections.key?(access_name) || access_name == :nodes
-              raise "#{self.name}: No such node collection declared: '#{access_name}'!"
+              Isomorfeus.raise_error(message: "#{self.name}: No such node collection declared: '#{access_name}'!")
             end
             Isomorfeus::Data::ElementValidator.new(self.name, collection, node_collections[access_name]).validate! if node_collections[access_name]
           end
@@ -95,7 +94,7 @@ module LucidData
 
           def _validate_edge_collection(access_name, collection)
             unless edge_collections.key?(access_name) || access_name == :edges
-              raise "#{self.name}: No such edge collection declared: '#{access_name}'!"
+              Isomorfeus.raise_error(message: "#{self.name}: No such edge collection declared: '#{access_name}'!")
             end
             Isomorfeus::Data::ElementValidator.new(self.name, collection, edge_collections[access_name]).validate! if edge_collections[access_name]
           end
@@ -223,7 +222,9 @@ module LucidData
             hash['edges'][name.to_s] = collection.to_sid if collection
           end
           hash.merge!('revision' => revision) if revision
-          { @class_name => { @key => hash }}
+          result = { @class_name => { @key => hash }}
+          result.deep_merge!(@class_name => { @previous_key => { new_key: @key}}) if @previous_key
+          result
         end
 
         def included_items_to_transport
@@ -248,9 +249,7 @@ module LucidData
             @key = key.to_s
             @class_name = self.class.name
             @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
-            @_store_path = [:data_state, @class_name, @key, :attributes]
-            @_edges_path = [:data_state, @class_name, @key, :edges]
-            @_nodes_path = [:data_state, @class_name, @key, :nodes]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_composition = composition
             @_changed = false
@@ -368,6 +367,12 @@ module LucidData
             nil
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+            @_edges_path = [:data_state, @class_name, @key, :edges]
+            @_nodes_path = [:data_state, @class_name, @key, :nodes]
+          end
+
           def edge_collections
             _init_edge_collections if @_edge_collections.empty?
             @_edge_collections
@@ -381,42 +386,34 @@ module LucidData
           alias document_collections node_collections
           alias vertex_collections node_collections
         else # RUBY_ENGINE
-          unless base == LucidData::Graph::Base
-            Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
-          end
+          Isomorfeus.add_valid_data_class(base) unless base == LucidData::Graph::Base
 
           base.instance_exec do
-            def load(key:, pub_sub_client: nil, current_user: nil)
-              data = instance_exec(key: key, pub_sub_client: pub_sub_client, current_user: current_user, &@_load_block)
-              revision = data.delete(:revision)
-              nodes = data.delete(:nodes)
-              edges = data.delete(:edges)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, edges: edges, nodes: nodes, attributes: attributes)
-            end
+            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
+                  end
+                end
+              end
 
-            def save(key:, revision: nil, attributes: nil, edges: nil, links: nil, nodes: nil, documents: nil, vertices: nil, vertexes: nil,
-                     pub_sub_client: nil, current_user: nil)
-              attributes = {} unless attributes
-              val_edges = edges || links
-              val_nodes = documents || nodes || vertexes || vertices
-              _validate_attributes(attributes) if attributes.any?
-              _validate_edges(val_edges)
-              _validate_nodes(val_nodes)
-              data = instance_exec(key: key, revision: revision, parts: parts, attributes: attributes,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              documents = data.delete(:documents)
-              vertexes = data.delete(:vertexes)
-              vertices = data.delete(:vertices)
-              nodes = data.delete(:nodes)
-              edges = data.delete(:edges)
-              links = data.delete(:links)
-              self.new(key: key, revision: revision, attributes: attributes, edges: edges, links: links, nodes: nodes, documents: documents,
-                       vertices: vertices, vertexes: vertexes, pub_sub_client: nil, current_user: nil)
+              new(key: key, revision: revision, attributes: attributes, nodes: nodes_edges[0], edges: nodes_edges[1])
             end
           end
 
@@ -467,6 +464,10 @@ module LucidData
             end
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def edge_collections
             @_edge_collections
           end

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

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

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

@@ -3,7 +3,6 @@ module LucidData
     module Mixin
       def self.included(base)
         base.include(Enumerable)
-        base.extend(LucidPropDeclaration::Mixin)
         base.include(Isomorfeus::Data::AttributeSupport)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
@@ -26,7 +25,7 @@ module LucidData
           def _relaxed_validate_attributes(attrs)
             attribute_conditions.each_key do |attr|
               if attribute_conditions[attr].key?(:required) && attribute_conditions[attr][:required] && !attrs.key?(attr)
-                raise "Required attribute #{attr} not given!"
+                Isomorfeus.raise_error(message: "Required attribute #{attr} not given!")
               end
             end
             attrs.each { |attr, val| _relaxed_validate_attribute(attr, val) } if attribute_conditions.any?
@@ -49,7 +48,9 @@ module LucidData
         def to_transport
           hash = { 'attributes' => to_h }
           hash['revision'] = revision if revision
-          { @class_name => { @key => hash }}
+          result = { @class_name => { @key => hash }}
+          result.deep_merge!(@class_name => { @previous_key => { new_key: @key}}) if @previous_key
+          result
         end
 
         def _relaxed_validate_attribute(attr_name, attr_val)
@@ -89,7 +90,7 @@ module LucidData
             @key = key.to_s
             @class_name = self.class.name
             @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
-            @_store_path = [:data_state, @class_name, @key, :attributes]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_changed = false
             @_changed_attributes = {}
@@ -125,6 +126,10 @@ module LucidData
             @_changed_attributes = {}
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+          end
+
           def changed?
             @_changed || @_changed_attributes.any?
           end
@@ -188,7 +193,7 @@ module LucidData
           end
 
           def key?(name)
-            _get_attribute(method_name) ? true : false
+            _get_attribute(name) ? true : false
           end
           alias has_key? key?
 
@@ -262,11 +267,7 @@ module LucidData
             self
           end
         else # RUBY_ENGINE
-          unless base == LucidData::Hash::Base
-            Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
-          end
+          Isomorfeus.add_valid_data_class(base) unless base == LucidData::Hash::Base
 
           base.instance_exec do
             def attribute(name, options = {})
@@ -283,21 +284,11 @@ module LucidData
               end
             end
 
-            def load(key:, pub_sub_client: nil, current_user: nil)
-              data = instance_exec(key: key, pub_sub_client: pub_sub_client, current_user: current_user, &@_load_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, attributes: attributes)
-            end
-
-            def save(key:, revision: nil, attributes: nil, pub_sub_client: nil, current_user: nil)
-              attributes = {} unless attributes
-              _relaxed_validate_attributes(attributes)
-              data = instance_exec(key: key, revision: revision, attributes: attributes,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, attributes: attributes)
+            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
+              new(key: key, revision: revision, attributes: attributes)
             end
           end
 
@@ -314,6 +305,10 @@ module LucidData
             @_raw_attributes = attributes
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def changed?
             @_changed
           end

data/lib/isomorfeus_data/lucid_data/link/base.rb

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

data/lib/isomorfeus_data/lucid_data/link_collection/base.rb

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

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

@@ -6,8 +6,6 @@ module LucidData
       if RUBY_ENGINE != 'opal'
         def self.inherited(base)
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
     end

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

@@ -2,7 +2,6 @@ module LucidData
   module Node
     module Mixin
       def self.included(base)
-        base.extend(LucidPropDeclaration::Mixin)
         base.include(Isomorfeus::Data::AttributeSupport)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
@@ -48,7 +47,9 @@ module LucidData
         def to_transport
           hash = _get_selected_attributes
           hash.merge!("revision" => revision) if revision
-          { @class_name => { @key => hash }}
+          result = { @class_name => { @key => hash }}
+          result.deep_merge!(@class_name => { @previous_key => { new_key: @key}}) if @previous_key
+          result
         end
 
         if RUBY_ENGINE == 'opal'
@@ -56,7 +57,7 @@ module LucidData
             @key = key.to_s
             @class_name = self.class.name
             @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
-            @_store_path = [:data_state, @class_name, @key]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, :revision, @class_name, @key)
             @_collection = collection
             @_composition = composition
@@ -84,6 +85,10 @@ module LucidData
             @_changed = false
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key]
+          end
+
           def each(&block)
             _get_attributes.each(&block)
           end
@@ -138,28 +143,14 @@ module LucidData
             end
           end
         else # RUBY_ENGINE
-          unless base == LucidData::Node::Base || base == LucidData::Document::Base || base == LucidData::Vertex::Base
-            Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
-          end
+          Isomorfeus.add_valid_data_class(base) unless base == LucidData::Node::Base || base == LucidData::Document::Base || base == LucidData::Vertex::Base
 
           base.instance_exec do
-            def load(key:, pub_sub_client: nil, current_user: nil)
-              data = instance_exec(key: key, pub_sub_client: pub_sub_client, current_user: current_user, &@_load_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, attributes: attributes)
-            end
-
-            def save(key:, revision: nil, attributes: nil, pub_sub_client: nil, current_user: nil)
-              attributes = {} unless attributes
-              _validate_attributes(attributes)
-              data = instance_exec(key: key, revision: revision, attributes: attributes,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, attributes: attributes)
+            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
+              new(key: key, revision: revision, attributes: attributes)
             end
           end
 
@@ -176,6 +167,10 @@ module LucidData
             @_raw_attributes = attributes
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def each(&block)
             @_raw_attributes.each(&block)
           end