riakpb 0.1.6 → 0.2.0

data/lib/riak/{riak_content.rb → content.rb}

@@ -1,17 +1,17 @@
 require 'riak'
 require 'set'
 
-module Riak
-  # Parent class of all object types supported by ripple. {Riak::RObject} represents
-  # the data and metadata stored in a bucket/key pair in the Riak database.
-  class RiakContent
+module Riakpb
+  # Parent class of all object types supported by ripple. {Riakpb::RObject} represents
+  # the data and metadata stored in a bucket/key pair in the Riakpb database.
+  class Content
     include Util::Translation
     include Util::MessageCode
 
-    # @return [Key] the key in which this RiakContent is stored.
+    # @return [Key] the key in which this Content is stored.
     attr_accessor   :key
 
-    # @return [String] the data stored in Riak at this object's key.  Varies in format by content-type.
+    # @return [String] the data stored in Riakpb at this object's key.  Varies in format by content-type.
     attr_accessor   :value
     alias_attribute :data, :value
 
@@ -27,7 +27,7 @@ module Riak
     # @return [String] the vtag of the object
     attr_accessor   :vtag
 
-    # @return [Set<Link>] an Set of {Riak::Link} objects for relationships between this object and other resources
+    # @return [Set<Link>] an Set of {Riakpb::Link} objects for relationships between this object and other resources
     attr_accessor   :links
 
     # @return [Time] the Last-Modified header from the most recent HTTP response, useful for caching and reloading
@@ -42,95 +42,127 @@ module Riak
     attr_accessor   :usermeta
     alias_attribute :meta, :usermeta
 
-    # Create a new riak_content object manually
-    # @param [Riak::Key] key Key instance that owns this RiakContent (really, you should use the Key to get this)
+    attr_accessor   :options
+
+   # Create a new riak_content object manually
+    # @param [Riakpb::Key] key Key instance that owns this Content (really, you should use the Key to get this)
     # @param [Hash] contents Any contents to initialize this instance with
     # @see Key#content
-    # @see RiakContent#load
-    def initialize(key, contents={})
+    # @see Content#load
+    def initialize(key, options={})
       @key              = key unless key.nil?
       @links            = Hash.new{|k,v| k[v] = []}
-      @_links           = []
       @usermeta         = {}
+      @options          = options
 
-      load(contents) unless contents.empty?
+      self.last_mod     = Time.now
 
       yield self if block_given?
     end
 
-    # Load information for the content from the response object, Riak::RpbContent.
-    #
+    def [](attribute)
+      instance_variable_get "@#{attribute}"
+    end
+
+    # Load information for the content from the response object, Riakpb::RpbContent.
     # @param [RpbContent/Hash] contents an RpbContent object or a Hash.
-    # @return [RiakContent] self
-    def load(contents)
-      if contents.is_a?(Riak::RpbContent) or contents.is_a?(Hash)
-        @content_type     = contents[:content_type]     unless contents[:content_type].blank?
-        @charset          = contents[:charset]          unless contents[:charset].blank?
-        @content_encoding = contents[:content_encoding] unless contents[:content_encoding].blank?
-        @vtag             = contents[:vtag]             unless contents[:vtag].blank?
-        self.links        = contents[:links]            unless contents[:links].blank?
-        @last_mod         = contents[:last_mod]
-        @last_mod_usecs   = contents[:last_mod_usecs]
-        self.usermeta     = contents[:usermeta]         unless contents[:usermeta].blank?
-
-        unless contents[:value].blank?
+    # @return [Content] self
+    def load(content)
+      case content
+      when Riakpb::RpbContent, Hash, Riakpb::Content
+        last_mod          = content[:last_mod]
+        last_mod_usecs    = content[:last_mod_usecs]
+
+        if not (last_mod.blank? or last_mod_usecs.blank?)
+          self.last_mod = Time.at "#{last_mod}.#{last_mod_usecs}".to_f
+        end
+
+        @content_type     = content[:content_type]     unless content[:content_type].blank?
+        @charset          = content[:charset]          unless content[:charset].blank?
+        @content_encoding = content[:content_encoding] unless content[:content_encoding].blank?
+        @vtag             = content[:vtag]             unless content[:vtag].blank?
+        self.links        = content[:links]            unless content[:links].blank?
+        self.usermeta     = content[:usermeta]         unless content[:usermeta].blank?
+
+        unless content[:value].blank?
           case @content_type
           when /json/
-            @value = ActiveSupport::JSON.decode(contents[:value]) 
+            @value = ActiveSupport::JSON.decode(content[:value]) 
           when /octet/
-            @value = Marshal.load(contents[:value])
+            @value = Marshal.load(content[:value])
           else
-            @value = contents[:value]
+            @value = content[:value]
           end
         end
-
-        return(self)
+      else raise ArgumentError, t("riak_content_type")
       end
 
-      raise ArgumentError, t("riak_content_type")
+      return(self)
     end
 
-    # Save the RiakContent instance in riak.
+    def merge(content)
+      @links.merge(
+        self.links  = content[:links]
+      ) unless content[:links].blank?
+
+      @usermega.merge(
+        self.usermeta = content[:usermeta]
+      ) unless content[:usermeta].blank?
+
+      @content_type     = content[:content_type]     unless content[:content_type].blank?
+      @value            = content[:value]
+      @charset          = content[:charset]          unless content[:charset].blank?
+      @content_encoding = content[:content_encoding] unless content[:content_encoding].blank?
+      @vtag             = content[:vtag]             unless content[:vtag].blank?
+      @last_mod         = content[:last_mod]
+      @last_mod_usecs   = content[:last_mod_usecs]
+
+      return(self)
+    end
+
+    # Save the Content instance in riak.
     # @option options [Fixnum] w (write quorum) how many replicas to write to before returning a successful response
     # @option options [Fixnum] dw how many replicas to commit to durable storage before returning a successful response
     # @option options [true/false] return_body whether or not to have riak return the key, once saved.  default = true
     def save(options={})
       begin
-        save!(options)
+        self.save!(options)
       rescue FailedRequest
         return(false)
       end
       return(true)
     end
 
-    # Save the RiakContent instance in riak.  Raise/do not rescue on failure.
+    # Save the Content instance in riak.  Raise/do not rescue on failure.
     # @option options [Fixnum] w (write quorum) how many replicas to write to before returning a successful response
     # @option options [Fixnum] dw how many replicas to commit to durable storage before returning a successful response
     # @option options [true/false] return_body whether or not to have riak return the key, once saved.  default = true
     def save!(options={})
       options[:content] = self
+      options           = @options.merge(options)
+
       return(true) if @key.save(options)
       return(false) # Create and raise Error message for this?  Extend "Failed Request"?
     end
 
+
     # Internalizes a link to a Key, which will be saved on next call to... uh, save
     # @param [Hash] tags name of the tag, pointing to a Key instance, or an array ["bucket", "key"]
-    # @return [Hash] links that this RiakContent points to
+    # @return [Hash] links that this Content points to
     def link_key(tags)
-      raise TypeError.new t('invalid_tag') unless tag.is_a?(Hash)
+      raise TypeError.new t('invalid_tag') unless tags.is_a?(Hash) or tags.is_a?(Array)
+
       tags.each do |tag, link|
         case link
         when Array
-          bucket            ||= link[0]
-          key               ||= link[1]
-          raise TypeError.new t('invalid_tag') if bucket.nil? or key.nil?
-
-          get_link          ||= @key.get_linked(bucket, key, {:safely => true})
-          raise RuntimeError.new t('invalid_key') if get_link.nil?
+          newlink = Riakpb::RpbLink.new
+          newlink[:bucket]            = link[0]
+          newlink[:key]               = link[1]
+          raise ArgumentError.new t('invalid_tag') if link[0].nil? or link[1].nil?
 
-          @links[tag.to_s]  <<  get_link
+          @links[tag.to_s]  <<  newlink
 
-        when Riak::Key
+        when Riakpb::Key
           @links[tag.to_s] << link
 
         else
@@ -142,35 +174,59 @@ module Riak
 
     # Set the links to other Key in riak.
     # @param [RpbGetResp, RpbPutResp] contains the tag/bucket/key of a given link
-    # @return [Set] links that this RiakContent points to
+    # @return [Set] links that this Content points to
     def links=(pb_links)
       @links.clear
 
-      pb_links.each do |pb_link|
-        @links[pb_link.tag] << @key.get_linked(pb_link.bucket, pb_link.key, {:safely => true})
+      case pb_links
+      when Hash
+        pb_links.each do |k, v|
+          raise TypeError.new unless k.is_a?(String)
+
+          if v.is_a?(Array)
+            @links[k] += v
+          else
+            @links[k] << v
+          end
+        end
+
+      when Array, Protobuf::Field::FieldArray
+        pb_links.each do |pb_link|
+          @links[pb_link.tag] << @key.get_linked(pb_link.bucket, pb_link.key, {:safely => true})
+        end
+      else
+        raise TypeError.new
       end
 
       return(@links)
     end
 
-    # @return [Riak::RpbContent] An instance of a RpbContent, suitable for protobuf exchange
-    def to_pb
-      raise TypeError.new t('value_empty') if @value.nil?
 
-      rpb_content                   = Riak::RpbContent.new
+    def last_mod=(time_mod)
+      @last_mod = Time.at time_mod
+    end
+
+    # @return [Riakpb::RpbContent] An instance of a RpbContent, suitable for protobuf exchange
+    def to_pb
+      rpb_content                   = Riakpb::RpbContent.new
       rpb_links                     = []
 
       @links.each do |tag, links|
         links.each do |link|
-          pb_link     =   link.to_pb_link
-          pb_link.tag =   tag
-          rpb_links   <<  pb_link
+          case link
+          when Riakpb::RpbLink
+            rpb_links   <<  hlink
+          when Riakpb::Key
+            pb_link     =   link.to_pb_link
+            pb_link.tag =   tag
+            rpb_links   <<  pb_link
+          end
         end
       end
 
       usermeta                      = []
       @usermeta.each do |key,value|
-        pb_pair         =   Riak::RpbPair.new
+        pb_pair         =   Riakpb::RpbPair.new
         pb_pair[:key]   =   key
         pb_pair[:value] =   value
         usermeta        <<  pb_pair
@@ -179,30 +235,29 @@ module Riak
       catch(:redo) do
         case @content_type
         when /octet/
-          rpb_content.value = Marshal.dump(@value)
+          rpb_content.value = Marshal.dump(@value) unless @value.blank?
         when /json/
-          rpb_content.value = ActiveSupport::JSON.encode(@value)
+          rpb_content.value = ActiveSupport::JSON.encode(@value) unless @value.blank?
         when "", nil
           @content_type     = "application/json"
           redo
         else
-          rpb_content.value = @value.to_s
+          rpb_content.value = @value.to_s unless @value.blank?
         end
       end
 
-      rpb_content.content_type      = @content_type     unless @content_type.nil?
-      rpb_content.charset           = @charset          unless @charset.nil? # || @charset.empty?
-      rpb_content.content_encoding  = @content_encoding unless @content_encoding.nil? # || @content_encoding.empty?
-      rpb_content.vtag              = @vtag             unless @vtag.nil?
-      rpb_content.links             = rpb_links         unless rpb_links.nil?
-      rpb_content.usermeta          = usermeta          unless usermeta.nil?
+      rpb_content.content_type      = @content_type     unless @content_type.blank?
+      rpb_content.charset           = @charset          unless @charset.blank? # || @charset.empty?
+      rpb_content.content_encoding  = @content_encoding unless @content_encoding.blank? # || @content_encoding.empty?
+      rpb_content.links             = rpb_links         unless rpb_links.blank?
+      rpb_content.usermeta          = usermeta          unless usermeta.blank?
 
       return(rpb_content)
     end
 
     # @return [String] A representation suitable for IRB and debugging output
     def inspect
-      "#<#Riak::RiakContent " + [
+      "#<#Riakpb::Content " + [
           (@value.nil?)             ? nil : "value=#{@value.inspect}",
           (@content_type.nil?)      ? nil : "content_type=#{@content_type.inspect}",
           (@charset.nil?)           ? nil : "charset=#{@charset.inspect}",
@@ -218,5 +273,5 @@ module Riak
 
     private
 
-  end # class RiakContent
-end # module Riak
+  end # class Content
+end # module Riakpb

data/lib/riak/failed_exchange.rb

@@ -1,7 +1,7 @@
 require 'riak'
 
-module Riak
-  # Exception raised when the expected response code from Riak
+module Riakpb
+  # Exception raised when the expected response code from Riakpb
   # fails to match the actual response code.
   class FailedExchange < StandardError
     include Util::Translation

data/lib/riak/failed_request.rb

@@ -1,10 +1,10 @@
 require 'riak'
 
-module Riak
-  # Exception raised when the expected response code from Riak
+module Riakpb
+  # Exception raised when the expected response code from Riakpb
   # fails to match the actual response code.
   class FailedRequest < StandardError
-    include Riak::Util::Translation
+    include Riakpb::Util::Translation
 
     attr_reader :expected
     attr_reader :actual

data/lib/riak/key.rb

@@ -1,13 +1,13 @@
 require 'riak'
 
-module Riak
-  # Represents and encapsulates operations on a Riak bucket.  You may retrieve a bucket
+module Riakpb
+  # Represents and encapsulates operations on a Riakpb bucket.  You may retrieve a bucket
   # using {Client#bucket}, or create it manually and retrieve its meta-information later.
   class Key
     include Util::Translation
     include Util::MessageCode
 
-    # @return [Riak::Client] the associated client
+    # @return [Riakpb::Client] the associated client
     attr_reader :bucket
 
     # @return [String] the bucket name
@@ -16,25 +16,25 @@ module Riak
     # @return [String] the bucket name
     attr_reader :vclock
 
-    # Create a Riak bucket manually.
+    # Create a Riakpb bucket manually.
     # @param [Bucket] bucket the Bucket object within which this Key exists
     # @option options [String] name the name assigned to this Key entity
     # @option options [Fixnum] vclock Careful! Do not set this unless you have a reason to
-    # @option options [RiakContent] content a content object, that's to be inserted in this Key
+    # @option options [Content] content a content object, that's to be inserted in this Key
     def initialize(bucket, key, get_response=nil)
 #      options.assert_valid_keys(:name, :vclock, :content)
 
       self.bucket   = bucket
       self.name     = key
 
-      @contents     = Hash.new{|k,v| k[v] = Riak::RiakContent.new(self)}
+      @contents     = Hash.new{|k,v| k[v] = Riakpb::Content.new(self)}
 
 #      @contents[:new]
 
       load(get_response) unless get_response.nil?
     end
 
-    # Load information for the key from the response object, Riak::RpbGetResp.
+    # Load information for the key from the response object, Riakpb::RpbGetResp.
     #
     # @param [RpbGetResp/Hash] response an RpbGetResp/RpbPutResp object or a Hash.
     # @return [Key] self
@@ -53,12 +53,12 @@ module Riak
       return(self)
     end
 
-    # Load information for the key from Riak::RpbGetResp object.
+    # Load information for the key from Riakpb::RpbGetResp object.
     #
     # @param [RpbGetResp/Hash] response an RpbGetResp/RpbPutResp object or a Hash.
     # @return [Key] self
     def load!(response)
-      raise ArgumentError, t("response_type") unless response.is_a?(Riak::RpbGetResp)
+      raise ArgumentError, t("response_type") unless response.is_a?(Riakpb::RpbGetResp)
 
       if response.has_field?(:vclock) and response.has_field?(:content)
 
@@ -89,8 +89,8 @@ module Riak
 
     end
 
-    # Retrieves any Keys that are linked to, inside RiakContent elements.
-    # @return [Key] the Key to which the RiakContent is linked (may be empty if it does not exist)
+    # Retrieves any Keys that are linked to, inside Content elements.
+    # @return [Key] the Key to which the Content is linked (may be empty if it does not exist)
     def get_linked(bucket, key, options={})
       @bucket.get_linked(bucket, key, options)
     end
@@ -98,7 +98,7 @@ module Riak
     # Sets the name attribute for this Key object
     # @param [String] key_name sets the name of the Key
     # @return [Hash] the properties that were accepted
-    # @raise [FailedRequest] if the new properties were not accepted by the Riak server
+    # @raise [FailedRequest] if the new properties were not accepted by the Riakpb server
     def name=(key_name)
       raise ArgumentError, t("key_name_type") unless key_name.is_a?(String)
 
@@ -107,9 +107,9 @@ module Riak
 
     # Sets the content object for this Key.  I do not yet support siblings in this method and, therefore,
     #  you may or may not destroy them if you use this and are not careful.
-    # @param [Riak::RiakContent] content a RiakContent instance that should be contained within this Key
-    # @return [Riak::RiakContent] the RiakContent instance that was just set
-    # @raise [ArgumentError] will yell at you if the supplied riak_content is not of the RiakContent class
+    # @param [Riakpb::Content] content a Content instance that should be contained within this Key
+    # @return [Riakpb::Content] the Content instance that was just set
+    # @raise [ArgumentError] will yell at you if the supplied riak_content is not of the Content class
     def content=(riak_contents)
 
       if riak_contents.is_a?(Protobuf::Field::FieldArray)
@@ -122,7 +122,7 @@ module Riak
         end
         
         return(true)
-      elsif riak_contents.is_a?(Riak::RiakContent)
+      elsif riak_contents.is_a?(Riakpb::Content)
 
         @contents.clear
 
@@ -137,9 +137,9 @@ module Riak
 
     end # def content=
 
-    # "@contents" is an array of RiakContent objects, though only contains more than one in the event that
+    # "@contents" is an array of Content objects, though only contains more than one in the event that
     #   there are siblings.
-    # @return [Riak::RiakContent] the content of this Key instance's value (ie, key/value)
+    # @return [Riakpb::Content] the content of this Key instance's value (ie, key/value)
     def content
       case @contents.size
       when 0 then @contents[:new]
@@ -148,8 +148,8 @@ module Riak
       end
     end
 
-    # "@contents" is an array of RiakContent objects.  This gives you that entire array.
-    # @return [Array<Riak::RiakContent>] the contents of this Key instance's value and its siblings, if any
+    # "@contents" is an array of Content objects.  This gives you that entire array.
+    # @return [Array<Riakpb::Content>] the contents of this Key instance's value and its siblings, if any
     def contents
       retr_c = []
 
@@ -158,8 +158,8 @@ module Riak
       return(retr_c)
     end
 
-    # Save the Key+RiakContent instance in riak.
-    # @option options [RiakContent] content RiakContent instance to be saved in this Key.  Must be specified if there are siblings.
+    # Save the Key+Content instance in riak.
+    # @option options [Content] content Content instance to be saved in this Key.  Must be specified if there are siblings.
     # @option options [Fixnum] w (write quorum) how many replicas to write to before returning a successful response
     # @option options [Fixnum] dw how many replicas to commit to durable storage before returning a successful response
     # @option options [Boolean] return_body whether or not to have riak return the key, once saved.  default = true
@@ -175,8 +175,8 @@ module Riak
         end
       end
 
-      options[:content] = rcontent.to_pb  if      rcontent.is_a?(Riak::RiakContent)
-      options[:content] = rcontent        if      rcontent.is_a?(Riak::RpbContent)
+      options[:content] = rcontent.to_pb  if      rcontent.is_a?(Riakpb::Content)
+      options[:content] = rcontent        if      rcontent.is_a?(Riakpb::RpbContent)
       options[:key]     = @name
       options[:vclock]  = @vclock         unless  @vclock.nil?
 
@@ -190,7 +190,7 @@ module Riak
       end
     end
 
-    # Save the RiakContent instance in riak.  Raise/do not rescue on failure.
+    # Save the Content instance in riak.  Raise/do not rescue on failure.
     # @option options [Fixnum] w (write quorum) how many replicas to write to before returning a successful response
     # @option options [Fixnum] dw how many replicas to commit to durable storage before returning a successful response
     # @option options [Boolean] return_body whether or not to have riak return the key, once saved.  default = true
@@ -208,7 +208,7 @@ module Riak
     # @option options [Fixnum] w (write quorum) how many replicas to write to before returning a successful response
     # @option options [Fixnum] dw how many replicas to commit to durable storage before returning a successful response
     # @option options [Boolean] return_body whether or not to have riak return the key, once saved.  default = true
-    # @return [Riak::RpbPutReq]
+    # @return [Riakpb::RpbPutReq]
     def to_pb_put(options={})
       rcontent    = options[:content]
 
@@ -220,26 +220,26 @@ module Riak
         end
       end
 
-      pb_put_req              = Riak::RpbPutReq.new
+      pb_put_req              = Riakpb::RpbPutReq.new
       pb_put_req.key          = @name
-      pb_put_req.content      = rcontent.to_pb  if      rcontent.is_a?(Riak::RiakContent)
-      pb_put_req.content      = rcontent        if      rcontent.is_a?(Riak::RpbContent)
+      pb_put_req.content      = rcontent.to_pb  if      rcontent.is_a?(Riakpb::Content)
+      pb_put_req.content      = rcontent        if      rcontent.is_a?(Riakpb::RpbContent)
       pb_put_req.vclock       = @vclock         unless  @vclock.nil?
 
       return(pb_put_req)
     end
 
-    # "@contents" is an array of RiakContent objects.  This gives you that entire array.
-    # @return [Riak::RpbLink]
+    # "@contents" is an array of Content objects.  This gives you that entire array.
+    # @return [Riakpb::RpbLink]
     def to_pb_link
-      pb_link = Riak::RpbLink.new
+      pb_link = Riakpb::RpbLink.new
       pb_link[:bucket]  = @bucket.name
       pb_link[:key]     = @name
 
       return(pb_link)
     end
 
-    # Converts this Key into an array, that can be used by a RiakContent, if desired.
+    # Converts this Key into an array, that can be used by a Content, if desired.
     # @return [Array] contains the name of the bucket and the name of the key
     def to_link
       [@bucket.name, @name]
@@ -255,7 +255,7 @@ module Riak
 
     # @return [String] a representation suitable for IRB and debugging output
     def inspect
-      "#<Riak::Key name=#{@name.inspect}, vclock=#{@vclock.inspect}, contents=#{contents.inspect}>"
+      "#<Riakpb::Key name=#{@name.inspect}, vclock=#{@vclock.inspect}, contents=#{contents.inspect}>"
     end
 
     private
@@ -263,14 +263,14 @@ module Riak
     # Sets the name attribute for this Key object
     # @param [String] key_name sets the name of the Key
     # @return [Hash] the properties that were accepted
-    # @raise [FailedRequest] if the new properties were not accepted by the Riak server
+    # @raise [FailedRequest] if the new properties were not accepted by the Riakpb server
     def bucket=(bucket)
-      raise ArgumentError, t("invalid_bucket") unless bucket.is_a?(Riak::Bucket)
+      raise ArgumentError, t("invalid_bucket") unless bucket.is_a?(Riakpb::Bucket)
 
       @bucket ||= bucket
     end
 
-    # Sets the vclock attribute for this Key, which was supplied by the Riak node (if you're doing it right)
+    # Sets the vclock attribute for this Key, which was supplied by the Riakpb node (if you're doing it right)
     # @param [Fixnum] vclock the vector clock
     # @return [Fixnum] the vector clock
     # @raise [ArgumentError] if you failed at this task, you'll be instructed to place your head on the keyboard
@@ -281,4 +281,4 @@ module Riak
     end
 
   end # class Key
-end # module Riak
+end # module Riakpb

data/lib/riak/locale/en.yml

@@ -1,14 +1,14 @@
 en:
   riak:
-    client_type: "invalid argument {{client}} is not a Riak::Client"
+    client_type: "invalid argument {{client}} is not a Riakpb::Client"
     string_type: "invalid_argument {{string}} is not a String"
     loading_bucket: "while loading bucket '{{name}}'"
     invalid_bucket: "the specified bucket is invalid"
     invalid_key: "the specified key is invalid or does not exist"
     siblings_disallowed: "the specified bucket does not allow siblings.  Set allow_mult in props to do this."
     value_empty: "a value must be set in order to serialize into a protocol buffer"
-    failed_request: "Expected message code {{expected}} from Riak but received {{actual}}. {{output}}"
-    decode_error: "Riak reported a message length of {{expected}} but length was {{actual}}. {{output}}"
+    failed_request: "Expected message code {{expected}} from Riakpb but received {{actual}}. {{output}}"
+    decode_error: "Riakpb reported a message length of {{expected}} but length was {{actual}}. {{output}}"
     save_resp_siblings: "The save operation has resulted in unresolved siblings. {{output}}"
     save_resp_err: "The attempted save operation resulted in an error response from riak."
     failed_rx: "You might have discovered a bug. {{failure}}"

data/lib/riak/map_reduce.rb

@@ -1,6 +1,6 @@
 require 'riak'
 
-module Riak
+module Riakpb
   # Class for invoking map-reduce jobs using the HTTP interface.
   class MapReduce
     include Util::Translation
@@ -15,7 +15,7 @@ module Riak
     attr_accessor :query
 
     # Creates a new map-reduce job.
-    # @param [Client] client the Riak::Client interface
+    # @param [Client] client the Riakpb::Client interface
     # @yield [self] helpful for initializing the job
     def initialize(client)
       @client, @inputs, @query = client, [], []
@@ -44,16 +44,16 @@ module Riak
       when 1
         p = params.first
         case p
-        when Riak::Bucket
+        when Riakpb::Bucket
           @inputs = p.name
-        when Riak::Key
+        when Riakpb::Key
           @inputs << p.to_input
         when String
           @inputs = p
         end
       when 2..3
         bucket = params.shift
-        bucket = bucket.name if Riak::Bucket === bucket
+        bucket = bucket.name if Riakpb::Bucket === bucket
         @inputs << params.unshift(bucket)
       end
       self
@@ -135,7 +135,7 @@ module Riak
       # @return [Symbol] the type of phase - :map, :reduce, or :link
       attr_accessor :type
 
-      # @return [String, Array<String, String>, Hash, WalkSpec] For :map and :reduce types, the Javascript function to run (as a string or hash with bucket/key), or the module + function in Erlang to run. For a :link type, a {Riak::WalkSpec} or an equivalent hash.
+      # @return [String, Array<String, String>, Hash, WalkSpec] For :map and :reduce types, the Javascript function to run (as a string or hash with bucket/key), or the module + function in Erlang to run. For a :link type, a {Riakpb::WalkSpec} or an equivalent hash.
       attr_accessor :function
 
       # @return [String] the language of the phase's function - "javascript" or "erlang". Meaningless for :link type phases.

data/lib/riak/sibling_error.rb

@@ -1,10 +1,10 @@
 require 'riak'
 
-module Riak
-  # Exception raised when the expected response code from Riak
+module Riakpb
+  # Exception raised when the expected response code from Riakpb
   # fails to match the actual response code.
   class SiblingError < StandardError
-    include Riak::Util::Translation
+    include Riakpb::Util::Translation
 
     attr_reader :key
 

data/lib/riak/util/decode.rb

@@ -1,6 +1,6 @@
 require 'riak'
 
-module Riak
+module Riakpb
   module Util
 
     module Decode