isomorfeus-data 2.0.22 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a61109439fc578e2cb037c578c437f63f65ff991e63207ea954913a77c0a2df8
-  data.tar.gz: efbc79050eb128af7c698081626ef078491dd7ea54d7d0e9827b042699ab1a25
+  metadata.gz: 36f2a4b42f218414eb7b5d64477e37d31af469bfc9e75dd2dfdc9dfa72784eb4
+  data.tar.gz: 882e1a566d0f5aa47f62766bb735c1c77de497274a6b77a6a4a464d92e39bc72
 SHA512:
-  metadata.gz: 2f06ed4873695a6bf2fa26ff86eed91f475326a36fb5a363e5347482496a97a681464f852d63acfda528f441eca5b8fa2017522bf563971a38402043197ec9cc
-  data.tar.gz: 62897ec244e3fa1b8b480393b1dcf3bfdd06ed01ddbee8713c141164a6ce5c383590fb9c79342ac2760d28a1169abda0631566849f74f07fb13eedb04b37c221
+  metadata.gz: 384ad08196c3672aed40ec02d02b14a37f54f9512792b15c93ff9be6d050896b383569b0f97a232c04789039f739b8de7303268a2e5028508f9124600a883e25
+  data.tar.gz: 3920980f38fd39a1c0110938cbdc5f306210788be3c97fb88cb7808587789bf4d2fd546c2c6bdfcce43eae43c2ccfa7e456af736004931eac718e3c83a3a73da

data/lib/isomorfeus/data/config.rb

@@ -56,7 +56,7 @@ module Isomorfeus
         valid_file_classes[raw_class_name(klass)] = true
       end
 
-      attr_accessor :data_path
+      attr_accessor :storage_path
       attr_accessor :files_path
 
       attr_accessor :ferret_path
@@ -64,23 +64,23 @@ module Isomorfeus
 
       attr_accessor :hamster_path
       attr_accessor :hamster_mapsize
-      attr_accessor :data_object_env_path
-      attr_accessor :data_object_idx_path
+      attr_accessor :data_object_envs_path
+      attr_accessor :data_object_idxs_path
     end
   end
 
   if RUBY_ENGINE != 'opal'
-    self.data_path = File.expand_path(File.join(Isomorfeus.root, 'data', Isomorfeus.env))
-    self.files_path = File.expand_path(File.join(self.data_path, 'files'))
+    self.storage_path = File.expand_path(File.join(Isomorfeus.root, 'storage', Isomorfeus.env))
+    self.files_path = File.expand_path(File.join(self.storage_path, 'files'))
 
     # documents and indices
-    self.ferret_path = File.expand_path(File.join(self.data_path, 'ferret'))
+    self.ferret_path = File.expand_path(File.join(self.storage_path, 'ferret'))
     self.data_documents_path = File.expand_path(File.join(self.ferret_path, 'documents'))
 
     # objects, nodes and edges
-    self.hamster_path = File.expand_path(File.join(self.data_path, 'hamster'))
+    self.hamster_path = File.expand_path(File.join(self.storage_path, 'hamster'))
     self.hamster_mapsize = 4294967296
-    self.data_object_env_path = File.expand_path(File.join(self.hamster_path, 'object_env'))
-    self.data_object_idx_path = File.expand_path(File.join(self.hamster_path, 'object_idx'))
+    self.data_object_envs_path = File.expand_path(File.join(self.hamster_path, 'object_envs'))
+    self.data_object_idxs_path = File.expand_path(File.join(self.hamster_path, 'object_idxs'))
   end
 end

data/lib/isomorfeus/data/document_accelerator.rb

@@ -5,17 +5,17 @@ module Isomorfeus
         proc { fer_acc.close_index }
       end
 
-      attr_reader :doc_class, :doc_class_name, :doc_class_name_u
+      attr_reader :doc_class, :doc_class_name
       attr_accessor :index
 
       def initialize(doc_class, &block)
         @doc_class = doc_class
         @doc_class_name = doc_class.name
-        @doc_class_name_u = @doc_class_name.underscore
         if block_given?
           res = block.call(self)
           @index = res unless @index
         else
+          @index_path = File.expand_path(File.join(Isomorfeus.data_documents_path, @doc_class_name.underscore))
           open_index
         end
         ObjectSpace.define_finalizer(self, self.class.finalize(self))
@@ -23,7 +23,7 @@ module Isomorfeus
 
       def destroy_index
         close_index
-        FileUtils.rm_rf(index_path(doc_class_name))
+        FileUtils.rm_rf(@index_path)
       end
 
       def close_index
@@ -66,14 +66,10 @@ module Isomorfeus
         id = top_docs.hits[0].doc if top_docs.total_hits == 1
       end
 
-      def index_path
-        File.expand_path(File.join(Isomorfeus.data_documents_path, @doc_class_name_u))
-      end
-
       def open_index
         FileUtils.mkdir_p(Isomorfeus.data_documents_path) unless Dir.exist?(Isomorfeus.data_documents_path)
         field_infos = Isomorfeus::Ferret::Index::FieldInfos.new(store: :yes, index: :yes, term_vector: :with_positions_offsets)
-        @index = Isomorfeus::Ferret::Index::Index.new(path: index_path, key: :key, auto_flush: true, lock_retry_time: 5, field_infos: field_infos)
+        @index = Isomorfeus::Ferret::Index::Index.new(path: @index_path, key: :key, auto_flush: true, lock_retry_time: 5, field_infos: field_infos)
         @index.field_infos.add_field(:key, store: :yes, index: :yes, term_vector: :no) unless @index.field_infos[:key]
         @doc_class.field_options.each do |field, options|
           @index.field_infos.add_field(field, options) unless @index.field_infos[field]

data/lib/isomorfeus/data/handler/generic.rb

@@ -19,7 +19,7 @@ module Isomorfeus
                 response_agent.request[type_class_name].each_key do |action|
                   case action
                   when 'load' then process_load(response_agent, type_class, type_class_name)
-                  when 'query' then process_query(response_agent, type_class, type_class_name)
+                  when 'execute' then process_execute(response_agent, type_class, type_class_name)
                   when 'create' then process_create(response_agent, type_class, type_class_name)
                   when 'save' then process_save(response_agent, type_class, type_class_name)
                   when 'destroy' then process_destroy(response_agent, type_class, type_class_name)
@@ -40,7 +40,7 @@ module Isomorfeus
           data = response_agent.request[type_class_name]['create']
           instance_data = data['instance']
           included_items_data = data.key?('included_items') ? data['included_items'] : nil
-          if Isomorfeus.current_user.authorized?(type_class, :create, data)
+          if Isomorfeus.current_user.authorized?(type_class, :create, type_class.props_from_data(instance_data))
             instance = type_class.instance_from_transport(instance_data, included_items_data)
             created_type = instance.create
             if created_type
@@ -56,6 +56,25 @@ module Isomorfeus
           end
         end
 
+        def process_execute(response_agent, type_class, type_class_name)
+          # 'Isomorfeus::Data::Handler::Generic', self.name, :execute, props_json
+          props = response_agent.request[type_class_name]['execute']
+          props.transform_keys!(&:to_sym)
+          if Isomorfeus.current_user.authorized?(type_class, :execute, props)
+            queried_type = type_class.execute(**props)
+            if queried_type
+              response_agent.outer_result = {} unless response_agent.outer_result
+              response_agent.outer_result.deep_merge!(data: queried_type.to_transport)
+              if queried_type.respond_to?(:included_items_to_transport)
+                response_agent.outer_result.deep_merge!(data: queried_type.included_items_to_transport)
+              end
+              response_agent.agent_result = { success: 'ok' }
+            else response_agent.error = { error: { type_class_name => 'Query returned nothing!' }}
+            end
+          else response_agent.error = { error: 'Access denied!' }
+          end
+        end
+
         def process_load(response_agent, type_class, type_class_name)
           # 'Isomorfeus::Data::Handler::Generic', self.name, :load, key: key
           props = response_agent.request[type_class_name]['load']
@@ -75,31 +94,12 @@ module Isomorfeus
           end
         end
 
-        def process_query(response_agent, type_class, type_class_name)
-          # 'Isomorfeus::Data::Handler::Generic', self.name, :query, props_json
-          props = response_agent.request[type_class_name]['query']
-          props.transform_keys!(&:to_sym)
-          if Isomorfeus.current_user.authorized?(type_class, :query, props)
-            queried_type = type_class.execute(**props)
-            if queried_type
-              response_agent.outer_result = {} unless response_agent.outer_result
-              response_agent.outer_result.deep_merge!(data: queried_type.to_transport)
-              if queried_type.respond_to?(:included_items_to_transport)
-                response_agent.outer_result.deep_merge!(data: queried_type.included_items_to_transport)
-              end
-              response_agent.agent_result = { success: 'ok' }
-            else response_agent.error = { error: { type_class_name => 'Query returned nothing!' }}
-            end
-          else response_agent.error = { error: 'Access denied!' }
-          end
-        end
-
         def process_save(response_agent, type_class, type_class_name)
           # 'Isomorfeus::Data::Handler::Generic', self.name, :save, data_hash
           data = response_agent.request[type_class_name]['save']
           instance_data = data['instance']
           included_items_data = data.key?('included_items') ? data['included_items'] : nil
-          if Isomorfeus.current_user.authorized?(type_class, :save, data)
+          if Isomorfeus.current_user.authorized?(type_class, :save, type_class.props_from_data(instance_data))
             instance = type_class.instance_from_transport(instance_data, included_items_data)
             saved_type = instance.save
             if saved_type

data/lib/isomorfeus/data/object_accelerator.rb

@@ -7,11 +7,12 @@ module Isomorfeus
 
       attr_accessor :index
 
-      def initialize(&block)
+      def initialize(object_class_name, &block)
         if block_given?
           res = block.call(self)
           @index = res unless @index
         else
+          @index_path = File.expand_path(File.join(Isomorfeus.data_object_idxs_path, object_class_name.underscore))
           open_index
         end
         ObjectSpace.define_finalizer(self, self.class.finalize(self))
@@ -19,7 +20,7 @@ module Isomorfeus
 
       def destroy_index
         close_index
-        FileUtils.rm_rf(Isomorfeus.data_object_idx_path)
+        FileUtils.rm_rf(@index_path)
       end
 
       def close_index
@@ -63,12 +64,12 @@ module Isomorfeus
       end
 
       def open_index
-        FileUtils.mkdir_p(Isomorfeus.data_object_idx_path) unless Dir.exist?(Isomorfeus.data_object_idx_path)
-        @index = Isomorfeus::Ferret::Index::Index.new(path: Isomorfeus.data_object_idx_path, key: :sid_s_attr, auto_flush: true, lock_retry_time: 5)
-        @index.field_infos.add_field(:attribute, store: :no, term_vector: :no) unless index.field_infos[:attribute]
-        @index.field_infos.add_field(:class_name, store: :no, term_vector: :no) unless index.field_infos[:class_name]
-        @index.field_infos.add_field(:value, store: :no) unless index.field_infos[:value]
-        @index.field_infos.add_field(:sid_s_attr, store: :yes, term_vector: :no) unless index.field_infos[:sid_s_attr]
+        FileUtils.mkdir_p(@index_path) unless Dir.exist?(@index_path)
+        @index = Isomorfeus::Ferret::Index::Index.new(path: @index_path, key: :sid_s_attr, auto_flush: true, lock_retry_time: 5)
+        @index.field_infos.add_field(:attribute, store: :no, term_vector: :no) unless @index.field_infos[:attribute]
+        @index.field_infos.add_field(:class_name, store: :no, term_vector: :no) unless @index.field_infos[:class_name]
+        @index.field_infos.add_field(:value, store: :no) unless @index.field_infos[:value]
+        @index.field_infos.add_field(:sid_s_attr, store: :yes, term_vector: :no) unless @index.field_infos[:sid_s_attr]
       end
     end
   end

data/lib/isomorfeus/data/object_expander.rb

@@ -2,55 +2,30 @@ module Isomorfeus
   module Data
     class ObjectExpander
       class << self
-        def environment
-          @environment
-        end
-
-        def environment=(env)
-          @environment = env
-        end
-
-        def ref
-          @ref ||= 0
-        end
-
-        def ref=(val)
-          @ref = val
-        end
-
-        def refa
-          self.ref += 1
-        end
-
-        def refs
-          self.ref -= 1 if self.ref > 0
-        end
-
-        def finalize(cls)
-          proc do
-            cls.refs
-            if cls.ref == 0
-              cls.environment.close rescue nil
-            end
-          end
+        def finalize(ins)
+          proc { ins.environment.close rescue nil }
         end
       end
 
-      def initialize(&block)
+      attr_accessor :environment
+
+      def initialize(class_name:, compress: false, &block)
         if block_given?
           res = block.call(self)
-          self.class.environment = res unless self.class.environment
+          self.environment = res unless self.environment
         else
+          @env_path = File.expand_path(File.join(Isomorfeus.data_object_envs_path, class_name.underscore))
           open_environment
         end
-        @db = self.class.environment.database('objects', create: true)
-        @index_db = self.class.environment.database('index', create: true, dupsort: true)
+        @db = self.environment.database('objects', create: true)
+        @index_db = self.environment.database('index', create: true, dupsort: true)
+        @compress = compress
         @use_class_cache = !Isomorfeus.development?
-        ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
+        ObjectSpace.define_finalizer(self, self.class.finalize(self))
       end
 
       def create_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache, compress: @compress)
       end
 
       def destroy_object(sid_s)
@@ -63,7 +38,7 @@ module Isomorfeus
       end
 
       def save_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache, compress: @compress)
       end
 
       def index_delete(key, val)
@@ -91,10 +66,8 @@ module Isomorfeus
       private
 
       def open_environment
-        return self.class.refa if self.class.environment
-        FileUtils.mkdir_p(Isomorfeus.data_object_env_path) unless Dir.exist?(Isomorfeus.data_object_env_path)
-        self.class.environment = Isomorfeus::Hamster.new(Isomorfeus.data_object_env_path, mapsize: Isomorfeus.hamster_mapsize)
-        self.class.refa
+        FileUtils.mkdir_p(@env_path) unless Dir.exist?(@env_path)
+        self.environment = Isomorfeus::Hamster.new(@env_path, mapsize: Isomorfeus.hamster_mapsize)
       end
     end
   end

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.22'
+    VERSION = '2.2.1'
   end
 end

data/lib/isomorfeus-data.rb

@@ -2,7 +2,9 @@ require 'base64'
 require 'stringio'
 require 'data_uri'
 require 'securerandom'
+require 'isomorfeus-policy'
 require 'isomorfeus-transport'
+require 'isomorfeus-i18n'
 require 'isomorfeus/data/config'
 require 'isomorfeus/data/attribute_support'
 require 'isomorfeus/data/field_support'

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -4,6 +4,7 @@ module LucidDocument
       base.include(Isomorfeus::Data::FieldSupport)
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
+      base.include(LucidI18n::Mixin)
 
       base.instance_exec do
         def escape_string(s)
@@ -85,6 +86,13 @@ module LucidDocument
             new(key: key, revision: revision, fields: fields)
           end
 
+          def props_from_data(instance_data)
+            key = instance_data[self.name].keys.first
+            revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
+            fields = instance_data[self.name][key].key?('fields') ? instance_data[self.name][key]['fields'].transform_keys!(&:to_sym) : nil
+            LucidProps.new({ key: key, revision: revision }.merge!(fields))
+          end
+
           def setup_index(&block)
             @_setup_index_block = block
           end

data/lib/isomorfeus_data/lucid_file/mixin.rb

@@ -3,6 +3,7 @@ module LucidFile
     def self.included(base)
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
+      base.include(LucidI18n::Mixin)
 
       def changed!
         @_changed = true
@@ -140,6 +141,13 @@ module LucidFile
             new(key: key, revision: revision, data_uri: data_uri)
           end
 
+          def props_from_data(instance_data)
+            key = instance_data[self.name].keys.first
+            revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
+            data_uri = instance_data[self.name][key].key?('data_uri') ? instance_data[self.name][key]['data_uri'] : nil
+            LucidProps.new({ key: key, revision: revision, data_uri: data_uri })
+          end
+
           def files_path
             @files_path ||= Isomorfeus.files_path
           end

data/lib/isomorfeus_data/lucid_object/mixin.rb

@@ -4,6 +4,17 @@ module LucidObject
       base.include(Isomorfeus::Data::AttributeSupport)
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
+      base.include(LucidI18n::Mixin)
+
+      base.instance_exec do
+        def store_compressed(quality: 5)
+          @_store_compressed = quality
+        end
+
+        def _store_compressed
+          @_store_compressed
+        end
+      end
 
       def [](name)
         send(name)
@@ -79,6 +90,13 @@ module LucidObject
             new(key: key, revision: revision, attributes: attributes)
           end
 
+          def props_from_data(instance_data)
+            key = instance_data[self.name].keys.first
+            revision = instance_data[self.name][key].key?('revision') ? instance_data[self.name][key]['revision'] : nil
+            attributes = instance_data[self.name][key].key?('attributes') ? instance_data[self.name][key]['attributes'].transform_keys!(&:to_sym) : nil
+            LucidProps.new({ key: key, revision: revision }.merge!(attributes))
+          end
+
           def setup_environment(&block)
             @_setup_environment_block = block
           end
@@ -87,21 +105,23 @@ module LucidObject
             @_setup_index_block = block
           end
 
-          def hamster_storage_expander
-            return @hamster_storage_expander if @hamster_storage_expander
-            @hamster_storage_expander = if @_setup_environment_block
-                                          Isomorfeus::Data::ObjectExpander.new(&@_setup_index_block)
-                                        else
-                                          Isomorfeus::Data::ObjectExpander.new
-                                        end
+          def object_expander
+            return @object_expander if @object_expander
+            compress = _store_compressed
+            compress = false if compress.nil?
+            @object_expander = if @_setup_environment_block
+                                 Isomorfeus::Data::ObjectExpander.new(class_name: self.to_s, compress: compress, &@_setup_index_block)
+                               else
+                                 Isomorfeus::Data::ObjectExpander.new(class_name: self.to_s, compress: compress)
+                               end
           end
 
-          def hamster_accelerator
-            return @hamster_accelerator if @hamster_accelerator
-            @hamster_accelerator = if @_setup_index_block
-                                     Isomorfeus::Data::ObjectAccelerator.new(&@_setup_index_block)
+          def object_accelerator
+            return @object_accelerator if @object_accelerator
+            @object_accelerator = if @_setup_index_block
+                                     Isomorfeus::Data::ObjectAccelerator.new(self.to_s, &@_setup_index_block)
                                    else
-                                     Isomorfeus::Data::ObjectAccelerator.new
+                                     Isomorfeus::Data::ObjectAccelerator.new(self.to_s)
                                    end
           end
 
@@ -112,8 +132,8 @@ module LucidObject
             if idx_type == :text
               query = "+value:#{val} +class_name:#{self.name}"
               query << " +attribute:#{attr}" if attr != '*'
-              self.hamster_accelerator.search_each(query, options) do |id|
-                doc = self.hamster_accelerator.index.doc(id)&.load
+              self.object_accelerator.search_each(query, options) do |id|
+                doc = self.object_accelerator.index.doc(id)&.load
                 if doc
                   sid_s = doc[:sid_s_attr].split(':|:')[0]
                   obj = self.load(key: sid_s)
@@ -122,13 +142,13 @@ module LucidObject
               end
             else
               if val == '*'
-                self.hamster_storage_expander.each do |obj|
+                self.object_expander.each do |obj|
                   objs << obj if obj.class == self
                 end
               else
                 attr_s = ":[#{attr}]"
                 accept_all_attr = attr_s == ":[*]" ? true : false
-                self.hamster_storage_expander.search(":[#{self.name}]:|:[:#{val}:]:") do |sid_s_attr|
+                self.object_expander.search(":[#{self.name}]:|:[:#{val}:]:") do |sid_s_attr|
                   if accept_all_attr || sid_s_attr.end_with?(attr_s)
                     sid_s = sid_s_attr.split(':|:[')[0]
                     obj = self.load(key: sid_s)
@@ -142,7 +162,7 @@ module LucidObject
 
           execute_create do
             self.key = SecureRandom.uuid unless self.key
-            self.class.hamster_storage_expander.create_object(self.sid_s, self)
+            self.class.object_expander.create_object(self.sid_s, self)
             self.class.indexed_attributes.each do |attr, idx_type|
               if idx_type == :text
                 self._create_text_indexed_attribute(attr)
@@ -156,14 +176,14 @@ module LucidObject
           execute_destroy do |key:|
             key = key.to_s
             sid_s = key.start_with?('[') ? key : gen_sid_s(key)
-            self.hamster_storage_expander.destroy_object(sid_s)
+            self.object_expander.destroy_object(sid_s)
             self.indexed_attributes.each do |attr, idx_type|
               if idx_type == :text
-                self.hamster_accelerator.destroy_doc("#{sid_s}:|:[#{attr}]")
+                self.object_accelerator.destroy_doc("#{sid_s}:|:[#{attr}]")
               else
-                old_val = self.hamster_storage_expander.index_get("#{sid_s}:|:[#{attr}]")
-                self.hamster_storage_expander.index_delete("#{sid_s}:|:[#{attr}]", old_val)
-                self.hamster_storage_expander.index_delete(":[#{self.name}]:|:[:#{old_val}:]:", "#{sid_s}:|:[#{attr}]")
+                old_val = self.object_expander.index_get("#{sid_s}:|:[#{attr}]")
+                self.object_expander.index_delete("#{sid_s}:|:[#{attr}]", old_val)
+                self.object_expander.index_delete(":[#{self.name}]:|:[:#{old_val}:]:", "#{sid_s}:|:[#{attr}]")
               end
             end
             true
@@ -172,12 +192,12 @@ module LucidObject
           execute_load do |key:|
             key = key.to_s
             sid_s = key.start_with?('[') ? key : gen_sid_s(key)
-            self.hamster_storage_expander.load_object(sid_s)
+            self.object_expander.load_object(sid_s)
           end
 
           execute_save do
             self.key = SecureRandom.uuid unless self.key
-            self.class.hamster_storage_expander.save_object(self.sid_s, self)
+            self.class.object_expander.save_object(self.sid_s, self)
             self.class.indexed_attributes.each do |attr, val|
               if val == :text
                 self._store_text_indexed_attribute(attr)
@@ -202,21 +222,21 @@ module LucidObject
 
         def _create_text_indexed_attribute(attr)
           doc = { sid_s_attr: "#{self.sid_s}:|:[#{attr}]", value: self.send(attr).to_s, attribute: attr.to_s, class_name: @class_name }
-          self.class.hamster_accelerator.create_doc(doc)
+          self.class.object_accelerator.create_doc(doc)
         end
 
         def _store_text_indexed_attribute(attr)
           doc = { sid_s_attr: "#{self.sid_s}:|:[#{attr}]", value: self.send(attr).to_s, attribute: attr.to_s, class_name: @class_name }
-          self.class.hamster_accelerator.save_doc("#{self.sid_s}:|:[#{attr}]", doc)
+          self.class.object_accelerator.save_doc("#{self.sid_s}:|:[#{attr}]", doc)
         end
 
         def _store_value_indexed_attribute(attr)
-          old_val = self.class.hamster_storage_expander.index_get("#{self.sid_s}:|:[#{attr}]")
-          self.class.hamster_storage_expander.index_delete("#{self.sid_s}:|:[#{attr}]", old_val)
-          self.class.hamster_storage_expander.index_delete(":[#{self.class.name}]:|:[:#{old_val}:]:", "#{self.sid_s}:|:[#{attr}]")
+          old_val = self.class.object_expander.index_get("#{self.sid_s}:|:[#{attr}]")
+          self.class.object_expander.index_delete("#{self.sid_s}:|:[#{attr}]", old_val)
+          self.class.object_expander.index_delete(":[#{self.class.name}]:|:[:#{old_val}:]:", "#{self.sid_s}:|:[#{attr}]")
           val = "#{self.send(attr)}"[0..300]
-          self.class.hamster_storage_expander.index_put("#{self.sid_s}:|:[#{attr}]", val)
-          self.class.hamster_storage_expander.index_put(":[#{self.class.name}]:|:[:#{val}:]:", "#{self.sid_s}:|:[#{attr}]")
+          self.class.object_expander.index_put("#{self.sid_s}:|:[#{attr}]", val)
+          self.class.object_expander.index_put(":[#{self.class.name}]:|:[:#{val}:]:", "#{self.sid_s}:|:[#{attr}]")
         end
 
         def _unchange!

data/lib/isomorfeus_data/lucid_query/mixin.rb

@@ -2,6 +2,7 @@ module LucidQuery
   module Mixin
     def self.included(base)
       base.extend(LucidPropDeclaration::Mixin)
+      base.include(LucidI18n::Mixin)
 
       if RUBY_ENGINE == 'opal'
         base.instance_exec do
@@ -22,7 +23,7 @@ module LucidQuery
             end
             props = validated_props(props)
             props[:key] = query_result_instance.key
-            Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :query, props).then do |agent|
+            Isomorfeus::Transport.promise_send_path( 'Isomorfeus::Data::Handler::Generic', self.name, :execute, props).then do |agent|
               agent.process do
                 query_result_instance._load_from_store!
                 Isomorfeus.store.dispatch(type: 'DATA_LOAD', data: agent.full_response[:data])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.22
+  version: 2.2.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.9
+        version: 0.14.17
 - !ruby/object:Gem::Dependency
   name: isomorfeus-ferret
   requirement: !ruby/object:Gem::Requirement
@@ -100,70 +100,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.6.6
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-policy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.31
+        version: 10.6.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.31
+        version: 10.6.40
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.15
+        version: 4.1.18
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.22
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: Develop apps with powerful reactive data access and queries.
 email: jan@kursator.de
 executables: []