couchbase 3.0.3-universal-darwin-20 → 3.1.1-universal-darwin-20

data/lib/couchbase.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/analytics_options.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/authenticator.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/binary_collection.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/binary_collection_options.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/bucket.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 Couchbase, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ module Couchbase
               metrics.processed_objects = resp[:meta][:metrics][:processed_objects]
             end
           end
-          res[:warnings] = resp[:warnings].map { |warn| QueryWarning.new(warn[:code], warn[:message]) } if resp[:warnings]
+          res[:warnings] = resp[:warnings].map { |warn| AnalyticsWarning.new(warn[:code], warn[:message]) } if resp[:warnings]
         end
         res.instance_variable_set("@rows", resp[:rows])
       end

data/lib/couchbase/collection.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/collection_options.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 Couchbase, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -151,15 +151,6 @@ module Couchbase
         !encoded[index].nil? && encoded[index].exists
       end
 
-      # @see MutateInOptions#create_as_deleted
-      #
-      # @return [Boolean] true if the document is a tombstone (created in deleted state)
-      def deleted?
-        @deleted
-      end
-
-      attr_accessor :deleted
-
       # @return [Array<SubDocumentField>] holds the encoded subdocument responses
       attr_accessor :encoded
 
@@ -172,6 +163,18 @@ module Couchbase
       # @return [JsonTranscoder] The default transcoder which should be used
       attr_accessor :transcoder
 
+      # @api private
+      #
+      # @see MutateInOptions#create_as_deleted
+      #
+      # @return [Boolean] true if the document is a tombstone (created in deleted state)
+      def deleted?
+        @deleted
+      end
+
+      # @api private
+      attr_accessor :deleted
+
       private
 
       def get_field_at_index(index)
@@ -199,15 +202,6 @@ module Couchbase
         end
       end
 
-      # @see MutateInOptions#create_as_deleted
-      #
-      # @return [Boolean] true if the document is a tombstone (created in deleted state)
-      def deleted?
-        @deleted
-      end
-
-      attr_accessor :deleted
-
       # @yieldparam [MutateInResult] self
       def initialize
         super
@@ -235,6 +229,18 @@ module Couchbase
       # @return [JsonTranscoder] The default transcoder which should be used
       attr_accessor :transcoder
 
+      # @api private
+      #
+      # @see MutateInOptions#create_as_deleted
+      #
+      # @return [Boolean] true if the document is a tombstone (created in deleted state)
+      def deleted?
+        @deleted
+      end
+
+      # @api private
+      attr_accessor :deleted
+
       private
 
       def get_field_at_index(index)

data/lib/couchbase/configuration.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/datastructures.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/datastructures/couchbase_list.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/datastructures/couchbase_map.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/datastructures/couchbase_queue.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/datastructures/couchbase_set.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/diagnostics.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/errors.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/json_transcoder.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/logger.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/analytics_index_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/bucket_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/collection_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 Couchbase, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -12,11 +12,15 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+require "rubygems/deprecate"
+
 require "couchbase/errors"
 
 module Couchbase
   module Management
     class CollectionManager
+      extend Gem::Deprecate
+
       alias inspect to_s
 
       # @param [Couchbase::Backend] backend
@@ -51,6 +55,8 @@ module Couchbase
       # @param [String] scope_name name of the scope
       # @param [GetScopeOptions] options
       #
+      # @deprecated Use {#get_all_scopes} with filter by name
+      #
       # @return [ScopeSpec]
       #
       # @raise [Error::ScopeNotFound]
@@ -58,6 +64,7 @@ module Couchbase
         get_all_scopes(GetAllScopesOptions.new { |o| o.timeout = options.timeout })
           .find { |scope| scope.name == scope_name } or raise Error::ScopeNotFound, "unable to find scope #{scope_name}"
       end
+      deprecate :get_scope, :get_all_scopes, 2021, 6
 
       # Creates a new scope
       #

data/lib/couchbase/management/query_index_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/search_index_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/user_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/management/view_index_manager.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/mutation_state.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020 Couchbase, Inc.
+#  Copyright 2020-2021 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/options.rb

@@ -1,4 +1,4 @@
-#    Copyright 2020-2021 Couchbase, Inc.
+#  Copyright 2020-2021 Couchbase, Inc.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -507,10 +507,13 @@ module Couchbase
       attr_accessor :expiry # @return [Integer, #in_seconds, nil]
       attr_accessor :transcoder # @return [JsonTranscoder, #encode(Object)]
       attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {Collection#upsert}
       #
       # @param [Integer, #in_seconds, Time, nil] expiry expiration time to associate with the document
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [JsonTranscoder, #encode(Object)] transcoder used for encoding
       # @param [Symbol] durability_level level of durability
       #  +:none+::
@@ -533,6 +536,7 @@ module Couchbase
       #
       # @yieldparam [Upsert]
       def initialize(expiry: nil,
+                     preserve_expiry: false,
                      transcoder: JsonTranscoder.new,
                      durability_level: :none,
                      timeout: nil,
@@ -541,6 +545,7 @@ module Couchbase
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @transcoder = transcoder
         @durability_level = durability_level
         yield self if block_given?
@@ -550,6 +555,7 @@ module Couchbase
         {
           timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
         }
       end
@@ -560,10 +566,13 @@ module Couchbase
       attr_accessor :expiry # @return [Integer, #in_seconds, nil]
       attr_accessor :transcoder # @return [JsonTranscoder, #encode(Object)]
       attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {Collection#upsert}
       #
       # @param [Integer, #in_seconds, Time, nil] expiry expiration time to associate with the document
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [JsonTranscoder, #encode(Object)] transcoder used for encoding
       # @param [Symbol] durability_level level of durability
       #  +:none+::
@@ -586,6 +595,7 @@ module Couchbase
       #
       # @yieldparam [Upsert]
       def initialize(expiry: nil,
+                     preserve_expiry: false,
                      transcoder: JsonTranscoder.new,
                      durability_level: :none,
                      timeout: nil,
@@ -594,6 +604,7 @@ module Couchbase
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @transcoder = transcoder
         @durability_level = durability_level
         yield self if block_given?
@@ -603,6 +614,7 @@ module Couchbase
         {
           timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
         }
       end
@@ -614,10 +626,13 @@ module Couchbase
       attr_accessor :transcoder # @return [JsonTranscoder, #encode(Object)]
       attr_accessor :cas # @return [Integer, nil]
       attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {Collection#replace}
       #
       # @param [Integer, #in_seconds, nil] expiry expiration time to associate with the document
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [JsonTranscoder, #encode(Object)] transcoder used for encoding
       # @param [Integer, nil] cas a CAS value that will be taken into account on the server side for optimistic concurrency
       # @param [Symbol] durability_level level of durability
@@ -641,6 +656,7 @@ module Couchbase
       #
       # @yieldparam [Replace]
       def initialize(expiry: nil,
+                     preserve_expiry: false,
                      transcoder: JsonTranscoder.new,
                      cas: nil,
                      durability_level: :none,
@@ -650,6 +666,7 @@ module Couchbase
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @transcoder = transcoder
         @cas = cas
         @durability_level = durability_level
@@ -660,6 +677,7 @@ module Couchbase
         {
           timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
           cas: @cas,
         }
@@ -671,14 +689,15 @@ module Couchbase
       attr_accessor :expiry # @return [Integer, #in_seconds, nil]
       attr_accessor :store_semantics # @return [Symbol]
       attr_accessor :cas # @return [Integer, nil]
-      attr_accessor :access_deleted # @return [Boolean]
-      attr_accessor :create_as_deleted # @return [Boolean]
       attr_accessor :durability_level # @return [Symbol]
       attr_accessor :transcoder # @return [JsonTranscoder, #encode(Object)]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {Collection#mutate_in}
       #
       # @param [Integer, #in_seconds, Time, nil] expiry expiration time to associate with the document
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [Symbol] store_semantics describes how the outer document store semantics on subdoc should act
       #  +:replace+:: replace the document, fail if it does not exist. This is the default
       #  +:upsert+:: replace the document or create if it does not exist
@@ -708,6 +727,7 @@ module Couchbase
       #
       # @yieldparam [MutateIn]
       def initialize(expiry: nil,
+                     preserve_expiry: false,
                      store_semantics: :replace,
                      cas: nil,
                      access_deleted: false,
@@ -720,6 +740,7 @@ module Couchbase
                      parent_span: nil)
         super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @store_semantics = store_semantics
         @cas = cas
         @access_deleted = access_deleted
@@ -734,6 +755,7 @@ module Couchbase
         {
           timeout: @timeout.respond_to?(:in_milliseconds) ? @timeout.public_send(:in_milliseconds) : @timeout,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
           cas: @cas,
           store_semantics: @store_semantics,
@@ -741,11 +763,18 @@ module Couchbase
           create_as_deleted: @create_as_deleted,
         }
       end
+
+      # @api private
+      # @return [Boolean]
+      attr_accessor :access_deleted
+
+      # @api private
+      # @return [Boolean]
+      attr_accessor :create_as_deleted
     end
 
     # Options for {Collection#lookup_in}
     class LookupIn < Base
-      attr_accessor :access_deleted # @return [Boolean]
       attr_accessor :transcoder # @return [JsonTranscoder, #decode(String)]
 
       # Creates an instance of options for {Collection#lookup_in}
@@ -778,6 +807,10 @@ module Couchbase
           access_deleted: @access_deleted,
         }
       end
+
+      # @api private
+      # @return [Boolean]
+      attr_accessor :access_deleted
     end
 
     # Options for {BinaryCollection#append}
@@ -853,12 +886,15 @@ module Couchbase
       attr_accessor :initial # @return [Integer]
       attr_accessor :expiry # @return [Integer, #in_seconds]
       attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {BinaryCollection#increment}
       #
       # @param [Integer] delta the delta for the operation
       # @param [Integer] initial if present, holds the initial value
       # @param [Integer, #in_seconds, Time, nil] expiry if set, holds the expiration for the operation
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [Symbol] durability_level level of durability
       #  +:none+::
       #     no enhanced durability required for the mutation
@@ -882,6 +918,7 @@ module Couchbase
       def initialize(delta: 1,
                      initial: nil,
                      expiry: nil,
+                     preserve_expiry: false,
                      durability_level: :none,
                      timeout: nil,
                      retry_strategy: nil,
@@ -893,6 +930,7 @@ module Couchbase
         @delta = delta
         @initial = initial
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -911,6 +949,7 @@ module Couchbase
           delta: @delta,
           initial_value: @initial,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
         }
       end
@@ -922,12 +961,15 @@ module Couchbase
       attr_accessor :initial # @return [Integer]
       attr_accessor :expiry # @return [Integer, #in_seconds]
       attr_accessor :durability_level # @return [Symbol]
+      attr_accessor :preserve_expiry # @return [Boolean]
 
       # Creates an instance of options for {BinaryCollection#decrement}
       #
       # @param [Integer] delta the delta for the operation
       # @param [Integer] initial if present, holds the initial value
       # @param [Integer, #in_seconds, Time, nil] expiry if set, holds the expiration for the operation
+      # @param [Boolean] preserve_expiry if true and the document exists, the server will preserve current expiration
+      #  for the document, otherwise will use {expiry} from the operation.
       # @param [Symbol] durability_level level of durability
       #  +:none+::
       #     no enhanced durability required for the mutation
@@ -951,6 +993,7 @@ module Couchbase
       def initialize(delta: 1,
                      initial: nil,
                      expiry: nil,
+                     preserve_expiry: false,
                      durability_level: :none,
                      timeout: nil,
                      retry_strategy: nil,
@@ -962,6 +1005,7 @@ module Couchbase
         @delta = delta
         @initial = initial
         @expiry = Utils::Time.extract_expiry_time(expiry)
+        @preserve_expiry = preserve_expiry
         @durability_level = durability_level
         yield self if block_given?
       end
@@ -980,6 +1024,7 @@ module Couchbase
           delta: @delta,
           initial_value: @initial,
           expiry: @expiry,
+          preserve_expiry: @preserve_expiry,
           durability_level: @durability_level,
         }
       end