jay_api 29.0.0 → 29.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fd8321f31af66d102817b6a53a6de84ec3bb5a784e9344e682b815194eb9c02
-  data.tar.gz: 5b1493b8853afdb9492c878c1a0f4e660966a6028b52c4495d33dbddbbca6755
+  metadata.gz: d730f73b47853cc0604558da470c22fe1818b492dadf61c4c3a0dd6cb567f00d
+  data.tar.gz: a5a7476fd2d5c402d00580e2f5420a201e395076b15659e70b3aa225002c0dfb
 SHA512:
-  metadata.gz: de63cf5cd907e7fb7ada754962df8b7d72c2592524a1efc0f09f1dfbd9527d945a49453fed1ae0727e14790fc2ce70e0e490acd0829d0d7731867aaf5f8e8c50
-  data.tar.gz: 76ec356377a73fc6922d9d4adbd237e2e62e260eff3867e5a4e2494d480c64b4d50de69b5e84ab22a9f731f934658d25f68a5a2a7d8ed87e5e01ba664783334a
+  metadata.gz: 38eecb188ae827dd18ad9aaf03ef9466f0cb09d6732e559d042ccdb299bf27f9333527553658b6722c1e932cd2de238df8df63519a03c41e9e74dbc61a70361c
+  data.tar.gz: 419aa1470d24e060b25250655e515b6c2a72c0f558015406b17ea5a571fb33c978e9f624821441f9756fd8922f45315bfd2960c2bd8cb4ece4dbc825201a248f

data/CHANGELOG.md

@@ -8,6 +8,23 @@ Please mark backwards incompatible changes with an exclamation mark at the start
 
 ## [Unreleased]
 
+## [29.2.0] - 2025-12-09
+
+### Added
+- A `#clone` method to `Elasticsearch::QueryBuilder` that properly clones the
+  `QueryBuilder` and its nested objects.
+- ActiveSupport's `#present?`, `#presence` and `#blank?` methods can now be used
+  in ERB configuration files.
+
+## [29.1.0] - 2025-10-22
+
+### Added
+- The `#bool` method to the `QueryBuilder::QueryClauses::Bool` class. This
+  allows boolean clauses to be nested.
+- `QueryBuilder#sort` can now receive either the direction of the sorting (`asc`
+  or `desc`) or a `Hash` with advanced sorting options. These are relayed
+  directly to Elasticsearch. 
+
 ## [29.0.0] - 2025-08-28
 
 ### Changed

data/lib/jay_api/configuration.rb

@@ -3,6 +3,7 @@
 require 'active_support'
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
 
 require 'erb'
 require 'forwardable'

data/lib/jay_api/elasticsearch/query_builder/query_clauses/bool.rb

@@ -61,6 +61,19 @@ module JayAPI
             add_boolean_clause(:must_not, &block)
           end
 
+          # Adds a nested +Boolean+ clause to the receiver. For this to work the
+          # receiver must have an active sub-clause (for example +must+).
+          # @yield [JayAPI::Elasticsearch::QueryBuilder::QueryClauses::Bool]
+          #   Yields the nested boolean clause to the given block.
+          # @return [JayAPI::Elasticsearch::QueryBuilder::QueryClauses::Bool]
+          #   Returns the nested boolean clause.
+          def bool(&block)
+            nested_bool = self.class.new
+            self << nested_bool
+            block&.call(nested_bool)
+            nested_bool
+          end
+
           # Adds a clause to the current sub-clause of the boolean clause.
           # @param [JayAPI::Elasticsearch::QueryBuilder::QueryClauses::QueryClause]
           #   query_clause The query clause to add.

data/lib/jay_api/elasticsearch/query_builder.rb

@@ -64,13 +64,22 @@ module JayAPI
       #   query_builder.sort(age: 'desc')
       #
       # Both will produce the same +sort+ clause.
+      #
+      # It is also possible to pass a Hash with advanced sorting options, for
+      # example:
+      #
+      #   query_builder.sort(price: { order: :desc, missing: :_last })
+      #
       # @param [Hash] sort A Hash whose keys are the name of the fields
-      #   and the keys are the direction of the sorting, either +asc+ or
-      #   +desc+.
+      #   and whose values are either the direction of the sorting (+:asc+ or
+      #   +:desc+) or a Hash with advanced sort options.
+      # @see https://www.elastic.co/docs/reference/elasticsearch/rest-apis/sort-search-results
       # @return [QueryBuilder] itself so that other methods can be chained.
       def sort(sort)
         check_argument(sort, 'sort', Hash)
-        @sort.merge!(sort)
+        @sort.merge!(
+          sort.transform_values { |value| value.is_a?(Hash) ? value : { order: value } }
+        )
         self
       end
 
@@ -118,6 +127,16 @@ module JayAPI
         )
       end
 
+      # @return [JayAPI::Elasticsearch::QueryBuilder] A copy of the receiver.
+      def clone
+        copy = super
+        copy.source = @source.clone # source can be an Array or a Hash
+        copy.sort = @sort.clone     # sort is a Hash
+        copy.query = query.clone
+        copy.aggregations = aggregations.clone
+        copy
+      end
+
       protected
 
       attr_writer :from, :size, :source, :collapse, :sort, :query, :aggregations
@@ -184,11 +203,7 @@ module JayAPI
         query_hash[:_source] = @source unless @source.nil?
         query_hash[:query] = query.to_h
 
-        if @sort.any?
-          query_hash[:sort] = @sort.map do |field, direction|
-            { field => { order: direction } }
-          end
-        end
+        query_hash[:sort] = @sort.map { |field, ordering| { field => ordering } } if @sort.any?
 
         if @collapse
           query_hash[:collapse] = {

data/lib/jay_api/version.rb

@@ -2,5 +2,5 @@
 
 module JayAPI
   # JayAPI gem's semantic version
-  VERSION = '29.0.0'
+  VERSION = '29.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jay_api
 version: !ruby/object:Gem::Version
-  version: 29.0.0
+  version: 29.2.0
 platform: ruby
 authors:
 - Accenture-Industry X
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport