elasticsearch_record 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdb71bb8689c67cd7a2ef1add3b7ad0ab6710cbb5833313cb3f474267c39e43e
-  data.tar.gz: 06ec37ac16f5adb110da8ffa08c9c44fc20993be3db12bf8033315cfa9611fc3
+  metadata.gz: 41575ee0aefe81ed3069dc81c1c0d9062ea841998a7bb4affaab885dad0a4291
+  data.tar.gz: 73e98d4b6aad0fda63df0fff562537245f2d4c95fb5f53d67ad891550d8e6b1b
 SHA512:
-  metadata.gz: 929f5df6456203e7bce466d62836805bb9a75ff5a89856c75cd1ba187a95e05f51aa3ad676c3058d7ad95d1295db1422571964240182000bef59a8cdb95181bc
-  data.tar.gz: 7f785864f92bc6f3243ea081236327ff7c600833cdf74a11d59239f31551d928dc7b8bb1b4952ec38aadaa8d0174ac2a7ceeebae100a247c3534ef4c1609e484
+  metadata.gz: ed60e5fe591f92169d51f333c600338cd4fcee46ca6ca988625399ee522068e3b5c67738fe5b9f3fcc1cede6491cfb1b969c525d5b1af2f2ed03e93b7303237f
+  data.tar.gz: eb51b9dc16d0457905fb15589ff2542dfe0a8f59678459be910726305a3b0527e3ddcee6d7e5271e2db0d658dabd5f476eea71b4dca27c1f99375d987de50f0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch_record (1.2.3)
+    elasticsearch_record (1.2.4)
       activerecord (~> 7.0.0)
       elasticsearch (~> 8.4)
 
@@ -28,7 +28,7 @@ GEM
       elasticsearch-api (= 8.5.2)
     elasticsearch-api (8.5.2)
       multi_json
-    faraday (2.7.1)
+    faraday (2.7.2)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [1.2.4] - 2022-12-15
+* [fix] missing `#visit_Arel_Nodes_In` method in `Arel::Visitors::ElasticsearchQuery` to build array conditions
+* [fix] resolving buckets from relation `ElasticsearchRecord::Result#buckets` not recognizing sub-buckets
+
 ## [1.2.3] - 2022-12-12
 * [fix] `change_table` 'if_exists: true' returns at the wrong state
 

data/lib/arel/visitors/elasticsearch_query.rb

@@ -355,6 +355,23 @@ module Arel # :nodoc: all
         end
       end
 
+      # DIRECT ASSIGNMENT
+      def visit_Arel_Nodes_In(o)
+        self.collector.preparable = false
+
+        attr, values = o.left, o.right
+
+        if Array === values
+          unless values.empty?
+            values.delete_if { |value| unboundable?(value) }
+          end
+
+          return failed! if values.empty?
+        end
+
+        assign(:filter, [{ terms: { visit(attr) => visit(values) } }])
+      end
+
       def visit_Arel_Nodes_And(o)
         collect(o.children)
       end
@@ -393,6 +410,7 @@ module Arel # :nodoc: all
         claim(:index, o.name)
       end
 
+      # RAW RETURN
       def visit_Struct_Raw(o)
         o
       end

data/lib/elasticsearch_record/gem_version.rb

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

data/lib/elasticsearch_record/result.rb

@@ -72,21 +72,7 @@ module ElasticsearchRecord
       # aggregations are already a hash with key => data, but to prevent reference manipulation on the hash
       # we have to create a new one here...
       aggregations.reduce({}) { |buckets, (key, agg)|
-        # check if this agg has a bucket
-        if agg.key?(:buckets)
-          buckets[key] = agg[:buckets].reduce({}) { |m, b|
-            # buckets can be a Hash or Array (of Hashes)
-            bucket_key, bucket = b.is_a?(Hash) ? [b[:key], b] : b
-            m[bucket_key]      = bucket.except(:key, :doc_count).transform_values { |val| val[:value] }
-
-            m
-          }
-        elsif agg.key?(:value)
-          buckets[key] = agg[:value]
-        elsif agg.key?(:values)
-          buckets[key] = agg[:values]
-        end
-
+        buckets[key] = _resolve_bucket(agg)
         buckets
       }.with_indifferent_access
     end
@@ -247,6 +233,33 @@ module ElasticsearchRecord
       end
     end
 
+    # resolves bucket nodes recursively
+    # @param [Object] node
+    # @return [Object]
+    def _resolve_bucket(node)
+      # check, if node is not a hash - in this case we just return it's value
+      return node unless node.is_a?(Hash)
+
+      # check if the node has a bucket
+      if node.key?(:buckets)
+        node[:buckets].reduce({}) { |m, b|
+          # buckets can be a Hash or Array (of Hashes)
+          bucket_key, bucket = b.is_a?(Hash) ? [b[:key], b] : b
+
+          m[bucket_key] = _resolve_bucket(bucket)
+          m
+        }
+      elsif node.key?(:value)
+        node[:value]
+      elsif node.key?(:values)
+        node[:values]
+      else
+        # resolve sub-aggregations / nodes without 'meta' keys.
+        # if this results in an empty hash, the return will be nil
+        node.except(:key, :doc_count, :doc_count_error_upper_bound, :sum_other_doc_count).transform_values { |val| _resolve_bucket(val) }.presence
+      end
+    end
+
     # builds computed results (used to build ActiveRecord models)
     # @return [Array]
     def computed_results

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_record
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Tobias Gonsior
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-12 00:00:00.000000000 Z
+date: 2022-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord