couchbase 3.4.1-arm64-darwin-20 → 3.4.2-arm64-darwin-20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c66775f9944c58be71025321c4cd11d33068f47e723ebc3f1116172d4d1b0c2
-  data.tar.gz: e8cf7b5a11ac1ca879c34d89f1bc063e67e8cfd9ed8de5a435316aea9e488a74
+  metadata.gz: faa96b8ef64469a07b7665a4d70a8f25cc43003361ee727c403db2514890b96b
+  data.tar.gz: 43936d9b52ce4a258d24a83111d85b4d19704d54a3ab26d5169a32c1af5d79d8
 SHA512:
-  metadata.gz: 49a1c6a75d971fb8a79128dfea4212425b8f5c9cb1304c12e34c23dd8587b957826146829ecb031afaabce5b82f0a79e14f9127ffa02e5be5433dde469d662d4
-  data.tar.gz: 491c19def9f8fbc4e124064150766c3c7be643d8f628d68eea9f4b702586ef6fc61e87820e3418635b245554f28078e9c455b2b472270e7eb415f617ce0e4157
+  metadata.gz: 6ca2f3e4cd54458cc4b4ee6399d79ba31e716640f1727aaee9f37d8916a3de13f5cdcb8e4a4849fa4c9d50b6bbe982ed8c728351b957fa4f5484ae96d96ba891
+  data.tar.gz: 712cf52caa8edfeb978c879575f204d44c69f42f9867d1b2232337d6ce103a4407669136ad27619e721c35f0b2802b6530966662b0d0806bc45aad59810ed1b1

data/README.md

@@ -23,7 +23,7 @@ The library has been tested with MRI 3.0, 3.1 and 3.2. Supported platforms are L
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "couchbase", "3.4.1"
+gem "couchbase", "3.4.2"
 ```
 
 And then execute:
@@ -139,7 +139,7 @@ Now the API reference is accessible using a web browser (where `VERSION` is the
 
 The gem is available as open source under the terms of the [Apache2 License](https://opensource.org/licenses/Apache-2.0).
 
-    Copyright 2011-2021 Couchbase, Inc.
+    Copyright 2011-Present Couchbase, Inc.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

data/lib/couchbase/cluster.rb

@@ -32,13 +32,13 @@ module Couchbase
 
     # Connect to the Couchbase cluster
     #
-    # @overload connect(connection_string, options)
-    #   @param [String] connection_string connection string used to locate the Couchbase Cluster
+    # @overload connect(connection_string_or_config, options)
+    #   @param [String, Configuration] connection_string_or_config connection string used to locate the Couchbase Cluster
     #   @param [Options::Cluster] options custom options when creating the cluster connection
     #
-    # @overload connect(connection_string, username, password, options)
+    # @overload connect(connection_string_or_config, username, password, options)
     #   Shortcut for {PasswordAuthenticator}
-    #   @param [String] connection_string connection string used to locate the Couchbase Cluster
+    #   @param [String] connection_string_or_config connection string used to locate the Couchbase Cluster
     #   @param [String] username name of the user
     #   @param [String] password password of the user
     #   @param [Options::Cluster, nil] options custom options when creating the cluster connection
@@ -62,12 +62,16 @@ module Couchbase
     # @see https://docs.couchbase.com/server/current/manage/manage-security/configure-client-certificates.html
     #
     # @return [Cluster]
-    def self.connect(connection_string, *options)
-      regexp = /^((couchbases?|http):\/\/.*)$/i
-      if regexp.match?(connection_string) || !connection_string.include?("://")
-        Cluster.new(connection_string, *options)
+    def self.connect(connection_string_or_config, *options)
+      connection_string = if connection_string_or_config.is_a?(Configuration)
+                            connection_string_or_config.connection_string
+                          else
+                            connection_string_or_config
+                          end
+      if connection_string =~ /\Acouchbases?:\/\/.*\z/i || !connection_string.include?("://")
+        Cluster.new(connection_string_or_config, *options)
       else
-        ClusterRegistry.instance.connect(connection_string, *options)
+        ClusterRegistry.instance.connect(connection_string_or_config, *options)
       end
     end
 

data/lib/couchbase/cluster_registry.rb

@@ -26,9 +26,14 @@ module Couchbase
       @handlers = {}
     end
 
-    def connect(connection_string, *options)
+    def connect(connection_string_or_config, *options)
+      connection_string = if connection_string_or_config.is_a?(Configuration)
+                            connection_string_or_config.connection_string
+                          else
+                            connection_string_or_config
+                          end
       @handlers.each do |regexp, cluster_class|
-        return cluster_class.connect(connection_string, *options) if regexp.match?(connection_string)
+        return cluster_class.connect(connection_string_or_config, *options) if regexp.match?(connection_string)
       end
       raise(Error::FeatureNotAvailable, "Connection string '#{connection_string}' not supported.")
     end

data/lib/couchbase/configuration.rb

@@ -33,10 +33,9 @@ module Couchbase
     private
 
     def load_configuration(settings)
-      configuration = settings.with_indifferent_access
-      @connection_string = configuration[:connection_string]
-      @username = configuration[:username]
-      @password = configuration[:password]
+      @connection_string = settings[:connection_string] || settings["connection_string"]
+      @username = settings[:username] || settings["username"]
+      @password = settings[:password] || settings["password"]
     end
 
     def load_yaml(path, environment)

data/lib/couchbase/options.rb

@@ -1029,10 +1029,38 @@ module Couchbase
     # Options for {BinaryCollection#append}
     class Append < Base
       attr_accessor :cas # @return [Integer]
+      attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :replicate_to # @return [Symbol]
+      attr_accessor :persist_to # @return [Symbol]
 
       # Creates an instance of options for {BinaryCollection#append}
       #
       # @param [Integer] cas The default CAS used (0 means no CAS in this context)
+      # @param [Symbol] durability_level level of durability
+      #  +:none+::
+      #     no enhanced durability required for the mutation
+      #  +:majority+::
+      #     the mutation must be replicated to a majority of the Data Service nodes
+      #     (that is, held in the memory allocated to the bucket)
+      #  +:majority_and_persist_to_active+::
+      #     The mutation must be replicated to a majority of the Data Service nodes.
+      #     Additionally, it must be persisted (that is, written and synchronised to disk) on the
+      #     node hosting the active partition (vBucket) for the data.
+      #  +:persist_to_majority+::
+      #     The mutation must be persisted to a majority of the Data Service nodes.
+      #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -1041,12 +1069,23 @@ module Couchbase
       #
       # @yieldparam [Append] self
       def initialize(cas: nil,
+                     durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @cas = cas
+
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @durability_level = durability_level
+        @replicate_to = replicate_to
+        @persist_to = persist_to
         yield self if block_given?
       end
 
@@ -1055,6 +1094,9 @@ module Couchbase
         {
           timeout: Utils::Time.extract_duration(@timeout),
           cas: @cas,
+          durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
 
@@ -1064,12 +1106,39 @@ module Couchbase
 
     # Options for {BinaryCollection#prepend}
     class Prepend < Base
-      # @return [Integer] The default CAS used (0 means no CAS in this context)
-      attr_accessor :cas
+      attr_accessor :cas # @return [Integer]
+      attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :replicate_to # @return [Symbol]
+      attr_accessor :persist_to # @return [Symbol]
 
       # Creates an instance of options for {BinaryCollection#prepend}
       #
       # @param [Integer] cas The default CAS used (0 means no CAS in this context)
+      # @param [Symbol] durability_level level of durability
+      #  +:none+::
+      #     no enhanced durability required for the mutation
+      #  +:majority+::
+      #     the mutation must be replicated to a majority of the Data Service nodes
+      #     (that is, held in the memory allocated to the bucket)
+      #  +:majority_and_persist_to_active+::
+      #     The mutation must be replicated to a majority of the Data Service nodes.
+      #     Additionally, it must be persisted (that is, written and synchronised to disk) on the
+      #     node hosting the active partition (vBucket) for the data.
+      #  +:persist_to_majority+::
+      #     The mutation must be persisted to a majority of the Data Service nodes.
+      #     Accordingly, it will be written to disk on those nodes.
+      # @param [Symbol] replicate_to number of nodes to replicate
+      #  +:none+:: do not apply any replication requirements.
+      #  +:one+::  wait for replication to at least one node.
+      #  +:two+::  wait for replication to at least two nodes.
+      #  +:three+:: wait for replication to at least three nodes.
+      # @param [Symbol] persist_to number of nodes to persist
+      #  +:none+:: do not apply any persistence requirements.
+      #  +:active+::  wait for persistence to active node
+      #  +:one+::  wait for persistence to at least one node.
+      #  +:two+:: wait for persistence to at least two nodes.
+      #  +:three+:: wait for persistence to at least three nodes.
+      #  +:four+:: wait for persistence to four nodes (active and replicas).
       #
       # @param [Integer, #in_milliseconds, nil] timeout
       # @param [Proc, nil] retry_strategy the custom retry strategy, if set
@@ -1078,12 +1147,23 @@ module Couchbase
       #
       # @yieldparam [Prepend] self
       def initialize(cas: nil,
+                     durability_level: :none,
+                     replicate_to: :none,
+                     persist_to: :none,
                      timeout: nil,
                      retry_strategy: nil,
                      client_context: nil,
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @cas = cas
+
+        if durability_level != :none && (replicate_to != :none || persist_to != :none)
+          raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
+        end
+
+        @durability_level = durability_level
+        @replicate_to = replicate_to
+        @persist_to = persist_to
         yield self if block_given?
       end
 
@@ -1092,6 +1172,9 @@ module Couchbase
         {
           timeout: Utils::Time.extract_duration(@timeout),
           cas: @cas,
+          durability_level: @durability_level,
+          persist_to: @persist_to,
+          replicate_to: @replicate_to,
         }
       end
 

data/lib/couchbase/search_options.rb

@@ -25,6 +25,16 @@ module Couchbase
         MatchQuery.new(match, &block)
       end
 
+      # @return [Hash<Symbol, #to_json>]
+      def to_h
+        {}
+      end
+
+      # @return [String]
+      def to_json(*args)
+        to_h.to_json(*args)
+      end
+
       # A match query analyzes the input text and uses that analyzed text to query the index.
       class MatchQuery < SearchQuery
         # @return [Float]
@@ -53,17 +63,16 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"match" => @match}
-          data["boost"] = boost if boost
-          data["field"] = field if field
-          data["analyzer"] = analyzer if analyzer
-          if fuzziness
-            data["fuzziness"] = fuzziness
-            data["prefix_length"] = prefix_length if prefix_length
-          end
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:match => @match}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data[:analyzer] = analyzer if analyzer
+          data[:operator] = operator if operator
+          data[:fuzziness] = fuzziness if fuzziness
+          data[:prefix_length] = prefix_length if prefix_length
+          data
         end
       end
 
@@ -82,9 +91,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -100,14 +106,14 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"match_phrase" => @match_phrase}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data["analyzer"] = analyzer if analyzer
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:match_phrase => @match_phrase}
+          data[:boost] = boost if boost
+          data[:operator] = operator.to_s if operator
+          data[:field] = field if field
+          data[:analyzer] = analyzer if analyzer
+          data
         end
       end
 
@@ -126,9 +132,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -141,13 +144,12 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"regexp" => @regexp}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:regexp => @regexp}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -166,9 +168,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @param [String] query_string
         #
         # @yieldparam [QueryStringQuery] self
@@ -178,12 +177,11 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"query" => @query_string}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:query => @query_string}
+          data[:boost] = boost if boost
+          data
         end
       end
 
@@ -202,9 +200,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -217,13 +212,12 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"wildcard" => @wildcard}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:wildcard => @wildcard}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -242,12 +236,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
-        # @return [String]
-        attr_accessor :field
-
         # @param [String...] doc_ids
         #
         # @yieldparam [DocIdQuery] self
@@ -257,13 +245,11 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"doc_ids" => @doc_ids.flatten.uniq}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:ids => @doc_ids.flatten.uniq}
+          data[:boost] = boost if boost
+          data
         end
       end
 
@@ -282,9 +268,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -297,13 +280,12 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"bool" => @value}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:bool => @value}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -321,9 +303,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -365,32 +344,31 @@ module Couchbase
 
         DATE_FORMAT_RFC3339 = "%Y-%m-%dT%H:%M:%S%:z".freeze
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           raise ArgumentError, "either start_time or end_time must be set for DateRangeQuery" if @start_time.nil? && @end_time.nil?
 
           data = {}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data["datetime_parser"] = date_time_parser if date_time_parser
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data[:datetime_parser] = date_time_parser if date_time_parser
           if @start_time
-            data["start"] = if @start_time.respond_to?(:strftime)
-                              @start_time.strftime(DATE_FORMAT_RFC3339)
-                            else
-                              @start_time
-                            end
-            data["inclusive_start"] = @start_inclusive unless @start_inclusive.nil?
+            data[:start] = if @start_time.respond_to?(:strftime)
+                             @start_time.strftime(DATE_FORMAT_RFC3339)
+                           else
+                             @start_time
+                           end
+            data[:inclusive_start] = @start_inclusive unless @start_inclusive.nil?
           end
           if @end_time
-            data["end"] = if @end_time.respond_to?(:strftime)
-                            @end_time.strftime(DATE_FORMAT_RFC3339)
-                          else
-                            @end_time
-                          end
-            data["inclusive_end"] = @end_inclusive unless @end_inclusive.nil?
+            data[:end] = if @end_time.respond_to?(:strftime)
+                           @end_time.strftime(DATE_FORMAT_RFC3339)
+                         else
+                           @end_time
+                         end
+            data[:inclusive_end] = @end_inclusive unless @end_inclusive.nil?
           end
-          data.to_json(*args)
+          data
         end
       end
 
@@ -408,9 +386,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -446,23 +421,22 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           raise ArgumentError, "either min or max must be set for NumericRangeQuery" if @min.nil? && @max.nil?
 
           data = {}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
+          data[:boost] = boost if boost
+          data[:field] = field if field
           if @min
-            data["min"] = @min
-            data["inclusive_min"] = @min_inclusive unless @min_inclusive.nil?
+            data[:min] = @min
+            data[:inclusive_min] = @min_inclusive unless @min_inclusive.nil?
           end
           if @max
-            data["max"] = @max
-            data["inclusive_max"] = @max_inclusive unless @max_inclusive.nil?
+            data[:max] = @max
+            data[:inclusive_max] = @max_inclusive unless @max_inclusive.nil?
           end
-          data.to_json(*args)
+          data
         end
       end
 
@@ -480,9 +454,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -518,23 +489,22 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           raise ArgumentError, "either min or max must be set for TermRangeQuery" if @min.nil? && @max.nil?
 
           data = {}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
+          data[:boost] = boost if boost
+          data[:field] = field if field
           if @min
-            data["min"] = @min
-            data["inclusive_min"] = @min_inclusive unless @min_inclusive.nil?
+            data[:min] = @min
+            data[:inclusive_min] = @min_inclusive unless @min_inclusive.nil?
           end
           if @max
-            data["max"] = @max
-            data["inclusive_max"] = @max_inclusive unless @max_inclusive.nil?
+            data[:max] = @max
+            data[:inclusive_max] = @max_inclusive unless @max_inclusive.nil?
           end
-          data.to_json(*args)
+          data
         end
       end
 
@@ -556,9 +526,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -574,16 +541,15 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           data = {
-            "location" => [@longitude, @latitude],
-            "distance" => @distance,
+            :location => [@longitude, @latitude],
+            :distance => @distance,
           }
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -606,9 +572,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -627,16 +590,15 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           data = {
-            "top_left" => [@top_left_longitude, @top_left_latitude],
-            "bottom_right" => [@bottom_right_longitude, @bottom_right_latitude],
+            :top_left => [@top_left_longitude, @top_left_latitude],
+            :bottom_right => [@bottom_right_longitude, @bottom_right_latitude],
           }
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -675,9 +637,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -690,15 +649,14 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           data = {
-            "polygon_points" => @coordinates.map { |coord| [coord.longitude, coord.latitude] },
+            :polygon_points => @coordinates.map { |coord| [coord.longitude, coord.latitude] },
           }
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -716,9 +674,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @yieldparam [ConjunctionQuery] self
         #
         # @param [*SearchQuery] queries
@@ -737,22 +692,21 @@ module Couchbase
           @queries.empty?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           raise ArgumentError, "compound conjunction query must have sub-queries" if @queries.nil? || @queries.empty?
 
-          data = {"conjuncts" => @queries.uniq}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+          data = {:conjuncts => @queries.uniq.map(&:to_h)}
+          data[:boost] = boost if boost
+          data
         end
       end
 
       # Prepare {ConjunctionQuery} body
       #
-      # @yieldparam [ConjunctionQuery] query
+      # @yieldparam [DisjunctionQuery] query
       #
-      # @return [ConjunctionQuery]
+      # @return [DisjunctionQuery]
       def self.disjuncts(...)
         DisjunctionQuery.new(...)
       end
@@ -762,9 +716,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [Integer]
         attr_accessor :min
 
@@ -786,19 +737,18 @@ module Couchbase
           @queries.empty?
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           raise ArgumentError, "compound disjunction query must have sub-queries" if @queries.nil? || @queries.empty?
 
-          data = {"disjuncts" => @queries.uniq}
+          data = {:disjuncts => @queries.uniq.map(&:to_h)}
           if min
             raise ArgumentError, "disjunction query has fewer sub-queries than configured minimum" if @queries.size < min
 
-            data["min"] = min
+            data[:min] = min
           end
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+          data[:boost] = boost if boost
+          data
         end
       end
 
@@ -816,9 +766,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @yieldparam [BooleanQuery] self
         def initialize
           super()
@@ -852,19 +799,18 @@ module Couchbase
           self
         end
 
-        # @return [String]
-        def to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
           if @must.empty? && @must_not.empty? && @should.empty?
             raise ArgumentError, "BooleanQuery must have at least one non-empty sub-query"
           end
 
           data = {}
-          data["must"] = @must unless @must.empty?
-          data["must_not"] = @must_not unless @must_not.empty?
-          data["should"] = @should unless @should.empty?
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+          data[:must] = @must.to_h unless @must.empty?
+          data[:must_not] = @must_not.to_h unless @must_not.empty?
+          data[:should] = @should.to_h unless @should.empty?
+          data[:boost] = boost if boost
+          data
         end
       end
 
@@ -884,9 +830,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -905,18 +848,16 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"term" => @term}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:term => @term}
+          data[:boost] = boost if boost
+          data[:field] = field if field
           if fuzziness
-            data["fuzziness"] = fuzziness
-            data["prefix_length"] = prefix_length if prefix_length
+            data[:fuzziness] = fuzziness
+            data[:prefix_length] = prefix_length if prefix_length
           end
-          data.to_json(*args)
+          data
         end
       end
 
@@ -950,13 +891,12 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"prefix" => @prefix}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:prefix => @prefix}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -975,9 +915,6 @@ module Couchbase
         # @return [Float]
         attr_accessor :boost
 
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @return [String]
         attr_accessor :field
 
@@ -990,13 +927,12 @@ module Couchbase
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"terms" => @terms.flatten.uniq}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data["field"] = field if field
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          data = {:terms => @terms.flatten.uniq}
+          data[:boost] = boost if boost
+          data[:field] = field if field
+          data
         end
       end
 
@@ -1011,24 +947,15 @@ module Couchbase
 
       # A query that matches all indexed documents.
       class MatchAllQuery < SearchQuery
-        # @return [Float]
-        attr_accessor :boost
-
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @yieldparam [MatchAllQuery] self
         def initialize
           super()
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"match_all" => nil}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          {:match_all => nil}
         end
       end
 
@@ -1043,24 +970,15 @@ module Couchbase
 
       # A query that matches nothing.
       class MatchNoneQuery < SearchQuery
-        # @return [Float]
-        attr_accessor :boost
-
-        # @return [nil, :or, :and]
-        attr_accessor :operator
-
         # @yieldparam [MatchNoneQuery] self
         def initialize
           super()
           yield self if block_given?
         end
 
-        # @return [String]
-        def to_json(*args)
-          data = {"match_none" => nil}
-          data["boost"] = boost if boost
-          data["operator"] = operator.to_s if operator
-          data.to_json(*args)
+        # @return [Hash<Symbol, #to_json>]
+        def to_h
+          {:match_none => nil}
         end
       end
     end

data/lib/couchbase/version.rb

@@ -19,5 +19,5 @@ module Couchbase
   #   $ ruby -rcouchbase -e 'pp Couchbase::VERSION'
   #   {:sdk=>"3.4.0", :ruby_abi=>"3.1.0", :revision=>"416fe68e6029ec8a4c40611cf6e6b30d3b90d20f"}
   VERSION = {} unless defined?(VERSION) # rubocop:disable Style/MutableConstant
-  VERSION.update(:sdk => "3.4.1".freeze)
+  VERSION.update(:sdk => "3.4.2".freeze)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: arm64-darwin-20
 authors:
 - Sergey Avseyev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-12 00:00:00.000000000 Z
 dependencies: []
 description: Modern SDK for Couchbase Server
 email:
@@ -73,9 +73,9 @@ metadata:
   homepage_uri: https://docs.couchbase.com/ruby-sdk/current/hello-world/start-using-sdk.html
   bug_tracker_uri: https://couchbase.com/issues/browse/RCBC
   mailing_list_uri: https://forums.couchbase.com/c/ruby-sdk
-  source_code_uri: https://github.com/couchbase/couchbase-ruby-client/tree/3.4.1
-  changelog_uri: https://github.com/couchbase/couchbase-ruby-client/releases/tag/3.4.1
-  documentation_uri: https://docs.couchbase.com/sdk-api/couchbase-ruby-client-3.4.1/index.html
+  source_code_uri: https://github.com/couchbase/couchbase-ruby-client/tree/3.4.2
+  changelog_uri: https://github.com/couchbase/couchbase-ruby-client/releases/tag/3.4.2
+  documentation_uri: https://docs.couchbase.com/sdk-api/couchbase-ruby-client-3.4.2/index.html
   github_repo: ssh://github.com/couchbase/couchbase-ruby-client
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: SDK for Couchbase Server