riakpb 0.1.6 → 0.2.0

data/spec/riak/map_reduce_spec.rb

@@ -1,15 +1,15 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::MapReduce do
+describe Riakpb::MapReduce do
   before :each do
-    @client = Riak::Client.new
+    @client = Riakpb::Client.new
     @client.rpc.stub!(:request).and_return(nil)
-    @mr = Riak::MapReduce.new(@client)
+    @mr = Riakpb::MapReduce.new(@client)
   end
 
   it "should require a client" do
-    lambda { Riak::MapReduce.new }.should raise_error
-    lambda { Riak::MapReduce.new(@client) }.should_not raise_error
+    lambda { Riakpb::MapReduce.new }.should raise_error
+    lambda { Riakpb::MapReduce.new(@client) }.should_not raise_error
   end
 
   it "should initialize the inputs and query to empty arrays" do
@@ -19,7 +19,7 @@ describe Riak::MapReduce do
 
   it "should yield itself when given a block on initializing" do
     @mr2 = nil
-    @mr = Riak::MapReduce.new(@client) do |mr|
+    @mr = Riakpb::MapReduce.new(@client) do |mr|
       @mr2 = mr
     end
     @mr2.should == @mr
@@ -41,8 +41,8 @@ describe Riak::MapReduce do
     end
 
     it "should add an object to the inputs by its bucket and key" do
-      bucket = Riak::Bucket.new(@client, "foo")
-      key = Riak::Key.new(bucket, "bar")
+      bucket = Riakpb::Bucket.new(@client, "foo")
+      key = Riakpb::Key.new(bucket, "bar")
       @mr.add(key)
       @mr.inputs.should == [["foo", "bar"]]
     end
@@ -53,7 +53,7 @@ describe Riak::MapReduce do
     end
 
     it "should use a bucket name as the single input" do
-      @mr.add(Riak::Bucket.new(@client, "foo"))
+      @mr.add(Riakpb::Bucket.new(@client, "foo"))
       @mr.inputs.should == "foo"
       @mr.add("docs")
       @mr.inputs.should == "docs"
@@ -114,7 +114,7 @@ describe Riak::MapReduce do
       @mr.query.should have(1).items
       phase = @mr.query.first
       phase.type.should == :link
-#      phase.function.should be_kind_of(Riak::WalkSpec)
+#      phase.function.should be_kind_of(Riakpb::WalkSpec)
       phase.function[:tag].should == "next"
     end
 
@@ -123,7 +123,7 @@ describe Riak::MapReduce do
       @mr.query.should have(1).items
       phase = @mr.query.first
       phase.type.should == :link
-#      phase.function.should be_kind_of(Riak::WalkSpec)
+#      phase.function.should be_kind_of(Riakpb::WalkSpec)
       phase.function[:bucket].should == "foo"
       phase.keep.should be_true
     end
@@ -135,7 +135,7 @@ describe Riak::MapReduce do
     end
 
     it "should map phases to their JSON equivalents" do
-      phase = Riak::MapReduce::Phase.new(:type => :map, :function => "function(){}")
+      phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => "function(){}")
       @mr.query << phase
       @mr.to_json.should include('"source":"function(){}"')
       @mr.to_json.should include('"query":[{"map":{')
@@ -175,11 +175,11 @@ describe Riak::MapReduce do
     end
 
     it "should interpret failed requests with JSON content-types as map reduce errors" do
-      @http.stub!(:post).and_raise(Riak::FailedRequest.new(:post, 200, 500, {"content-type" => ["application/json"]}, '{"error":"syntax error"}'))
-      lambda { @mr.run }.should raise_error(Riak::MapReduceError)
+      @http.stub!(:post).and_raise(Riakpb::FailedRequest.new(:post, 200, 500, {"content-type" => ["application/json"]}, '{"error":"syntax error"}'))
+      lambda { @mr.run }.should raise_error(Riakpb::MapReduceError)
       begin
         @mr.run
-      rescue Riak::MapReduceError => mre
+      rescue Riakpb::MapReduceError => mre
         mre.message.should == '{"error":"syntax error"}'
       else
         fail "No exception raised!"
@@ -187,66 +187,66 @@ describe Riak::MapReduce do
     end
 
     it "should re-raise non-JSON error responses" do
-      @http.stub!(:post).and_raise(Riak::FailedRequest.new(:post, 200, 500, {"content-type" => ["text/plain"]}, 'Oops, you bwoke it.'))
-      lambda { @mr.run }.should raise_error(Riak::FailedRequest)
+      @http.stub!(:post).and_raise(Riakpb::FailedRequest.new(:post, 200, 500, {"content-type" => ["text/plain"]}, 'Oops, you bwoke it.'))
+      lambda { @mr.run }.should raise_error(Riakpb::FailedRequest)
     end
   end
 =end
 end
 
-describe Riak::MapReduce::Phase do
+describe Riakpb::MapReduce::Phase do
   before :each do
     @fun = "function(v,_,_){ return v['values'][0]['data']; }"
   end
 
   it "should initialize with a type and a function" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => @fun, :language => "javascript")
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => @fun, :language => "javascript")
     phase.type.should == :map
     phase.function.should == @fun
     phase.language.should == "javascript"
   end
 
   it "should initialize with a type and an MF" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => ["module", "function"], :language => "erlang")
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => ["module", "function"], :language => "erlang")
     phase.type.should == :map
     phase.function.should == ["module", "function"]
     phase.language.should == "erlang"
   end
 
   it "should initialize with a type and a bucket/key" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => {:bucket => "funs", :key => "awesome_map"}, :language => "javascript")
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => {:bucket => "funs", :key => "awesome_map"}, :language => "javascript")
     phase.type.should == :map
     phase.function.should == {:bucket => "funs", :key => "awesome_map"}
     phase.language.should == "javascript"
   end
 
   it "should assume the language is erlang when the function is an array" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => ["module", "function"])
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => ["module", "function"])
     phase.language.should == "erlang"
   end
 
   it "should assume the language is javascript when the function is a string" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => @fun)
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => @fun)
     phase.language.should == "javascript"
   end
 
   it "should assume the language is javascript when the function is a hash" do
-    phase = Riak::MapReduce::Phase.new(:type => :map, :function => {:bucket => "jobs", :key => "awesome_map"})
+    phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => {:bucket => "jobs", :key => "awesome_map"})
     phase.language.should == "javascript"
   end
 
   it "should accept a WalkSpec for the function when a link phase" do
-#    phase = Riak::MapReduce::Phase.new(:type => :link, :function => Riak::WalkSpec.new({}))
-#    phase.function.should be_kind_of(Riak::WalkSpec)
+#    phase = Riakpb::MapReduce::Phase.new(:type => :link, :function => Riakpb::WalkSpec.new({}))
+#    phase.function.should be_kind_of(Riakpb::WalkSpec)
   end
 
   it "should raise an error if a WalkSpec is given for a phase type other than :link" do
-#    lambda { Riak::MapReduce::Phase.new(:type => :map, :function => Riak::WalkSpec.new({})) }.should raise_error(ArgumentError)
+#    lambda { Riakpb::MapReduce::Phase.new(:type => :map, :function => Riakpb::WalkSpec.new({})) }.should raise_error(ArgumentError)
   end
 
   describe "converting to JSON for the job" do
     before :each do
-      @phase = Riak::MapReduce::Phase.new(:type => :map, :function => "")
+      @phase = Riakpb::MapReduce::Phase.new(:type => :map, :function => "")
     end
 
     [:map, :reduce].each do |type|
@@ -276,8 +276,8 @@ describe Riak::MapReduce::Phase do
         end
 
         it "should include the function name when the function is not a lambda" do
-          @phase.function = "Riak.mapValues"
-          @phase.to_json.should include('"name":"Riak.mapValues"')
+          @phase.function = "Riakpb.mapValues"
+          @phase.to_json.should include('"name":"Riakpb.mapValues"')
           @phase.to_json.should_not include('"source"')
         end
         

data/spec/riak/rpc_spec.rb

@@ -1,4 +1,4 @@
 require File.expand_path("../spec_helper", File.dirname(__FILE__))
 
-describe Riak::Client::Rpc do
-end # Riak::Client::Rpc
+describe Riakpb::Client::Rpc do
+end # Riakpb::Client::Rpc

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Scott Gonyea
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 -07:00
+date: 2010-07-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
         version: 0.4.4
   type: :runtime
   version_requirements: *id003
-description: riakpb is a protocol buffer client for Riak--the distributed database by Basho.
+description: riakpb is a protocol buffer client for Riakpb--the distributed database by Basho.
 email: me@inherentlylame.com
 executables: []
 
@@ -76,13 +76,13 @@ files:
 - lib/riak/client/rpc.rb
 - lib/riak/client.rb
 - lib/riak/client_pb.rb
+- lib/riak/content.rb
 - lib/riak/failed_exchange.rb
 - lib/riak/failed_request.rb
 - lib/riak/i18n.rb
 - lib/riak/key.rb
 - lib/riak/locale/en.yml
 - lib/riak/map_reduce.rb
-- lib/riak/riak_content.rb
 - lib/riak/sibling_error.rb
 - lib/riak/util/decode.rb
 - lib/riak/util/encode.rb
@@ -93,15 +93,14 @@ files:
 - Manifest.txt
 - Rakefile
 - README.rdoc
-- riakpb.gemspec
 - script/console
 - script/destroy
 - script/generate
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
+- spec/riak/content_spec.rb
 - spec/riak/key_spec.rb
 - spec/riak/map_reduce_spec.rb
-- spec/riak/riak_content_spec.rb
 - spec/riak/rpc_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -133,12 +132,12 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: riakpb is a protocol buffer client for Riak--the distributed database by Basho.
+summary: riakpb is a protocol buffer client for Riakpb--the distributed database by Basho.
 test_files: 
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
+- spec/riak/content_spec.rb
 - spec/riak/key_spec.rb
 - spec/riak/map_reduce_spec.rb
-- spec/riak/riak_content_spec.rb
 - spec/riak/rpc_spec.rb
 - spec/spec_helper.rb

data/riakpb.gemspec

@@ -1,37 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{riakpb}
-  s.version = "0.1.6"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Gonyea"]
-  s.date = %q{2010-07-08}
-  s.description = %q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
-  s.email = %q{me@inherentlylame.com}
-  s.files = ["goog.csv", "History.txt", "lib/riak/bucket.rb", "lib/riak/client/rpc.rb", "lib/riak/client.rb", "lib/riak/client_pb.rb", "lib/riak/failed_exchange.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/key.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce.rb", "lib/riak/riak_content.rb", "lib/riak/sibling_error.rb", "lib/riak/util/decode.rb", "lib/riak/util/encode.rb", "lib/riak/util/message_code.rb", "lib/riak/util/translation.rb", "lib/riak.rb", "load_stocks.rb", "Manifest.txt", "Rakefile", "README.rdoc", "riakpb.gemspec", "script/console", "script/destroy", "script/generate", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/key_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/riak_content_spec.rb", "spec/riak/rpc_spec.rb", "spec/spec_helper.rb"]
-  s.homepage = %q{http://github.com/aitrus/riak-pbclient}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{riakpb is a protocol buffer client for Riak--the distributed database by Basho.}
-  s.test_files = ["spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/key_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/riak_content_spec.rb", "spec/riak/rpc_spec.rb", "spec/spec_helper.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_runtime_dependency(%q<protobuf>, [">= 0.4.4"])
-    else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.9"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-      s.add_dependency(%q<protobuf>, [">= 0.4.4"])
-    end
-  else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.9"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.5"])
-    s.add_dependency(%q<protobuf>, [">= 0.4.4"])
-  end
-end