isomorfeus-data 2.2.10 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac14fede053fd257ce57f22eccb8a83c3f1f563e95969d72e5c8fdc269b81ebc
-  data.tar.gz: 232a02ed01f77d627f9bf91726b53973d3becc8e2e6d9705c196e8e77d825c6f
+  metadata.gz: ecada7abb58b35e74c7f0443286a473e9c8662118068258b8752d671fe73bd6a
+  data.tar.gz: bd60bdcceec9379fadd760deef48a5b81718d07020fb5384836b584c869dc384
 SHA512:
-  metadata.gz: a8042dfbc75120886f39f550ccae76050017cdd7d62ef1ede12dc63739ee706839d86856f122cef7bceede7ee08c2816646f5902f713f0d57f05e3159f3a03e6
-  data.tar.gz: 7fe8c3031d9c71a5709559a4a83445015da3ea0f48b228e35b910cb9ea0506636f3babcfff772ecdf133480cd2685f9be5f1992c6c3315a8877ceaeb3010598d
+  metadata.gz: 5ae0594cefae1ac6773387a21de8fc696d84e3b24816d09828b1130684b07dc15729eede6d4dbf33a377438b9ffa1c23289594e12e0acddbbd553010fc2bf963
+  data.tar.gz: a4f43cb48a4ce2143ec73632ce4d1acca57a7c0f464650be8539148ea3f561a54a90d35a5d982867e71b5f414a769beb1e1e24ac7205b5094b6d4ae98ca9a1a1

data/lib/isomorfeus/data/config.rb

@@ -79,7 +79,7 @@ module Isomorfeus
 
     # objects, nodes and edges
     self.hamster_path = File.expand_path(File.join(self.storage_path, 'hamster'))
-    self.hamster_mapsize = 4294967296
+    self.hamster_mapsize = 4_294_967_296
     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

data/lib/isomorfeus/data/object_expander.rb

@@ -50,11 +50,11 @@ module Isomorfeus
       end
 
       def index_put(key, val)
-        @index_db.put(key, val)
+        environment.transaction { @index_db.put(key, val) }
       end
 
-      def each(&block)
-        @db.each do |key, obj|
+      def each(readonly: true, &block)
+        @db.each(readonly: readonly) do |key, obj|
           block.call(Isomorfeus::Hamster::Marshal.unserialize(obj, class_cache: @use_class_cache))
         end
       end
@@ -67,7 +67,12 @@ module Isomorfeus
 
       def open_environment
         FileUtils.mkdir_p(@env_path) unless Dir.exist?(@env_path)
-        self.environment = Isomorfeus::Hamster.new(@env_path, mapsize: Isomorfeus.hamster_mapsize)
+        begin
+          self.environment = Isomorfeus::Hamster.new(@env_path, mapsize: Isomorfeus.hamster_mapsize)
+        rescue RangeError
+          self.environment = Isomorfeus::Hamster.new(@env_path, mapsize: 2_147_483_647)
+          STDERR.puts "Isomorfeus::Data Warning: Hamster Object Store limited to 2Gb because of platform restrictions."
+        end
       end
     end
   end

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '2.2.10'
+    VERSION = '2.3.1'
   end
 end

data/lib/isomorfeus_data/lucid_document/mixin.rb

@@ -106,6 +106,16 @@ module LucidDocument
                                   end
           end
 
+          def each(&block)
+            self.ferret_accelerator.each do |id|
+              doc = self.ferret_accelerator.index.doc(id)&.load
+              if doc
+                key = doc.delete(:key)
+                block.call(self.new(key: key, fields: doc))
+              end
+            end
+          end
+
           def search(query, options = {})
             top_docs = []
             self.ferret_accelerator.search_each(query, options) do |id|

data/lib/isomorfeus_data/lucid_file/mixin.rb

@@ -18,72 +18,6 @@ module LucidFile
         result
       end
 
-      def content_type
-        _reload
-        return @_data_uri_object.content_type if @_data_uri_object
-        nil
-      end
-
-      def content_type=(c)
-        changed!
-        _content_type(c)
-      end
-
-      def _content_type(c)
-        _reload
-        @_data_uri_string = _format_data_uri(c, @_data_uri_object.data)
-        @_data_uri_object = URI::Data.new(@_data_uri_string)
-        c
-      end
-
-      def data
-        _reload
-        @_data_uri_object.data
-      end
-
-      def data=(d)
-        changed!
-        _data(d)
-      end
-
-      def _data(d)
-        _reload
-        @_data_uri_string = _format_data_uri(self.content_type, d)
-        @_data_uri_object = URI::Data.new(@_data_uri_string)
-        d
-      end
-
-      def data_uri
-        _reload
-        @_data_uri_string
-      end
-
-      def data_uri=(d)
-        changed!
-        _data_uri(d)
-      end
-
-      def _data_uri(d)
-        _reload
-        if d.class == URI::Data
-          @_data_uri_string = _format_data_uri(d.content_type, d.data)
-          @_data_uri_object = d
-        else
-          @_data_uri_string = d
-          @_data_uri_object = URI::Data.new(d)
-        end
-        @_data_uri_string
-      end
-
-      def data_uri_object
-        _reload
-        @_data_uri_object
-      end
-
-      def _format_data_uri(c, d)
-        "data:#{c};base64,#{Base64.encode64(d).chop}"
-      end
-
       if RUBY_ENGINE == 'opal'
         base.instance_exec do
           def files_path
@@ -130,6 +64,72 @@ module LucidFile
         def _update_paths
           @_store_path = [:data_state, @class_name, @key, :data_uri]
         end
+
+        def content_type
+          _reload
+          return @_data_uri_object.content_type if @_data_uri_object
+          nil
+        end
+
+        def content_type=(c)
+          changed!
+          _content_type(c)
+        end
+
+        def _content_type(c)
+          _reload
+          @_data_uri_string = _format_data_uri(c, @_data_uri_object.data)
+          @_data_uri_object = URI::Data.new(@_data_uri_string)
+          c
+        end
+
+        def data
+          _reload
+          @_data_uri_object.data
+        end
+
+        def data=(d)
+          changed!
+          _data(d)
+        end
+
+        def _data(d)
+          _reload
+          @_data_uri_string = _format_data_uri(self.content_type, d)
+          @_data_uri_object = URI::Data.new(@_data_uri_string)
+          d
+        end
+
+        def data_uri
+          _reload
+          @_data_uri_string
+        end
+
+        def data_uri=(d)
+          changed!
+          _data_uri(d)
+        end
+
+        def _data_uri(d)
+          _reload
+          if d.class == URI::Data
+            @_data_uri_string = _format_data_uri(d.content_type, d.data)
+            @_data_uri_object = d
+          else
+            @_data_uri_string = d
+            @_data_uri_object = URI::Data.new(d)
+          end
+          @_data_uri_string
+        end
+
+        def data_uri_object
+          _reload
+          @_data_uri_object
+        end
+
+        def _format_data_uri(c, d)
+          "data:#{c};base64,#{Base64.encode64(d).chop}"
+        end
       else # RUBY_ENGINE
         Isomorfeus.add_valid_file_class(base) unless base == LucidFile::Base
 
@@ -163,7 +163,7 @@ module LucidFile
             file = elements.pop
             if elements.size > 0
               dir_path = ::File.expand_path(::File.join(files_path, *elements))
-              FileUtils.mkdir_p(path) unless Dir.exist?(dir_path)
+              FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
               ::File.join(dir_path, file)
             else
               FileUtils.mkdir_p(files_path) unless Dir.exist?(files_path)
@@ -183,15 +183,18 @@ module LucidFile
 
           execute_load do |key:|
             file = check_and_prepare_path(key: key)
-            d = ::File.read(file)
-            instance = self.new(key: key)
-            instance.data = d
-            instance
+            if File.exist?(file)
+              d = ::File.binread(file)
+              instance = self.new(key: key, data: d)
+              instance
+            else
+              nil
+            end
           end
 
           execute_save do
             file = self.class.check_and_prepare_path(key: self.key)
-            ::File.write(file, self.data)
+            ::File.binwrite(file, self.data)
             self
           end
         end
@@ -201,24 +204,77 @@ module LucidFile
           @class_name = self.class.name
           @class_name = @class_name.split('>::').last if @class_name.start_with?('#<')
           @_revision = revision
-          @_data_uri_object = nil
-          @_data_uri_string = nil
           if data_uri
             self._data_uri(data_uri)
           else
-            self._data(data ? data : '')
-            self._content_type(content_type) if content_type
+            @_data = data
+            @_content_type = content_type
           end
           @_changed = false
         end
 
-        def _reload
-        end
-
         def _unchange!
-          @_data_uri = @_changed_data_uri if @_changed
           @_changed = false
         end
+
+        def content_type
+          @_content_type = @_data_uri_object.content_type if !@_content_type && @_data_uri_object
+          @_content_type
+        end
+
+        def content_type=(c)
+          changed!
+          _content_type(c)
+        end
+
+        def _content_type(c)
+          if @_data_uri_string
+            @_data_uri_string = _format_data_uri(c, @_data_uri_object.data)
+            @_data_uri_object = URI::Data.new(@_data_uri_string)
+          end
+          @_content_type = c
+        end
+
+        def data
+          @_data = @_data_uri_object.data if !@_data && @_data_uri_object
+          @_data
+        end
+
+        def data=(d)
+          changed!
+          @_data = d
+        end
+
+        def data_uri
+          _data_uri(_format_data_uri(content_type, @_data)) if !@_data_uri_string && @_data
+          @_data_uri_string
+        end
+
+        def data_uri=(d)
+          changed!
+          _data_uri(d)
+        end
+
+        def _data_uri(d)
+          if d.class == URI::Data
+            d = '' if d.nil?
+            @_data_uri_string = _format_data_uri(d.content_type, d.data)
+            @_data_uri_object = d
+          else
+            @_data_uri_string = d
+            @_data_uri_object = URI::Data.new(d)
+          end
+          @_data_uri_string
+        end
+
+        def data_uri_object
+          _data_uri(@_data) if !@_data_uri_object && @_data
+          @_data_uri_object
+        end
+
+        def _format_data_uri(c, d)
+          "data:#{c};base64,#{Base64.encode64(d).chop}"
+        end
       end # RUBY_ENGINE
     end
   end

data/lib/isomorfeus_data/lucid_object/mixin.rb

@@ -125,6 +125,12 @@ module LucidObject
                                    end
           end
 
+          def each(readonly: true, &block)
+            self.object_expander.each(readonly: readonly) do |obj|
+              block.call(obj) if obj.class == self
+            end
+          end
+
           def search(attr, val, options = {})
             idx_type = self.indexed_attributes[attr]
             raise "Can only search indexed attributes, but attribute :#{attr} is not indexed!" unless idx_type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.3.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-03-12 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.17
+        version: 0.14.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.17
+        version: 0.14.21
 - !ruby/object:Gem::Dependency
   name: isomorfeus-ferret
   requirement: !ruby/object:Gem::Requirement
@@ -100,56 +100,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.6
+        version: 0.6.7
 - !ruby/object:Gem::Dependency
   name: isomorfeus-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.54
+        version: 10.6.61
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.54
+        version: 10.6.61
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +170,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement