isomorfeus-data 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09020f3b3236877f85125081f8764b2d1dbf1dc3c89fbd8d46330c4b1dca170
-  data.tar.gz: 7ed66920cca65525177f290fdbf087f613cd86eeda4f6e11f71e10a4b11da663
+  metadata.gz: 03adcad549502d3b374fa200b4c1a90b4a1963288a40e619a170ffb5190ec870
+  data.tar.gz: 000c496d28015877c52c84934d100827dea59740cda0f78b1b6f8b6c9eea5979
 SHA512:
-  metadata.gz: cdab55e27bf5bd67980e94f71d237bb61e057936bf157bc89a02542dc064990ec2749415941374a5fd39e9936bb2bcc02124e046b6c449f1ef4662c5e5aa854d
-  data.tar.gz: 0c43b39b25ab371e5927e462c7e0d1c4c6dd1f151e2b2379dc94687fb970556b78d46b9e159fd699af1829a71669260f71b689562c54558ac9852c228393d03d
+  metadata.gz: bdd85f149ef46ba89524c23045fa68cc5662786dcb16f07c9a8405e567edac87e4c87f679d1286164f0e1fee62e5b76b6299506c26f9a0ad25620a43d8632c24
+  data.tar.gz: 5bcac6b623211981f5d4e5adc83ef63257d022301cad48582bd7cecd43ecbd46054622ed133c3f7f158868823a36b8e5bbfcf488a6eab7fbbf7bf1553225f268

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.8'
+    VERSION = '2.0.9'
   end
 end

data/lib/isomorfeus_data/lucid_query/mixin.rb

@@ -5,20 +5,23 @@ module LucidQuery
 
       if RUBY_ENGINE == 'opal'
         base.instance_exec do
-          def execute(**props)
-            props[:query_result_instance] = LucidQueryResult.new
+          def execute(key: nil, **props)
+            props[:query_result_instance] = LucidQueryResult.new(key: key)
             promise_execute(props) unless props[:query_result_instance].loaded?
             props[:query_result_instance]
           end
 
-          def promise_execute(**props)
+          def promise_execute(key: nil, **props)
             query_result_instance = props.delete(:query_result_instance)
-            query_result_instance = LucidQueryResult.new unless query_result_instance
+            query_result_instance = LucidQueryResult.new(key: key) unless query_result_instance
+
+            return Promise.new.resolve(query_result_instance) if query_result_instance.loaded?
+
             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
             props = validated_props(props)
-            props[:query_result_instance_key] = query_result_instance.key
+            props[:key] = query_result_instance.key
             Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :query, props).then do |agent|
               if agent.processed
                 agent.result
@@ -50,10 +53,9 @@ module LucidQuery
           end
 
           def execute(**props)
-            query_result_instance_key = props.delete(:query_result_instance_key)
-            query_result = LucidQueryResult.new(key: query_result_instance_key)
-            query_result.result_set = self.new(**props).instance_exec(&@_query_block)
-            query_result
+            key = props.delete(:key)
+            result_set = self.new(**props).instance_exec(&@_query_block)
+            LucidQueryResult.new(key: key, result_set: result_set)
           end
 
           def execute_query(&block)

data/lib/isomorfeus_data/lucid_query_result.rb

@@ -14,7 +14,7 @@ class LucidQueryResult
   end
 
   if RUBY_ENGINE == 'opal'
-    def initialize(key: nil, result_set: {})
+    def initialize(key: nil, result_set: nil)
       @class_name = 'LucidQueryResult'
       @key = key ? key.to_s : self.object_id.to_s
       @result_set = result_set
@@ -39,17 +39,13 @@ class LucidQueryResult
     end
     alias has_key? key?
 
-    def result_set=(r)
-      @result_set = r
-    end
-
     def method_missing(accessor_name, *args, &block)
       sid_or_array = if @result_set
-              @result_set[accessor_name]
-            else
-              stored_results = Redux.fetch_by_path(:data_state, @class_name, @key)
-              stored_results.JS[accessor_name] if stored_results
-            end
+                       @result_set[accessor_name]
+                     else
+                       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_or_array
       if stored_results.JS['_is_array_']
         sid_or_array.map { |sid| Isomorfeus.instance_from_sid(sid) }
@@ -58,7 +54,7 @@ class LucidQueryResult
       end
     end
   else
-    def initialize(key: nil, result_set: {})
+    def initialize(key: nil, result_set: nil)
       @class_name = 'LucidQueryResult'
       @key = key ? key.to_s : self.object_id.to_s
       @result_set = result_set.nil? ? {} : result_set
@@ -74,10 +70,6 @@ class LucidQueryResult
     end
     alias has_key? key?
 
-    def result_set=(r)
-      @result_set = r
-    end
-
     def method_missing(accessor_name, *args, &block)
       Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless @result_set.key?(accessor_name)
       @result_set[accessor_name]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-25 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.13
+        version: 10.6.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.13
+        version: 10.6.14
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.8
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement