isomorfeus-data 2.0.19 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef3d094c6a7a94a181f67a7222a07a86456ab095866495c8931031f9d77f1538
-  data.tar.gz: 74a274d6c6971fa0462349ad04ee39f22cc6a669353381c60670493f82d24ff0
+  metadata.gz: 336c73e455b2044f1b96dc1a1e2e7a7b9ca0ef962f9121dcd9df9d0e1bea02bb
+  data.tar.gz: 36cd08025344752f7bcac649aabc6e26ecfa85dd00da2135ab4e43f10b3b47e0
 SHA512:
-  metadata.gz: 365a9b1e1b71142b782f241fe4114110b4511adcf03c163613a02e3e0a09f98b9a26aec6d31f9ca840c1a2460c5174d688df82048647e0c450380856c61234d6
-  data.tar.gz: 3259cce4fa11bb784ff457feea421adf7f03d804e955f0ecc69bbb9ece009a111e8460c53c0867e887954cfac863f282422227549a64cc6082215cf6e8f28d14
+  metadata.gz: e97477903e581484d03c93712871671ed56d864f1c7db9379e758c3229913db7c8b08ed8ac33a127ecaf500590f31fbcffcab7cbce7ed97f37c8eb64bab2879b
+  data.tar.gz: 05c46807e85b6403e47b34359fb90cb71f0c8b0b14ddb03973891e985cc83f310544a58f78f85204e462ff41c4a1f8114e2b36e0de0631b024e0b6dcab167f79

data/README.md

@@ -4,7 +4,7 @@ Data access for Isomorfeus.
 
 ### Community and Support
 
-At the [Isomorfeus Framework Project](http://isomorfeus.com)
+At the [Isomorfeus Framework Project](https://isomorfeus.com)
 
 ### Overview
 

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/{ferret_accelerator.rb → document_accelerator.rb}

@@ -1,21 +1,21 @@
 module Isomorfeus
   module Data
-    class FerretAccelerator
+    class DocumentAccelerator
       def self.finalize(fer_acc)
         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)
+        @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

@@ -0,0 +1,76 @@
+module Isomorfeus
+  module Data
+    class ObjectAccelerator
+      def self.finalize(ham_acc)
+        proc { ham_acc.close_index }
+      end
+
+      attr_accessor :index
+
+      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))
+      end
+
+      def destroy_index
+        close_index
+        FileUtils.rm_rf(@index_path)
+      end
+
+      def close_index
+        @index.close
+      end
+
+      def create_doc(document)
+        @index.add_document(document)
+      end
+
+      def destroy_doc(key)
+        id = get_doc_id(key)
+        @index.delete(id) if id
+        true
+      end
+
+      def load_doc(key)
+        id = get_doc_id(key)
+        @index.doc(id)&.load&.to_h if id
+      end
+
+      def save_doc(key, document)
+        id = get_doc_id(key)
+        if id
+          @index.update(id, document)
+          true
+        end
+      end
+
+      def search_each(query, options, &block)
+        @index.search_each(query, options, &block)
+      end
+
+      private
+
+      def get_doc_id(key)
+        # special characters must be escaped, characters taken from the ferret query parser documentation
+        escaped_key = key.gsub(/([\\\&\:\(\)\[\]\{\}\!\"\~\^\|\<\>\=\*\?\+\-\s])/, '\\\\\1')
+        top_docs = @index.search("sid_s_attr:\"#{escaped_key}\"", limit: 1)
+        id = top_docs.hits[0].doc if top_docs.total_hits == 1
+      end
+
+      def open_index
+        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
+end

data/lib/isomorfeus/data/{hamster_storage_expander.rb → object_expander.rb}

@@ -1,52 +1,26 @@
 module Isomorfeus
   module Data
-    class HamsterStorageExpander
+    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(object_class_name, &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, object_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)
         @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)
@@ -91,10 +65,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/reducer.rb

@@ -18,7 +18,7 @@ module Isomorfeus
               prev_state
             end
           else
-            prev_state
+            prev_state.nil? ? {} : prev_state
           end
         end
 

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.0.19'
+    VERSION = '2.1.0'
   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'
@@ -23,11 +25,11 @@ else
   require 'active_support/core_ext/hash'
 
   require 'isomorfeus-ferret'
-  require 'isomorfeus/data/ferret_accelerator'
+  require 'isomorfeus/data/document_accelerator'
 
   require 'isomorfeus-hamster'
-  require 'isomorfeus/data/hamster_storage_expander'
-  require 'isomorfeus/data/hamster_accelerator'
+  require 'isomorfeus/data/object_expander'
+  require 'isomorfeus/data/object_accelerator'
 
   require 'isomorfeus_data/lucid_query_result'
   require 'isomorfeus_data/lucid_object/mixin'

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
@@ -92,9 +100,9 @@ module LucidDocument
           def ferret_accelerator
             return @ferret_accelerator if @ferret_accelerator
             @ferret_accelerator = if @_setup_index_block
-                                    Isomorfeus::Data::FerretAccelerator.new(self, &@_setup_index_block)
+                                    Isomorfeus::Data::DocumentAccelerator.new(self, &@_setup_index_block)
                                   else
-                                    Isomorfeus::Data::FerretAccelerator.new(self)
+                                    Isomorfeus::Data::DocumentAccelerator.new(self)
                                   end
           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,7 @@ module LucidObject
       base.include(Isomorfeus::Data::AttributeSupport)
       base.extend(Isomorfeus::Data::GenericClassApi)
       base.include(Isomorfeus::Data::GenericInstanceApi)
+      base.include(LucidI18n::Mixin)
 
       def [](name)
         send(name)
@@ -79,6 +80,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 +95,21 @@ 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::HamsterStorageExpander.new(&@_setup_index_block)
+          def object_expander
+            return @object_expander if @object_expander
+            @object_expander = if @_setup_environment_block
+                                          Isomorfeus::Data::ObjectExpander.new(self.to_s, &@_setup_index_block)
                                         else
-                                          Isomorfeus::Data::HamsterStorageExpander.new
+                                          Isomorfeus::Data::ObjectExpander.new(self.to_s)
                                         end
           end
 
-          def hamster_accelerator
-            return @hamster_accelerator if @hamster_accelerator
-            @hamster_accelerator = if @_setup_index_block
-                                     Isomorfeus::Data::HamsterAccelerator.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::HamsterAccelerator.new
+                                     Isomorfeus::Data::ObjectAccelerator.new(self.to_s)
                                    end
           end
 
@@ -112,8 +120,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.load_doc(id)
+              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 +130,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,10 +150,10 @@ 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._store_text_indexed_attribute(attr)
+                self._create_text_indexed_attribute(attr)
               else
                 self._store_value_indexed_attribute(attr)
               end
@@ -156,14 +164,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 +180,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)
@@ -200,18 +208,23 @@ module LucidObject
           @_raw_attributes = attributes
         end
 
+        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.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.19
+  version: 2.1.0
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.1
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -72,98 +72,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.10
 - !ruby/object:Gem::Dependency
   name: isomorfeus-ferret
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.3
+        version: 0.12.6
 - !ruby/object:Gem::Dependency
   name: isomorfeus-hamster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: isomorfeus-policy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.34
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.34
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.1.15
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.19
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +220,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.10.0
-description: Write Browser Apps that transparently access server side data with Graphs
-  and Collections with ease.
+description: Develop apps with powerful reactive data access and queries.
 email: jan@kursator.de
 executables: []
 extensions: []
@@ -207,13 +234,13 @@ files:
 - lib/isomorfeus-data.rb
 - lib/isomorfeus/data/attribute_support.rb
 - lib/isomorfeus/data/config.rb
-- lib/isomorfeus/data/ferret_accelerator.rb
+- lib/isomorfeus/data/document_accelerator.rb
 - lib/isomorfeus/data/field_support.rb
 - lib/isomorfeus/data/generic_class_api.rb
 - lib/isomorfeus/data/generic_instance_api.rb
-- lib/isomorfeus/data/hamster_accelerator.rb
-- lib/isomorfeus/data/hamster_storage_expander.rb
 - lib/isomorfeus/data/handler/generic.rb
+- lib/isomorfeus/data/object_accelerator.rb
+- lib/isomorfeus/data/object_expander.rb
 - lib/isomorfeus/data/reducer.rb
 - lib/isomorfeus/data/version.rb
 - lib/isomorfeus_data/lucid_document/base.rb
@@ -228,11 +255,12 @@ files:
 - opal/uri.rb
 - opal/uri/common.rb
 - opal/uri/generic.rb
-homepage: http://isomorfeus.com
+homepage: https://isomorfeus.com
 licenses:
 - MIT
 metadata:
   github_repo: ssh://github.com/isomorfeus/gems
+  source_code_uri: https://github.com/isomorfeus/isomorfeus-project/isomorfeus-data
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -251,5 +279,5 @@ requirements: []
 rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
-summary: Compose Graphs and Collections of data just as needed for a isomorfeus app.
+summary: Reactive objects, documents, files and queries for isomorfeus.
 test_files: []

data/lib/isomorfeus/data/hamster_accelerator.rb

@@ -1,87 +0,0 @@
-module Isomorfeus
-  module Data
-    class HamsterAccelerator
-      class << self
-        def index
-          @index
-        end
-
-        def index=(idx)
-          @index = idx
-        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
-            cls.index.close if cls.ref == 0
-          end
-        end
-      end
-
-      def initialize(&block)
-        if block_given?
-          res = block.call(self)
-          self.class.index = res unless self.class.index
-        else
-          open_index
-        end
-        ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
-      end
-
-      def destroy_index
-        close_index
-        FileUtils.rm_rf(Isomorfeus.data_object_idx_path)
-      end
-
-      def destroy_doc(id)
-        self.class.index.delete(id)
-        true
-      end
-
-      def load_doc(id)
-        self.class.index.doc(id)&.load
-      end
-
-      def save_doc(id, document)
-        self.class.index.update(id, document)
-      end
-
-      def search_each(query, options, &block)
-        self.class.index.search_each(query, options, &block)
-      end
-
-      private
-
-      def open_index
-        return self.class.refa if self.class.index
-        unless Dir.exist?(Isomorfeus.data_object_idx_path)
-          FileUtils.mkdir_p(Isomorfeus.data_object_idx_path)
-          fis = Isomorfeus::Ferret::Index::FieldInfos.new
-          fis.add_field(:attribute, store: :no)
-          fis.add_field(:class_name, store: :no)
-          fis.add_field(:value, store: :no)
-          fis.add_field(:sid_s_attr, store: :yes)
-          fis.create_index(Isomorfeus.data_object_idx_path)
-        end
-        self.class.index = Isomorfeus::Ferret::Index::Index.new(path: Isomorfeus.data_object_idx_path, id_field: :sid_s_attr)
-        self.class.refa
-      end
-    end
-  end
-end