couchbase 3.0.0.beta.1-universal-darwin-19 → 3.0.0-universal-darwin-19

data/lib/couchbase/datastructures/couchbase_queue.rb

@@ -63,14 +63,14 @@ module Couchbase
       # @return [Integer] returns the number of elements in the queue.
       def length
         result = @collection.lookup_in(@id, [
-            LookupInSpec.count("")
-        ], @options.lookup_in_options)
+                                         LookupInSpec.count(""),
+                                       ], @options.lookup_in_options)
         result.content(0)
       rescue Error::DocumentNotFound
         0
       end
 
-      alias_method :size, :length
+      alias size length
 
       # @return [Boolean] returns true if queue is empty
       def empty?
@@ -92,30 +92,30 @@ module Couchbase
       def push(obj)
         begin
           @collection.mutate_in(@id, [
-              MutateInSpec.array_prepend("", [obj])
-          ], @options.mutate_in_options)
+                                  MutateInSpec.array_prepend("", [obj]),
+                                ], @options.mutate_in_options)
         rescue Error::PathExists
           # ignore
         end
         self
       end
 
-      alias_method :enq, :push
-      alias_method :<<, :push
+      alias enq push
+      alias << push
 
       # Retrieves object from the queue
       #
       # @return [Object, nil] queue entry or nil
       def pop
         result = @collection.lookup_in(@id, [
-            LookupInSpec.get("[-1]")
-        ], @options.lookup_in_options)
+                                         LookupInSpec.get("[-1]"),
+                                       ], @options.lookup_in_options)
         obj = result.exists?(0) ? result.content(0) : nil
         options = Collection::MutateInOptions.new
         options.cas = result.cas
         @collection.mutate_in(@id, [
-            MutateInSpec.remove("[-1]")
-        ], options)
+                                MutateInSpec.remove("[-1]"),
+                              ], options)
         obj
       rescue Error::CasMismatch
         retry
@@ -123,8 +123,8 @@ module Couchbase
         nil
       end
 
-      alias_method :deq, :pop
-      alias_method :shift, :pop
+      alias deq pop
+      alias shift pop
     end
 
     class CouchbaseQueueOptions

data/lib/couchbase/datastructures/couchbase_set.rb

@@ -63,14 +63,14 @@ module Couchbase
       # @return [Integer] returns the number of elements in the set.
       def length
         result = @collection.lookup_in(@id, [
-            LookupInSpec.count("")
-        ], @options.lookup_in_options)
+                                         LookupInSpec.count(""),
+                                       ], @options.lookup_in_options)
         result.content(0)
       rescue Error::DocumentNotFound
         0
       end
 
-      alias_method :size, :length
+      alias size length
 
       # @return [Boolean] returns true if set is empty
       def empty?
@@ -84,8 +84,8 @@ module Couchbase
       def add(obj)
         begin
           @collection.mutate_in(@id, [
-              MutateInSpec.array_add_unique("", obj)
-          ], @options.mutate_in_options)
+                                  MutateInSpec.array_add_unique("", obj),
+                                ], @options.mutate_in_options)
         rescue Error::PathExists
           # ignore
         end
@@ -107,11 +107,12 @@ module Couchbase
         result = @collection.get(@id)
         idx = result.content.index(obj)
         return false unless idx
+
         options = Collection::MutateInOptions.new
         options.cas = result.cas
         @collection.mutate_in(@id, [
-            MutateInSpec.remove("[#{idx}]")
-        ], options)
+                                MutateInSpec.remove("[#{idx}]"),
+                              ], options)
         true
       rescue Error::CasMismatch
         retry

data/lib/couchbase/errors.rb

@@ -67,10 +67,13 @@ module Couchbase
     class UnsupportedOperation < CouchbaseError
     end
 
-    class AmbiguousTimeout < CouchbaseError
+    class Timeout < CouchbaseError
     end
 
-    class UnambiguousTimeout < CouchbaseError
+    class AmbiguousTimeout < Timeout
+    end
+
+    class UnambiguousTimeout < Timeout
     end
 
     class FeatureNotAvailable < CouchbaseError
@@ -164,7 +167,6 @@ module Couchbase
     class PreparedStatementFailure < CouchbaseError
     end
 
-
     # Analytics exceptions
 
     class CompilationFailure < CouchbaseError
@@ -188,6 +190,11 @@ module Couchbase
     class LinkNotFound < CouchbaseError
     end
 
+    # Search exceptions
+
+    class IndexNotReady < CouchbaseError
+    end
+
     # View exceptions
 
     class DesignDocumentNotFound < CouchbaseError

data/lib/couchbase/json_transcoder.rb

@@ -23,9 +23,9 @@ module Couchbase
     end
 
     # @param [String, nil] blob string of bytes, containing encoded representation of the document
-    # @param [Integer, :json] flags bit field, describing how the data encoded
+    # @param [Integer, :json] _flags bit field, describing how the data encoded
     # @return Object decoded document
-    def decode(blob, flags)
+    def decode(blob, _flags)
       JSON.parse(blob) unless blob.nil?
     end
   end

data/lib/couchbase/management/analytics_index_manager.rb

@@ -17,7 +17,7 @@ require "couchbase/errors"
 module Couchbase
   module Management
     class AnalyticsIndexManager
-      alias_method :inspect, :to_s
+      alias inspect to_s
 
       # @param [Couchbase::Backend] backend
       def initialize(backend)
@@ -35,9 +35,9 @@ module Couchbase
       # @raise [Error::DataverseExists]
       def create_dataverse(dataverse_name, options = CreateDataverseOptions.new)
         @backend.analytics_dataverse_create(
-            dataverse_name,
-            options.ignore_if_exists,
-            options.timeout
+          dataverse_name,
+          options.ignore_if_exists,
+          options.timeout
         )
       end
 
@@ -52,9 +52,9 @@ module Couchbase
       # @raise [Error::DataverseNotFound]
       def drop_dataverse(dataverse_name, options = DropDataverseOptions.new)
         @backend.analytics_dataverse_drop(
-            dataverse_name,
-            options.ignore_if_does_not_exist,
-            options.timeout
+          dataverse_name,
+          options.ignore_if_does_not_exist,
+          options.timeout
         )
       end
 
@@ -71,12 +71,12 @@ module Couchbase
       # @raise [Error::LinkNotFound]
       def create_dataset(dataset_name, bucket_name, options = CreateDatasetOptions.new)
         @backend.analytics_dataset_create(
-            dataset_name,
-            bucket_name,
-            options.condition,
-            options.dataverse_name,
-            options.ignore_if_exists,
-            options.timeout
+          dataset_name,
+          bucket_name,
+          options.condition,
+          options.dataverse_name,
+          options.ignore_if_exists,
+          options.timeout
         )
       end
 
@@ -91,10 +91,10 @@ module Couchbase
       # @raise [Error::DatasetNotFound]
       def drop_dataset(dataset_name, options = DropDatasetOptions.new)
         @backend.analytics_dataset_drop(
-            dataset_name,
-            options.dataverse_name,
-            options.ignore_if_does_not_exist,
-            options.timeout
+          dataset_name,
+          options.dataverse_name,
+          options.ignore_if_does_not_exist,
+          options.timeout
         )
       end
 
@@ -128,12 +128,12 @@ module Couchbase
       # @raise [Error::IndexExists]
       def create_index(index_name, dataset_name, fields, options = CreateIndexOptions.new)
         @backend.analytics_index_create(
-            index_name,
-            dataset_name,
-            fields.entries,
-            options.dataverse_name,
-            options.ignore_if_exists,
-            options.timeout
+          index_name,
+          dataset_name,
+          fields.entries,
+          options.dataverse_name,
+          options.ignore_if_exists,
+          options.timeout
         )
       end
 
@@ -149,11 +149,11 @@ module Couchbase
       # @raise [Error::IndexNotFound]
       def drop_index(index_name, dataset_name, options = DropIndexOptions.new)
         @backend.analytics_index_drop(
-            index_name,
-            dataset_name,
-            options.dataverse_name,
-            options.ignore_if_does_not_exist,
-            options.timeout
+          index_name,
+          dataset_name,
+          options.dataverse_name,
+          options.ignore_if_does_not_exist,
+          options.timeout
         )
       end
 
@@ -184,10 +184,10 @@ module Couchbase
       # @raise [Error::LinkNotFound]
       def connect_link(options = ConnectLinkOptions.new)
         @backend.analytics_link_connect(
-            options.link_name,
-            options.force,
-            options.dataverse_name,
-            options.timeout
+          options.link_name,
+          options.force,
+          options.dataverse_name,
+          options.timeout
         )
       end
 
@@ -201,9 +201,9 @@ module Couchbase
       # @raise [Error::LinkNotFound]
       def disconnect_link(options = DisconnectLinkOptions.new)
         @backend.analytics_link_disconnect(
-            options.link_name,
-            options.dataverse_name,
-            options.timeout
+          options.link_name,
+          options.dataverse_name,
+          options.timeout
         )
       end
 
@@ -218,7 +218,7 @@ module Couchbase
       #   and values are number of mutations for given dataset.
       def get_pending_mutations(options = GetPendingMutationsOptions.new)
         @backend.analytics_get_pending_mutations(
-            options.timeout
+          options.timeout
         )
       end
 
@@ -422,7 +422,7 @@ module Couchbase
 
       # @return [Boolean]
       attr_accessor :is_primary
-      alias_method :primary?, :is_primary
+      alias primary? is_primary
 
       # @yieldparam [AnalyticsIndex]
       def initialize

data/lib/couchbase/management/bucket_manager.rb

@@ -17,7 +17,7 @@ require "couchbase/errors"
 module Couchbase
   module Management
     class BucketManager
-      alias_method :inspect, :to_s
+      alias inspect to_s
 
       # @param [Couchbase::Backend] backend
       def initialize(backend)
@@ -35,19 +35,19 @@ module Couchbase
       # @raise [Error::BucketExists]
       def create_bucket(settings, options = CreateBucketOptions.new)
         @backend.bucket_create(
-            {
-
-                name: settings.name,
-                flush_enabled: settings.flush_enabled,
-                ram_quota_mb: settings.ram_quota_mb,
-                num_replicas: settings.num_replicas,
-                replica_indexes: settings.replica_indexes,
-                bucket_type: settings.bucket_type,
-                ejection_policy: settings.ejection_policy,
-                max_expiry: settings.max_expiry,
-                compression_mode: settings.compression_mode,
-                conflict_resolution_type: settings.conflict_resolution_type,
-            }, options.timeout
+          {
+
+            name: settings.name,
+            flush_enabled: settings.flush_enabled,
+            ram_quota_mb: settings.ram_quota_mb,
+            num_replicas: settings.num_replicas,
+            replica_indexes: settings.replica_indexes,
+            bucket_type: settings.bucket_type,
+            ejection_policy: settings.ejection_policy,
+            max_expiry: settings.max_expiry,
+            compression_mode: settings.compression_mode,
+            conflict_resolution_type: settings.conflict_resolution_type,
+          }, options.timeout
         )
       end
 
@@ -62,17 +62,17 @@ module Couchbase
       # @raise [Error::BucketNotFound]
       def update_bucket(settings, options = UpdateBucketOptions.new)
         @backend.bucket_update(
-            {
-                name: settings.name,
-                flush_enabled: settings.flush_enabled,
-                ram_quota_mb: settings.ram_quota_mb,
-                num_replicas: settings.num_replicas,
-                replica_indexes: settings.replica_indexes,
-                bucket_type: settings.bucket_type,
-                ejection_policy: settings.ejection_policy,
-                max_expiry: settings.max_expiry,
-                compression_mode: settings.compression_mode,
-            }, options.timeout
+          {
+            name: settings.name,
+            flush_enabled: settings.flush_enabled,
+            ram_quota_mb: settings.ram_quota_mb,
+            num_replicas: settings.num_replicas,
+            replica_indexes: settings.replica_indexes,
+            bucket_type: settings.bucket_type,
+            ejection_policy: settings.ejection_policy,
+            max_expiry: settings.max_expiry,
+            compression_mode: settings.compression_mode,
+          }, options.timeout
         )
       end
 

data/lib/couchbase/management/collection_manager.rb

@@ -17,7 +17,7 @@ require "couchbase/errors"
 module Couchbase
   module Management
     class CollectionManager
-      alias_method :inspect, :to_s
+      alias inspect to_s
 
       # @param [Couchbase::Backend] backend
       # @param [String] bucket_name
@@ -55,8 +55,8 @@ module Couchbase
       #
       # @raise [Error::ScopeNotFound]
       def get_scope(scope_name, options = GetScopeOptions.new)
-        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}"
+        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
 
       # Creates a new scope

data/lib/couchbase/management/query_index_manager.rb

@@ -17,7 +17,7 @@ require "couchbase/errors"
 module Couchbase
   module Management
     class QueryIndexManager
-      alias_method :inspect, :to_s
+      alias inspect to_s
 
       # @param [Couchbase::Backend] backend
       def initialize(backend)
@@ -40,6 +40,9 @@ module Couchbase
             index.is_primary = idx[:is_primary]
             index.type = idx[:type]
             index.state = idx[:state]
+            index.bucket = idx[:bucket_id]
+            index.collection = idx[:collection_id]
+            index.scope = idx[:scope_id]
             index.key_space = idx[:keyspace_id]
             index.name_space = idx[:namespace_id]
             index.index_key = idx[:index_key]
@@ -61,10 +64,12 @@ module Couchbase
       # @raise [Error::IndexExists]
       def create_index(bucket_name, index_name, fields, options = CreateIndexOptions.new)
         @backend.query_index_create(bucket_name, index_name, fields, {
-            ignore_if_exists: options.ignore_if_exists,
-            condition: options.condition,
-            deferred: options.deferred,
-            num_replicas: options.num_replicas,
+          ignore_if_exists: options.ignore_if_exists,
+          condition: options.condition,
+          deferred: options.deferred,
+          num_replicas: options.num_replicas,
+          scope_name: options.scope_name,
+          collection_name: options.collection_name,
         }, options.timeout)
       end
 
@@ -79,9 +84,11 @@ module Couchbase
       # @raise [Error::IndexExists]
       def create_primary_index(bucket_name, options = CreatePrimaryIndexOptions.new)
         @backend.query_index_create_primary(bucket_name, {
-            ignore_if_exists: options.ignore_if_exists,
-            deferred: options.deferred,
-            num_replicas: options.num_replicas,
+          ignore_if_exists: options.ignore_if_exists,
+          deferred: options.deferred,
+          num_replicas: options.num_replicas,
+          scope_name: options.scope_name,
+          collection_name: options.collection_name,
         }, options.timeout)
       end
 
@@ -97,7 +104,9 @@ module Couchbase
       # @raise [Error::IndexNotFound]
       def drop_index(bucket_name, index_name, options = DropIndexOptions.new)
         @backend.query_index_drop(bucket_name, index_name, {
-            ignore_if_does_not_exist: options.ignore_if_does_not_exist,
+          ignore_if_does_not_exist: options.ignore_if_does_not_exist,
+          scope_name: options.scope_name,
+          collection_name: options.collection_name,
         }, options.timeout)
         true
       end
@@ -113,8 +122,10 @@ module Couchbase
       # @raise [Error::IndexNotFound]
       def drop_primary_index(bucket_name, options = DropPrimaryIndexOptions.new)
         @backend.query_index_drop_primary(bucket_name, {
-            ignore_if_does_not_exist: options.ignore_if_does_not_exist,
-            index_name: options.index_name,
+          ignore_if_does_not_exist: options.ignore_if_does_not_exist,
+          index_name: options.index_name,
+          scope_name: options.scope_name,
+          collection_name: options.collection_name,
         }, options.timeout)
         true
       end
@@ -141,7 +152,9 @@ module Couchbase
       # @raise [ArgumentError]
       # @raise [Error::IndexNotFound]
       def watch_indexes(bucket_name, index_names, timeout, options = WatchIndexesOptions.new)
-        @backend.query_index_watch(bucket_name, index_names, timeout, {})
+        @backend.query_index_watch(bucket_name, index_names, timeout, {
+          watch_primary: options.watch_primary,
+        })
       end
 
       class GetAllIndexOptions
@@ -170,6 +183,12 @@ module Couchbase
         # @return [String] condition to apply to the index
         attr_accessor :condition
 
+        # @return [String] the name of the scope
+        attr_accessor :scope_name
+
+        # @return [String] the name of the collection
+        attr_accessor :collection_name
+
         # @yieldparam [CreateIndexOptions] self
         def initialize
           @ignore_if_exists = false
@@ -193,6 +212,12 @@ module Couchbase
         # @return [Integer] the time in milliseconds allowed for the operation to complete
         attr_accessor :timeout
 
+        # @return [String] the name of the scope
+        attr_accessor :scope_name
+
+        # @return [String] the name of the collection
+        attr_accessor :collection_name
+
         # @yieldparam [CreatePrimaryIndexOptions] self
         def initialize
           @ignore_if_exists = false
@@ -207,6 +232,12 @@ module Couchbase
         # @return [Integer] the time in milliseconds allowed for the operation to complete
         attr_accessor :timeout
 
+        # @return [String] the name of the scope
+        attr_accessor :scope_name
+
+        # @return [String] the name of the collection
+        attr_accessor :collection_name
+
         # @yieldparam [DropIndexOptions] self
         def initialize
           @ignore_if_does_not_exist = false
@@ -224,6 +255,12 @@ module Couchbase
         # @return [Integer] the time in milliseconds allowed for the operation to complete
         attr_accessor :timeout
 
+        # @return [String] the name of the scope
+        attr_accessor :scope_name
+
+        # @return [String] the name of the collection
+        attr_accessor :collection_name
+
         # @yieldparam [DropPrimaryIndexOptions] self
         def initialize
           @ignore_if_does_not_exist = false
@@ -258,7 +295,7 @@ module Couchbase
 
       # @return [Boolean] true if this is a primary index
       attr_accessor :is_primary
-      alias_method :primary?, :is_primary
+      alias primary? is_primary
 
       # @return [:gsi, :view] type of the index
       attr_accessor :type
@@ -266,6 +303,15 @@ module Couchbase
       # @return [Symbol] state
       attr_accessor :state
 
+      # @return [String, nil] the name of the bucket
+      attr_accessor :bucket
+
+      # @return [String, nil] the name of the scope
+      attr_accessor :scope
+
+      # @return [String, nil] the name of the collection
+      attr_accessor :collection
+
       # @return [String] the key space for the index, typically the bucket name.
       attr_accessor :key_space
 
@@ -279,7 +325,6 @@ module Couchbase
       #   instance, it will show the indexed fields in an escaped format (surrounded by backticks).
       attr_accessor :index_key
 
-
       # @return [String] the string representation of the index's condition (the WHERE clause of the index),
       #   or an empty Optional if no condition was set.
       #