riakpb 0.1.6 → 0.2.0

data/lib/riak/util/encode.rb

@@ -1,11 +1,11 @@
 require 'riak'
 
-module Riak
+module Riakpb
   module Util
     
     module Encode
       
-      # Construct a Request Message for Riak, which adheres to the following structure:
+      # Construct a Request Message for Riakpb, which adheres to the following structure:
       #
       #   00 00 00 07 09 0A 01 62 12 01 6B
       #   |----Len---|MC|----Message-----|

data/lib/riak/util/message_code.rb

@@ -1,4 +1,4 @@
-module Riak
+module Riakpb
   module Util
     module MessageCode
       ERROR_RESPONSE            = 0
@@ -56,17 +56,17 @@ module Riak
       
       RESPONSE_CLASS_FOR        = {
         PING_REQUEST            =>  nil,
-        GET_CLIENT_ID_REQUEST   =>  Riak::RpbGetClientIdResp,
+        GET_CLIENT_ID_REQUEST   =>  Riakpb::RpbGetClientIdResp,
         SET_CLIENT_ID_REQUEST   =>  nil,
-        GET_SERVER_INFO_REQUEST =>  Riak::RpbGetServerInfoResp,
-        GET_REQUEST             =>  Riak::RpbGetResp,
-        PUT_REQUEST             =>  Riak::RpbPutResp,
+        GET_SERVER_INFO_REQUEST =>  Riakpb::RpbGetServerInfoResp,
+        GET_REQUEST             =>  Riakpb::RpbGetResp,
+        PUT_REQUEST             =>  Riakpb::RpbPutResp,
         DEL_REQUEST             =>  nil,
-        LIST_BUCKETS_REQUEST    =>  Riak::RpbListBucketsResp,
-        LIST_KEYS_REQUEST       =>  Riak::RpbListKeysResp,
-        GET_BUCKET_REQUEST      =>  Riak::RpbGetBucketResp,
+        LIST_BUCKETS_REQUEST    =>  Riakpb::RpbListBucketsResp,
+        LIST_KEYS_REQUEST       =>  Riakpb::RpbListKeysResp,
+        GET_BUCKET_REQUEST      =>  Riakpb::RpbGetBucketResp,
         SET_BUCKET_REQUEST      =>  nil,
-        MAP_REDUCE_REQUEST      =>  Riak::RpbMapRedResp
+        MAP_REDUCE_REQUEST      =>  Riakpb::RpbMapRedResp
       }
     end
   end

data/lib/riak/util/translation.rb

@@ -1,6 +1,6 @@
 require 'riak'
 
-module Riak
+module Riakpb
   module Util
     module Translation
       def i18n_scope

data/lib/riak.rb

@@ -8,14 +8,14 @@ require 'yaml'
 require 'base64'
 require 'riak/client_pb'
 
-module Riak
-  VERSION = '0.1.6'
+module Riakpb
+  VERSION = '0.2.0'
 
   # Domain objects
   autoload :I18n,             'riak/i18n'
   autoload :Client,           'riak/client'
   autoload :Key,              'riak/key'
-  autoload :RiakContent,      'riak/riak_content'
+  autoload :Content,          'riak/content'
   autoload :Bucket,           'riak/bucket'
   autoload :MapReduce,        'riak/map_reduce'
 

data/load_stocks.rb

@@ -1,7 +1,7 @@
 require 'riak'
 require 'csv'
 
-client = Riak::Client.new
+client = Riakpb::Client.new
 bucket = client["goog"]
 
 CSV.foreach('goog.csv', :headers => true) do |row|

data/spec/riak/bucket_spec.rb

@@ -1,13 +1,13 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::Bucket do
+describe Riakpb::Bucket do
   describe "when directly initializing" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
     end
 
     it "should default with the client and name, and empty n_val or allow_mult" do
-      bucket = Riak::Bucket.new(@client, "test")
+      bucket = Riakpb::Bucket.new(@client, "test")
       bucket.client.should      == @client
       bucket.name.should        == "test"
       bucket.n_val.should       == nil
@@ -15,14 +15,14 @@ describe Riak::Bucket do
     end
 
     it "should correctly accept an n_val" do
-      bucket                    = Riak::Bucket.new(@client, "test")
+      bucket                    = Riakpb::Bucket.new(@client, "test")
       bucket.n_val              = 5
       bucket.n_val.should       be_kind_of(Fixnum)
       lambda { bucket.n_val="5" }.should raise_error(ArgumentError)
     end
 
     it "should correctly accept an allow_mult" do
-      bucket                    = Riak::Bucket.new(@client, "test")
+      bucket                    = Riakpb::Bucket.new(@client, "test")
       bucket.allow_mult         = true
       bucket.allow_mult.should  be_kind_of(TrueClass)
       bucket.allow_mult         = false
@@ -33,16 +33,16 @@ describe Riak::Bucket do
 
   describe "when initialized from the Client" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
       @client.rpc.stub!(:request).and_return(nil)
     end
 
     it "should have set the properties" do
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_BUCKET_REQUEST,
-          Riak::RpbGetBucketReq.new(:bucket => "goog")
+          Riakpb::Util::MessageCode::GET_BUCKET_REQUEST,
+          Riakpb::RpbGetBucketReq.new(:bucket => "goog")
         ).and_return(
-          Riak::RpbGetBucketResp.new(
+          Riakpb::RpbGetBucketResp.new(
             {   :props  => {
                 :allow_mult => false,
                 :n_val      => 3
@@ -50,7 +50,7 @@ describe Riak::Bucket do
             }
         ))
       bucket = @client["goog"]
-      bucket.should             be_kind_of(Riak::Bucket)
+      bucket.should             be_kind_of(Riakpb::Bucket)
       bucket.client.should      == @client
       bucket.name.should        == "goog"
       bucket.n_val.should       == 3
@@ -60,12 +60,12 @@ describe Riak::Bucket do
 
   describe "key retrieval" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_BUCKET_REQUEST,
-          Riak::RpbGetBucketReq.new(:bucket => "goog")
+          Riakpb::Util::MessageCode::GET_BUCKET_REQUEST,
+          Riakpb::RpbGetBucketReq.new(:bucket => "goog")
         ).and_return(
-          Riak::RpbGetBucketResp.new(
+          Riakpb::RpbGetBucketResp.new(
             {   :props  => {
                 :allow_mult => false,
                 :n_val      => 3
@@ -77,10 +77,10 @@ describe Riak::Bucket do
 
     it "should list the keys within the bucket" do
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::LIST_KEYS_REQUEST,
-          Riak::RpbListKeysReq.new(:bucket => "goog")
+          Riakpb::Util::MessageCode::LIST_KEYS_REQUEST,
+          Riakpb::RpbListKeysReq.new(:bucket => "goog")
         ).and_return(
-          Riak::RpbListKeysResp.new(
+          Riakpb::RpbListKeysResp.new(
             {   :keys =>  ["2010-04-12", "2008-01-10", "2006-06-06"],
                 :done =>  true
             }
@@ -90,16 +90,16 @@ describe Riak::Bucket do
 
     it "should return a key, when requested" do
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_REQUEST,
-          Riak::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
+          Riakpb::Util::MessageCode::GET_REQUEST,
+          Riakpb::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
         ).and_return(
-          Riak::RpbGetResp.new(
+          Riakpb::RpbGetResp.new(
             {   :content  =>  [],
                 :vclock   =>  ""
             }
         ))
-      @bucket["2010-04-12"].should be_kind_of(Riak::Key)
+      @bucket["2010-04-12"].should be_kind_of(Riakpb::Key)
     end
   end # describe "key retrieval"
 
-end # Riak::Client
+end # Riakpb::Client

data/spec/riak/client_spec.rb

@@ -1,27 +1,27 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::Client do
+describe Riakpb::Client do
   describe "when initializing" do
     it "should default to the local interface on port 8087" do
-      client = Riak::Client.new
+      client = Riakpb::Client.new
       client.host.should      == "127.0.0.1"
       client.port.should      == 8087
     end
 
     it "should accept a host" do
-      client = Riak::Client.new :host => "riak.basho.com"
+      client = Riakpb::Client.new :host => "riak.basho.com"
       client.host.should == "riak.basho.com"
     end
 
     it "should accept a port" do
-      client = Riak::Client.new :port => 9000
+      client = Riakpb::Client.new :port => 9000
       client.port.should == 9000
     end
   end
 
   describe "reconfiguring" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
     end
 
     describe "setting the host" do
@@ -70,18 +70,18 @@ describe Riak::Client do
       end
 
       it "should reject an integer equal to the maximum client id" do
-        lambda { @client.client_id = Riak::Client::MAX_CLIENT_ID }.should raise_error(ArgumentError)
+        lambda { @client.client_id = Riakpb::Client::MAX_CLIENT_ID }.should raise_error(ArgumentError)
       end
 
       it "should reject an integer larger than the maximum client id" do
-        lambda { @client.client_id = Riak::Client::MAX_CLIENT_ID + 1 }.should raise_error(ArgumentError)
+        lambda { @client.client_id = Riakpb::Client::MAX_CLIENT_ID + 1 }.should raise_error(ArgumentError)
       end
     end # describe "setting the client id"
   end # describe "reconfiguring"
 
   describe "sending and receiving protocol buffers" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
       @client.rpc.stub!(:status).and_return(true)
       @client.rpc.stub!(:request).and_return(nil)
     end
@@ -89,7 +89,7 @@ describe Riak::Client do
     describe "basic communication with riak node" do
       it "should send a ping request and return true" do
         @client.rpc.stub!(:request).with(
-            Riak::Util::MessageCode::PING_REQUEST
+            Riakpb::Util::MessageCode::PING_REQUEST
           ).and_return('')
 
         @client.ping?.should          == true
@@ -98,8 +98,8 @@ describe Riak::Client do
       it "should request the connected riak node's server info and return a Hash" do
         # test length or content?  Need to look at what are considered acceptable values
         @client.rpc.stub!(:request).with(
-            Riak::Util::MessageCode::GET_SERVER_INFO_REQUEST
-          ).and_return(Riak::RpbGetServerInfoResp.new(
+            Riakpb::Util::MessageCode::GET_SERVER_INFO_REQUEST
+          ).and_return(Riakpb::RpbGetServerInfoResp.new(
             {   :node           => "riak@127.0.0.1",
                 :server_version => "0.10.1"
             }
@@ -115,21 +115,21 @@ describe Riak::Client do
       describe "bucket retrieval (get)" do
         it "should send a request to list available bucket names and return a Protobuf::Field::FieldArray" do
           @client.rpc.stub!(:request).with(
-              Riak::Util::MessageCode::LIST_BUCKETS_REQUEST
+              Riakpb::Util::MessageCode::LIST_BUCKETS_REQUEST
             ).and_return(
-              Riak::RpbListBucketsResp.new(
+              Riakpb::RpbListBucketsResp.new(
                 {   :buckets => ["goog"] }
             ))
 
           @client.buckets.should be_kind_of(Protobuf::Field::FieldArray)
         end
 
-        it "should send a request with the bucket name and return a Riak::Bucket" do
+        it "should send a request with the bucket name and return a Riakpb::Bucket" do
           @client.rpc.stub!(:request).with(
-              Riak::Util::MessageCode::GET_BUCKET_REQUEST,
-              Riak::RpbGetBucketReq.new(:bucket => "goog")
+              Riakpb::Util::MessageCode::GET_BUCKET_REQUEST,
+              Riakpb::RpbGetBucketReq.new(:bucket => "goog")
             ).and_return(
-              Riak::RpbGetBucketResp.new(
+              Riakpb::RpbGetBucketResp.new(
                 {   :props  => {
                     :allow_mult => false,
                     :n_val      => 3
@@ -137,15 +137,15 @@ describe Riak::Client do
                 }
             ))
 
-          @client.bucket("goog").should be_kind_of(Riak::Bucket)
+          @client.bucket("goog").should be_kind_of(Riakpb::Bucket)
         end
 
         it "should send a request to list keys within a bucket and return a Protobuf::Field::FieldArray" do
           @client.rpc.stub!(:request).with(
-              Riak::Util::MessageCode::LIST_KEYS_REQUEST,
-              Riak::RpbListKeysReq.new(:bucket => "goog")
+              Riakpb::Util::MessageCode::LIST_KEYS_REQUEST,
+              Riakpb::RpbListKeysReq.new(:bucket => "goog")
             ).and_return(
-              Riak::RpbListKeysResp.new(
+              Riakpb::RpbListKeysResp.new(
                 {   :keys =>  ["2010-04-12", "2008-01-10", "2006-06-06"],
                     :done =>  true
                 }
@@ -161,21 +161,21 @@ describe Riak::Client do
     describe "key operations: retrieval (get), send (put) and delete (del)" do
       before :each do
         @client.rpc.stub!(:request).with(
-            Riak::Util::MessageCode::GET_REQUEST,
-            Riak::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
+            Riakpb::Util::MessageCode::GET_REQUEST,
+            Riakpb::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
           ).and_return(
-            Riak::RpbGetResp.new(
+            Riakpb::RpbGetResp.new(
               {   :content  =>  [],
                   :vclock   =>  ""
               }
           ))
       end
 
-      it "should send a request for a bucket/key pair and return a Riak::RpbGetResp" do
-        @client.get_request("goog", "2010-04-12").should be_kind_of(Riak::RpbGetResp)
+      it "should send a request for a bucket/key pair and return a Riakpb::RpbGetResp" do
+        @client.get_request("goog", "2010-04-12").should be_kind_of(Riakpb::RpbGetResp)
       end
 
-      it "should have a vclock attribute within Riak::RpbGetResp of that is a String" do
+      it "should have a vclock attribute within Riakpb::RpbGetResp of that is a String" do
         @client.get_request("goog", "2010-04-12").vclock.should be_kind_of(String)
       end
     end # describe "key operations and retrieval"
@@ -183,10 +183,10 @@ describe Riak::Client do
     describe "key operations and retrieval" do
       before :each do
         @client.rpc.stub!(:request).with(
-            Riak::Util::MessageCode::GET_REQUEST,
-            Riak::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
+            Riakpb::Util::MessageCode::GET_REQUEST,
+            Riakpb::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
           ).and_return(
-            Riak::RpbGetResp.new(
+            Riakpb::RpbGetResp.new(
               {   :content  =>  [],
                   :vclock   =>  ""
               }
@@ -196,4 +196,4 @@ describe Riak::Client do
 
     end # describe "key operations and retrieval"
   end # describe "basic communication with riak node"
-end # Riak::Client
+end # Riakpb::Client

data/spec/riak/{riak_content_spec.rb → content_spec.rb}

@@ -1,14 +1,14 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::RiakContent do
+describe Riakpb::Content do
   describe "when directly initializing" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_BUCKET_REQUEST,
-          Riak::RpbGetBucketReq.new(:bucket => "goog")
+          Riakpb::Util::MessageCode::GET_BUCKET_REQUEST,
+          Riakpb::RpbGetBucketReq.new(:bucket => "goog")
         ).and_return(
-          Riak::RpbGetBucketResp.new(
+          Riakpb::RpbGetBucketResp.new(
             {   :props  => {
                 :allow_mult => false,
                 :n_val      => 3
@@ -16,11 +16,11 @@ describe Riak::RiakContent do
             }
         ))
       @bucket = @client["goog"]
-      @key    = Riak::Key.new(@bucket, "test")
+      @key    = Riakpb::Key.new(@bucket, "test")
     end
 
     it "should default with nil attributes and links/usermeta as instances of Set/Hash" do
-      rcontent                          =   Riak::RiakContent.new(@key)
+      rcontent                          =   Riakpb::Content.new(@key)
       rcontent.key.should               ==  @key
       rcontent.value.should             ==  nil
       rcontent.content_type.should      ==  nil
@@ -28,30 +28,30 @@ describe Riak::RiakContent do
       rcontent.content_encoding.should  ==  nil
       rcontent.vtag.should              ==  nil
       rcontent.links.should             be_kind_of(Hash)
-      rcontent.last_mod.should          ==  nil
+      rcontent.last_mod.should          be_kind_of(Time)
       rcontent.last_mod_usecs.should    ==  nil
       rcontent.usermeta.should          be_kind_of(Hash)
     end
 
     it "should allow you to set the Key, after initialization" do
-      rcontent                          =   Riak::RiakContent.new(@key)
+      rcontent                          =   Riakpb::Content.new(@key)
       rcontent.key                      =   @key
       rcontent.key.should               ==  @key
     end
 
     it "should accept a Key as an argument to new, tying it back to an owner" do
-      rcontent                          =   Riak::RiakContent.new(@key)
+      rcontent                          =   Riakpb::Content.new(@key)
       rcontent.key.should               ==  @key
     end
 
     it "should serialize into a corresponding Protocol Buffer (RpbContent)" do
-      rcontent                          =   Riak::RiakContent.new(@key, :value => "Test")
-      rcontent.to_pb.should             be_kind_of(Riak::RpbContent)
+      rcontent                          =   Riakpb::Content.new(@key, :value => "Test")
+      rcontent.to_pb.should             be_kind_of(Riakpb::RpbContent)
     end
     
-    it "should load a Riak::RpbContent instance, returning a matching self, RiakContent" do
-      rcontent                          =   Riak::RiakContent.new(@key)
-      rpb_content                       =   Riak::RpbContent.new
+    it "should load a Riakpb::RpbContent instance, returning a matching self, Content" do
+      rcontent                          =   Riakpb::Content.new(@key)
+      rpb_content                       =   Riakpb::RpbContent.new
       rpb_content.value                 =   "{\"Date\":\"2010-04-12\",\"Open\":567.35,\"High\":574.00,\"Low\":566.22,\"Close\":572.73,\"Volume\":2352400,\"Adj. Close\":572.73}"
       rpb_content.content_type          =   "application/json"
       rpb_content.vtag                  =   "4DNB6Vt0zLl5VJ6P2xx9dc"
@@ -66,10 +66,9 @@ describe Riak::RiakContent do
       rcontent.content_encoding.should  ==  nil
       rcontent.vtag.should              ==  "4DNB6Vt0zLl5VJ6P2xx9dc"
       rcontent.links.should             be_kind_of(Hash)
-      rcontent.last_mod.should          ==  1274645855
-      rcontent.last_mod_usecs.should    ==  968694
+      rcontent.last_mod.should          ==  Time.at(1274645855.968694)
       rcontent.usermeta.should          be_kind_of(Hash)
     end
 
   end # describe "when directly initializing"
-end # Riak::RiakContent
+end # Riakpb::Content

data/spec/riak/key_spec.rb

@@ -1,14 +1,14 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::Key do
+describe Riakpb::Key do
   describe "when directly initializing" do
     before :each do
-      @client = Riak::Client.new
+      @client = Riakpb::Client.new
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_BUCKET_REQUEST,
-          Riak::RpbGetBucketReq.new(:bucket => "goog")
+          Riakpb::Util::MessageCode::GET_BUCKET_REQUEST,
+          Riakpb::RpbGetBucketReq.new(:bucket => "goog")
         ).and_return(
-          Riak::RpbGetBucketResp.new(
+          Riakpb::RpbGetBucketResp.new(
             {   :props  => {
                 :allow_mult => false,
                 :n_val      => 3
@@ -19,36 +19,36 @@ describe Riak::Key do
     end
 
     it "should default with the bucket and name, and an empty vclock" do
-      key                 =   Riak::Key.new(@bucket, "test")
+      key                 =   Riakpb::Key.new(@bucket, "test")
       key.bucket.should   ==  @bucket
       key.name.should     ==  "test"
       key.vclock.should   ==  nil
-      key.content.should  be_kind_of(Riak::RiakContent)
+      key.content.should  be_kind_of(Riakpb::Content)
     end
 
     it "should serialize into a Key Protocol Buffer (RpbPutReq)" do
       @client.rpc.stub!(:request).with(
-          Riak::Util::MessageCode::GET_REQUEST,
-          Riak::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
+          Riakpb::Util::MessageCode::GET_REQUEST,
+          Riakpb::RpbGetReq.new(:bucket => "goog", :key => "2010-04-12", :r => nil)
         ).and_return(
-          Riak::RpbGetResp.new(
-            {   :content  =>  [Riak::RpbContent.new(:value => "Test")],
+          Riakpb::RpbGetResp.new(
+            {   :content  =>  [Riakpb::RpbContent.new(:value => "Test")],
                 :vclock   =>  "k\xCEa```\xCC`\xCA\x05R,\xACL\xF7^e0%2\xE6\xB12\xC4s\xE6\x1D\xE5\xCB\x02\x00"
             }
         ))
-      key                   =   @bucket["2010-04-12"] # Riak::Key.new(@bucket, "test")
+      key                   =   @bucket["2010-04-12"] # Riakpb::Key.new(@bucket, "test")
       pb_put                =   key.to_pb_put
-      pb_put.should         be_kind_of(Riak::RpbPutReq)
+      pb_put.should         be_kind_of(Riakpb::RpbPutReq)
       pb_put.vclock.should  ==  "k\xCEa```\xCC`\xCA\x05R,\xACL\xF7^e0%2\xE6\xB12\xC4s\xE6\x1D\xE5\xCB\x02\x00"
     end
 
     it "should serialize into a Link Protocol Buffer (RpbLink)" do
-      key                   =   Riak::Key.new(@bucket, "test")
+      key                   =   Riakpb::Key.new(@bucket, "test")
       pb_link               =   key.to_pb_link
-      pb_link.should        be_kind_of(Riak::RpbLink)
+      pb_link.should        be_kind_of(Riakpb::RpbLink)
       pb_link.bucket.should ==  "goog"
       pb_link.key.should    ==  "test"
     end
   end # describe "when directly initializing"
-end # Riak::Key
+end # Riakpb::Key