elasticsearch_record 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef01a33de054cbae1fe582ba5f7d8a5910c73dd81e3395f8b6c07ec9d3a5fbe2
-  data.tar.gz: d574bafc90b201869727539fd0a0c148118d6f666f9f29400690613bd7cbbaa8
+  metadata.gz: bbb80c1852041338e02e17314a2a70e852db077e2724383fe05d1990dc5c601e
+  data.tar.gz: 5d1f2b445e83e602b16ac571b8b3824784490f9c365a304b4be06aaa02620cb2
 SHA512:
-  metadata.gz: 89ac7c99f35a36650c2ac8f00600f0c702ed8ec4c4aaa5d28ad86c329a66be3625d063ada9dd8c6630b8b30eea1a5283a0231a60c0d8021242adeae4efe86316
-  data.tar.gz: b44f713a1650100a925c94349fcb9fdce4b72bf5acb901c5ff04b871e0586115bf5e08e42f38cd9ecb0e550663977da48e430a739b67230ced4eb29aa4f5bb8b
+  metadata.gz: 80ac0419ba02c1d7cc563446067caff43f7ee5b1a92c1155b5d3c2871652b06d5a8998aae4da6ee5c44289c7579a87b1346c15ae15630c11ab8cded34412e524
+  data.tar.gz: 1559d1ab3873e002c867c88726358a4d1c3f875e087f8b37ec58d9c8ee196fc757490c246409c1bc32871e9210b617e6c48473c7fe6fe68e97ab47e66da010ec

data/README.md

@@ -14,8 +14,10 @@ _ElasticsearchRecord is a ActiveRecord adapter and provides similar functionalit
 
 **PLEASE NOTE:**
 
-- This is the `rails-7-1-stable`-branch, which only supports rails **7.1** _(see section 'Rails_Versions' for supported versions)_
+- This is the `main`-branch, which currently supports rails **7.1** _(see section 'Rails_Versions' for supported versions)_
 - supports ActiveRecord ~> 7.1 + Elasticsearch >= 7.17
+- added features up to Elasticsearch `8.16.1`
+- tested with Elasticsearch `8.15.2`
 
 -----
 
@@ -48,6 +50,7 @@ gem 'elasticsearch_record', '~> 1.8'
 
 # alternative
 gem 'elasticsearch_record', git: 'https://github.com/ruby-smart/elasticsearch_record', branch: 'rails-7-1-stable'
+gem 'elasticsearch_record', git: 'https://github.com/ruby-smart/elasticsearch_record', branch: 'rails-70-stable'
 
 ```
 

data/docs/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [1.8.2] - 2024-11-26
+* [fix] `ElasticsearchRecord::Relation::QueryMethods#build_query_clause` to raise an exception on `nil` assignments
+* [fix] `Arel::Visitors::ElasticsearchBase#compile` to always reset temporary assignments _(causes missing assignments after a query-build-exception)_
+* [fix] `Arel::Nodes::SelectAgg` to not merge nil-values
+* [add] elasticsearch mapping type _(semantic_text)_
+
 ## [1.8.1] - 2024-05-07
 * [add] new elasticsearch mapping types _(percolator, geo, vector, texts, ...)_
 * [ref] `ElasticsearchRecord::Relation#limit` to detect `Float::INFINITY` to also set the **max_result_window**

data/lib/active_record/connection_adapters/elasticsearch/schema_definitions/column_methods.rb

@@ -18,7 +18,7 @@ module ActiveRecord
                                 :integer_range, :float_range, :long_range, :double_range, :date_range, :ip_range,
                                 :ip, :version, :murmur3,
                                 :aggregate_metric_double, :histogram,
-                                :text, :match_only_text, :completion, :search_as_you_type, :token_count,
+                                :text, :match_only_text, :completion, :search_as_you_type, :token_count, :semantic_text,
                                 :dense_vector, :sparse_vector, :rank_feature, :rank_features,
                                 :geo_point, :geo_shape, :point, :shape,
                                 :percolator

data/lib/arel/nodes/select_agg.rb

@@ -9,7 +9,7 @@ module Arel # :nodoc: all
       end
 
       def right
-        return expr[1].reduce({}) { |m, data| m.merge(data) } if expr[1].is_a?(Array)
+        return expr[1].reduce({}) { |m, data| data ? m.merge(data) : m } if expr[1].is_a?(Array)
 
         expr[1]
       end

data/lib/arel/visitors/elasticsearch_base.rb

@@ -27,11 +27,6 @@ module Arel # :nodoc: all
       def initialize(connection)
         super()
         @connection = connection
-
-        # required for nested assignment.
-        # see +#assign+ method
-        @nested      = false
-        @nested_args = []
       end
 
       def dispatch_as(mode)
@@ -45,6 +40,13 @@ module Arel # :nodoc: all
       end
 
       def compile(node, collector = Arel::Collectors::ElasticsearchQuery.new)
+        # IMPORTANT: To prevent persistent assigned variables due *accept* exceptions, those must be 'reset' before each compile.
+        #
+        # required for nested assignment.
+        # see +#assign+ method
+        @nested      = false
+        @nested_args = []
+
         # we don't need to forward the collector each time - we just set it and always access it, when we need.
         self.collector = collector
 

data/lib/elasticsearch_record/gem_version.rb

@@ -9,7 +9,7 @@ module ElasticsearchRecord
   module VERSION
     MAJOR = 1
     MINOR = 8
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

data/lib/elasticsearch_record/relation/query_methods.rb

@@ -316,6 +316,12 @@ module ElasticsearchRecord
       end
 
       def build_query_clause(kind, data, rest = [])
+        # prevent empty data clauses
+        # e.g. [nil] - which will cause possible query-exceptions
+        if data.blank? || (data.is_a?(Array) && data.all?(&:blank?))
+          raise ArgumentError, "Unable to build query clause for '#{kind}' without any data @ #{klass.name}!"
+        end
+
         ElasticsearchRecord::Relation::QueryClause.new(kind, Array.wrap(data), rest.extract_options!)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_record
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Tobias Gonsior
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-07 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: ActiveRecord adapter for Elasticsearch