elasticsearch_record 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92676fe7f2327036588c1d2e3cb6756cabbc2365ee8984196f1ef1c4a23d8448
-  data.tar.gz: 8c1f329957f4a1909181dde9e9c781a86a41188ee7337a73614eb8d893cae482
+  metadata.gz: 9e957272489ab4ebcfc628f36441959f01e20264d215f3f8d020d461447b87bc
+  data.tar.gz: a12a713313af1fd1dd83077b96255efe9cfeced3bcc5204739fd383499e6ad8a
 SHA512:
-  metadata.gz: 9cb4514641f1f26d922f5cb941a677c5cff568641ddcf7243a914481707a982440b6a8967e74734d7900c00c6441128ef69c29a5c3774455df018206932e1b85
-  data.tar.gz: 004b62c74a4b4878c2e0a982a91217beee695a8e58d4509bba4cbd8f7664fdd0a4658cfd8533e1ff5a409f5fee6bce613d46f398ac067ed474324d65ad43406c
+  metadata.gz: 4ef80538ae0feca07575902168df24c56696b4c4cf608ca8466b4c495261296a4338709e302bf402b2596fe1bb0617faa3c1198a7fa6f6b96cc031bd4ea7831e
+  data.tar.gz: 5ad60438e39b4f579d84959f897452d48ac1d4b261c7b65af7539ddb7b69601b1d963dd393ab647d5dbcef55c695ce0cf5e2ffbb6db217348ead523f8e373f4b

data/README.md

@@ -44,7 +44,7 @@ https://github.com/ruby-smart/elasticsearch_record/tree/rails-7-0-stable
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'elasticsearch_record', '~> 1.7'
+gem 'elasticsearch_record', '~> 1.7.0'
 
 # alternative
 gem 'elasticsearch_record', git: 'https://github.com/ruby-smart/elasticsearch_record', branch: 'rails-7-0-stable'

data/docs/CHANGELOG.md

@@ -1,5 +1,13 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [1.7.2] - 2024-01-10
+* [ref] gemspec to lock on rails 7.0
+
+## [1.7.1] - 2024-01-09
+* [fix] `ElasticsearchRecord::Relation` calculation methods return with different nodes
+* [ref] `ElasticsearchRecord::Relation#calculate` removes default value of `node`
+* [ref] `ActiveRecord::ConnectionAdapters::ElasticsearchAdapter#api` prevents inaccurate variable interpretation of `log`
+
 ## [1.7.0] - 2024-01-09
 * [add] `ElasticsearchRecord::Relation#boxplot` calculation method
 * [add] `ElasticsearchRecord::Relation#stats` calculation method

data/elasticsearch_record.gemspec

@@ -32,7 +32,7 @@ DESC
 
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '~> 7.0'
+  spec.add_dependency 'activerecord', '~> 7.0.0'
   spec.add_dependency 'elasticsearch', '>= 7.17'
 
   #spec.add_development_dependency 'coveralls_reborn', '~> 0.25'

data/lib/active_record/connection_adapters/elasticsearch_adapter.rb

@@ -238,7 +238,7 @@ module ActiveRecord # :nodoc:
         # resolve the API target
         target = namespace == :core ? @connection : @connection.__send__(namespace)
 
-        log("#{namespace}.#{action}", arguments, name, async: async, log: log) do
+        __send__(:log, "#{namespace}.#{action}", arguments, name, async: async, log: log) do
           response = ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
             target.__send__(action, arguments)
           end

data/lib/elasticsearch_record/gem_version.rb

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

data/lib/elasticsearch_record/relation/calculation_methods.rb

@@ -168,7 +168,7 @@ module ElasticsearchRecord
       # @param [Symbol, String] column_name
       # @param [Array] values
       def percentile_ranks(column_name, values)
-        calculate(:percentiles, column_name, opts: { values: values }, node: :values)
+        calculate(:percentile_ranks, column_name, opts: { values: values }, node: :values)
       end
 
       # Calculates the cardinality on a given column. Returns +0+ if there's no row.
@@ -180,7 +180,7 @@ module ElasticsearchRecord
       #
       # @param [Symbol, String] column_name
       def cardinality(column_name)
-        calculate(:cardinality, column_name)
+        calculate(:cardinality, column_name, node: :value)
       end
 
       # Calculates the average value on a given column. Returns +nil+ if there's no row. See #calculate for examples with options.
@@ -191,7 +191,7 @@ module ElasticsearchRecord
       #
       # @param [Symbol, String] column_name
       def average(column_name)
-        calculate(:avg, column_name)
+        calculate(:avg, column_name, node: :value)
       end
 
       # Calculates the minimum value on a given column. The value is returned
@@ -204,7 +204,7 @@ module ElasticsearchRecord
       #
       # @param [Symbol, String] column_name
       def minimum(column_name)
-        calculate(:min, column_name)
+        calculate(:min, column_name, node: :value)
       end
 
       # Calculates the maximum value on a given column. The value is returned
@@ -217,7 +217,7 @@ module ElasticsearchRecord
       #
       # @param [Symbol, String] column_name
       def maximum(column_name)
-        calculate(:max, column_name)
+        calculate(:max, column_name, node: :value)
       end
 
       # This single-value aggregation approximates the median absolute deviation of its search results.
@@ -247,7 +247,7 @@ module ElasticsearchRecord
       #
       # @param [Symbol, String] column_name (optional)
       def sum(column_name)
-        calculate(:sum, column_name)
+        calculate(:sum, column_name, node: :value)
       end
 
       # creates a aggregation with the provided metric (e.g. :sum) and columns.
@@ -255,8 +255,8 @@ module ElasticsearchRecord
       # @param [Symbol, String] metric
       # @param [Array<Symbol|String>] columns
       # @param [Hash] opts - additional arguments that get merged with the metric definition
-      # @param [Symbol] node (default :value)
-      def calculate(metric, *columns, opts: {}, node: :value)
+      # @param [Symbol] node (default: nil)
+      def calculate(metric, *columns, opts: {}, node: nil)
         metric_key = "calculate_#{metric}"
 
         # spawn a new aggregation and return the aggs
@@ -266,7 +266,11 @@ module ElasticsearchRecord
                      aggregate(metric_key, { metric => { fields: columns }.merge(opts) }).aggregations
                    end
 
-        response[metric_key][node]
+        if node.present?
+          response[metric_key][node]
+        else
+          response[metric_key]
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_record
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Tobias Gonsior
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement