isomorfeus-data 2.2.10 → 2.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac14fede053fd257ce57f22eccb8a83c3f1f563e95969d72e5c8fdc269b81ebc
-  data.tar.gz: 232a02ed01f77d627f9bf91726b53973d3becc8e2e6d9705c196e8e77d825c6f
+  metadata.gz: 7edcc25158eb863dcb53427511afa3097f33ff8ce7381bab1bcbe205befb4e89
+  data.tar.gz: f5484ef3b0d8a7587d1c7fd3ac0925865286047f14f194cfd3de2cc5b68ed2bc
 SHA512:
-  metadata.gz: a8042dfbc75120886f39f550ccae76050017cdd7d62ef1ede12dc63739ee706839d86856f122cef7bceede7ee08c2816646f5902f713f0d57f05e3159f3a03e6
-  data.tar.gz: 7fe8c3031d9c71a5709559a4a83445015da3ea0f48b228e35b910cb9ea0506636f3babcfff772ecdf133480cd2685f9be5f1992c6c3315a8877ceaeb3010598d
+  metadata.gz: 0f1026b18985f4bd97e7131d49340e5ec79f3053e8dc5e481734736f7c4502dc38646453a269b1d00b32c3715e9b74c3c09005186403aef72bff0137c337a243
+  data.tar.gz: 627b7d8734514dc7e69fcdb7c34acadb8c2118b01a4ca30e1dadf1f21b5ef8c180689d3e596244fea122ee4656a8775a8011fd257cf6cf7f0685c2bccba5ac16

data/lib/isomorfeus/data/version.rb

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.2.11
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-26 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,42 +114,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.54
+        version: 10.6.56
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.6.54
+        version: 10.6.56
 - !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.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.11
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement