riak-client 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fd5ca4128dcee49ac4cad41574580e34abab01a
-  data.tar.gz: 1a8090a12c5d537a23372f8c4791017c6af38570
+  metadata.gz: ead2288b6e4cf47a182c33bb8f7d9305b3f8bf81
+  data.tar.gz: 84f40a4b0c078fa3d8660d942c47987b9a79e1b6
 SHA512:
-  metadata.gz: 8d94f5fd8afe506fca3e15e95321f6e52d1e688f0d186b64bcc86f2245da292ca69abf0cfabd5df58019bb89419a72663d9768070d17c4cf17afd0767057b2ef
-  data.tar.gz: 016abb456a2f0e149b902177c796ec0d4a2ce93454f848e1d39372d79a2a984158b41ecf42d4836e63d7c8cd358e24818ae416dbe393b84df12277acc6c9d48a
+  metadata.gz: d60099de09cdd2b8dd511eaed9482cd4ab8e35088b5946343afab8871e7414c571090cde02075e62176a312421270539ba7df646c5d44f66803fac1d85daf756
+  data.tar.gz: 4e1513258ca94ac6032f0eda704df463104eb892a03c3d7fe0bd7288a157190a6a8ce4b867a863d28b194278ef3d84e81ad8f8a7f2385e74063a024dc6ebaae1

data/README.markdown

@@ -210,6 +210,9 @@ q2 = q.next_page
     $ git checkout master
     $ git pull --rebase basho master
     ```
+
+* Copy spec/support/test_server.yml.example to spec/support/test_server.yml and change that file according to your local installation of riak.
+
 * Create a topic branch. If you've already created a topic branch, rebase it on top of changes from the mainline "master" branch. Examples:
   * New branch:
 

data/RELEASE_NOTES.md

@@ -1,5 +1,26 @@
 # Riak Ruby Client Release Notes
 
+## 1.4.2 Bugfix Release - TBD
+
+Release 1.4.2 fixes a couple bugs.
+
+Issues:
+
+* Secondary index queries against non-2i-enabled buckets/backends now raise a
+  useful exception.
+
+Bugfixes:
+
+* 2i Requests over PBC block forever when 0 results match in 1.4.x,
+  reported by Sean "graphex" McKibben in
+  https://github.com/basho/riak-ruby-client/pull/121 and
+  https://github.com/basho/riak-ruby-client/pull/122
+* RObject#links is an Array when loaded from PBC, reported by Dan Pisarski in
+  https://github.com/basho/riak-ruby-client/pull/123
+* Bucket listing doesn't work with HTTP backend,
+  reported and fixed by Wagner Camaro in
+  https://github.com/basho/riak-ruby-client/pull/124
+
 ## 1.4.1 Patch/Bugfix Release - 2013-09-06
 
 Release 1.4.1 fixes a few minor bugs and issues.

data/lib/riak/client/beefcake/object_methods.rb

@@ -47,7 +47,7 @@ module Riak
           rcontent.raw_data = pbuf.value
           rcontent.etag = pbuf.vtag if pbuf.vtag.present?
           rcontent.content_type = pbuf.content_type if pbuf.content_type.present?
-          rcontent.links = pbuf.links.map(&method(:decode_link)) if pbuf.links.present?
+          rcontent.links = Set.new(pbuf.links.map(&method(:decode_link))) if pbuf.links.present?
           pbuf.usermeta.each {|pair| decode_meta(pair, rcontent.meta) } if pbuf.usermeta.present?
           if pbuf.indexes.present?
             rcontent.indexes.clear

data/lib/riak/client/beefcake_protobuffs_backend.rb

@@ -318,7 +318,23 @@ module Riak
           raise SocketError, "Unexpected EOF on PBC socket" if header.nil?
           msglen, msgcode = header.unpack("NC")
           code = MESSAGE_CODES[msgcode]
-          raise SocketError, "Expected IndexResp, got #{code}" unless code == :IndexResp
+          if code == :ErrorResp
+            resp = RpbErrorResp.decode socket.read msglen - 1
+            message = resp.errmsg
+            if match = message.match(/indexes_not_supported,(\w+)/)
+              message = t('index.wrong_backend', backend: match[1])
+            end
+            raise ProtobuffsFailedRequest.new resp.errcode, message
+          elsif code != :IndexResp
+            teardown # close socket, we don't know what's going on anymore
+            inner = ProtobuffsFailedRequest.new code, t('protobuffs.unexpected_message')
+            raise Innertube::Pool::BadResource, inner
+          end
+
+          if msglen == 1
+            return if block_given?
+            return IndexCollection.new_from_protobuf(RpbIndexResp.decode(''))
+          end
 
           message = RpbIndexResp.decode socket.read msglen - 1
 

data/lib/riak/client/http_backend.rb

@@ -204,9 +204,9 @@ module Riak
 
       # Lists known buckets
       # @return [Array<String>] the list of buckets
-      def list_buckets(&block)
+      def list_buckets(options = {}, &block)
         if block_given?
-          get(200, bucket_list_path(stream: true), &BucketStreamer.new(block))
+          get(200, bucket_list_path(options.merge(stream: true)), &BucketStreamer.new(block))
           return
         end
 
@@ -294,8 +294,14 @@ module Riak
           end
           get(200, path, &parser)
         else
-          response = get(200, path)
-          Riak::IndexCollection.new_from_json response[:body]
+          begin
+            response = get(200, path)
+            Riak::IndexCollection.new_from_json response[:body]
+          rescue HTTPFailedRequest => e
+            if match = e.message.match(/indexes_not_supported,(\w+)/)
+              raise HTTPFailedRequest.new :get, 200, 500, e.headers, t('index.wrong_backend', backend: match[1])
+            end
+          end
         end
       end
 

data/lib/riak/locale/en.yml

@@ -28,6 +28,7 @@ en:
         return_terms_not_available: "The Riak server does not support return_terms."
         streaming_not_available: "The Riak server does not support streaming."
         include_terms_is_wrong: "include_terms isn't a valid option; return_terms is."
+        wrong_backend: "Secondary indexes aren't supported on the %{backend} backend."
     invalid_basic_auth: "basic auth must be set using 'user:pass'"
     invalid_client_id: "Invalid client ID, must be a string or between 0 and %{max_id}"
     invalid_io_object: "Invalid IO-like object assigned to RObject#data.  It should be assigned to raw_data instead."

data/lib/riak/version.rb

@@ -1,3 +1,3 @@
 module Riak
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/riak/beefcake_protobuffs_backend_spec.rb

@@ -42,6 +42,24 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
       @socket = mock(:socket).as_null_object
       TCPSocket.stub(:new => @socket)
     end
+
+    it 'should raise an appropriate error when 2i is not available' do
+      backend.should_receive(:write_protobuff)
+      response_message = Riak::Client::BeefcakeProtobuffsBackend::
+        RpbErrorResp.
+        new(errmsg: '{error,{indexes_not_supported,riak_kv_bitcask_backend}}',
+            errcode: 0).
+        encode
+
+      response_header = [response_message.length + 1, 0].pack('NC')
+
+      @socket.should_receive(:read).with(5).and_return response_header
+      @socket.should_receive(:read).with(response_message.length).and_return response_message
+
+      expect{ backend.get_index 'bucket', 'words', 'asdf' }.to raise_error "Expected success from Riak but received 0. Secondary indexes aren't supported on the riak_kv_bitcask_backend backend."
+      # '
+    end
+    
     context 'when streaming' do
       it "should stream when a block is given" do 
         backend.should_receive(:write_protobuff) do |msg, req|
@@ -99,7 +117,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
       results.should == %w{asdf asdg asdh}
     end
 
-    it "should not crash out when no keys or terms are released" do
+    it "should not crash out when no keys or terms are returned" do
       backend.should_receive(:write_protobuff) do |msg, req|
         msg.should == :IndexReq
         req[:stream].should_not be
@@ -107,9 +125,12 @@ describe Riak::Client::BeefcakeProtobuffsBackend do
 
       response_message = Riak::Client::BeefcakeProtobuffsBackend::
         RpbIndexResp.new().encode
-      
+
       header = [response_message.length + 1, 26].pack 'NC'
-      @socket.should_receive(:read).and_return(header, response_message)
+      @socket.
+        should_receive(:read).
+        with(5).
+        and_return(header)
 
       results = nil
       fetch = proc do

data/spec/riak/http_backend_spec.rb

@@ -171,9 +171,20 @@ describe Riak::Client::HTTPBackend do
   end
 
   context "listing buckets" do
-    it "should GET the bucket list URL and parse the response as JSON" do
+    before(:each) do
       @backend.should_receive(:get).with(200, @backend.bucket_list_path).and_return({:body => '{"buckets":["foo", "bar", "baz"]}'})
-      @backend.list_buckets.should == ["foo", "bar", "baz"]
+    end
+
+    context "given no arguments" do
+      it "should GET the bucket list URL and parse the response as JSON" do
+        @backend.list_buckets.should == ["foo", "bar", "baz"]
+      end
+    end
+
+    context "given a hash of options" do
+      it "should GET the bucket list URL and parse the response as JSON" do
+        @backend.list_buckets({}).should == ["foo", "bar", "baz"]
+      end
     end
   end
 

data/spec/support/unified_backend_examples.rb

@@ -11,6 +11,8 @@ shared_examples_for "Unified backend API" do
       @robject.content_type = "application/json"
       @robject.data = { "test" => "pass" }
       @robject.indexes['test_bin'] << 'pass' if test_server.version >= "1.0.0"
+      @robject.links << Riak::Link.new('/riak/foo/bar', 'next')
+      @robject.links << Riak::Link.new('/riak/foo/baz', 'next')
       @backend.store_object(@robject)
     end
 
@@ -18,6 +20,7 @@ shared_examples_for "Unified backend API" do
       robj = @backend.fetch_object("test", "fetch")
       robj.should be_kind_of(Riak::RObject)
       robj.data.should == { "test" => "pass" }
+      robj.links.should be_a Set
     end
 
     it "should raise an error when the object is not found" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Sean Cribbs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.