riakpb 0.1.6 → 0.2.0

data/README.rdoc

@@ -4,7 +4,7 @@
 
 == DESCRIPTION:
 
-This is a Ruby client for Riak, using protocol buffers instead of REST.  It offers some benefit in terms of speed and it abstracts Buckets/Keys differently than does the REST client.  Different != Better.
+This is a Ruby client for Riakpb, using protocol buffers instead of REST.  It offers some benefit in terms of speed and it abstracts Buckets/Keys differently than does the REST client.  Different != Better.
 
 == FEATURES/PROBLEMS:
 
@@ -19,23 +19,23 @@ This is a work in progress and I am current improving the rspec and the document
 
 === Connect to riak and ping it:
 
-  >> client = Riak::Client.new # Riak::Client.new({:host => "ubuntu01", :port => 1234})
-  => #<Riak::Client:0x0000010328a040 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
+  >> client = Riakpb::Client.new # Riakpb::Client.new({:host => "ubuntu01", :port => 1234})
+  => #<Riakpb::Client:0x0000010328a040 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
   >> client.ping?
   => true
 
 === List Buckets within riak:
 <i>Not suggested for use in production</i>
 
-  >> client = Riak::Client.new
-  => #<Riak::Client:0x00000101439a78 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
+  >> client = Riakpb::Client.new
+  => #<Riakpb::Client:0x00000101439a78 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
   >> client.buckets
   => ["hb", "goog"]
 
 === Fetch a Bucket:
 
   >> bucket = client["goog"]
-  => #<Riak::Bucket name=goog, props={n_val=>3, allow_mult=false}>
+  => #<Riakpb::Bucket name=goog, props={n_val=>3, allow_mult=false}>
 
 === Destroy a Bucket:
 
@@ -45,22 +45,22 @@ This is a work in progress and I am current improving the rspec and the document
 === List Keys within the Bucket:
 
   >> bucket = client["goog"]
-  => #<Riak::Bucket name=goog, props={n_val=>3, allow_mult=false}>
+  => #<Riakpb::Bucket name=goog, props={n_val=>3, allow_mult=false}>
   >> bucket.keys
   => ["2010-05-03", "2010-03-24", "2010-03-05", "2010-02-25", <<SNIP>>, "2005-02-10", "2005-01-04"]
 
 === Fetch a Key:
 
   >> key = bucket["2010-04-12"]
-  => #<Riak::Key name="2010-04-12", vclock="k\xCEa```\xCC`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\x97\x05\x00", contents=[#<#Riak::RiakContent value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>]>
+  => #<Riakpb::Key name="2010-04-12", vclock="k\xCEa```\xCC`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\x97\x05\x00", contents=[#<#Riakpb::Content value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>]>
 
 === Fetch a Key's Content:
-<i>Differs from the REST client.  Key+RiakContent = ROjbect</i>
+<i>Differs from the REST client.  Key+Content = ROjbect</i>
 
   >> rcon = key.content
-  => #<#Riak::RiakContent value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>
+  => #<#Riakpb::Content value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>
 
-=== Play with the RiakContent's data and save it:
+=== Play with the Content's data and save it:
 
   >> rcon.value
   => {"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}
@@ -71,29 +71,29 @@ This is a work in progress and I am current improving the rspec and the document
   >> rcon.value["Date"] += 1.day
   => Tue, 13 Apr 2010
   >> rcon
-  => #<#Riak::RiakContent value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>
+  => #<#Riakpb::Content value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="3pbhcnmUtPZvXBSCmo5ESs", links=[], last_mod=1276388043, last_mod_usecs=65345, usermeta={}>
   >> rcon.save
   => true
   >> key = bucket["2010-04-12"]
-  => #<Riak::Key name="2010-04-12", vclock="k\xCEa```\xCA`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\a\x13\xFE\x9A\xF3\x05*|x)P8\v\x00", contents=[#<#Riak::RiakContent value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="2wCEI09OVZEUcHozcm9XCX", links=[], last_mod=1276389827, last_mod_usecs=762316, usermeta={}>]>
+  => #<Riakpb::Key name="2010-04-12", vclock="k\xCEa```\xCA`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\a\x13\xFE\x9A\xF3\x05*|x)P8\v\x00", contents=[#<#Riakpb::Content value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="2wCEI09OVZEUcHozcm9XCX", links=[], last_mod=1276389827, last_mod_usecs=762316, usermeta={}>]>
   >> rcon = key.content
-  => #<#Riak::RiakContent value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="2wCEI09OVZEUcHozcm9XCX", links=[], last_mod=1276389827, last_mod_usecs=762316, usermeta={}>
+  => #<#Riakpb::Content value={"Date"=>Tue, 13 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="2wCEI09OVZEUcHozcm9XCX", links=[], last_mod=1276389827, last_mod_usecs=762316, usermeta={}>
   >> rcon.value["Date"] -= 1.day
   => Mon, 12 Apr 2010
   >> rcon.save
   => true
   >> key = bucket["2010-04-12"]
-  => #<Riak::Key name="2010-04-12", vclock="k\xCEa```\xCA`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\a\x13\xFE\x9A\xF3\x05(\xCC\x04\x14~\xBC\x14(\x9C\x05\x00", contents=[#<#Riak::RiakContent value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="264RmLHrCK89zvhtq4n6Fj", links=[], last_mod=1276389859, last_mod_usecs=810556, usermeta={}>]>
+  => #<Riakpb::Key name="2010-04-12", vclock="k\xCEa```\xCA`\xCA\x05R,\xCC\xF3{*2\x98\x12\x19\xF3X\x19N\xCF\xEB8\xCA\a\x13\xFE\x9A\xF3\x05(\xCC\x04\x14~\xBC\x14(\x9C\x05\x00", contents=[#<#Riakpb::Content value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="264RmLHrCK89zvhtq4n6Fj", links=[], last_mod=1276389859, last_mod_usecs=810556, usermeta={}>]>
   >> rcon = key.content
-  => #<#Riak::RiakContent value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="264RmLHrCK89zvhtq4n6Fj", links=[], last_mod=1276389859, last_mod_usecs=810556, usermeta={}>
+  => #<#Riakpb::Content value={"Date"=>Mon, 12 Apr 2010, "Open"=>"567.35", "High"=>"574.00", "Low"=>"566.22", "Close"=>"572.73", "Volume"=>"2352400", "Adj Close"=>"572.73"}, content_type="application/json", vtag="264RmLHrCK89zvhtq4n6Fj", links=[], last_mod=1276389859, last_mod_usecs=810556, usermeta={}>
   >> 
 
 === Junkshot: (Siblings)
 
-  >> client = Riak::Client.new
-  => #<Riak::Client:0x00000100d2b998 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
+  >> client = Riakpb::Client.new
+  => #<Riakpb::Client:0x00000100d2b998 @host="127.0.0.1", @port=8087, @w=nil, @dw=nil, @buckets=[], @bucket_cache={}>
   >> bucket = client["goog2"]
-  => #<Riak::Bucket name=goog2, props={n_val=>3, allow_mult=false}>
+  => #<Riakpb::Bucket name=goog2, props={n_val=>3, allow_mult=false}>
   >> bucket.allow_mult = true
   => true
   >> client.junkshot "goog2", "2010-04-12", {:links => {"tomorrow" => ["goog2", "2010-04-13"]}}
@@ -129,7 +129,7 @@ I'm working on ways to simplify M/R requests.  It works the same as in ripple.
   require 'riak'
   require 'csv'
 
-  client = Riak::Client.new
+  client = Riakpb::Client.new
   bucket = client["goog"]
 
   CSV.foreach('goog.csv', :headers => true) do |row|
@@ -158,9 +158,9 @@ From Github:
 
 == LINKS:
 
-* Riak Fast Track: https://wiki.basho.com/display/RIAK/The+Riak+Fast+Track
-* Riak Fast Track GOOG data: https://wiki.basho.com/display/RIAK/Loading+Data+and+Running+MapReduce+Queries
-* Ruby Client for Riak's REST Interface: http://github.com/seancribbs/ripple
+* Riakpb Fast Track: https://wiki.basho.com/display/RIAK/The+Riakpb+Fast+Track
+* Riakpb Fast Track GOOG data: https://wiki.basho.com/display/RIAK/Loading+Data+and+Running+MapReduce+Queries
+* Ruby Client for Riakpb's REST Interface: http://github.com/seancribbs/ripple
 
 == THANKS:
 

data/Rakefile

@@ -5,9 +5,9 @@ require './lib/riak'
 
 gemspec = Gem::Specification.new do |gem|
   gem.name = "riakpb"
-  gem.summary = %Q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
-  gem.description = %Q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
-  gem.version = Riak::VERSION
+  gem.summary = %Q{riakpb is a protocol buffer client for Riakpb--the distributed database by Basho.}
+  gem.description = %Q{riakpb is a protocol buffer client for Riakpb--the distributed database by Basho.}
+  gem.version = Riakpb::VERSION
   gem.email = "me@inherentlylame.com"
   gem.homepage = "http://github.com/aitrus/riak-pbclient"
   gem.authors = ["Scott Gonyea"]

data/lib/riak/bucket.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 Bucket
     include Util::Translation
     include Util::MessageCode
 
-    # @return [Riak::Client] the associated client
+    # @return [Riakpb::Client] the associated client
     attr_reader :client
 
     # @return [String] the bucket name
@@ -21,11 +21,11 @@ module Riak
 
     attr_reader :key_cache
 
-    # Create a Riak bucket manually.
-    # @param [Client] client the {Riak::Client} for this bucket
+    # Create a Riakpb bucket manually.
+    # @param [Client] client the {Riakpb::Client} for this bucket
     # @param [String] name the name of the bucket
     def initialize(client, name, options={})
-      options.assert_valid_keys(:n_val, :allow_mult)
+      options.assert_valid_keys(:n_val, :allow_mult, :return_body)
       raise ArgumentError, t("client_type", :client => client.inspect)  unless client.is_a?(Client)
       raise ArgumentError, t("string_type", :string => name.inspect)    unless name.is_a?(String)
 
@@ -33,16 +33,16 @@ module Riak
       @name             = name
       self.n_val      ||= options[:n_val]
       self.allow_mult ||= options[:allow_mult]
-      @key_cache        = Hash.new{|k,v| k[v] = Riak::Key.new(self, v)}
+      @key_cache        = Hash.new{|k,v| k[v] = Riakpb::Key.new(self, v)}
     end
 
-    # Load information for the bucket from a response given by the {Riak::Client::HTTPBackend}.
-    # Used mostly internally - use {Riak::Client#bucket} to get a {Bucket} instance.
-    # @param [RpbHash] response a response from {Riak::Client::HTTPBackend}
+    # Load information for the bucket from a response given by the {Riakpb::Client::HTTPBackend}.
+    # Used mostly internally - use {Riakpb::Client#bucket} to get a {Bucket} instance.
+    # @param [RpbHash] response a response from {Riakpb::Client::HTTPBackend}
     # @return [Bucket] self
     # @see Client#bucket
     def load(response)
-      if response.is_a?(Riak::RpbGetBucketResp)
+      if response.is_a?(Riakpb::RpbGetBucketResp)
         @n_val      = response.props.n_val
         @allow_mult = response.props.allow_mult
 
@@ -66,7 +66,7 @@ module Riak
     # Retrieve an object from within the bucket.
     # @param [String] key the key of the object to retrieve
     # @param [Fixnum] r - the read quorum for the request - how many nodes should concur on the read
-    # @return [Riak::Key] the object
+    # @return [Riakpb::Key] the object
     def key(key, options={})
       raise ArgumentError, t("fixnum_invalid", :num => options[:r]) unless options[:r].is_a?(NilClass) or options[:r].is_a?(Fixnum)
       raise ArgumentError, t("string_invalid", :string => key)      unless key.is_a?(String)
@@ -84,21 +84,21 @@ module Riak
     # Retrieve an object from within the bucket.  Will raise an error message if key does not exist.
     # @param [String] key the key of the object to retrieve
     # @param [Fixnum] quorum - the read quorum for the request - how many nodes should concur on the read
-    # @return [Riak::Key] the object
+    # @return [Riakpb::Key] the object
     def key!(key, r=nil)
       raise ArgumentError, t("string_invalid", :string  => key) unless key.is_a?(String)
       raise ArgumentError, t("fixnum_invalid", :num     => r)   unless r.is_a?(Fixnum) or r.nil?
 
       response = @client.get_request @name, key, r
 
-      Riak::Key.new(self, key).load!(response)
+      Riakpb::Key.new(self, key).load!(response)
     end
 
     # Retrieves a Key from the given Bucket. Originally written for link retrieval.
     # @param [String] bucket the name of the bucket, in which the Key is contained
     # @param [String] key the name of the key to retrieve
     # @option options [Fixnum] :quorum read quorum- num of replicas need to agree when retrieving the object
-    # @return [Riak::Key] the object
+    # @return [Riakpb::Key] the object
     def get_linked(bucket, key, options=nil)
       @client[bucket].key(key, options)
     end
@@ -123,9 +123,9 @@ module Riak
       options           = params.slice :return_body, :w, :dw
       content           = params.slice :value, :content_type, :charset, :content_encoding, :links, :usermeta
 
-      key               = key.name if key.is_a?(Riak::Key)
+      key               = key.name if key.is_a?(Riakpb::Key)
       options[:key]     = key
-      options[:content] = Riak::RpbContent.new(content)
+      options[:content] = Riakpb::RpbContent.new(content)
 
       self.store(options)
     end
@@ -135,7 +135,7 @@ module Riak
     # @param [Hash] options quorum options
     # @option options [Fixnum] :rw - the read/write quorum for the delete
     def delete(key, rw=nil)
-      key = key.name if key.is_a?(Riak::Key)
+      key = key.name if key.is_a?(Riakpb::Key)
 
       @client.del_request(@name, key, rw)
     end
@@ -158,7 +158,7 @@ module Riak
       @allow_mult
     end
 
-    # Set the allow_mult property.  *NOTE* This will result in a PUT request to Riak.
+    # Set the allow_mult property.  *NOTE* This will result in a PUT request to Riakpb.
     # @param [true, false] value whether the bucket should allow siblings
     def allow_mult=(value)
       case value
@@ -194,12 +194,12 @@ module Riak
 
     # @return [String] a representation suitable for IRB and debugging output
     def inspect
-      "#<Riak::Bucket name=#{@name}, props={n_val=>#{@n_val}, allow_mult=#{@allow_mult}}>"
+      "#<Riakpb::Bucket name=#{@name}, props={n_val=>#{@n_val}, allow_mult=#{@allow_mult}}>"
     end
 
     # @return [String] a representation suitable for IRB and debugging output, including keys within this bucket
     def inspect!
-      "#<Riak::Bucket name=#{@name}, props={n_val=>#{@n_val}, allow_mult=#{@allow_mult}}, keys=#{keys.inspect}>"
+      "#<Riakpb::Bucket name=#{@name}, props={n_val=>#{@n_val}, allow_mult=#{@allow_mult}}, keys=#{keys.inspect}>"
     end
 
     private
@@ -207,7 +207,7 @@ module Riak
       rpb_links = []
 
       link_params.each do |tag, links|
-        pb_link         = Riak::RpbLink.new
+        pb_link         = Riakpb::RpbLink.new
         pb_link.tag     = tag
         pb_link.bucket  = links[0]
         pb_link.key     = links[1]
@@ -220,7 +220,7 @@ module Riak
       rpb_meta = []
 
       meta_params.each do |k,v|
-        pb_meta       = Riak::RpbPair.new
+        pb_meta       = Riakpb::RpbPair.new
         pb_meta.key   = k
         pb_meta.value = v
         rpb_meta     << pb_meta

data/lib/riak/client/rpc.rb

@@ -6,27 +6,27 @@
 #
 require 'socket'
 
-module Riak
+module Riakpb
   class Client
     class Rpc
-      include Riak::Util::MessageCode
-      include Riak::Util::Translation
-      include Riak::Util::Encode
-      include Riak::Util::Decode
+      include Riakpb::Util::MessageCode
+      include Riakpb::Util::Translation
+      include Riakpb::Util::Encode
+      include Riakpb::Util::Decode
 
       RECV_LIMIT=1073741824
 
       attr_reader :req_message, :response, :resp_message_codes, :resp_message, :status
 
-      # Establishes a Client ID with the Riak node, for the life of the RPC connection.
-      # @param [Client] client the Riak::Client object in which this Rpc instance lives
+      # Establishes a Client ID with the Riakpb node, for the life of the RPC connection.
+      # @param [Client] client the Riakpb::Client object in which this Rpc instance lives
       # @param [Fixnum] limit the max size of an individual TCPSocket receive call.  Need to fix, later.
       def initialize(client, limit=RECV_LIMIT)
         @status             = false
         @client             = client
         @limit              = limit
         @client_id          = request(Util::MessageCode::GET_CLIENT_ID_REQUEST).client_id
-        @set_client_id      = Riak::RpbSetClientIdReq.new(:client_id => @client_id)
+        @set_client_id      = Riakpb::RpbSetClientIdReq.new(:client_id => @client_id)
 
         # Request / Response Data
         @resp_message_codes = -1
@@ -97,14 +97,16 @@ module Riak
             self.parse_response socket.recv(@limit)
 
           end while(false == (@response[:done] rescue true))
+
+          socket.flush
         end # with_socket
 
         return(@response)
       end # stream_request
 
-      # Handles the response from the Riak node
-      # @param [String] value The message returned from the Riak node over the TCP Socket
-      # @return [Protobuf::Message] @response the processed response (if any) from the Riak node
+      # Handles the response from the Riakpb node
+      # @param [String] value The message returned from the Riakpb node over the TCP Socket
+      # @return [Protobuf::Message] @response the processed response (if any) from the Riakpb node
       def parse_response(value)
         @resp_message << value
 
@@ -135,4 +137,4 @@ module Riak
 
     end # class Client
   end # module Rpc
-end # module RiakPbclient
+end # module RiakpbPbclient

data/lib/riak/client.rb

@@ -1,7 +1,7 @@
 require 'riak'
 
-module Riak
-  # A client connection to Riak.
+module Riakpb
+  # A client connection to Riakpb.
   class Client
     include Util::Translation
     include Util::MessageCode
@@ -22,23 +22,31 @@ module Riak
     attr_reader :node
     attr_reader :server_version
     attr_reader :client_id
-
-    # Creates a client connection to Riak's Protobuf Listener
-    # @param [String] options configuration options for the client
-    # @param [String] host ('127.0.0.1') The host or IP address for the Riak endpoint
-    # @param [Fixnum] port (8087) The port of the Riak protobuf listener endpoint
+    attr_reader :options
+    
+    # Creates a client connection to Riakpb's Protobuf Listener
+    # @options [Hash] options configuration options for the client
     def initialize(options={})
       self.host         = options[:host]      ||      "127.0.0.1"
       self.port         = options[:port]      ||      8087
-      self.client_id    = options[:client_id] unless  options[:client_id].nil?
-      @w                = options[:w]
-      @dw               = options[:dw]
+      self.client_id    = options[:client_id] unless  options[:client_id].blank?
+    
+      read_quorum       = options[:r]         || options[:read_quorum]
+      write_quorum      = options[:w]         || options[:write_quorum]
+      replica_commit    = options[:dw]        || options[:replica_commit]
+      return_body       = options[:rb]        || options[:return_body]    || true
+    
+      @options                = options.slice!(:host, :port, :client_id, :r, :read_quorum, :w, :write_quorum, :dw, :replica_commit, :rb, :return_body)
+      @options[:r]            = read_quorum     unless read_quorum.blank?
+      @options[:w]            = write_quorum    unless write_quorum.blank?
+      @options[:dw]           = replica_commit  unless replica_commit.blank?
+      @options[:return_body]  = return_body     unless return_body.blank?
+    
       @buckets          = []
-      @bucket_cache     = Hash.new{|k,v| k[v] = Riak::Bucket.new(self, v)}
+      @bucket_cache     = Hash.new{|k,v| k[v] = Riakpb::Bucket.new(self, v, @options)}
     end
-
-    # Set the hostname of the Riak endpoint. Must be an IPv4, IPv6, or valid hostname
-    # @param [String] value The host or IP address for the Riak endpoint
+    # Set the hostname of the Riakpb endpoint. Must be an IPv4, IPv6, or valid hostname
+    # @param [String] value The host or IP address for the Riakpb endpoint
     # @raise [ArgumentError] if an invalid hostname is given
     # @return [String] the assigned hostname
     def host=(value)
@@ -46,8 +54,8 @@ module Riak
       @host = value
     end
 
-    # Set the port number of the Riak endpoint. This must be an integer between 0 and 65535.
-    # @param [Fixnum] value The port number of the Riak endpoint
+    # Set the port number of the Riakpb endpoint. This must be an integer between 0 and 65535.
+    # @param [Fixnum] value The port number of the Riakpb endpoint
     # @raise [ArgumentError] if an invalid port number is given
     # @return [Fixnum] the assigned port number
     def port=(value)
@@ -56,7 +64,7 @@ module Riak
     end
 
     # Set the client ID for this client. Must be a string or Fixnum value 0 =< value < MAX_CLIENT_ID.
-    # @param [String, Fixnum] value The internal client ID used by Riak to route responses
+    # @param [String, Fixnum] value The internal client ID used by Riakpb to route responses
     # @raise [ArgumentError] when an invalid client ID is given
     # @return [String] the assigned client ID
     def client_id=(value)
@@ -71,13 +79,13 @@ module Riak
     end
 
     # Establish a connection to the riak node, and store the Rpc instance
-    # @return [Riak::Client::Rpc] the Rpc instance that handles connections to the riak node
+    # @return [Riakpb::Client::Rpc] the Rpc instance that handles connections to the riak node
     def rpc(options={})
       options[:client_id] ||= @client_id if @client_id
       @rpc                ||= Rpc.new(self)
     end
 
-    # Tests connectivity with the Riak host.
+    # Tests connectivity with the Riakpb host.
     # @return [Boolean] Successful returned as 'true', failed connection returned as 'false'
     def ping?
       rpc.request Util::MessageCode::PING_REQUEST
@@ -88,7 +96,7 @@ module Riak
     # Retrieves basic information from the riak node.
     # @return [Hash] Returns the name of the node and its software release number
     def info
-      response        = rpc.request Riak::Util::MessageCode::GET_SERVER_INFO_REQUEST
+      response        = rpc.request Riakpb::Util::MessageCode::GET_SERVER_INFO_REQUEST
 
       @node           = response.node
       @server_version = response.server_version
@@ -96,21 +104,21 @@ module Riak
       {:node => @node, :server_version => @server_version}
     end
 
-    # I need bucket!  Bring me bucket! (Retrieves a bucket from Riak.  Eating disorder not included.)
+    # I need bucket!  Bring me bucket! (Retrieves a bucket from Riakpb.  Eating disorder not included.)
     # @param [String] bucket the bucket to retrieve
     # @return [Bucket] the requested bucket
     def bucket(bucket)
       return(@bucket_cache[bucket]) if @bucket_cache.has_key?(bucket)
-      bring_me_bucket!(bucket)
+      self.bucket!(bucket)
     end
     alias :[]               :bucket
     alias :bring_me_bucket  :bucket
 
-    # I need bucket!  Bring me bucket! (Retrieves a bucket from Riak, even if it's already been retrieved.)
+    # I need bucket!  Bring me bucket! (Retrieves a bucket from Riakpb, even if it's already been retrieved.)
     # @param [String] bucket the bucket to retrieve
     # @return [Bucket] the requested bucket
     def bucket!(bucket)
-      request       = Riak::RpbGetBucketReq.new(:bucket => bucket)
+      request       = Riakpb::RpbGetBucketReq.new(:bucket => bucket)
       response      = rpc.request(
                         Util::MessageCode::GET_BUCKET_REQUEST,
                         request
@@ -124,12 +132,12 @@ module Riak
     # @param [RpbBucketProps, Hash] props the properties to be set within the given bucket
     # @return [TrueClass, FalseClass] whether or not the operation was successful
     def set_bucket(bucket, props)
-      props = Riak::RpbBucketProps.new(props) if props.is_a?(Hash)
+      props = Riakpb::RpbBucketProps.new(props) if props.is_a?(Hash)
 
-      raise TypeError.new t('invalid_props') unless props.is_a?(Riak::RpbBucketProps)
+      raise TypeError.new t('invalid_props') unless props.is_a?(Riakpb::RpbBucketProps)
 
       begin
-        request       = Riak::RpbSetBucketReq.new(:bucket => bucket, :props => props)
+        request       = Riakpb::RpbSetBucketReq.new(:bucket => bucket, :props => props)
         response      = rpc.request(
                           Util::MessageCode::SET_BUCKET_REQUEST,
                           request
@@ -142,14 +150,20 @@ module Riak
       end
     end
 
-    # Retrieves a key, using RpbGetReq, from within a given bucket, from Riak.
+    # Retrieves a key, using RpbGetReq, from within a given bucket, from Riakpb.
     # @param [String] bucket the bucket from which to retrieve the key
     # @param [String] key the name of the key to be received
     # @param [Fixnum] quorum read quorum- num of replicas need to agree when retrieving the object
     # @return [RpbGetResp] the response in which the given Key is stored
     def get_request(bucket, key, quorum=nil)
-      request   = Riak::RpbGetReq.new({:bucket => bucket, :key => key})
-      request.r = quorum if quorum.is_a?(Fixnum)
+      request   = Riakpb::RpbGetReq.new({:bucket => bucket, :key => key})
+
+      quorum  ||= @read_quorum
+      unless quorum.blank?
+        quorum    = quorum.to_i
+        request.r = quorum
+      end
+
 
       response  = rpc.request(
                     Util::MessageCode::GET_REQUEST,
@@ -169,27 +183,27 @@ module Riak
     def put_request(options)
       raise ArgumentError, t('invalid_bucket')  if options[:bucket].empty?
       raise ArgumentError, t('empty_content')   if options[:content].nil?
+      options[:w]           ||= @write_quorum   unless @write_quorum.nil?
+      options[:dw]          ||= @replica_commit unless @replica_commit.nil?
+      options[:return_body]   = @return_body    unless options.has_key?(:return_body)
 
-      options[:w]           ||= @w  unless @w.nil?
-      options[:dw]          ||= @dw unless @dw.nil?
-      options[:return_body] ||= true
-
-      request   = Riak::RpbPutReq.new(options)
+      request   = Riakpb::RpbPutReq.new(options.slice :bucket, :key, :vclock, :content, :w, :dw, :return_body)
       response  = rpc.request(
                     Util::MessageCode::PUT_REQUEST,
                     request
                   )
 
+      return(true)      if response == ""
       return(response)
     end
 
-    # Deletes a key, using RpbDelReq, from within a given bucket, from Riak.
+    # Deletes a key, using RpbDelReq, from within a given bucket, from Riakpb.
     # @param [String] bucket the bucket from which to delete the key
     # @param [String] key the name of the key to be deleted
     # @param [Fixnum] rw how many replicas to delete before returning a successful response
     # @return [RpbGetResp] the response confirming deletion
     def del_request(bucket, key, rw=nil)
-      request         = Riak::RpbDelReq.new
+      request         = Riakpb::RpbDelReq.new
       request.bucket  = bucket
       request.key     = key
       request.rw    ||= rw
@@ -198,6 +212,9 @@ module Riak
                           Util::MessageCode::DEL_REQUEST,
                           request
                         )
+
+      return(true)      if response == ""
+      return(response)
     end
 
     # Sends a MapReduce operation to riak, using RpbMapRedReq, and returns the Response/phases.
@@ -205,7 +222,7 @@ module Riak
     # @param [String] content_type encoding for map/reduce job
     # @return [RpbMapRedResp] the response, encoded in the same format that was sent
     def map_reduce_request(mr_request, content_type)
-      request               = Riak::RpbMapRedReq.new
+      request               = Riakpb::RpbMapRedReq.new
       request.request       = mr_request
       request.content_type  = content_type
 
@@ -214,12 +231,12 @@ module Riak
                                 request
                               )
 
-       return(response)
+      return(response)
     end
     alias :mapred :map_reduce_request
     alias :mr     :map_reduce_request
 
-    # Lists the buckets found in the Riak database
+    # Lists the buckets found in the Riakpb database
     # @raise [ReturnRespError] if the message response does not correlate with the message requested
     # @return [Array] list of buckets (String)
     def buckets
@@ -229,7 +246,7 @@ module Riak
       @buckets = response.buckets.each{|b| b}
     end
 
-    # Lists the keys within their respective buckets, that are found in the Riak database
+    # Lists the keys within their respective buckets, that are found in the Riakpb database
     # @param [String] bucket the bucket from which to retrieve the list of keys
     # @raise [ReturnRespError] if the message response does not correlate with the message requested
     # @return [Hash] Mapping of the buckets (String) to their keys (Array of Strings)
@@ -246,42 +263,11 @@ module Riak
 #        "#<Client >"
 #      end
 
-    # Junkshot lets you throw a lot of data at riak, which will then need to be reconciled later
-    # @overload junkshot(bucket, key, params)
-    #   @param [String] bucket the name of the bucket
-    #   @param [String] key the name of the key
-    #   @param [Hash] params the parameters that are to be updated (Needs fixin')
-    # @overload junkshot(key, params)
-    #   @param [Key] key the Key instance to be junkshotted
-    #   @param [Hash] params the parameters that are to be updated (Needs fixin')
-    # @return [String, Key] dependent upon whether :return_body is set to true or false
-    def junkshot(*params)
-      params = params.dup.flatten
-      case params.size
-      when 3
-        bucket  = params[0]
-        key     = params[1]
-        params  = params[2]
-      when 2
-        begin
-          key     = params[0]
-          bucket  = key.bucket
-          key     = key.name
-        rescue NoMethodError
-          raise TypeError.new t('invalid_key')
-        end
-        params  = params[1]
-      end
-      self.bucket!(bucket).junkshot(key, params)
-    end
-    alias :stuff  :junkshot
-    alias :jk     :junkshot
-
     private
     def b64encode(n)
       Base64.encode64([n].pack("N")).chomp
     end
 
   end # class Client
-end # module Riak
+end # module Riakpb
 

data/lib/riak/client_pb.rb

@@ -253,7 +253,7 @@ require 'protobuf/message/enum'
 require 'protobuf/message/service'
 require 'protobuf/message/extend'
 
-module Riak
+module Riakpb
   class RpbErrorResp < ::Protobuf::Message
     defined_in __FILE__
     required :bytes, :errmsg, 1