isomorfeus-data 23.6.0.rc4 → 23.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2933e76d12a5c71ca4b530780279752315411c3320399738506238db5930bf1
-  data.tar.gz: b2285afb0da725ab3b9b617e20dca1cabfadedc7137c65253a02141dca973916
+  metadata.gz: 9ba8c579c7cf981541b8b7079ec550c9ef35a5c8a82d06d5573fe1234e0d6a52
+  data.tar.gz: 3405f884befcbcdf32121b2660a4b73581ce4727ea9a194e719614bd88896aca
 SHA512:
-  metadata.gz: eb8bf3c9a01dc449a62e2107781d714c7e0fd7d99abaf702c39e15898d6e4f73c27364312eb554792893a59b303ec2ec1a3cec30435a5455188c6cd75e5d1847
-  data.tar.gz: 77ed0b5486b8ec243f46e404692ce2451a40160d82354c600a358115c466a74b5b3f51c034176cae774406c3f713e71c208271346efdfb1fe1dbbb151dd208d5
+  metadata.gz: 3e87ee43905c60b7d307035d8670165bc94b2550fac70fc2b157400b35dd861e5527df3e0415ad9dd143c37b058693b466f9b06609dfccc0dc4b1bc8b3225d20
+  data.tar.gz: 3059d88172bbd52c8c00c8dd4355e4b429a0494b76cc18aa4b84e3932e3120417520a1f256b546b20f21c769bf508ead1119214f4ec1ffd72e2951be41da368b

data/lib/isomorfeus/data/enhancer.rb

@@ -118,7 +118,7 @@ module Isomorfeus
               item_class.field_conditions.each do |field, options|
                 loaded_data.delete(field) if options[:server_only]
               end
-              action = { type: 'DATA_MERGE', data: { item_class_name => { item_key => { fields: loaded_data, revision: revision, instance_uuid: instance_uuid }}}}
+              action = { type: 'DATA_ADD', data: { item_class_name => { item_key => { fields: loaded_data, revision: revision, instance_uuid: instance_uuid }}}}
             elsif action_type == 'DATA_SEARCH'
               item_class_name = action[:class_name]
               item_class = get_verified_class(item_class_name)
@@ -236,7 +236,7 @@ module Isomorfeus
                 revision = stored_revision
                 instance_uuid = nil
               end
-              action = { type: 'DATA_MERGE', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, instance_uuid: instance_uuid }}}}
+              action = { type: 'DATA_ADD', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, instance_uuid: instance_uuid }}}}
             elsif action_type == 'FILE_DESTROY'
               item_class_name = action[:class_name]
               item_key = action[:key]

data/lib/isomorfeus/data/reducer.rb

@@ -36,6 +36,11 @@ module Isomorfeus
             new_state = prev_state ? prev_state.deep_dup : {}
             new_state.deep_merge!(action[:data])
             new_state
+          elsif action_type == 'DATA_ADD'
+            new_state = prev_state ? prev_state.deep_dup : {}
+            new_state.deep_merge!(action[:data])
+            new_state[:queries] = { action[:data].keys.first => nil }
+            new_state
           elsif action_type == 'DATA_SET'
             new_state = prev_state ? prev_state.deep_dup : {}
             if !new_state[action[:class_name]]
@@ -44,6 +49,7 @@ module Isomorfeus
               new_state[action[:class_name]].delete(action[:key])
             end
             new_state[action[:class_name]][action[:key]] = action[:data]
+            new_state[:queries] = { action[:class_name] => nil }
             new_state
           else
             prev_state || {}

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '23.6.0.rc4'
+    VERSION = '23.6.0.rc5'
   end
 end

data/lib/isomorfeus-data.rb

@@ -29,8 +29,6 @@ require 'isomorfeus/data/enhancer'
 Isomorfeus::Data::Enhancer.add_enhancer_to_store
 
 if RUBY_ENGINE == 'opal'
-  Isomorfeus.zeitwerk.push_dir('isomorfeus_data')
-  require_tree 'isomorfeus_data', autoload: true
   Isomorfeus.zeitwerk.push_dir('data')
 else
   require 'isomorfeus/data/rack_middleware'

data/lib/lucid_data_generic.rb

@@ -6,7 +6,9 @@ class LucidDataGeneric
 
     def load(key:)
       instance = self.new(key: key, _loading: true)
-      instance.loaded? ? instance : load!(key: key, instance: instance)
+      return instance if instance.loaded?
+      return load!(key: key, instance: instance) if instance.loadable?
+      instance
     end
 
     def destroyed?(key:)
@@ -80,7 +82,7 @@ class LucidDataGeneric
   end # RUBY_ENGINE
 
   def initialize(key: nil)
-    @key = key.nil? ? SecureRandom.uuid : key.to_s
+    @key = key.nil? ? instance_uuid : key.to_s
     @self_class = self.class
     @class_name = @self_class.name
     @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
@@ -91,6 +93,11 @@ class LucidDataGeneric
     revision > 0
   end
 
+  def loadable?
+    return true unless Isomorfeus.store.dig(:data_state, @class_name, @key)
+    Isomorfeus.store.dig(:data_state, @class_name, @key, :revision) != nil
+  end
+
   def instance_uuid
     @instance_uuid ||= SecureRandom.uuid
   end

data/lib/lucid_object.rb

@@ -321,7 +321,7 @@ class LucidObject < LucidDataGeneric
   alias_method :fetch, :[]
 
   def []=(name, val)
-    return self.key = name if name == :key
+    return self.key = val.to_s if name == :key
     val = _validate_field(name, val)
     changed!
     @changed_fields[name] = val

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 23.6.0.rc4
+  version: 23.6.0.rc5
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,70 +106,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.6.0.rc4
+        version: 23.6.0.rc5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement