elasticsearch_record 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a53ead4edbffa7bb74c8021008343f80813512f89b6580717d7d4335ce238ba
-  data.tar.gz: 26603c0b2de3b938c4239401652d4986088be1d29b1c039c2feb0c48b83a5207
+  metadata.gz: 238cf0f5e82cb385fc6d0f4e7f0416192f1cf65134b9726de16149be5fe6dc6b
+  data.tar.gz: 002b7d91869f2c0a9f03729c9c2c0db3719abfa9d523925cfeaf5bacf101e563
 SHA512:
-  metadata.gz: 8d60b93db8b944ac6b0b42c91e411d6ae9673f773feeab7fbc9097e519663401a349936a271f6949d65f46485198cce44c349c38d3d2f668e2f3ee6148417264
-  data.tar.gz: 9e3a2700baa40c8bc4b6a72c6a94895f3beb030294955ca6d1a168349c81b289d80bf2d93cfa5411f0a8c2a74dd3b183ece5ee64ef3deef7ff2f0f440aef32dc
+  metadata.gz: b58fc1dbdd310c1e5c8c47bb54398a4300042c063afd6a49543a5c6b2a270f2ffe7fb168b357ff1da5cb738ab602550bbf8a1297d4464089c5c0d8809a4e3a8c
+  data.tar.gz: 10be3f8fa2ea798bf58f2187ee7ea23099545ddad32036642e3b16d5e48cde7ccbabaff2bc68bc0baa2c71c41409de14abebedd11d6b0bcbe026c0e8200f0db2

data/docs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ElasticsearchRecord - CHANGELOG
 
+## [1.5.3] - 2023-07-14
+* [fix] `ElasticsearchRecord::Relation#where!` on nested, provided `:none` key
+* [ref] minor code tweaks and comment updates
+
 ## [1.5.2] - 2023-07-12
 * [fix] `ElasticsearchRecord::Relation#limit` setter method `limit_value=` to work with **delegate_query_nil_limit?**
 

data/docs/CODE_OF_CONDUCT.md

@@ -39,7 +39,7 @@ This Code of Conduct applies within all community spaces, and also applies when
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at tg@reimbursement.institute. All complaints will be reviewed and investigated promptly and fairly.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at info@ruby-smart.org. All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the reporter of any incident.
 

data/lib/arel/visitors/elasticsearch_query.rb

@@ -138,12 +138,11 @@ module Arel # :nodoc: all
 
       # CUSTOM node by elasticsearch_record
       def visit_Query(o)
-        # in some cases we don't have a kind, but where conditions.
-        # in this case we force the kind as +:bool+.
-        kind = :bool if o.wheres.present? && o.kind.blank?
-
-        # resolve kind, if not already set
-        kind ||= o.kind.present? ? visit(o.kind.expr) : nil
+        # resolves the query kind.
+        # PLEASE NOTE: in some cases there is no kind, but an existing +where+ conditions.
+        # This will then be treat as +:bool+.
+        kind = o.kind.present? ? visit(o.kind.expr).presence : nil
+        kind ||= :bool if o.wheres.present?
 
         # check for existing kind - we cannot create a node if we don't have any kind
         return unless kind
@@ -423,6 +422,7 @@ module Arel # :nodoc: all
         o
       end
 
+      # alias for RAW returns
       alias :visit_Integer :visit_Struct_Raw
       alias :visit_Symbol :visit_Struct_Raw
       alias :visit_Hash :visit_Struct_Raw
@@ -430,7 +430,6 @@ module Arel # :nodoc: all
       alias :visit_String :visit_Struct_Raw
       alias :visit_Arel_Nodes_SqlLiteral :visit_Struct_Raw
 
-
       # used by insert / update statements.
       # does not claim / assign any values!
       # returns a Hash of key => value pairs
@@ -453,6 +452,7 @@ module Arel # :nodoc: all
         o.name
       end
 
+      # alias for ATTRIBUTE returns
       alias :visit_Arel_Attributes_Attribute :visit_Struct_Attribute
       alias :visit_Arel_Nodes_UnqualifiedColumn :visit_Struct_Attribute
       alias :visit_ActiveModel_Attribute_FromUser :visit_Struct_Attribute
@@ -473,6 +473,7 @@ module Arel # :nodoc: all
         o.value
       end
 
+      # alias for BIND returns
       alias :visit_ActiveModel_Attribute :visit_Struct_BindValue
       alias :visit_ActiveRecord_Relation_QueryAttribute :visit_Struct_BindValue
 
@@ -484,6 +485,7 @@ module Arel # :nodoc: all
         collect(o)
       end
 
+      # alias for ARRAY returns
       alias :visit_Set :visit_Array
     end
   end

data/lib/arel/visitors/elasticsearch_schema.rb

@@ -89,8 +89,7 @@ module Arel # :nodoc: all
         # prepare query
         claim(:type, ::ElasticsearchRecord::Query::TYPE_INDEX_UPDATE_SETTING)
 
-        # special overcomplicated blocks to assign a hash of settings directly to the body...
-        # todo: refactor this in future versions
+        # overcomplicated blocks to assign a hash of settings directly to the body
         assign(:__query__, {}) do
           assign(:body, {}) do
             resolve(o.items, :visit_TableSettingDefinition)

data/lib/elasticsearch_record/gem_version.rb

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

data/lib/elasticsearch_record/persistence.rb

@@ -61,21 +61,17 @@ module ElasticsearchRecord
 
       private
 
-      # WARNING: BETA!!!
       # Resolves the +auto_increment+ status from the tables +_meta+ attributes.
       def _insert_with_auto_increment(values)
-        # check, if the primary_key's values is provided.
-        # so, no need to resolve a +auto_increment+ value, but provide
-        if values[self.primary_key].present?
-          # resolve id from values
-          id = values[self.primary_key]
-
+        # check, if the primary_key's value is provided.
+        # so, no need to resolve a +auto_increment+ value, but provide the id directly
+        if (id = values[self.primary_key]).present?
           yield({id: id})
         elsif auto_increment?
           ids = [
-            # we try to resolve the current-auto-increment value from the tables meta
+            # try to resolve the current-auto-increment value from the tables meta
             connection.table_metas(self.table_name).dig('auto_increment').to_i + 1,
-            # for secure reasons, we also resolve the current maximum value for the primary key
+            # for secure reasons: also resolve the current maximum value for the primary key
             self.unscoped.all.maximum(self.primary_key).to_i + 1
           ]
 

data/lib/elasticsearch_record/relation/query_methods.rb

@@ -184,35 +184,36 @@ module ElasticsearchRecord
 
       # creates a condition on the relation.
       # There are several possibilities to call this method.
+      #
       # @example
       #   # create a simple 'term' condition on the query[:filter] param
-      #     where({name: 'hans'})
-      #     > query[:filter] << { term: { name: 'hans' } }
+      #   where({name: 'hans'})
+      #   #> query[:filter] << { term: { name: 'hans' } }
       #
       #   # create a simple 'terms' condition on the query[:filter] param
-      #     where({name: ['hans','peter']})
-      #     > query[:filter] << { terms: { name: ['hans','peter'] } }
+      #   where({name: ['hans','peter']})
+      #   #> query[:filter] << { terms: { name: ['hans','peter'] } }
       #
-      #     where(:must_not, term: {name: 'horst'})
-      #     where(:query_string, "(new york OR dublin)", fields: ['name','description'])
+      #   where(:must_not, term: {name: 'horst'})
+      #   where(:query_string, "(new york OR dublin)", fields: ['name','description'])
       #
       #   # nested array
       #   where([ [:filter, {...}], [:must_not, {...}]])
-      def where(*args)
-        return none if args[0] == :none
-
-        super
-      end
-
+      #
+      #   # invalidate query
+      #   where(:none)
+      #
       def where!(opts, *rest)
         # :nodoc:
         case opts
-          # check the first provided parameter +opts+ and validate, if this is an alias for "must, must_not, should or filter"
-          # if true, we expect the rest[0] to be a hash.
-          # For this correlation we forward this as RAW-data without check & manipulation
         when Symbol
           case opts
+          when :none
+            none!
           when :filter, :must, :must_not, :should
+            # check the first provided parameter +opts+ and validate, if this is an alias for "must, must_not, should or filter".
+            # if true, we expect the rest[0] to be a hash.
+            # For this correlation we forward this as RAW-data without check & manipulation
             send("#{opts}!", *rest)
           else
             raise ArgumentError, "Unsupported prefix type '#{opts}'. Allowed types are: :filter, :must, :must_not, :should"
@@ -220,9 +221,7 @@ module ElasticsearchRecord
         when Array
           # check if this is a nested array of multiple [<kind>,<data>]
           if opts[0].is_a?(Array)
-            opts.each { |item|
-              where!(*item)
-            }
+            opts.each { |item| where!(*item) }
           else
             where!(*opts, *rest)
           end

metadata

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