isomorfeus-data 1.0.0.zeta12 → 1.0.0.zeta13

data/lib/isomorfeus/data/handler/object_call.rb

@@ -4,7 +4,7 @@ module Isomorfeus
   module Data
     module Handler
       class Object < LucidHandler::Base
-        on_request do |pub_sub_client, current_user, response_agent|
+        on_request do |response_agent|
           # promise_send_path('Isomorfeus::Data::Handler::Object', action, object_hash)
           response_agent.request.each_key do |array_class_name|
             if Isomorfeus.valid_array_class_name?(array_class_name)
@@ -13,11 +13,10 @@ module Isomorfeus
                 props_json = response_agent.request[array_class_name]
                 begin
                   props = Oj.load(props_json, mode: :strict)
-                  props.merge!({pub_sub_client: pub_sub_client, current_user: current_user})
                   if current_user.authorized?(array_class, :load, *props)
                     array = array_class.load(props)
                     array.instance_exec do
-                      array_class.on_load_block.call(pub_sub_client, current_user) if array_class.on_load_block
+                      array_class.on_load_block.call() if array_class.on_load_block
                     end
                     response_agent.outer_result = { data: array.to_transport }
                     response_agent.agent_result = { success: 'ok' }

data/lib/isomorfeus/data/handler/object_store.rb

@@ -4,7 +4,7 @@ module Isomorfeus
   module Data
     module Handler
       class Object < LucidHandler::Base
-        on_request do |pub_sub_client, current_user, response_agent|
+        on_request do |response_agent|
           # promise_send_path('Isomorfeus::Data::Handler::Object', action, object_hash)
           response_agent.request.each_key do |array_class_name|
             if Isomorfeus.valid_array_class_name?(array_class_name)
@@ -13,11 +13,10 @@ module Isomorfeus
                 props_json = response_agent.request[array_class_name]
                 begin
                   props = Oj.load(props_json, mode: :strict)
-                  props.merge!({pub_sub_client: pub_sub_client, current_user: current_user})
                   if current_user.authorized?(array_class, :load, *props)
                     array = array_class.load(props)
                     array.instance_exec do
-                      array_class.on_load_block.call(pub_sub_client, current_user) if array_class.on_load_block
+                      array_class.on_load_block.call() if array_class.on_load_block
                     end
                     response_agent.outer_result = { data: array.to_transport }
                     response_agent.agent_result = { success: 'ok' }

data/lib/isomorfeus/data/version.rb

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

data/lib/isomorfeus_data/lucid_data/array/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/array/mixin.rb

@@ -3,7 +3,6 @@ module LucidData
     module Mixin
       def self.included(base)
         base.include(Enumerable)
-        base.extend(LucidPropDeclaration::Mixin)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
 
@@ -59,7 +58,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, :elements]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_changed_array = nil
             @_composition = composition
@@ -84,6 +83,10 @@ module LucidData
             Redux.fetch_by_path(*@_store_path)
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :elements]
+          end
+
           def changed?
             @_changed || !!@_changed_array
           end
@@ -344,27 +347,14 @@ module LucidData
           end
           alias prepend unshift
         else # RUBY_ENGINE
-          unless base == LucidData::Array::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::Array::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)
-              elements = data.delete(:elements)
-              self.new(key: key, revision: revision, elements: elements)
-            end
-
-            def save(key:, revision: nil, elements: nil, pub_sub_client: nil, current_user: nil)
-              _validate_elements(elements)
-              data = instance_exec(key: key, revision: revision, elements: elements,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              elements = data.delete(:elements)
-              self.new(key: key, revision: revision, elements: elements)
+            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
+              elements = instance_data[self.name][key].key?('elements') ? instance_data[self.name][key]['elements'] : nil
+              new(key: key, revision: revision, elements: elements)
             end
           end
 
@@ -381,6 +371,10 @@ module LucidData
             @_raw_array = elements
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def changed?
             @_changed
           end
@@ -392,7 +386,9 @@ module LucidData
           def to_transport
             hash = { 'elements' => @_raw_array }
             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
 
           # Array methods

data/lib/isomorfeus_data/lucid_data/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/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)
@@ -96,7 +95,9 @@ module LucidData
         def to_transport
           hash = { 'attributes' => _get_selected_attributes, 'nodes' => nodes_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
@@ -113,8 +114,7 @@ module LucidData
             @class_name = self.class.name
             @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
             @_graph = graph
-            @_store_path = [:data_state, @class_name, @key, :attributes]
-            @_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
@@ -158,6 +158,11 @@ module LucidData
             @_changed_collection = nil
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+            @_nodes_path = [:data_state, @class_name, @key, :nodes]
+          end
+
           def nodes
             nodes_as_sids.map do |node_sid|
               node = Isomorfeus.instance_from_sid(node_sid)
@@ -450,40 +455,28 @@ module LucidData
           end
           alias prepend unshift
         else # RUBY_ENGINE
-          unless base == LucidData::Collection::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::Collection::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)
-              documents = data.delete(:documents)
-              vertexes = data.delete(:vertexes)
-              vertices = data.delete(:vertices)
-              nodes = data.delete(:nodes)
-              self.new(key: key, revision: revision, attributes: attributes, documents: documents, vertexes: vertexes, vertices: vertices,
-                       nodes: nodes)
-            end
-
-            def save(key:, revision: nil, attributes: nil, documents: nil, vertexes: nil, vertices: nil, nodes: nil,
-                     pub_sub_client: nil, current_user: nil)
-              val_nodes = documents || nodes || vertexes || vertices
-              _validate_attributes(attributes) if self.class.attribute_conditions.any?
-              _validate_nodes(val_nodes) if self.class.node_conditions.any?
-              data = instance_exec(key: key, revision: revision, attributes: attributes, documents: documents, vertexes: vertexes, vertices: vertices,
-                                   nodes: nodes, 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)
-              self.new(key: key, revision: revision, attributes: attributes, documents: documents, vertexes: vertexes, vertices: vertices,
-                       nodes: nodes)
+            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'] : []
+              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)
+                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 << node
+                end
+              end
+              new(key: key, revision: revision, attributes: attributes, nodes: nodes)
             end
           end
 
@@ -510,6 +503,10 @@ module LucidData
             @_sid_to_node_cache = {}
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def nodes
             @_raw_collection
           end

data/lib/isomorfeus_data/lucid_data/composition/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/composition/mixin.rb

@@ -5,7 +5,6 @@ module LucidData
       # TODO include -> compose dsl
       # TODO inline store path
       def self.included(base)
-        base.extend(LucidPropDeclaration::Mixin)
         base.include(Isomorfeus::Data::AttributeSupport)
         base.extend(Isomorfeus::Data::GenericClassApi)
         base.include(Isomorfeus::Data::GenericInstanceApi)
@@ -39,14 +38,14 @@ module LucidData
           end
 
           def _validate_part(access_name, part)
-            raise "#{self.name}: No such part declared: '#{access_name}'!" unless parts.key?(access_name)
+            Isomorfeus.raise_error(message: "#{self.name}: No such part declared: '#{access_name}'!") unless parts.key?(access_name)
             Isomorfeus::Data::ElementValidator.new(self.name, part, parts[access_name]).validate!
           end
 
           def _validate_parts(many_parts)
             parts.each_key do |access_name|
               if parts[access_name].key?(:required) && parts[access_name][:required] && !many_parts.key?(attr)
-                raise "Required part #{access_name} not given!"
+                Isomorfeus.raise_error(message: "Required part #{access_name} not given!")
               end
             end
             many_parts.each { |access_name, part| _validate_part(access_name, part) } if parts.any?
@@ -75,7 +74,9 @@ module LucidData
           parts.each do |name, instance|
             hash['parts'][name.to_s] = instance.to_sid if instance
           end
-          { @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
@@ -94,8 +95,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]
-            @_parts_path = [:data_state, @class_name, @key, :parts]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_changed = false
 
@@ -146,6 +146,11 @@ module LucidData
             nil
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+            @_parts_path = [:data_state, @class_name, @key, :parts]
+          end
+
           def _init_parts
             self.class.parts.each_key do |access_name|
               sid = Redux.fetch_by_path(*(@_parts_path + [access_name]))
@@ -165,31 +170,28 @@ module LucidData
             Redux.fetch_by_path(*@_composition_path)
           end
         else # RUBY_ENGINE
-          unless base == LucidData::Composition::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::Composition::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)
-              parts = data.delete(:parts)
-              self.new(key: key, revision: revision, parts: parts, attributes: attributes)
-            end
-
-            def save(key:, revision: nil, parts: nil, attributes: nil, pub_sub_client: nil, current_user: nil)
-              attributes = {} unless attributes
-              _validate_attributes(attributes)
-              _validate_parts(parts)
-              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)
-              parts = data.delete(:parts)
-              self.new(key: key, revision: revision, parts: parts, 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
+              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)
+                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
+                  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
+                  parts[part_name.to_sym] = part
+                end
+              end
+              new(key: key, revision: revision, attributes: attributes, parts: parts)
             end
           end
 
@@ -214,6 +216,10 @@ module LucidData
             end
           end
 
+          def _unchange!
+            @_changed = false
+          end
+
           def parts
             @_parts
           end

data/lib/isomorfeus_data/lucid_data/document/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/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/mixin.rb

@@ -2,7 +2,6 @@ module LucidData
   module Edge
     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)
@@ -57,7 +56,9 @@ module LucidData
                    "from" => from_as_sid,
                    "to" => to_as_sid }
           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'
@@ -65,9 +66,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]
-            @_from_path = [:data_state, @class_name, @key, :from]
-            @_to_path = [:data_state, @class_name, @key, :to]
+            _update_paths
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_collection = collection
             @_composition = composition
@@ -113,6 +112,12 @@ module LucidData
             @_changed = false
           end
 
+          def _update_paths
+            @_store_path = [:data_state, @class_name, @key, :attributes]
+            @_from_path = [:data_state, @class_name, @key, :from]
+            @_to_path = [:data_state, @class_name, @key, :to]
+          end
+
           def each(&block)
             _get_attributes.each(&block)
           end
@@ -162,32 +167,31 @@ module LucidData
             node
           end
         else # RUBY_ENGINE
-          unless base == LucidData::Edge::Base || base == LucidData::Link::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::Edge::Base || base == LucidData::Link::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)
-              from = data.delete(:from)
-              to = data.delete(:to)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, from: from, to: to, attributes: attributes)
-            end
-
-            def save(key:, revision: nil, from:, to:, attributes: nil, pub_sub_client: nil, current_user: nil)
-              attributes = {} unless attributes
-              _validate_attributes(attributes)
-              data = instance_exec(key: key, revision: revision, from: from, to: to, attributes: attributes,
-                                   pub_sub_client: pub_sub_client, current_user: current_user, &@_save_block)
-              revision = data.delete(:revision)
-              from = data.delete(:from)
-              to = data.delete(:to)
-              attributes = data.delete(:attributes)
-              self.new(key: key, revision: revision, from: from, to: to, 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
+              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 = []
+              if from_node_sid && to_node_sid
+                [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)
+                  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
+                    from_to << node
+                  end
+                end
+              end
+              new(key: key, revision: revision, attributes: attributes, from: from_to[0], to: from_to[1])
             end
           end
 
@@ -218,6 +222,10 @@ module LucidData
                        end
           end
 
+          def _unchange!
+            @_changed =false
+          end
+
           def each(&block)
             @_raw_attributes.each(&block)
           end
@@ -237,7 +245,7 @@ module LucidData
           end
 
           def from=(node)
-            raise "A invalid 'from' was given" unless node
+            Isomorfeus.raise_error(message: "A invalid 'from' was given") unless node
             changed!
             old_from = from
             if node.respond_to?(:to_sid)
@@ -257,7 +265,7 @@ module LucidData
           end
 
           def to=(node)
-            raise "A invalid 'to' was given" unless node
+            Isomorfeus.raise_error(message: "A invalid 'to' was given") unless node
             old_to = to
             changed!
             if node.respond_to?(:to_sid)