riak-client 2.2.0.pre1 → 2.2.0

data/lib/riak/crdt/batch_counter.rb

@@ -2,16 +2,16 @@ module Riak
   module Crdt
     class BatchCounter
       attr_reader :accumulator
-      
+
       def initialize
         @accumulator = 0
       end
-      
-      def increment(amount=1)
+
+      def increment(amount = 1)
         @accumulator += amount
       end
-      
-      def decrement(amount=1)
+
+      def decrement(amount = 1)
         increment -amount
       end
     end

data/lib/riak/crdt/batch_map.rb

@@ -4,7 +4,7 @@ module Riak
     # Riak all at once.
     class BatchMap
       attr_reader :counters, :flags, :maps, :registers, :sets
-      
+
       # @api private
       def initialize(parent)
         @parent = parent
@@ -27,7 +27,7 @@ module Riak
           end
         end
       end
-      
+
       private
       def initialize_collections
         @counters = @parent.counters.reparent self

data/lib/riak/crdt/counter.rb

@@ -19,10 +19,10 @@ module Riak
       # @param [String] bucket_type The optional bucket type for this counter.
       #        The default is in `Crdt::Base::DEFAULT_BUCKET_TYPES[:counter]`.
       # @param [Hash] options
-      def initialize(bucket, key, bucket_type=nil, options={})
+      def initialize(bucket, key, bucket_type = nil, options = {})
         super(bucket, key, bucket_type || :counter, options)
       end
-      
+
       # The current value of the counter; hits the server if the value has
       # not been fetched or if the counter has been incremented.
       def value
@@ -34,7 +34,7 @@ module Riak
       #
       # @param [Integer] amount
       # @param [Hash] options
-      def increment(amount=1, options={})
+      def increment(amount = 1, options = {})
         operate operation(amount), options
       end
 
@@ -46,16 +46,16 @@ module Riak
         batcher = BatchCounter.new
 
         yield batcher
-        
+
         increment batcher.accumulator
       end
-      
+
       alias :to_i :value
 
       # Decrement the counter.
       #
       # @param [Integer] amount
-      def decrement(amount=1)
+      def decrement(amount = 1)
         increment -amount
       end
 
@@ -65,7 +65,7 @@ module Riak
           pp.text "value=#{value}"
         end
       end
-      
+
       private
       def vivify(value)
         @value = value

data/lib/riak/crdt/inner_counter.rb

@@ -1,6 +1,6 @@
 module Riak
   module Crdt
-    # The {InnerCounter} lives inside a {Map}, or an {InnerMap} inside of a 
+    # The {InnerCounter} lives inside a {Map}, or an {InnerMap} inside of a
     # {Map}, and is accessed through a {TypedCollection}.
     #
     # Much like the {Riak::Crdt::Counter}, it provides an integer value that can
@@ -21,9 +21,9 @@ module Riak
       #
       # @api private
       attr_reader :parent
-        
+
       # @api private
-      def initialize(parent, value=0)
+      def initialize(parent, value = 0)
         @parent = parent
         @value = value
       end
@@ -54,7 +54,7 @@ module Riak
 
         increment batcher.accumulator
       end
-      
+
       def pretty_print(pp)
         pp.object_group self do
           pp.breakable

data/lib/riak/crdt/inner_flag.rb

@@ -6,15 +6,15 @@ module Riak
     #
     # @api private
     class InnerFlag
-      def self.new(parent, value=false)
+      def self.new(parent, value = false)
         ensure_boolean value
-        
+
         return value
       end
 
       def self.update(value)
         ensure_boolean value
-        
+
         Operation::Update.new.tap do |op|
           op.value = value
           op.type = :flag

data/lib/riak/crdt/inner_map.rb

@@ -12,7 +12,7 @@ module Riak
       attr_reader :parent
 
       # @api private
-      def initialize(parent, value={})
+      def initialize(parent, value = {})
         @parent = parent
         @value = value.symbolize_keys
 

data/lib/riak/crdt/inner_register.rb

@@ -2,7 +2,7 @@ module Riak
   module Crdt
     class InnerRegister < String
       attr_reader :parent
-      
+
       def initialize(parent, *args, &block)
         @parent = parent
         super(*args, &block)

data/lib/riak/crdt/inner_set.rb

@@ -4,14 +4,14 @@ module Riak
     # a {Map} (or an {InnerMap} inside of a {Map}). It is usually accessed
     # through a {TypedCollection}.
     #
-    # Just like a {Riak::Crdt::Set}, it's a set of {String Strings} that can 
+    # Just like a {Riak::Crdt::Set}, it's a set of {String Strings} that can
     # be added to or removed from.
     class InnerSet
       # The name of this set inside a map.
       #
       # @api private
       attr_accessor :name
-      
+
       # The {::Set} value of this {InnerSet}.
       #
       # @return [::Set] set value
@@ -24,13 +24,13 @@ module Riak
       attr_reader :parent
 
       # @api private
-      def initialize(parent, value=[])
+      def initialize(parent, value = [])
         @parent = parent
         frozen_value = value.to_a.tap{ |v| v.each(&:freeze) }
         @value = ::Set.new frozen_value
         @value.freeze
       end
-      
+
       # Casts this {InnerSet} to an {Array}.
       #
       # @return [Array] an array of all the members of this set
@@ -68,7 +68,7 @@ module Riak
         @parent.operate name, update(remove: element)
       end
 
-            
+
       # Does the map containing this set have the context necessary to remove elements?
       #
       # @return [Boolean] if the set has a defined context

data/lib/riak/crdt/map.rb

@@ -16,10 +16,10 @@ module Riak
     # * {InnerRegister}: a {String} value inside a map
     # * {InnerCounter}: a {Riak::Crdt::Counter}, but inside a map
     # * {InnerSet}: a {Riak::Crdt::Set}, but inside a map
-    # 
+    #
     class Map < Base
       attr_reader :counters, :flags, :maps, :registers, :sets
-      
+
       # Create a map instance. The bucket type is determined by the first of
       # these sources:
       #
@@ -33,21 +33,21 @@ module Riak
       # @param [String] bucket_type The optional bucket type for this map.
       #        The default is in `Crdt::Base::DEFAULT_BUCKET_TYPES[:map]`.
       # @param options [Hash]
-      def initialize(bucket, key, bucket_type=nil, options={})
+      def initialize(bucket, key, bucket_type = nil, options = {})
         super(bucket, key, bucket_type || :map, options)
 
         if key
-          initialize_collections 
+          initialize_collections
         else
           initialize_blank_collections
         end
       end
 
-      # Maps are frequently updated in batches. Use this method to get a 
+      # Maps are frequently updated in batches. Use this method to get a
       # {BatchMap} to turn multiple operations into a single Riak update
       # request.
       #
-      # @yieldparam batch_map [BatchMap] collects updates and other operations 
+      # @yieldparam batch_map [BatchMap] collects updates and other operations
       def batch(*args)
         batch_map = BatchMap.new self
 
@@ -58,7 +58,7 @@ module Riak
 
       # This method *for internal use only* is used to collect oprations from
       # disparate sources to provide a user-friendly API.
-      # 
+      #
       # @api private
       def operate(operation, *args)
         batch *args do |m|
@@ -83,7 +83,7 @@ module Riak
       end
 
       alias :value :to_value_h
-      
+
       private
       def vivify(data)
         @counters = TypedCollection.new InnerCounter, self, data[:counters]
@@ -93,7 +93,7 @@ module Riak
         @sets = TypedCollection.new InnerSet, self, data[:sets]
       end
 
-      def initialize_collections(data={})
+      def initialize_collections(data = {})
         reload if dirty?
       end
 

data/lib/riak/crdt/set.rb

@@ -6,7 +6,7 @@ module Riak
     # Uses the Ruby standard library `::Set` frequently, so the full class names will
     # be used frequently.
     class Set < Base
-      
+
       # Create a set instance. The bucket type is determined by the first of
       # these sources:
       #
@@ -19,12 +19,12 @@ module Riak
       #        Riak assign a key.
       # @param [String] bucket_type The optional bucket type for this set.
       # @param options [Hash]
-      def initialize(bucket, key, bucket_type=nil, options={})
+      def initialize(bucket, key, bucket_type = nil, options = {})
         super(bucket, key, bucket_type || :set, options)
       end
 
       # Yields a `BatchSet` to proxy multiple set operations into a single
-      # Riak update. The `BatchSet` has the same methods as this 
+      # Riak update. The `BatchSet` has the same methods as this
       # {Riak::Crdt::Set}.
       #
       # @yieldparam batch_set [BatchSet] collects set operations
@@ -38,7 +38,7 @@ module Riak
         batcher = BatchSet.new self
 
         yield batcher
-        
+
         operate batcher.operations
       end
 
@@ -53,7 +53,7 @@ module Riak
       end
 
       alias :value :members
-      
+
       # Cast this {Riak::Crdt::Set} to a Ruby {Array}.
       #
       # @return [Array] array of set members
@@ -67,7 +67,7 @@ module Riak
       def empty?
         members.empty?
       end
-      
+
       # Check to see if a given string is present in this data structure.
       #
       # @param [String] candidate string to check for inclusion in this structure
@@ -80,7 +80,7 @@ module Riak
       #
       # @param [String] element the element to add to the set
       # @param [Hash] options
-      def add(element, options={})
+      def add(element, options = {})
         operate operation(:add, element), options
       end
 
@@ -88,13 +88,13 @@ module Riak
       #
       # @param [String] element to remove from the set
       # @param [Hash] options
-      def remove(element, options={})
+      def remove(element, options = {})
         raise CrdtError::SetRemovalWithoutContextError unless context?
         operate operation(:remove, element), options
       end
 
       alias :delete :remove
-      
+
       def pretty_print(pp)
         super pp do
           pp.comma_breakable
@@ -120,7 +120,7 @@ module Riak
           @adds = ::Set.new
           @removes = ::Set.new
         end
-        
+
         def add(element)
           @adds.add element
         end

data/lib/riak/crdt/typed_collection.rb

@@ -2,28 +2,17 @@ module Riak
   module Crdt
     # A collection of elements of a given type inside a {Map}.
     class TypedCollection
-
       ALREADY_WRAPPED = ::Set.new [InnerCounter, InnerFlag, InnerMap]
       NEEDS_NAME = ::Set.new [InnerCounter, InnerSet, InnerMap]
       INITIALIZE_NIL = ::Set.new [InnerRegister]
-      
+
       # @api private
-      def initialize(type, parent, contents={})
+      def initialize(type, parent, contents = {})
         @type = type
         @parent = parent
         contents = {} if contents.nil?
         stringified_contents = contents.stringify_keys
-        @contents = stringified_contents.keys.inject(Hash.new) do |contents, key|
-          contents.tap do |c|
-            content = stringified_contents[key]
-            if ALREADY_WRAPPED.include? content.class
-              c[key] = content
-            else
-              c[key] = @type.new self, content
-            end
-            c[key].name = key if needs_name?
-          end
-        end
+        @contents = materialize_contents stringified_contents
       end
 
       def pretty_print(pp)
@@ -31,15 +20,15 @@ module Riak
           pp.breakable
           pp.text inspect_name
           pp.comma_breakable
-          pp.text "parent="
+          pp.text 'parent='
           @parent.pretty_print_cycle(pp)
           pp.comma_breakable
-          pp.text "contents="
+          pp.text 'contents='
           pp.pp @contents
         end
         # buf = []
         # buf << inspect_name
-        # buf << 
+        # buf <<
         # buf << "contents={#{inspect_contents}}"
         # "#<#{self.class.name} #{buf.join ' '}>"
       end
@@ -55,8 +44,8 @@ module Riak
         "contains=#{content_name}"
       end
 
-      def pretty_print_contents(pp)
-        @contents.map do |k,v|
+      def pretty_print_contents(_pp)
+        @contents.map do |k, v|
           "#{k}=>#{v.inspect}"
         end.join ', '
       end
@@ -67,11 +56,11 @@ module Riak
 
       # @api private
       def reparent(new_parent)
-        reparented = self.class.new(@type,
-                                    new_parent,
-                                    @contents)
+        self.class.new(@type,
+                       new_parent,
+                       @contents)
       end
-      
+
       # Check if a value for a given key exists in this map.
       #
       # @param [String] key the key to check for
@@ -79,7 +68,7 @@ module Riak
       def include?(key)
         @contents.include? normalize_key(key)
       end
-      
+
       # Get the value for a given key
       #
       # @param [String] key the key to get the value for
@@ -93,15 +82,15 @@ module Riak
         end
 
         return nil if initialize_nil?
-        
+
         new_instance = @type.new self
         new_instance.name = key if needs_name?
 
-        return new_instance
+        new_instance
       end
 
       # Set the value for a given key. Operation of this method
-      # is only defined for {InnerCounter}, {InnerRegister}, and 
+      # is only defined for {InnerCounter}, {InnerRegister}, and
       # {InnerFlag} types.
       #
       # @param [String] key the key to set a new value for
@@ -117,11 +106,11 @@ module Riak
 
         @contents[key] = @type.new self, value
         @contents[key].name = key if needs_name?
-        
+
         result
       end
-      
-      alias :increment :[]=
+
+      alias_method :increment, :[]=
 
       # Remove the entry from the map.
       #
@@ -139,20 +128,19 @@ module Riak
       # @api private
       def operate(key, inner_operation)
         key = normalize_key key
-        
+
         inner_operation.name = key
-        
+
         @parent.operate inner_operation
       end
-      
-      
+
       # Does this set have the context necessary to remove elements?
       #
       # @return [Boolean] if the set has a defined context
       def context?
         !!@parent.context?
       end
-      
+
       def to_value_h
         return @contents unless NEEDS_NAME.include? @type
 
@@ -162,6 +150,7 @@ module Riak
       end
 
       private
+
       def normalize_key(unnormalized_key)
         unnormalized_key.to_s
       end
@@ -169,10 +158,24 @@ module Riak
       def initialize_nil?
         INITIALIZE_NIL.include? @type
       end
-      
+
       def needs_name?
         NEEDS_NAME.include? @type
       end
+
+      def materialize_contents(stringified_contents)
+        stringified_contents.keys.inject(Hash.new) do |new_contents, key|
+          new_contents.tap do |c|
+            content = stringified_contents[key]
+            if ALREADY_WRAPPED.include? content.class
+              c[key] = content
+            else
+              c[key] = @type.new self, content
+            end
+            c[key].name = key if needs_name?
+          end
+        end
+      end
     end
   end
 end