esse 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ce86d71e0cf9b67506dd0caf1651b91ae836c9e7981e46a238446c8afde078
-  data.tar.gz: 9ec1069cbb8106743d5832f94fbce5d2c937037a62a746350e736385f3b78cdc
+  metadata.gz: 540baccff2e25c74759646482ad15e2ae6355266a9d800cce66c0af24638a326
+  data.tar.gz: f0574c8a07a2b07a08f7a40dbe4a6cc5e54f21ea254b8d02f6601b2a9f063b83
 SHA512:
-  metadata.gz: f2a5012e3d3dab0b3894f8e8fb1665be2a57c8538a3fc02bce2ac089510bd63b982f8f919554a9f16d6e8dafe5d93d9f5614d99ca4f170d82cc41e413fec0209
-  data.tar.gz: 034b15fd5cfc4f6ebdd97ba9d73ed284f50c209225b2c6a43b27216a57578ca1b91d9c92d4e020c4a1c7910038cf5978054bfa4b491bafb431bcfc1dcbc0a706
+  metadata.gz: 803649ff5b75cd4b8c817e3e0e413d5770c03ab13d8c5800bca0a100614f90614860da1129bd4c6e0bdfb937767fdad0e6b2f62794108633f1ff43bdaba1f39e
+  data.tar.gz: 6da8d0cda0a6639c4f0bd7b668004db54ac3576ebc805eeb19cda14b9d76a63a415bb4edb663d26070f58d141200ddeefca11c3bea24336639cf63ecf6a7992c

data/exec/esse

@@ -6,6 +6,8 @@ $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'esse'
 require 'esse/cli'
 
+Esse::CLI::ExtensionsLoader.load!
+
 Esse::CLI.with_friendly_errors do
   Esse::CLI.start(ARGV)
 end

data/lib/esse/cli/event_listener.rb

@@ -63,7 +63,7 @@ module Esse
       end
 
       def elasticsearch_update_aliases(event)
-        actions = event[:request][:body][:actions]
+        actions = event[:request].dig(:body, :actions) || []
         removed = actions.select { |a| a.key?(:remove) }
         added = actions.select { |a| a.key?(:add) }
         print_message '[%<runtime>s] Successfuly updated aliases:',

data/lib/esse/cli/extensions_loader.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Esse
+  module CLI
+    class ExtensionsLoader
+      GEMS = %w[
+        esse-rails
+        esse-active_record
+        esse-sequel
+        esse-kaminari
+      ].freeze
+
+      def self.load!
+        GEMS.each do |gem_name|
+          require gem_name
+        rescue LoadError
+          # do nothing
+        end
+      end
+    end
+  end
+end

data/lib/esse/cli.rb

@@ -6,6 +6,7 @@ require_relative 'primitives/output'
 require_relative 'cli/index'
 require_relative 'cli/generate'
 require_relative 'cli/event_listener'
+require_relative 'cli/extensions_loader'
 
 module Esse
   module CLI

data/lib/esse/cluster.rb

@@ -4,6 +4,12 @@ require_relative 'cluster_engine'
 require_relative 'transport'
 
 module Esse
+  class << self
+    extend Forwardable
+
+    def_delegators :config, :cluster
+  end
+
   class Cluster
     ATTRIBUTES = %i[index_prefix settings mappings client wait_for_status readonly].freeze
     WAIT_FOR_STATUSES = %w[green yellow red].freeze
@@ -133,7 +139,7 @@ module Esse
     end
 
     def engine
-      @engine ||=ClusterEngine.new(**info)
+      @engine ||= ClusterEngine.new(**info)
     end
     alias_method :warm_up!, :engine
 

data/lib/esse/index/search.rb

@@ -6,6 +6,13 @@ module Esse
       # @param query_or_payload [String,Hash] The search request definition or query in the Lucene query string syntax
       # @param kwargs [Hash] The options to pass to the search.
       def search(*args, &block)
+        kwargs = extract_search_options!(args)
+        cluster.search(self, **kwargs, &block)
+      end
+
+      private
+
+      def extract_search_options!(args)
         query_or_payload = args.shift
         kwargs = args.last.is_a?(Hash) ? args.pop : {}
 
@@ -18,7 +25,7 @@ module Esse
         elsif query_or_payload.is_a?(String)
           kwargs[:q] = query_or_payload
         end
-        cluster.search(self, **kwargs, &block)
+        kwargs
       end
     end
 

data/lib/esse/primitives/hash_utils.rb

