isomorfeus-data 23.9.0.rc2 → 23.9.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 739662fafe5bae053feae6e3ead2d2bf9d8a63b73779fd3301327ed8de761d20
-  data.tar.gz: fe7c744206f046ffb0177efb1b1acb4b003841d2f1e695b86e57dd554d49dbc2
+  metadata.gz: 52bd517854fce63b24584af58fa2eb4480f345c81d543000a83c19e19db9f9c7
+  data.tar.gz: 20ce11e50a95d775b5f91c00aaf94a719b8057263d12c70c2b4e2221326e577b
 SHA512:
-  metadata.gz: 991f39d7186356302fc7bbbf67ee07f0370b418b739cb0038f6d4ad30be926daac8e281118ed7595f3e118c643f23ffea8d11c20a4dc6817befb2a446d422673
-  data.tar.gz: bb182834ac1435b13b2ebcd1530f365d81171097a930bcfa2d565f2f8e028278770adeb950e0dd599e06e6b25439081cfdbae283a79e7d3c789738d2be163173
+  metadata.gz: 16d9862281a0bbe9f8fb3e5b2aa3903390092401ae49dc809fdb3b964a7bf7b3ba80781969742e2e2de94192af59acc4c8ec7e8fdcddb405a5effc33b43cf8a8
+  data.tar.gz: 4c9a327753797038d1e2dc9c1ffc991cc3730c4ce4cf8bed95fce64aa46a4c291be9cf1e492ee13f09bbd425b000a79893239754c8b5850462cbdb3ac5c5cf1c

data/lib/isomorfeus/data/enhancer.rb

@@ -180,8 +180,7 @@ module Isomorfeus
               if data
                 content_type = Marcel::MimeType.for(data)
                 data_uri = item_class.format_data_uri(content_type, data)
-                revision = meta[:revision]
-                item_hash = { data_uri: data_uri, revision: revision }
+                item_hash = { data_uri: data_uri }.merge(meta)
               end
               action = { type: 'DATA_MERGE', data: { item_class_name => { item_key => item_hash }}}
             elsif action_type == 'FILE_SAVE'
@@ -191,6 +190,7 @@ module Isomorfeus
               data_uri = action[:data_uri]
               authorization_error!(action) unless Isomorfeus.current_user.authorized?(item_class, :save, { key: item_key, data_uri: data_uri })
               revision = action[:revision]
+              name = action[:name]
               sid = SID.new(item_class_name, item_key)
               meta = item_class.file_accelerator.meta(sid: sid)
               stored_revision = meta[:revision]
@@ -201,7 +201,7 @@ module Isomorfeus
                   res = item_class.before_save_block.call(key: item_key, data_uri: data_uri)
                   data_uri = res[:data_uri] if res.is_a?(Hash) && res.key?(:data_uri)
                 end
-                if item_class.file_accelerator.save(sid: sid, data: URI::Data.new(data_uri).data, meta: { revision: revision })
+                if item_class.file_accelerator.save(sid: sid, data: URI::Data.new(data_uri).data, meta: { revision: revision, name: name })
                   item_class.after_save_block.call(key: item_key, data_uri: data_uri) if item_class.after_save_block
                 else
                   instance_uuid = nil
@@ -210,13 +210,14 @@ module Isomorfeus
                 revision = 0
                 instance_uuid = nil
               end
-              action = { type: 'DATA_MERGE', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, instance_uuid: instance_uuid }}}}
+              action = { type: 'DATA_MERGE', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, name: name, instance_uuid: instance_uuid }}}}
             elsif action_type == 'FILE_CREATE'
               item_class_name = action[:class_name]
               item_key = action[:key]
               item_class = get_verified_class(item_class_name)
               data_uri = action[:data_uri]
               authorization_error!(action) unless Isomorfeus.current_user.authorized?(item_class, :create, { key: item_key, data_uri: data_uri })
+              name = action[:name]
               sid = SID.new(item_class_name, item_key)
               meta = item_class.file_accelerator.meta(sid: sid)
               stored_revision = meta ? meta[:revision] : nil
@@ -227,7 +228,7 @@ module Isomorfeus
                   res = item_class.before_create_block.call(key: item_key, data_uri: data_uri)
                   data_uri = res[:data_uri] if res.is_a?(Hash) && res.key?(:data_uri)
                 end
-                if item_class.file_accelerator.create(sid: sid, data: URI::Data.new(data_uri).data, meta: { revision: revision })
+                if item_class.file_accelerator.create(sid: sid, data: URI::Data.new(data_uri).data, meta: { revision: revision, name: name })
                   item_class.after_create_block.call(key: item_key, data_uri: data_uri) if item_class.after_create_block
                 else
                   stored_revision = 0
@@ -237,7 +238,7 @@ module Isomorfeus
                 revision = stored_revision
                 instance_uuid = nil
               end
-              action = { type: 'DATA_ADD', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, instance_uuid: instance_uuid }}}}
+              action = { type: 'DATA_ADD', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, name: name, instance_uuid: instance_uuid }}}}
             elsif action_type == 'FILE_SEARCH'
               item_class_name = action[:class_name]
               item_class = get_verified_class(item_class_name)
@@ -302,7 +303,7 @@ module Isomorfeus
           end
 
           def get_verified_class(item_class_name)
-            raise "Invalid data class!" unless Isomorfeus.valid_data_class_name?(item_class_name)
+            raise "Invalid data class #{item_class_name}!" unless Isomorfeus.valid_data_class_name?(item_class_name)
             item_class = Isomorfeus.cached_data_class(item_class_name)
           end
 

data/lib/isomorfeus/data/file_accelerator.rb

@@ -105,17 +105,8 @@ module Isomorfeus
       end
 
       def check_and_prepare_paths(key:)
-        Isomorfeus.raise_error(message: 'Invalid key (contains ".." or "\\")') if key.include?('..') || key.include?('\\')
-        elements = key.split('/')
-        Isomorfeus.raise_error(message: 'Invalid key (contains more than 2 slashes "/")') if elements.size > 3
-        file = elements.pop
-        path = if elements.size > 0
-                 dir_path = ::File.expand_path(::File.join(@store_path, *elements))
-                 FileUtils.mkdir_p(dir_path) unless Dir.exist?(dir_path)
-                 File.join(dir_path, file)
-               else
-                 File.join(@store_path, file)
-               end
+        Isomorfeus.raise_error(message: 'Invalid key, must contain word characters or "-" only!') unless key.match?(SID::SID_S_KEY_RE)
+        path = File.join(@store_path, key)
         [path, "#{path}__meta__"]
       end
     end

data/lib/isomorfeus/data/sid.rb

@@ -1,4 +1,5 @@
 class SID
+  SID_S_KEY_RE = /\A[\w\/\-]+\z/
   SID_S_RE = /\ASID__([a-zA-Z0-9:]+)__([\w\/\-]+)__\z/ # must use this way for compatiblity
 
   class << self

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '23.9.0.rc2'
+    VERSION = '23.9.0.rc4'
   end
 end

data/lib/lucid_file.rb

@@ -1,7 +1,7 @@
 class LucidFile < LucidDataGeneric
   include LucidI18nMixin
 
-  VALID_METHODS = %i[key data data_uri content_type]
+  VALID_METHODS = %i[key data data_uri name content_type]
 
   class << self
     def api_path(key:)
@@ -34,11 +34,12 @@ class LucidFile < LucidDataGeneric
     end
   end
 
-  def initialize(key: nil, content_type: nil, data: nil, data_uri: nil, _loading: false)
+  def initialize(key: nil, content_type: nil, data: nil, data_uri: nil, name: nil, _loading: false)
     super(key: key)
     _update_paths
     loaded = loaded?
     @changed_uri_string = nil
+    @changed_name = name if name
     if data_uri
       @changed_uri_string = data_uri
     elsif data || content_type
@@ -56,7 +57,7 @@ class LucidFile < LucidDataGeneric
     d = data_uri
     unchange!
     Isomorfeus.something_loading!
-    Isomorfeus.store.deferred_dispatch(type: "FILE_CREATE", class_name: @class_name, key: @key, data_uri: d, instance_uuid: instance_uuid, revision: 0)
+    Isomorfeus.store.deferred_dispatch(type: "FILE_CREATE", class_name: @class_name, key: @key, data_uri: d, name: name, instance_uuid: instance_uuid, revision: 0)
     self
   end
 
@@ -66,16 +67,16 @@ class LucidFile < LucidDataGeneric
     d = data_uri
     unchange!
     Isomorfeus.something_loading!
-    Isomorfeus.store.deferred_dispatch(type: "FILE_SAVE", class_name: @class_name, key: @key, data_uri: d, instance_uuid: instance_uuid, revision: @last_revision)
+    Isomorfeus.store.deferred_dispatch(type: "FILE_SAVE", class_name: @class_name, key: @key, data_uri: d, name: name, instance_uuid: instance_uuid, revision: @last_revision)
     self
   end
 
-  def [](name)
-    self.send(name) if VALID_METHODS.include?(name)
+  def [](n)
+    self.send(n) if VALID_METHODS.include?(n)
   end
 
-  def []=(name, value)
-    self.send("#{name}=".to_sym, value) if VALID_METHODS.include?(name)
+  def []=(n, value)
+    self.send("#{n}=".to_sym, value) if VALID_METHODS.include?(n)
   end
 
   def unchange!
@@ -84,7 +85,7 @@ class LucidFile < LucidDataGeneric
   end
 
   def _update_paths
-    @store_path = [:data_state, @class_name, @key, :data_uri]
+    @store_path = [:data_state, @class_name, @key]
   end
 
   def content_type
@@ -93,13 +94,13 @@ class LucidFile < LucidDataGeneric
 
   def content_type=(c)
     changed!
-    uri_string = @changed_uri_string ? @changed_uri_string : Isomorfeus.store.dig(*@store_path)
+    uri_string = @changed_uri_string ? @changed_uri_string : Isomorfeus.store.dig(*@store_path)&.fetch(:data_uri, nil)
     @changed_uri_string = self.class.format_data_uri(c, URI::Data.new(uri_string).data)
     c
   end
 
   def data_uri
-    @changed_uri_string ? @changed_uri_string : Isomorfeus.store.dig(*@store_path)
+    @changed_uri_string ? @changed_uri_string : Isomorfeus.store.dig(*@store_path)&.fetch(:data_uri, nil)
   end
 
   def data_uri=(d)
@@ -127,6 +128,15 @@ class LucidFile < LucidDataGeneric
     @changed_uri_string = self.class.format_data_uri(ct, d)
   end
 
+  def name
+    @changed_name ? @changed_name : Isomorfeus.store.dig(*@store_path)&.fetch(:name, nil)
+  end
+
+  def name=(n)
+    changed!
+    @changed_name = name
+  end
+
   if RUBY_ENGINE != 'opal'
     class << self
       def inherited(base)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc2
+  version: 23.9.0.rc4
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,70 +106,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc2
+        version: 23.9.0.rc4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement