isomorfeus-data 23.9.0.rc1 → 23.9.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bd98dab77bb6bd9275f22c1e5f3445bea4f9790c7cd8af78689d04079e61231
-  data.tar.gz: b4acd2f6522de4a85f1c87f7958a6b67d7221b1435bc7ace10981338381b6173
+  metadata.gz: 739662fafe5bae053feae6e3ead2d2bf9d8a63b73779fd3301327ed8de761d20
+  data.tar.gz: fe7c744206f046ffb0177efb1b1acb4b003841d2f1e695b86e57dd554d49dbc2
 SHA512:
-  metadata.gz: 7097cd901c6caeed1809f82975c659e26eb1023b83e194b8a2a79e02ff4b5b198a0e7c8e08f8cb18048e8b79846548b4006a20f55b3d7a41d8d00fb7e3ad9f5b
-  data.tar.gz: aea81c3a73635815f02dd1d6e9c3a4c819e5a9fc2c079cf10096c2ed127b9e1626655f7be82f6a53614dab52c517e1dbd085a6a854f5f4240f13e4b257c8ef9f
+  metadata.gz: 991f39d7186356302fc7bbbf67ee07f0370b418b739cb0038f6d4ad30be926daac8e281118ed7595f3e118c643f23ffea8d11c20a4dc6817befb2a446d422673
+  data.tar.gz: bb182834ac1435b13b2ebcd1530f365d81171097a930bcfa2d565f2f8e028278770adeb950e0dd599e06e6b25439081cfdbae283a79e7d3c789738d2be163173

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|
@@ -238,6 +238,35 @@ module Isomorfeus
                 instance_uuid = nil
               end
               action = { type: 'DATA_ADD', data: { item_class_name => { item_key => { data_uri: data_uri, revision: revision, 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]

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,6 +90,20 @@ 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('/')

data/lib/isomorfeus/data/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Data
-    VERSION = '23.9.0.rc1'
+    VERSION = '23.9.0.rc2'
   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

@@ -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
@@ -128,6 +137,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.rc2
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-09-10 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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc2
 - !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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc2
 - !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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc2
 - !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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc2
 - !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.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 23.9.0.rc1
+        version: 23.9.0.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement