isomorfeus-data 1.0.0.zeta9 → 1.0.0.zeta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68381ec90c7a9afd97157ffe41b9bdb2a94d9211f410f487cabf600e7ad9faf
-  data.tar.gz: b54c989aee64b6fa1c54d81fda74885c1a39331ba5e922c8aa04e944a3a6cf0d
+  metadata.gz: f806c11706bdf321a3522be0c3fbf727695d65b6c8b8f8897158c4d136e593b2
+  data.tar.gz: 462e6635a0c19080fba47e06bd076b15955e109c11b090175197e227e7c2d2db
 SHA512:
-  metadata.gz: 1c671e0271f8944ca85ba4ec76731c2096943ba438eee7651b2013eff7057482fc2821744601bd4c48f46e48884d18f2e4c2b5ff4dd6be62005750c587b3241f
-  data.tar.gz: 911c6553c5154aa2678203c7418fc8fe8ee1aa9283b62f36f1d94885079acfb374f0a8bedaaf3abff12536d37cd47bf807307a20a83d931c3838dd0c2982db9a
+  metadata.gz: 10645fb7608b96f4f2b2e6a5a3d8f89de7d28ef1aef47920a4566b486a73ee4992a09c61b1290008d60b4129e0fa8d9b2acd7447bec4e4d0daba54d95da92686
+  data.tar.gz: 55e236b32fb9c8b1432ae7c18f5e16b1f50432e70d7e5691f8367ad1578aa8af84f570562d8484e7fb8a6b1e1c17ce4a9e93bbe0e8adee607e9ed30dbc8f00cb

data/lib/isomorfeus/data/attribute_support.rb

@@ -37,7 +37,12 @@ module Isomorfeus
               attribute_conditions[name] = options
 
               define_method(name) do
-                _get_attribute(name)
+                v = _get_attribute(name)
+                %x{
+                  if (v instanceof Object && !(v instanceof Array)) {
+                    return Opal.Hash.$new(v);
+                  } else { return v; }
+                }
               end
 
               define_method("#{name}=") do |val|

data/lib/isomorfeus/data/generic_class_api.rb

@@ -35,7 +35,7 @@ module Isomorfeus
 
         def load(key:)
           instance = self.new(key: key)
-          self.promise_load(key: key, instance: instance) unless instance.loaded?
+          promise_load(key: key, instance: instance) unless instance.loaded?
           instance
         end
 
@@ -57,6 +57,15 @@ module Isomorfeus
           end
         end
 
+        def promise_load_once(key:, instance: nil)
+          instance = self.new(key: key) unless instance
+          if instance.loaded?
+            Promise.new.resolve(instance)
+          else
+            promise_load(key: key, instance: instance)
+          end
+        end
+
         def promise_query(props = {})
           validate_props(props)
           props_json = props.to_json

data/lib/isomorfeus/data/generic_instance_api.rb

@@ -36,6 +36,10 @@ module Isomorfeus
           self
         end
 
+        def promise_load_once
+          self.class.promise_load_once(key: key, instance: self)
+        end
+        
         def promise_reload
           self.class.promise_load(@key, self)
         end

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '1.0.0.zeta9'
+    VERSION = '1.0.0.zeta10'
   end
 end

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

@@ -209,7 +209,9 @@ module LucidData
 
           def [](idx)
             sid = nodes_as_sids[idx]
-            Isomorfeus.instance_from_sid(sid)
+            node = Isomorfeus.instance_from_sid(sid)
+            node.collection = self
+            node
           end
 
           def []=(idx, node)

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

@@ -44,6 +44,14 @@ module LucidData
           other_from if other_to == node
         end
 
+        def from
+          graph&.node_from_sid(from_as_sid)
+        end
+
+        def to
+          graph&.node_from_sid(to_as_sid)
+        end
+
         def to_transport
           hash = { "attributes" => _get_selected_attributes,
                    "from" => from_as_sid,
@@ -119,44 +127,39 @@ module LucidData
             @_changed_attributes[name] = val
           end
 
-          def from
-            sid = from_as_sid
-            Isomorfeus.instance_from_sid(sid) if sid
-          end
-
           def from_as_sid
             @_changed_from ? @_changed_from : Redux.fetch_by_path(*@_from_path)
           end
 
-          def from=(document)
+          def from=(node)
             changed!
-            if document.respond_to?(:to_sid)
-              @_changed_from = document.to_sid
-              document
+            old_from = from
+            if node.respond_to?(:to_sid)
+              @_changed_from = node.to_sid
             else
-              @_changed_from = document
-              Isomorfeus.instance_from_sid(document)
+              @_changed_from = node
+              node = Isomorfeus.instance_from_sid(node)
             end
-          end
-
-          def to
-            sid = to_as_sid
-            Isomorfeus.instance_from_sid(sid) if sid
+            @_collection.update_node_to_edge_cache(self, old_from, node) if @_collection
+            node
           end
 
           def to_as_sid
             @_changed_to ? @_changed_to : Redux.fetch_by_path(*@_to_path)
           end
 
-          def to=(document)
+          def to=(node)
             changed!
-            if document.respond_to?(:to_sid)
-              @_changed_to = document.to_sid
-              document
+            old_to = to
+            if node.respond_to?(:to_sid)
+              @_changed_to = node.to_sid
+              node
             else
-              @_changed_to = document
-              Isomorfeus.instance_from_sid(document)
+              @_changed_to = node
+              node = Isomorfeus.instance_from_sid(node)
             end
+            @_collection.update_node_to_edge_cache(self, old_to, node) if @_collection
+            node
           end
         else # RUBY_ENGINE
           unless base == LucidData::Edge::Base || base == LucidData::Link::Base
@@ -225,11 +228,6 @@ module LucidData
             @_raw_attributes[name] = val
           end
 
-          def from
-            sid = @_changed_from ? @_changed_from : @_raw_from
-            graph&.node_from_sid(sid)
-          end
-
           def from_as_sid
             @_changed_from ? @_changed_from : @_raw_from
           end
@@ -250,11 +248,6 @@ module LucidData
             node
           end
 
-          def to
-            sid = @_changed_to ? @_changed_to : @_raw_to
-            graph&.node_from_sid(sid)
-          end
-
           def to_as_sid
             @_changed_to ? @_changed_to : @_raw_to
           end

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

@@ -49,6 +49,7 @@ module LucidData
           else
             sid = arg
             edge = Isomorfeus.instance_from_sid(sid)
+            edge.collection = self
           end
           [edge, sid]
         end
@@ -79,6 +80,16 @@ module LucidData
           @_changed = true
         end
 
+        def update_node_to_edge_cache(edge, old_node, new_node)
+          old_node_sid = old_node.to_sid
+          new_node_sid = new_node.to_sid
+          edge_sid = edge.to_sid
+          if @_node_to_edge_cache.key?(old_node_sid)
+            @_node_to_edge_cache[old_node_sid].delete_if { |node_edge| node_edge.to_sid == edge_sid }
+          end
+          @_node_to_edge_cache[new_node_sid].push(edge) if @_node_to_edge_cache.key?(new_node_sid)
+        end
+
         def to_transport
           hash = { 'attributes' => _get_selected_attributes, 'edges' => edges_as_sids }
           hash.merge!('revision' => revision) if revision
@@ -103,6 +114,7 @@ module LucidData
             @_revision = revision ? revision : Redux.fetch_by_path(:data_state, @class_name, @key, :revision)
             @_graph = graph
             @_composition = composition
+            @_node_to_edge_cache = {}
             @_changed_collection = nil
             @_edge_con = self.class.edge_conditions
             @_validate_edges = @_edge_con ? true : false
@@ -162,6 +174,23 @@ module LucidData
             []
           end
 
+          def edges_for_node(node)
+            node_sid = node.respond_to?(:to_sid) ? node.to_sid : node
+            return @_node_to_edge_cache[node_sid] if @_node_to_edge_cache.key?(node_sid)
+            node_edge_sids = edges_as_sids.select do |edge_sid|
+              edge_data = Redux.fetch_by_path(:data_state, edge_sid[0], edge_sid[1])
+              (edge_data.JS[:from] == node_sid || edge_data.JS[:to] == node_sid) ? true : false
+            end
+            node_edges = node_edge_sids.map do |edge_sid|
+              edge = Isomorfeus.instance_from_sid(edge_sid)
+              edge.collection = self
+              edge
+            end
+            @_node_to_edge_cache[node_sid] = node_edges
+          end
+          alias edges_for_vertex edges_for_node
+          alias edges_for_document edges_for_node
+
           def each(&block)
             edges.each(&block)
           end
@@ -190,7 +219,9 @@ module LucidData
 
           def [](idx)
             sid = edges_as_sids[idx]
-            Isomorfeus.instance_from_sid(sid)
+            edge = Isomorfeus.instance_from_sid(sid)
+            edge.collection = self
+            edge
           end
 
           def []=(idx, edge)
@@ -488,16 +519,6 @@ module LucidData
           alias edges_for_vertex edges_for_node
           alias edges_for_document edges_for_node
 
-          def update_node_to_edge_cache(edge, old_node, new_node)
-            old_node_sid = old_node.to_sid
-            new_node_sid = new_node.to_sid
-            edge_sid = edge.to_sid
-            if @_node_to_edge_cache.key?(old_node_sid)
-              @_node_to_edge_cache[old_node_sid].delete_if { |node_edge| node_edge.to_sid == edge_sid }
-            end
-            @_node_to_edge_cache[new_node_sid].push(edge) if @_node_to_edge_cache.key?(new_node_sid)
-          end
-
           def each(&block)
             @_raw_collection.each(&block)
           end

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

@@ -289,7 +289,7 @@ module LucidData
           end
 
           def _init_edge_collections
-            keys = self.class.node_collections.keys
+            keys = self.class.edge_collections.keys
             keys << :edges if keys.empty?
             keys.each do |access_name|
               sid = Redux.fetch_by_path(*(@_edges_path + [access_name]))

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

@@ -45,47 +45,6 @@ module LucidData
           graph&.linked_nodes_for_node(self)
         end
 
-        def method_missing(method_name, *args, &block)
-          if graph
-            method_name_s = method_name.to_s
-            singular_name = method_name_s.singularize
-            plural_name = method_name_s.pluralize
-            node_edges = edges
-            if method_name_s == plural_name
-              # return all nodes
-              nodes = []
-              sid = to_sid
-              node_edges.each do |edge|
-                from_sid = edge.from_as_sid
-                to_sid = edge.to_as_sid
-                node = if from_sid[0].underscore == singular_name && to_sid == sid
-                         edge.from
-                       elsif to_sid[0].underscore == singular_name && from_sid == sid
-                         edge.to
-                       end
-                nodes << node if node
-              end
-              return nodes
-            elsif method_name_s == singular_name
-              # return one node
-              sid = to_sid
-              node_edges.each do |edge|
-                from_sid = edge.from_as_sid
-                to_sid = edge.to_as_sid
-                node = if from_sid[0].underscore == singular_name && to_sid == sid
-                         edge.from
-                       elsif to_sid[0].underscore == singular_name && from_sid == sid
-                         edge.to
-                       end
-                return node if node
-              end
-              nil
-            end
-          else
-            super(method_name, *args, &block)
-          end
-        end
-
         def to_transport
           hash = _get_selected_attributes
           hash.merge!("revision" => revision) if revision
@@ -138,6 +97,46 @@ module LucidData
             changed!
             @_changed_attributes[name] = val
           end
+
+          def method_missing(method_name, *args, &block)
+            if graph
+              singular_name = `method_name.endsWith('s')` ? method_name.singularize : method_name
+              node_edges = edges
+              sid = to_sid
+              camelized_singular = singular_name.camelize
+
+              if method_name == singular_name
+                # return one node
+                node_edges.each do |edge|
+                  from_sid = edge.from_as_sid
+                  to_sid = edge.to_as_sid
+                  node = if from_sid[0] == camelized_singular && to_sid == sid
+                           edge.from
+                         elsif to_sid[0] == camelized_singular && from_sid == sid
+                           edge.to
+                         end
+                  return node if node
+                end
+                nil
+              elsif method_name == method_name.pluralize
+                # return all nodes
+                nodes = []
+                node_edges.each do |edge|
+                  from_sid = edge.from_as_sid
+                  to_sid = edge.to_as_sid
+                  node = if from_sid[0] == camelized_singular && to_sid == sid
+                           edge.from
+                         elsif to_sid[0] == camelized_singular && from_sid == sid
+                           edge.to
+                         end
+                  nodes << node if node
+                end
+                return nodes
+              end
+            else
+              super(method_name, *args, &block)
+            end
+          end
         else # RUBY_ENGINE
           unless base == LucidData::Node::Base || base == LucidData::Document::Base || base == LucidData::Vertex::Base
             Isomorfeus.add_valid_data_class(base)
@@ -185,6 +184,47 @@ module LucidData
             changed!
             @_raw_attributes[name] = val
           end
+
+          def method_missing(method_name, *args, &block)
+            if graph
+              method_name_s = method_name.to_s
+              singular_name = method_name_s.singularize
+              node_edges = edges
+              sid = to_sid
+              camelized_singular = singular_name.camelize
+
+              if method_name_s == singular_name
+                # return one node
+                node_edges.each do |edge|
+                  from_sid = edge.from_as_sid
+                  to_sid = edge.to_as_sid
+                  node = if from_sid[0] == camelized_singular && to_sid == sid
+                           edge.from
+                         elsif to_sid[0] == camelized_singular && from_sid == sid
+                           edge.to
+                         end
+                  return node if node
+                end
+                nil
+              elsif method_name_s == method_name_s.pluralize
+                # return all nodes
+                nodes = []
+                node_edges.each do |edge|
+                  from_sid = edge.from_as_sid
+                  to_sid = edge.to_as_sid
+                  node = if from_sid[0] == camelized_singular && to_sid == sid
+                           edge.from
+                         elsif to_sid[0] == camelized_singular && from_sid == sid
+                           edge.to
+                         end
+                  nodes << node if node
+                end
+                return nodes
+              end
+            else
+              super(method_name, *args, &block)
+            end
+          end
         end # RUBY_ENGINE
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta9
+  version: 1.0.0.zeta10
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.2
+        version: 16.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.2
+        version: 16.12.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta9
+        version: 1.0.0.zeta10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta9
+        version: 1.0.0.zeta10
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta9
+        version: 1.0.0.zeta10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta9
+        version: 1.0.0.zeta10
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement