isomorfeus-data 2.0.18 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ceee66f1fd4e107d808108d8c71d03496a17eae12c9ad38a1d83afd4cf3697b
-  data.tar.gz: 405224c9f80eb01ca6ecbf3371e258459139c9077700949a8a2b9c22c15e8969
+  metadata.gz: a61109439fc578e2cb037c578c437f63f65ff991e63207ea954913a77c0a2df8
+  data.tar.gz: efbc79050eb128af7c698081626ef078491dd7ea54d7d0e9827b042699ab1a25
 SHA512:
-  metadata.gz: 241acbbc830cef52b87dfa337801102081f92c643223eb06a960940fe4c0d4b1551a190e5c75e2ae0012dd8515e1944f62d9201bd8a65ef4f565479cccc65cf0
-  data.tar.gz: f55c1b2cd8b276e66b648e3e351ac0be59f74945bf95ad446d0bb3fa1749c236d58252dfc3bb3967f2adbb166a6565e58e94a22713c399a9a96bb53fa9bf1dc0
+  metadata.gz: 2f06ed4873695a6bf2fa26ff86eed91f475326a36fb5a363e5347482496a97a681464f852d63acfda528f441eca5b8fa2017522bf563971a38402043197ec9cc
+  data.tar.gz: 62897ec244e3fa1b8b480393b1dcf3bfdd06ed01ddbee8713c141164a6ce5c383590fb9c79342ac2760d28a1169abda0631566849f74f07fb13eedb04b37c221

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

@@ -1,6 +1,6 @@
 module Isomorfeus
   module Data
-    class FerretAccelerator
+    class DocumentAccelerator
       def self.finalize(fer_acc)
         proc { fer_acc.close_index }
       end
@@ -73,7 +73,7 @@ module Isomorfeus
       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/object_accelerator.rb

@@ -0,0 +1,75 @@
+module Isomorfeus
+  module Data
+    class ObjectAccelerator
+      def self.finalize(ham_acc)
+        proc { ham_acc.close_index }
+      end
+
+      attr_accessor :index
+
+      def initialize(&block)
+        if block_given?
+          res = block.call(self)
+          @index = res unless @index
+        else
+          open_index
+        end
+        ObjectSpace.define_finalizer(self, self.class.finalize(self))
+      end
+
+      def destroy_index
+        close_index
+        FileUtils.rm_rf(Isomorfeus.data_object_idx_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(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]
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module Isomorfeus
   module Data
-    class HamsterStorageExpander
+    class ObjectExpander
       class << self
         def environment
           @environment
@@ -45,11 +45,12 @@ module Isomorfeus
         end
         @db = self.class.environment.database('objects', create: true)
         @index_db = self.class.environment.database('index', create: true, dupsort: true)
+        @use_class_cache = !Isomorfeus.development?
         ObjectSpace.define_finalizer(self, self.class.finalize(self.class))
       end
 
       def create_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
       end
 
       def destroy_object(sid_s)
@@ -58,11 +59,11 @@ module Isomorfeus
       end
 
       def load_object(sid_s)
-        Isomorfeus::Hamster::Marshal.load(@db, sid_s)
+        Isomorfeus::Hamster::Marshal.load(@db, sid_s, class_cache: @use_class_cache)
       end
 
       def save_object(sid_s, obj)
-        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj)
+        Isomorfeus::Hamster::Marshal.dump(@db, sid_s, obj, class_cache: @use_class_cache)
       end
 
       def index_delete(key, val)
@@ -79,7 +80,7 @@ module Isomorfeus
 
       def each(&block)
         @db.each do |key, obj|
-          block.call(Isomorfeus::Hamster::Marshal.unserialize(obj))
+          block.call(Isomorfeus::Hamster::Marshal.unserialize(obj, class_cache: @use_class_cache))
         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.18'
+    VERSION = '2.0.22'
   end
 end

data/lib/isomorfeus-data.rb

@@ -23,11 +23,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

@@ -92,9 +92,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_object/mixin.rb

@@ -90,18 +90,18 @@ module LucidObject
           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)
+                                          Isomorfeus::Data::ObjectExpander.new(&@_setup_index_block)
                                         else
-                                          Isomorfeus::Data::HamsterStorageExpander.new
+                                          Isomorfeus::Data::ObjectExpander.new
                                         end
           end
 
           def hamster_accelerator
             return @hamster_accelerator if @hamster_accelerator
             @hamster_accelerator = if @_setup_index_block
-                                     Isomorfeus::Data::HamsterAccelerator.new(&@_setup_index_block)
+                                     Isomorfeus::Data::ObjectAccelerator.new(&@_setup_index_block)
                                    else
-                                     Isomorfeus::Data::HamsterAccelerator.new
+                                     Isomorfeus::Data::ObjectAccelerator.new
                                    end
           end
 
@@ -113,7 +113,7 @@ module LucidObject
               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)
+                doc = self.hamster_accelerator.index.doc(id)&.load
                 if doc
                   sid_s = doc[:sid_s_attr].split(':|:')[0]
                   obj = self.load(key: sid_s)
@@ -123,7 +123,7 @@ module LucidObject
             else
               if val == '*'
                 self.hamster_storage_expander.each do |obj|
-                  objs << obj if obj.class.name == self.name
+                  objs << obj if obj.class == self
                 end
               else
                 attr_s = ":[#{attr}]"
@@ -145,7 +145,7 @@ module LucidObject
             self.class.hamster_storage_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
@@ -200,6 +200,11 @@ 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.hamster_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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.0.18
+  version: 2.0.22
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-06 00:00:00.000000000 Z
+date: 2022-02-12 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,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.8
+        version: 0.14.9
 - !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-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.31
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.30
+        version: 10.6.31
 - !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.18
+        version: 2.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.18
+        version: 2.0.22
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.18
+        version: 2.0.22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.18
+        version: 2.0.22
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -192,8 +192,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 +206,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 +227,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 +251,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