@@ -6,6 +6,17 @@ module Esse
   module HashUtils
     module_function
 
+    def deep_dup(hash)
+      hash.each_with_object({}) do |(key, value), result|
+        result[key] = \
+          if value.is_a?(Hash)
+            deep_dup(value)
+          else
+            value
+          end
+      end
+    end
+
     def deep_transform_keys(hash, &block)
       hash.each_with_object({}) do |(key, value), result|
         result[yield(key)] = \

data/lib/esse/search/query/dsl.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Esse
+  module Search
+    class Query
+      module DSL
+        def limit(value)
+          return self if value.to_i <= 0
+
+          mutate do |defn|
+            defn.delete(:size)
+            if (body = defn[:body]).is_a?(Hash)
+              body[body.key?('size') ? 'size' : :size] = value.to_i
+            else
+              defn.update(size: value.to_i)
+            end
+          end
+        end
+
+        def offset(value)
+          return self if value.to_i < 0
+
+          mutate do |defn|
+            defn.delete(:from)
+            if (body = defn[:body]).is_a?(Hash)
+              body[body.key?('from') ? 'from' : :from] = value.to_i
+            else
+              defn.update(from: value.to_i)
+            end
+          end
+        end
+
+        def limit_value
+          raw_limit_value || 10
+        end
+
+        def offset_value
+          raw_offset_value || 0
+        end
+
+        private
+
+        def mutate(&block)
+          relation = clone
+          relation.send(:reset!)
+          relation.instance_variable_set(:@definition, HashUtils.deep_dup(definition))
+          relation.instance_exec(relation.definition, &block) if block
+          relation
+        end
+
+        def raw_limit_value
+          definition.dig(:body, :size) || definition.dig(:body, 'size') || definition.dig(:size) || definition.dig('size')
+        end
+
+        def raw_offset_value
+          definition.dig(:body, :from) || definition.dig(:body, 'from') || definition.dig(:from) || definition.dig('from')
+        end
+      end
+    end
+  end
+end

data/lib/esse/search/query.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'query/dsl'
 module Esse
   module Search
     class Query
+      include DSL
       attr_reader :transport, :definition
 
       # @param transport [Esse::Transport] The client proxy to use for the query
@@ -11,7 +13,11 @@ module Esse
       def initialize(transport, *indices, suffix: nil, **definition, &_block)
         @transport = transport
         @definition = definition
-        @definition[:index] = indices.map do |index|
+        @definition[:index] = self.class.normalize_indices(*indices, suffix: suffix) if indices.size > 0
+      end
+
+      def self.normalize_indices(*indices, suffix: nil)
+        indices.map do |index|
           if index.is_a?(Class) && index < Esse::Index
             index.index_name(suffix: suffix)
           elsif index.is_a?(String) || index.is_a?(Symbol)
@@ -92,14 +98,6 @@ module Esse
       def reset!
         @response = nil
       end
-
-      def raw_limit_value
-        definition.dig(:body, :size) || definition.dig(:body, 'size') || definition.dig(:size) || definition.dig('size')
-      end
-
-      def raw_offset_value
-        definition.dig(:body, :from) || definition.dig(:body, 'from') || definition.dig(:from) || definition.dig('from')
-      end
     end
   end
 end

data/lib/esse/transport/aliases.rb

@@ -25,7 +25,7 @@ module Esse
         throw_error_when_readonly!
 
         Esse::Events.instrument('elasticsearch.update_aliases') do |payload|
-          payload[:request] = options
+          payload[:request] = options.merge(body: body)
           payload[:response] = coerce_exception { client.indices.update_aliases(**options, body: body) }
         end
       end

data/lib/esse/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Esse
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esse
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Marcos G. Zimmermann
 autorequire:
 bindir: exec
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -215,6 +215,7 @@ files:
 - lib/esse/cli.rb
 - lib/esse/cli/base.rb
 - lib/esse/cli/event_listener.rb
+- lib/esse/cli/extensions_loader.rb
 - lib/esse/cli/generate.rb
 - lib/esse/cli/index.rb
 - lib/esse/cli/index/base_operation.rb
@@ -285,6 +286,7 @@ files:
 - lib/esse/repository/documents.rb
 - lib/esse/repository/object_document_mapper.rb
 - lib/esse/search/query.rb
+- lib/esse/search/query/dsl.rb
 - lib/esse/search/response.rb
 - lib/esse/template_loader.rb
 - lib/esse/transport.rb