isomorfeus-data 1.0.0.zeta12 → 1.0.0.zeta13

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

@@ -0,0 +1,13 @@
+module LucidData
+  module Query
+    class Base
+      include LucidData::Query::Mixin
+
+      if RUBY_ENGINE != 'opal'
+        def self.inherited(base)
+          Isomorfeus.add_valid_data_class(base)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,88 @@
+module LucidData
+  module Query
+    module Mixin
+      def self.included(base)
+        base.extend(LucidPropDeclaration::Mixin)
+
+        if RUBY_ENGINE == 'opal'
+          base.instance_exec do
+            def execute(props:)
+              query_result_instance = LucidData::QueryResult.new
+              promise_execute(props: props, query_result_instance: query_result_instance) unless query_result_instance.loaded?
+              query_result_instance
+            end
+
+            def promise_execute(props:, query_result_instance: nil)
+              query_result_instance = LucidData::QueryResult.new unless query_result_instance
+              props.each_key do |prop_name|
+                Isomorfeus.raise_error(message: "#{self.to_s} No such query prop declared: '#{prop_name}'!") unless declared_props.key?(prop_name)
+              end
+              validate_props(props)
+              data_props = { props: props, query_result_instance_key: query_result_instance.key }
+              props_json = data_props.to_json
+              Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :execute, props_json).then do |agent|
+                if agent.processed
+                  agent.result
+                else
+                  agent.processed = true
+                  if agent.response.key?(:error)
+                    `console.error(#{agent.response[:error].to_n})`
+                    Isomorfeus.raise_error(message: agent.response[:error])
+                  end
+                  query_result_instance._load_from_store!
+                  Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.full_response[:data])
+                  agent.result = query_result_instance
+                end
+              end
+            end
+
+            def execute_query(_); end
+          end
+        else
+          unless base == LucidData::Node::Base || base == LucidData::Document::Base || base == LucidData::Vertex::Base
+            Isomorfeus.add_valid_data_class(base)
+          end
+
+          base.instance_exec do
+            def promise_execute(props:)
+              instance = self.execute(props: props)
+              result_promise = Promise.new
+              result_promise.resolve(instance)
+              result_promise
+            end
+
+            def execute(props:, query_result_instance_key: nil)
+              props.each_key do |prop_name|
+                Isomorfeus.raise_error(message: "#{self.to_s} No such query prop declared: '#{prop_name}'!") unless declared_props.key?(prop_name)
+              end
+              validate_props(props)
+              query_result = LucidData::QueryResult.new(key: query_result_instance_key)
+              query_result.result_set = instance_exec(props: Isomorfeus::PropsProxy.new(props), &@_query_block)
+              query_result
+            end
+
+            def execute_query(&block)
+              @_query_block = block
+            end
+
+            def current_user
+              Isomorfeus.current_user
+            end
+
+            def pub_sub_client
+              Isomorfeus.pub_sub_client
+            end
+          end
+
+          def current_user
+            Isomorfeus.current_user
+          end
+
+          def pub_sub_client
+            Isomorfeus.pub_sub_client
+          end
+        end
+      end
+    end
+  end
+end

data/lib/isomorfeus_data/lucid_data/query_result.rb

@@ -18,14 +18,15 @@ module LucidData
       end
 
       def loaded?
-        Redux.fetch_by_path([:data_state, @class_name, @key]) ? true : false
+        Redux.fetch_by_path(:data_state, @class_name, @key) ? true : false
       end
 
       def key?(k)
-        if @result_set.any?
+        if @result_set
           @result_set.key?(k)
         else
-          stored_results = Redux.fetch_by_path([:data_state, @class_name, @key])
+          stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
+          return false unless stored_results
           `Object.hasOwnProperty(stored_results, k)`
         end
       end
@@ -36,20 +37,21 @@ module LucidData
       end
 
       def method_missing(accessor_name, *args, &block)
-        raise "#{@class_name}: no such thing '#{accessor_name}‘in the results!" unless @result_set.key?(accessor_name)
-        sid = if @result_set.any?
+        sid = if @result_set
                 @result_set[accessor_name]
               else
-                stored_results = Redux.fetch_by_path([:data_state, @class_name, @key])
-                stored_results.JS[accessor_name]
+                stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
+                stored_results.JS[accessor_name] if stored_results
               end
+        Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless sid
         Isomorfeus.instance_from_sid(sid)
       end
     else
       def initialize(key: nil, result_set: {})
         @class_name = 'LucidData::QueryResult'
         @key = key ? key.to_s : self.object_id.to_s
-        @result_set = result_set
+        @result_set = result_set.nil? ? {} : result_set
+        @result_set.transform_keys!(&:to_sym)
       end
 
       def loaded?
@@ -66,14 +68,14 @@ module LucidData
       end
 
       def method_missing(accessor_name, *args, &block)
-        raise "#{@class_name}: no such thing '#{accessor_name}‘in the results!" unless @result_set.key?(accessor_name)
+        Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless @result_set.key?(accessor_name)
         @result_set[accessor_name]
       end
 
       def to_transport
         sids_hash = {}
         @result_set.each do |key, value|
-          sids_hash[key] = value.to_sid
+          sids_hash[key.to_s] = value.to_sid
         end
         { @class_name => { @key => sids_hash }}
       end

data/lib/isomorfeus_data/lucid_data/vertex/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/lucid_arango/collection/base.rb

@@ -6,8 +6,6 @@ module LucidArango
       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/lucid_arango/collection/mixin.rb

@@ -5,8 +5,6 @@ module LucidArango
         if RUBY_ENGINE != 'opal'
           unless base == LucidArango::DocumentCollection::Base
             Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
           end
         end
 

data/lib/lucid_arango/document/base.rb

@@ -6,8 +6,6 @@ module LucidArango
       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/lucid_arango/edge/base.rb

@@ -6,9 +6,6 @@ module LucidArango
       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/lucid_arango/edge/mixin.rb

@@ -5,8 +5,6 @@ module LucidArango
         if RUBY_ENGINE != 'opal'
           unless base == LucidArango::Edge::Base
             Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
           end
         end
 

data/lib/lucid_arango/edge_collection/base.rb

@@ -6,8 +6,6 @@ module LucidArango
       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/lucid_arango/edge_collection/mixin.rb

@@ -5,8 +5,6 @@ module LucidArango
         if RUBY_ENGINE != 'opal'
           unless base == LucidArango::EdgeCollection::Base
             Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
           end
         end
 

data/lib/lucid_arango/graph/base.rb

@@ -6,8 +6,6 @@ module LucidArango
       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/lucid_arango/graph/mixin.rb

@@ -5,8 +5,6 @@ module LucidArango
         if RUBY_ENGINE != 'opal'
           unless base == LucidArango::Graph::Base
             Isomorfeus.add_valid_data_class(base)
-            base.prop :pub_sub_client, default: nil
-            base.prop :current_user, default: Anonymous.new
           end
         end
 

data/lib/lucid_arango/node/base.rb

@@ -6,9 +6,6 @@ module LucidArango
       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/lucid_arango/node/mixin.rb

@@ -71,8 +71,6 @@ module LucidArango
         else # RUBY_ENGINE
           unless base == LucidArango::Document::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/lucid_arango/object/base.rb

@@ -5,8 +5,6 @@ module LucidStorableObject
     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/lucid_arango/object/mixin.rb

@@ -80,7 +80,7 @@ module LucidStorableObject
                 agent.processed = true
                 if agent.response.key?(:error)
                   `console.error(#{agent.response[:error].to_n})`
-                  raise agent.response[:error]
+                  Isomorfeus.raise_error(message: agent.response[:error])
                 end
                 Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.full_response[:data])
                 agent.result = instance
@@ -93,8 +93,6 @@ module LucidStorableObject
       else # RUBY_ENGINE
         unless base == LucidStorableObject::Base
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
 
         def initialize(store_path: nil, validated_props: nil)

data/lib/lucid_arango/remote_object/base.rb

@@ -5,8 +5,6 @@ module LucidRemoteObject
     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/lucid_arango/remote_object/mixin.rb

@@ -5,8 +5,6 @@ module LucidRemoteObject
       if RUBY_ENGINE != 'opal'
         unless base == LucidRemoteObject::Base
           Isomorfeus.add_valid_data_class(base)
-          base.prop :pub_sub_client, default: nil
-          base.prop :current_user, default: Anonymous.new
         end
       end
 

data/lib/lucid_arango/vertex/base.rb

@@ -6,8 +6,6 @@ module LucidArango
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 1.0.0.zeta12
+  version: 1.0.0.zeta13
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-19 00:00:00.000000000 Z
+date: 2020-01-27 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.9
+        version: 16.12.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.12.9
+        version: 16.12.14
 - !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.zeta12
+        version: 1.0.0.zeta13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.zeta12
+        version: 1.0.0.zeta13
 - !ruby/object:Gem::Dependency
   name: opal-webpack-loader
   requirement: !ruby/object:Gem::Requirement
@@ -228,6 +228,8 @@ files:
 - lib/isomorfeus_data/lucid_data/link_collection/mixin.rb
 - lib/isomorfeus_data/lucid_data/node/base.rb
 - lib/isomorfeus_data/lucid_data/node/mixin.rb
+- lib/isomorfeus_data/lucid_data/query/base.rb
+- lib/isomorfeus_data/lucid_data/query/mixin.rb
 - lib/isomorfeus_data/lucid_data/query_result.rb
 - lib/isomorfeus_data/lucid_data/vertex/base.rb
 - lib/isomorfeus_data/lucid_data/vertex/mixin.rb