isomorfeus-data 2.0.0 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8164f378080fd27c2175ab62246f588fc862c463b2ab764c392410ca5169fc0
-  data.tar.gz: ba522d380b2afc47c5f9b420befbaa2b16552cfb60db4be51fee86c132d03708
+  metadata.gz: cb9108f2f9e715878385080c0baaa26f956306df3aaa7972671909c1ebefb5cd
+  data.tar.gz: 19e1f6d114a2bb41d3ccf8a5d06c18ea788f19d84e5c695c701889857f4709d4
 SHA512:
-  metadata.gz: e66e159004cf71f9fdf95868624f30af2a95a5ac5c925750745ffc94720bdd1df0caf21fd34309cee844d29530de431e3d1b551339af62b6b7f8ece7138a3f86
-  data.tar.gz: f48628bb5bdc60261c62416345406b8ce28922388a909857b939bae9147dfb2f059762f529d1eb78d6aac33b802c993ff02990cfc1c7c99fce4a83d388abbe0f
+  metadata.gz: dd5ec492a7d4a2332c54d8d796ec384acf73d83bf0942e9f1484abc2572fb11b37e39760467ee7b2f5d9279deac3409e855d47e56b1113ed0509912c2088b5dc
+  data.tar.gz: 5d4f243fdbc432b8b2b435e45bbf6c94c8e6bef437fb8ff9ff8cfe00f15f92f977a249fe808e51a209a4c849dcff80ccb5fca7ef9ba16f5d6d3c611baa943cce

data/lib/isomorfeus/data/generic_class_api.rb

@@ -80,10 +80,9 @@ module Isomorfeus
 
         def load(key:)
           data = instance_exec(key: key, &@_load_block)
-          return nil unless data
-          return data if data.class == self
-          Isomorfeus.raise_error(message: "#{self.to_s}: execute_load must return a instance of #{self.to_s} or nil. Returned was: #{data.class}.") if data.class != self
-          data
+          return nil if data.nil?
+          return data if data.class.to_s == self.to_s
+          Isomorfeus.raise_error(message: "#{self}: execute_load must return a instance of #{self} or nil. Returned was: #{data.class}.")
         end
         alias load! load
 

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.0'
+    VERSION = '2.0.4'
   end
 end

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -108,6 +108,7 @@ module LucidDocument
 
           execute_load do |key:|
             doc = self.ferret_accelerator.load_doc(key)
+            return nil unless doc
             doc.delete(:key)
             self.new(key: key, fields: doc)
           end

data/lib/isomorfeus_data/lucid_query_result.rb

@@ -40,14 +40,18 @@ class LucidQueryResult
     end
 
     def method_missing(accessor_name, *args, &block)
-      sid = if @result_set
+      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
-      Isomorfeus.raise_error(message: "#{@class_name}: no such thing '#{accessor_name}' in the results!") unless sid
-      Isomorfeus.instance_from_sid(sid)
+      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) }
+      else
+        Isomorfeus.instance_from_sid(sid_or_array)
+      end
     end
   else
     def initialize(key: nil, result_set: {})
@@ -77,8 +81,13 @@ class LucidQueryResult
 
     def to_transport
       sids_hash = {}
-      @result_set.each do |key, value|
-        sids_hash[key.to_s] = value.sid
+      @result_set.each do |key, value_or_array|
+        if value_or_array.class == Array
+          sids_hash[key.to_s] = value_or_array.map(&:sid)
+          sids_hash[:_is_array_] = true
+        else
+          sids_hash[key.to_s] = value_or_array.sid
+        end
       end
       { @class_name => { @key => sids_hash }}
     end
@@ -86,9 +95,18 @@ class LucidQueryResult
     def included_items_to_transport
       data_hash = {}
       @result_set.each_value do |value|
-        data_hash.deep_merge!(value.to_transport)
-        if value.respond_to?(:included_items_to_transport)
-          data_hash.deep_merge!(value.included_items_to_transport)
+        if value.class == Array
+          value.each do |v|
+            data_hash.deep_merge!(v.to_transport)
+            if v.respond_to?(:included_items_to_transport)
+              data_hash.deep_merge!(v.included_items_to_transport)
+            end
+          end
+        else
+          data_hash.deep_merge!(value.to_transport)
+          if value.respond_to?(:included_items_to_transport)
+            data_hash.deep_merge!(value.included_items_to_transport)
+          end
         end
       end
       data_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.14.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.14.5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-ferret
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.6
+        version: 10.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.6
+        version: 10.6.11
 - !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.0
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement