couchbase 3.0.0.beta.1 → 3.0.0

data/lib/couchbase/collection.rb

@@ -22,7 +22,7 @@ module Couchbase
     attr_reader :scope_name
     attr_reader :name
 
-    alias_method :inspect, :to_s
+    alias inspect to_s
 
     # @param [Couchbase::Backend] backend
     # @param [String] bucket_name name of the bucket
@@ -140,7 +140,7 @@ module Couchbase
     # @return [MutationResult]
     def remove(id, options = RemoveOptions.new)
       resp = @backend.document_remove(bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, {
-          durability_level: options.durability_level
+        durability_level: options.durability_level,
       })
       MutationResult.new do |res|
         res.cas = resp[:cas]
@@ -158,8 +158,8 @@ module Couchbase
     def insert(id, content, options = InsertOptions.new)
       blob, flags = options.transcoder.encode(content)
       resp = @backend.document_insert(bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, blob, flags, {
-          durability_level: options.durability_level,
-          expiry: options.expiry,
+        durability_level: options.durability_level,
+        expiry: options.expiry,
       })
       MutationResult.new do |res|
         res.cas = resp[:cas]
@@ -177,8 +177,8 @@ module Couchbase
     def upsert(id, content, options = UpsertOptions.new)
       blob, flags = options.transcoder.encode(content)
       resp = @backend.document_upsert(bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, blob, flags, {
-          durability_level: options.durability_level,
-          expiry: options.expiry,
+        durability_level: options.durability_level,
+        expiry: options.expiry,
       })
       MutationResult.new do |res|
         res.cas = resp[:cas]
@@ -196,9 +196,9 @@ module Couchbase
     def replace(id, content, options = ReplaceOptions.new)
       blob, flags = options.transcoder.encode(content)
       resp = @backend.document_replace(bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, blob, flags, {
-          durability_level: options.durability_level,
-          expiry: options.expiry,
-          cas: options.cas,
+        durability_level: options.durability_level,
+        expiry: options.expiry,
+        cas: options.cas,
       })
       MutationResult.new do |res|
         res.cas = resp[:cas]
@@ -240,14 +240,14 @@ module Couchbase
     # @return [LookupInResult]
     def lookup_in(id, specs, options = LookupInOptions.new)
       resp = @backend.document_lookup_in(
-          bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, options.access_deleted,
-          specs.map { |s|
-            {
-                opcode: s.type,
-                xattr: s.xattr?,
-                path: s.path
-            }
+        bucket_name, "#{@scope_name}.#{@name}", id, options.timeout, options.access_deleted,
+        specs.map do |s|
+          {
+            opcode: s.type,
+            xattr: s.xattr?,
+            path: s.path,
           }
+        end
       )
       LookupInResult.new do |res|
         res.transcoder = options.transcoder
@@ -275,26 +275,26 @@ module Couchbase
     # @return [MutateInResult]
     def mutate_in(id, specs, options = MutateInOptions.new)
       resp = @backend.document_mutate_in(
-          bucket_name, "#{@scope_name}.#{@name}", id, options.timeout,
-          specs.map { |s|
-            {
-                opcode: s.type,
-                path: s.path,
-                param: s.param,
-                xattr: s.xattr?,
-                expand_macros: s.expand_macros?,
-                create_path: s.create_path?
-            }
-          },
+        bucket_name, "#{@scope_name}.#{@name}", id, options.timeout,
+        specs.map do |s|
           {
-              durability_level: options.durability_level,
-              store_semantics: options.store_semantics,
-              access_deleted: options.access_deleted,
-              cas: options.cas,
-              expiry: options.expiry,
+            opcode: s.type,
+            path: s.path,
+            param: s.param,
+            xattr: s.xattr?,
+            expand_macros: s.expand_macros?,
+            create_path: s.create_path?,
           }
+        end,
+        {
+          durability_level: options.durability_level,
+          store_semantics: options.store_semantics,
+          access_deleted: options.access_deleted,
+          cas: options.cas,
+          expiry: options.expiry,
+        }
       )
-      res = MutateInResult.new do |res|
+      result = MutateInResult.new do |res|
         res.transcoder = options.transcoder
         res.cas = resp[:cas]
         res.mutation_token = extract_mutation_token(resp)
@@ -310,11 +310,9 @@ module Couchbase
           end
         end
       end
-      if res.success?
-        res
-      else
-        raise res.first_error
-      end
+      raise result.first_error unless result.success?
+
+      result
     end
 
     private

data/lib/couchbase/collection_options.rb

@@ -28,6 +28,7 @@ module Couchbase
 
       # @yieldparam [GetOptions] self
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         @preserve_array_indexes = false
         @with_expiry = nil
@@ -67,6 +68,7 @@ module Couchbase
 
       # @yieldparam [GetAndLockOptions] self
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         yield self if block_given?
       end
@@ -78,6 +80,7 @@ module Couchbase
 
       # @yieldparam [GetAndTouchOptions] self
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         yield self if block_given?
       end
@@ -122,6 +125,7 @@ module Couchbase
 
       # @yieldparam [GetAllReplicasOptions] self
       def initialize
+        super
         yield self if block_given?
       end
     end
@@ -132,6 +136,7 @@ module Couchbase
 
       # @yieldparam [GetAnyReplicaOptions] self
       def initialize
+        super
         yield self if block_given?
       end
     end
@@ -139,12 +144,13 @@ module Couchbase
     class GetReplicaResult < GetResult
       # @return [Boolean] true if this result came from a replica
       attr_accessor :is_replica
-      alias_method :replica?, :is_replica
+      alias replica? is_replica
     end
 
     class ExistsOptions < CommonOptions
       # @yieldparam [ExistsOptions] self
       def initialize
+        super
         yield self if block_given?
       end
     end
@@ -181,6 +187,7 @@ module Couchbase
 
       # @yieldparam [RemoveOptions]
       def initialize
+        super
         @durability_level = :none
         yield self if block_given?
       end
@@ -198,6 +205,7 @@ module Couchbase
 
       # @yieldparam [InsertOptions]
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         @durability_level = :none
         yield self if block_given?
@@ -216,6 +224,7 @@ module Couchbase
 
       # @yieldparam [UpsertOptions]
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         @durability_level = :none
         yield self if block_given?
@@ -237,6 +246,7 @@ module Couchbase
 
       # @yieldparam [ReplaceOptions]
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         @durability_level = :none
         yield self if block_given?
@@ -259,6 +269,7 @@ module Couchbase
     class TouchOptions < CommonOptions
       # @yieldparam [TouchOptions] self
       def initialize
+        super
         yield self if block_given?
       end
     end
@@ -266,6 +277,7 @@ module Couchbase
     class UnlockOptions < CommonOptions
       # @yieldparam [UnlockOptions] self
       def initialize
+        super
         yield self if block_given?
       end
     end
@@ -279,6 +291,7 @@ module Couchbase
 
       # @yieldparam [LookupInOptions] self
       def initialize
+        super
         @transcoder = JsonTranscoder.new
         yield self if block_given?
       end
@@ -320,13 +333,12 @@ module Couchbase
       private
 
       def get_field_at_index(index)
-        if index >= 0 && index < encoded.size
-          field = encoded[index]
-          raise field.error unless field.success?
-          field
-        else
-          raise Error::PathInvalid, "Index is out of bounds: #{index}"
-        end
+        raise Error::PathInvalid, "Index is out of bounds: #{index}" unless index >= 0 && index < encoded.size
+
+        field = encoded[index]
+        raise field.error unless field.success?
+
+        field
       end
     end
 
@@ -357,6 +369,7 @@ module Couchbase
 
       # @yieldparam [MutateInOptions]
       def initialize
+        super
         @durability_level = :none
         @store_semantics = :replace
         @transcoder = JsonTranscoder.new
@@ -383,6 +396,7 @@ module Couchbase
 
       # @yieldparam [MutateInResult] self
       def initialize
+        super
         yield self if block_given?
       end
 
@@ -393,7 +407,7 @@ module Couchbase
 
       # @api private
       def first_error
-        encoded[first_error_index].error
+        encoded[first_error_index].error unless success?
       end
 
       # @return [Array<SubDocumentField>] holds the encoded subdocument responses
@@ -410,13 +424,12 @@ module Couchbase
       private
 
       def get_field_at_index(index)
-        if index >= 0 && index < encoded.size
-          field = encoded[index]
-          raise field.error unless field.success?
-          field
-        else
-          raise Error::PathInvalid, "Index is out of bounds: #{index}"
-        end
+        raise Error::PathInvalid, "Index is out of bounds: #{index}" unless index >= 0 && index < encoded.size
+
+        field = encoded[index]
+        raise field.error unless field.success?
+
+        field
       end
     end
 
@@ -458,7 +471,8 @@ module Couchbase
       #
       # [+:success+] Indicates a successful response in general.
       # [+:path_not_found+] The provided path does not exist in the document
-      # [+:path_mismatch+] One of path components treats a non-dictionary as a dictionary, or a non-array as an array, or value the path points to is not a number
+      # [+:path_mismatch+] One of path components treats a non-dictionary as a dictionary, or a non-array as an array, or value the path
+      #   points to is not a number
       # [+:path_invalid+] The path's syntax was incorrect
       # [+:path_too_big+] The path provided is too large: either the string is too long, or it contains too many components
       # [+:value_cannot_insert+] The value provided will invalidate the JSON if inserted

data/lib/couchbase/common_options.rb

@@ -26,4 +26,4 @@ module Couchbase
     # @return [Span] If set holds the parent span, that should be used for this request
     attr_accessor :parent_span
   end
-end
+end

data/lib/couchbase/datastructures/couchbase_list.rb

@@ -63,14 +63,14 @@ module Couchbase
       # @return [Integer] returns the number of elements in the list.
       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 list is empty
       def empty?
@@ -84,12 +84,12 @@ module Couchbase
       # @return [CouchbaseList]
       def push(*obj)
         @collection.mutate_in(@id, [
-            MutateInSpec.array_append("", obj)
-        ], @options.mutate_in_options)
+                                MutateInSpec.array_append("", obj),
+                              ], @options.mutate_in_options)
         self
       end
 
-      alias_method :append, :push
+      alias append push
 
       # Prepends objects to the front of the list, moving other elements upwards
       #
@@ -97,12 +97,12 @@ module Couchbase
       # @return [CouchbaseList]
       def unshift(*obj)
         @collection.mutate_in(@id, [
-            MutateInSpec.array_prepend("", obj)
-        ], @options.mutate_in_options)
+                                MutateInSpec.array_prepend("", obj),
+                              ], @options.mutate_in_options)
         self
       end
 
-      alias_method :prepend, :unshift
+      alias prepend unshift
 
       # Inserts the given values before the element with the given +index+.
       #
@@ -111,8 +111,8 @@ module Couchbase
       # @return [CouchbaseList]
       def insert(index, *obj)
         @collection.mutate_in(@id, [
-            MutateInSpec.array_insert("[#{index.to_i}]", obj)
-        ])
+                                MutateInSpec.array_insert("[#{index.to_i}]", obj),
+                              ])
         self
       end
 
@@ -122,14 +122,14 @@ module Couchbase
       # @return [Object, nil]
       def at(index)
         result = @collection.lookup_in(@id, [
-            LookupInSpec.get("[#{index.to_i}]")
-        ], @options.lookup_in_options)
+                                         LookupInSpec.get("[#{index.to_i}]"),
+                                       ], @options.lookup_in_options)
         result.exists?(0) ? result.content(0) : nil
       rescue Error::DocumentNotFound
         nil
       end
 
-      alias_method :[], :at
+      alias [] at
 
       # Deletes the element at the specified +index+, returning that element, or nil
       #
@@ -137,8 +137,8 @@ module Couchbase
       # @return [CouchbaseList]
       def delete_at(index)
         @collection.mutate_in(@id, [
-            MutateInSpec.remove("[#{index.to_i}]")
-        ])
+                                MutateInSpec.remove("[#{index.to_i}]"),
+                              ])
         self
       rescue Error::DocumentNotFound
         self

data/lib/couchbase/datastructures/couchbase_map.rb

@@ -63,14 +63,14 @@ module Couchbase
       # @return [Integer] returns the number of elements in the map.
       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 map is empty
       def empty?
@@ -110,12 +110,13 @@ module Couchbase
       # @return [Object]
       def fetch(key, *rest)
         result = @collection.lookup_in(@id, [
-            LookupInSpec.get(key)
-        ], @options.lookup_in_options)
+                                         LookupInSpec.get(key),
+                                       ], @options.lookup_in_options)
         result.content(0)
       rescue Error::DocumentNotFound, Error::PathNotFound
         return yield if block_given?
-        return rest.first if rest.size > 0
+        return rest.first unless rest.empty?
+
         raise KeyError, "key not found: #{key}"
       end
 
@@ -135,12 +136,11 @@ module Couchbase
       # @param [String] key
       # @param [Object] value
       #
-      # @return Object
+      # @return [void]
       def []=(key, value)
         @collection.mutate_in(@id, [
-            MutateInSpec.upsert(key, value)
-        ], @options.mutate_in_options)
-        value
+                                MutateInSpec.upsert(key, value),
+                              ], @options.mutate_in_options)
       end
 
       # Deletes the key-value pair from the map.
@@ -150,8 +150,8 @@ module Couchbase
       # @return void
       def delete(key)
         @collection.mutate_in(@id, [
-            MutateInSpec.remove(key)
-        ])
+                                MutateInSpec.remove(key),
+                              ])
       rescue Error::DocumentNotFound, Error::PathNotFound
         nil
       end
@@ -162,28 +162,28 @@ module Couchbase
       # @return [Boolean]
       def key?(key)
         result = @collection.lookup_in(@id, [
-            LookupInSpec.exists(key)
-        ], @options.lookup_in_options)
+                                         LookupInSpec.exists(key),
+                                       ], @options.lookup_in_options)
         result.exists?(0)
       rescue Error::DocumentNotFound, Error::PathNotFound
         false
       end
 
-      alias_method :member?, :key?
-      alias_method :include?, :key?
+      alias member? key?
+      alias include? key?
 
       # Returns a new array populated with the keys from the map.
       #
       # @return [Array]
       def keys
-        map {|key, _value| key}
+        map { |key, _value| key }
       end
 
       # Returns a new array populated with the values from the map.
       #
       # @return [Array]
       def values
-        map {|_key, value| value}
+        map { |_key, value| value }
       end
     end