isomorfeus-data 23.9.0.rc1 → 23.9.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd98dab77bb6bd9275f22c1e5f3445bea4f9790c7cd8af78689d04079e61231
-  data.tar.gz: b4acd2f6522de4a85f1c87f7958a6b67d7221b1435bc7ace10981338381b6173
+  metadata.gz: dc95d885418b6e12dc9362e26f7e82675688da923045593a3747a1aab0a1e167
+  data.tar.gz: 5f6b105e0ed4b58fbfbd771d8406b453dd478a9427c046a5a63bcac4ea5cb27e
 SHA512:
-  metadata.gz: 7097cd901c6caeed1809f82975c659e26eb1023b83e194b8a2a79e02ff4b5b198a0e7c8e08f8cb18048e8b79846548b4006a20f55b3d7a41d8d00fb7e3ad9f5b
-  data.tar.gz: aea81c3a73635815f02dd1d6e9c3a4c819e5a9fc2c079cf10096c2ed127b9e1626655f7be82f6a53614dab52c517e1dbd085a6a854f5f4240f13e4b257c8ef9f
+  metadata.gz: c77b8a0f96568725c56f20e300597d201d0d2f5b126425cad25e6405d2c9f9ffc05e2d8e451cc17796ec4c522da17223c76902c5c958a853dc90163b61e85c63
+  data.tar.gz: aa546e9a214a5e5470e6421f26f74945dbdc06d674666486763ecedc4ec4bc8d54ef8bb9f2af9200d86a7601fb6c70c7783cc02039a01717ded61788dc302fc5

data/lib/isomorfeus/data/enhancer.rb

@@ -15,7 +15,7 @@ module Isomorfeus
           next_enh.call(action)
         end
 
-        FILE_ACTION_TYPES = %w[FILE_LOAD FILE_SAVE FILE_CREATE FILE_DESTROY]
+        FILE_ACTION_TYPES = %w[FILE_LOAD FILE_SAVE FILE_CREATE FILE_SEARCH FILE_DESTROY]
         FILE_MERGE_TYPES = %w[FILE_SAVE FILE_CREATE]
 
         CLIENT_FILE_ENHANCER = proc do |action, next_enh|
@@ -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,36 @@ 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)
+              query = action[:query].to_sym
+              params = action[:params]
+              raise "Invalid params #{params}!" unless params.nil? || params.is_a?(Hash)
+              params.transform_keys!(&:to_sym) if params
+              authorization_error!(action) unless Isomorfeus.current_user.authorized?(item_class, :search, { query: query, params: params })
+              result = []
+              query_string = item_class.queries.dig(query, :query_string)
+              raise "Invalid query '#{query}'!" unless query_string
+              options = item_class.queries[query][:options] || {}
+              fa = item_class.file_accelerator
+              full_query =  if params.is_a?(Hash)
+                              if options[:escape_params]
+                                escaped_params = params.to_h do |k,v|
+                                  [k, oa.escape(v)]
+                                end
+                                query_string % escaped_params
+                              else
+                                query_string % params
+                              end
+                            else
+                              query_string
+                            end
+              fa.search_each(full_query, options) do |key|
+                result << SID.new(item_class_name, key).to_s
+              end
+              action = { type: 'DATA_MERGE', data: { queries: { item_class_name => { query => { Oj.dump(params, mode: :strict) => { result_time: Time.now.httpdate, result: result }}}}}}
             elsif action_type == 'FILE_DESTROY'
               item_class_name = action[:class_name]
               item_key = action[:key]
@@ -273,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

@@ -36,6 +36,20 @@ module Isomorfeus
         File.exist?(path)
       end
 
+      def search_each(_query, _options, &block)
+        if block_given?
+          each(&block)
+        else
+          files = []
+          each { |file| files << file }
+          files
+        end
+      end
+        
+      def each(&block)
+        internal_each(@store_path, &block)
+      end
+
       def create(sid:, data:, meta:)
         path, meta_path = check_and_prepare_paths(key: sid.key)
         File.binwrite(path, data)
@@ -76,18 +90,23 @@ module Isomorfeus
 
       private
 
+      def internal_each(path, &block)
+        Dir.each_child(path) do |entry_name|
+          unless entry_name.end_with?('__meta__')
+            new_path = File.join(path, entry_name)
+            key = new_path[(@store_path.size+1)..-1]
+            if File.file?(new_path)
+              block.call(key)
+            elsif Dir.exist?(File.join(new_path))
+              internal_each(new_path, &block)
+            end
+          end
+        end
+      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.rc1'
+    VERSION = '23.9.0.rc3'
   end
 end

data/lib/lucid_data_generic.rb

@@ -18,6 +18,14 @@ class LucidDataGeneric
     def current_user
       Isomorfeus.current_user
     end
+
+    def query(name, query_string, options = nil)
+      queries[name] = { query_string: query_string, options: options }
+    end
+
+    def queries
+      @queries ||= {}
+    end
   end
 
   if RUBY_ENGINE == 'opal'

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:)
@@ -12,6 +12,15 @@ class LucidFile < LucidDataGeneric
       "data:#{c};base64,#{Base64.strict_encode64(d)}"
     end
 
+    def search(query = :all, params = nil)
+      proxy_instance = LucidObject::SearchResultProxy.new(self.name, query, params)
+      unless proxy_instance.loaded?
+        Isomorfeus.something_loading!
+        Isomorfeus.store.deferred_dispatch(type: 'FILE_SEARCH', class_name: self.name, query: query, params: params)
+      end
+      proxy_instance
+    end
+
     def destroy(key:)
       Isomorfeus.store.deferred_dispatch(type: 'FILE_DESTROY', class_name: self.name, key: key)
       true
@@ -25,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
@@ -47,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
 
@@ -57,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!
@@ -75,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
@@ -84,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)
@@ -118,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)
@@ -128,6 +147,21 @@ class LucidFile < LucidDataGeneric
         @file_accelerator ||= Isomorfeus::Data::FileAccelerator.new(self)
       end
 
+      def each(&block)
+        if block_given?
+          file_accelerator.each do |key|
+            block.call self.load(key: key)
+          end
+        else
+          Enumerator.new do |yielder|
+            file_accelerator.each do |key|
+              yielder << self.load(key: key)
+            end
+          end
+        end
+      end
+      alias to_enum each
+
       def exist?(key:)
         raise "Not authorized!" unless current_user.authorized?(self, :load, key: key)
         file_accelerator.exist?(sid: SID.new(self.name, key))

data/lib/lucid_object.rb

@@ -95,6 +95,11 @@ class LucidObject < LucidDataGeneric
       proxy_instance
     end
 
+    def destroy(key:)
+      Isomorfeus.store.deferred_dispatch(type: 'DATA_DESTROY', class_name: self.name, key: key)
+      true
+    end
+
     def load!(key:, instance: nil)
       instance = self.new(key: key, _loading: true) unless instance
       Isomorfeus.something_loading!
@@ -102,11 +107,6 @@ class LucidObject < LucidDataGeneric
       instance
     end
 
-    def destroy(key:)
-      Isomorfeus.store.deferred_dispatch(type: 'DATA_DESTROY', class_name: self.name, key: key)
-      true
-    end
-
     def escape_string(s)
       s.gsub(/([\\\&\:\(\)\[\]\{\}\!\"\~\^\|\<\>\=\*\?\+\-\s])/, '\\\\\1')
     end
@@ -117,14 +117,6 @@ class LucidObject < LucidDataGeneric
       data_class.load(key: sid.key)
     end
 
-    def query(name, query_string, options = nil)
-      queries[name] = { query_string: query_string, options: options }
-    end
-
-    def queries
-      @queries ||= {}
-    end
-
     def field_types
       # determines how the item is stored in the index
       @field_types ||= {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-data
 version: !ruby/object:Gem::Version
-  version: 23.9.0.rc1
+  version: 23.9.0.rc3
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-09-11 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.rc1
+        version: 23.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-policy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-preact
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: isomorfeus-transport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement