elasticsearch_record 1.2.1 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32688db9e3220d919f454f7c4c9445b006d43299d66322f4586af9d426fdc907
-  data.tar.gz: 9169c9110e662d647f7eddeddae7fa3497a03ad36486d85c001e762af5c756df
+  metadata.gz: 41575ee0aefe81ed3069dc81c1c0d9062ea841998a7bb4affaab885dad0a4291
+  data.tar.gz: 73e98d4b6aad0fda63df0fff562537245f2d4c95fb5f53d67ad891550d8e6b1b
 SHA512:
-  metadata.gz: 9221a04be02abcb7d8f36da24f3b7e2d061b778233b8190bb14b906bf54b2a8d881a870f9c0b1b65d90b3ff2418fe8ee21d828b35dceac85b2f8bc766677c73c
-  data.tar.gz: a1b4e64cf4a8c33d8ce3aaeb89fedd5b7847a648a1dcfccc2b15ecfba0f99d0fbf9a0c94237edcd6ef0feb8d4ef40889ab00c2b8a6bc50773b4982cd5e326149
+  metadata.gz: ed60e5fe591f92169d51f333c600338cd4fcee46ca6ca988625399ee522068e3b5c67738fe5b9f3fcc1cede6491cfb1b969c525d5b1af2f2ed03e93b7303237f
+  data.tar.gz: eb51b9dc16d0457905fb15589ff2542dfe0a8f59678459be910726305a3b0527e3ddcee6d7e5271e2db0d658dabd5f476eea71b4dca27c1f99375d987de50f0b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    elasticsearch_record (1.2.1)
+    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,18 @@
 # 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
+
+## [1.2.2] - 2022-12-12
+* [add] `:if_exists` option for `change_table`
+* [fix] executing `_compute_table_name` irregular on some schema methods and some not - not only executes on `create_table` and `change_table`
+* [ref] private `_compute_table_name` method to public `compute_table_name`
+* [ref] drop `_compute_table_name` on methods: open_table, close_table, truncate_table, drop_table, block_table, unblock_table & clone_table
+
 ## [1.2.1] - 2022-12-12
 * [add] `ActiveRecord::ConnectionAdapters::Elasticsearch::SchemaStatements#access_id_fielddata?` which checks the clusters setting 'indices.id_field_data.enabled' to determinate if a general sorting on the +_id+-field is possible or not.
 * [add] `ElasticsearchRecord::Relation#ordered_relation` which overwrites the original method to check against the `#access_id_fielddata?` method

data/lib/active_record/connection_adapters/elasticsearch/table_statements.rb

@@ -38,9 +38,6 @@ module ActiveRecord
           # @param [String] table_name
           # @return [Boolean] acknowledged status
           def open_table(table_name)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             schema_cache.clear_data_source_cache!(table_name)
             api(:indices, :open, { index: table_name }, 'OPEN TABLE').dig('acknowledged')
           end
@@ -59,9 +56,6 @@ module ActiveRecord
           # @param [String] table_name
           # @return [Boolean] acknowledged status
           def close_table(table_name)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             schema_cache.clear_data_source_cache!(table_name)
             api(:indices, :close, { index: table_name }, 'CLOSE TABLE').dig('acknowledged')
           end
@@ -84,9 +78,6 @@ module ActiveRecord
           # @param [String] table_name
           # @return [Boolean] acknowledged status
           def truncate_table(table_name)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             # force: automatically drops an existing index
             create_table(table_name, force: true, **table_schema(table_name))
           end
@@ -111,9 +102,6 @@ module ActiveRecord
           # @param [Boolean] if_exists
           # @return [Array] acknowledged status
           def drop_table(table_name, if_exists: false, **)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             schema_cache.clear_data_source_cache!(table_name)
             api(:indices, :delete, { index: table_name, ignore: (if_exists ? 404 : nil) }, 'DROP TABLE').dig('acknowledged')
           end
@@ -123,9 +111,6 @@ module ActiveRecord
           # @param [Symbol] block_name The block to add (one of :read, :write, :read_only or :metadata)
           # @return [Boolean] acknowledged status
           def block_table(table_name, block_name = :write)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             api(:indices, :add_block, { index: table_name, block: block_name }, "BLOCK #{block_name.to_s.upcase} TABLE").dig('acknowledged')
           end
 
@@ -135,9 +120,6 @@ module ActiveRecord
           # @param [Symbol] block_name The block to add (one of :read, :write, :read_only or :metadata)
           # @return [Boolean] acknowledged status
           def unblock_table(table_name, block_name = nil)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-
             if block_name.nil?
               change_table(table_name) do |t|
                 t.change_setting('index.blocks.read', false)
@@ -157,10 +139,6 @@ module ActiveRecord
           # @param [Hash] options
           # @param [Proc] block
           def clone_table(table_name, target_name, **options, &block)
-            # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
-            target_name = _compute_table_name(target_name)
-
             # create new definition
             definition = clone_table_definition(table_name, target_name, **extract_table_options!(options), &block)
 
@@ -191,7 +169,7 @@ module ActiveRecord
           # @return [Boolean] acknowledged status
           def create_table(table_name, force: false, copy_from: nil, if_not_exists: false, **options)
             # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
+            table_name = compute_table_name(table_name)
 
             return if if_not_exists && table_exists?(table_name)
 
@@ -226,9 +204,11 @@ module ActiveRecord
           #     t.mapping :name, :string
           #     # Other column alterations here
           #   end
-          def change_table(table_name, **options)
+          def change_table(table_name, if_exists: false, **options)
             # IMPORTANT: compute will add possible configured prefix & suffix
-            table_name = _compute_table_name(table_name)
+            table_name = compute_table_name(table_name)
+
+            return if if_exists && !table_exists?(table_name)
 
             definition = update_table_definition(table_name, self, **options)
 
@@ -303,17 +283,22 @@ module ActiveRecord
             _exec_change_table_with(:delete_alias, table_name, name, **options, &block)
           end
 
-          private
-
-          def _compute_table_name(table_name)
+          # computes a provided +table_name+ with optionally configured +table_name_prefix+ & +table_name_suffix+.
+          # @param [String] table_name
+          # @return [String]
+          def compute_table_name(table_name)
+            table_name = table_name.to_s
+            
             # HINT: +"" creates a new +unfrozen+ string!
             str = +""
-            str << table_name_prefix unless table_name.to_s.start_with?(table_name_prefix)
+            str << table_name_prefix unless table_name.start_with?(table_name_prefix)
             str << table_name
-            str << table_name_suffix unless table_name.to_s.end_with?(table_name_suffix)
+            str << table_name_suffix unless table_name.end_with?(table_name_suffix)
             str
           end
 
+          private
+
           def _exec_change_table_with(method, table_name, *args, **kwargs, &block)
             change_table(table_name) do |t|
               t.send(method, *args, **kwargs, &block)

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  = 1
+    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.1
+  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