riak-client 1.2.0 → 1.4.0

data/spec/riak/multiget_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe Riak::Multiget do
+  before :each do
+    @client = Riak::Client.new
+    @bucket = Riak::Bucket.new(@client, 'foo')
+    @pairs = [[@bucket, 'key1'], [@bucket, 'key2']]
+  end
+
+  describe "initialization" do
+    it "should accept a client and an array of bucket/key pairs" do
+      lambda { Riak::Multiget.new(@client, @pairs) }.should_not raise_error
+    end
+  end
+
+  describe "operation" do
+    it "should fetch both keys from the bucket" do
+      @bucket.should_receive(:[]).with('key1')
+      @bucket.should_receive(:[]).with('key2')
+
+      @multiget = Riak::Multiget.new(@client, @pairs)
+      @multiget.fetch
+      @multiget.wait_for_finish
+    end
+
+    it "should asynchronously fetch" do
+      # make fetches slow
+      @slow_mtx = Mutex.new
+      @slow_mtx.lock
+
+      # set up fetch process to wait on key2
+      @bucket.should_receive(:[]) do |key|
+        next if key == 'key1'
+
+        # wait for test process
+        @slow_mtx.lock
+      end.twice
+
+      # start fetch process
+      @multiget = Riak::Multiget.new(@client, @pairs)
+      @multiget.fetch
+
+      @multiget.finished?.should be_false
+
+      # allow fetch 
+      @slow_mtx.unlock
+
+      @results = @multiget.results
+      @multiget.finished?.should be_true
+      @results.should be_a Hash
+    end
+
+    it "should not die when objects aren't found" do
+      @bucket.should_receive(:[]).with('key1').and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "File not found"))
+      @bucket.should_receive(:[]).with('key2').and_return(true)
+
+      @results = Riak::Multiget.get_all @client, @pairs
+
+      @results[[@bucket, 'key1']].should be_nil
+      @results[[@bucket, 'key2']].should be_true
+    end
+  end
+
+  describe "results" do
+    it "should return a hash of pairs to values" do
+      @bucket.should_receive(:[]).with('key1')
+      @bucket.should_receive(:[]).with('key2')
+      
+      @multiget = Riak::Multiget.new(@client, @pairs)
+      @multiget.fetch
+      @results = @multiget.results
+
+      @results.should be_a Hash
+    end
+  end
+end

data/spec/riak/robject_spec.rb

@@ -277,6 +277,10 @@ describe Riak::RObject do
       lambda { @object.content_type = "   "; @object.store }.should raise_error(ArgumentError)
     end
 
+    it "should raise an error when given an empty string as key" do
+      lambda { @object.key = ''; @object.store }.should raise_error(ArgumentError)
+    end
+
     it "should pass along quorum parameters and returnbody to the backend" do
       @backend.should_receive(:store_object).with(@object, :returnbody => false, :w => 3, :dw => 2).and_return(true)
       @object.store(:returnbody => false, :w => 3, :dw => 2)
@@ -461,4 +465,3 @@ describe Riak::RObject do
     end
   end
 end
-

data/spec/riak/secondary_index_spec.rb

@@ -0,0 +1,225 @@
+require 'spec_helper'
+
+describe Riak::SecondaryIndex do
+  before(:each) do
+    @client = Riak::Client.new
+    @bucket = Riak::Bucket.new @client, 'foo'
+  end
+
+  describe "initialization" do
+    it "should accept a bucket, index name, and scalar" do
+      lambda { Riak::SecondaryIndex.new @bucket, 'asdf', 'aaaa' }.should_not raise_error
+      lambda { Riak::SecondaryIndex.new @bucket, 'asdf', 12345 }.should_not raise_error
+    end
+
+    it "should accept a bucket, index name, and a range" do
+      lambda { Riak::SecondaryIndex.new @bucket, 'asdf', 'aaaa'..'zzzz' }.should_not raise_error
+      lambda { Riak::SecondaryIndex.new @bucket, 'asdf', 1..5 }.should_not raise_error
+    end
+  end
+
+  describe "operation" do
+    before(:each) do
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @args = [@bucket, 'asdf', 'aaaa'..'zzzz', {}]
+      @index = Riak::SecondaryIndex.new *@args
+
+      @backend.should_receive(:get_index).with(*@args).and_return(%w{abcd efgh})
+    end
+
+    it "should return an array of keys" do
+      @results = @index.keys
+      @results.should be_a Array
+      @results.first.should be_a String
+    end
+    it "should return an array of values" do
+      @backend.should_receive(:fetch_object).with(@bucket, 'abcd', {}).and_return('abcd')
+      @backend.should_receive(:fetch_object).with(@bucket, 'efgh', {}).and_return('efgh')
+
+      @results = @index.values
+      @results.should be_a Array
+      @results.length.should == 2
+    end
+  end
+
+  describe "streaming" do
+    it "should stream keys into a block" do
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @args = [@bucket, 'asdf', 'aaaa'..'zzzz', {stream: true}]
+      @index = Riak::SecondaryIndex.new *@args
+
+      @backend.should_receive(:get_index).with(*@args).and_yield('abcd').and_yield('efgh')
+
+      @index.keys {|b| :noop }
+    end
+  end
+
+  describe "pagination" do
+    it "should support max_results" do
+      @max_results = 5
+
+      @expected_collection = Riak::IndexCollection.new_from_json({
+        'keys' => %w{aaaa bbbb cccc dddd eeee},
+        'continuation' => 'examplecontinuation'
+      }.to_json)
+
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @backend.
+        should_receive(:get_index).
+        with(
+             @bucket,
+             'asdf',
+             ('aaaa'..'zzzz'),
+             :max_results => @max_results
+             ).
+        and_return(@expected_collection)
+      @backend.stub(:get_server_version => '1.4.0')
+
+
+      @index = Riak::SecondaryIndex.new(
+                                        @bucket, 
+                                        'asdf', 
+                                        'aaaa'..'zzzz',
+                                        :max_results => @max_results
+                                        )
+
+      @results = @index.keys
+      @results.should be_an Array
+      @results.should == @expected_collection
+      @results.length.should == @max_results
+    end
+
+    it "should support continuations" do
+      @max_results = 5
+
+      @expected_collection = Riak::IndexCollection.new_from_json({
+        'keys' => %w{ffff gggg hhhh}
+      }.to_json)
+
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @backend.
+        should_receive(:get_index).
+        with(
+             @bucket,
+             'asdf',
+             ('aaaa'..'zzzz'),
+             max_results: @max_results,
+             continuation: 'examplecontinuation'
+             ).
+        and_return(@expected_collection)
+      @backend.stub(:get_server_version => '1.4.0')
+
+
+      @index = Riak::SecondaryIndex.new(
+                                        @bucket, 
+                                        'asdf', 
+                                        'aaaa'..'zzzz',
+                                        max_results: @max_results,
+                                        continuation: 'examplecontinuation'
+                                        )
+
+      @results = @index.keys
+      @results.should be_an Array
+      @results.should == @expected_collection
+    end
+
+    it "should support a next_page method" do
+      @max_results = 5
+
+      @expected_collection = Riak::IndexCollection.new_from_json({
+        'keys' => %w{aaaa bbbb cccc dddd eeee},
+        'continuation' => 'examplecontinuation'
+      }.to_json)
+
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @backend.
+        should_receive(:get_index).
+        once.
+        with(
+             @bucket,
+             'asdf',
+             ('aaaa'..'zzzz'),
+             :max_results => @max_results
+             ).
+        and_return(@expected_collection)
+      @backend.stub(:get_server_version => '1.4.0')
+
+
+      @index = Riak::SecondaryIndex.new(
+                                        @bucket, 
+                                        'asdf', 
+                                        'aaaa'..'zzzz',
+                                        :max_results => @max_results
+                                        )
+
+      @results = @index.keys
+      @results.should == @expected_collection
+
+      @second_collection = Riak::IndexCollection.new_from_json({
+        'keys' => %w{ffff gggg hhhh}
+      }.to_json)
+      @backend.
+        should_receive(:get_index).
+        once.
+        with(
+             @bucket,
+             'asdf',
+             ('aaaa'..'zzzz'),
+             max_results: @max_results,
+             continuation: 'examplecontinuation'
+             ).
+        and_return(@second_collection)
+
+      @second_page = @index.next_page
+      @second_results = @second_page.keys
+      @second_results.should == @second_collection
+    end
+  end
+
+  describe "return_terms" do
+    it "should optionally give the index value" do
+      @expected_collection = Riak::IndexCollection.new_from_json({
+        'results' => [
+          {'aaaa' => 'aaaa'},
+          {'bbbb' => 'bbbb'},
+          {'bbbb' => 'bbbb2'}
+        ]
+        }.to_json)
+
+
+      @backend = mock 'Backend'
+      @client.stub!(:backend).and_yield(@backend)
+      @backend.
+        should_receive(:get_index).
+        with(
+             @bucket,
+             'asdf',
+             ('aaaa'..'zzzz'),
+             :return_terms => true
+             ).
+        and_return(@expected_collection)
+      @backend.stub(:get_server_version => '1.4.0')
+
+
+      @index = Riak::SecondaryIndex.new(
+                                        @bucket,
+                                        'asdf',
+                                        'aaaa'..'zzzz',
+                                        :return_terms => true
+                                        )
+
+      @results = @index.keys
+      @results.should be_an Array
+      @results.should == @expected_collection
+      @results.with_terms.should == {
+        'aaaa' => %w{aaaa},
+        'bbbb' => %w{bbbb bbbb2}
+      }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'rubygems' # Use the gems path only for the spec suite
 require 'riak'
 require 'rspec'
 require 'fakeweb'
+require 'stringio'
 
 # Only the tests should really get away with this.
 Riak.disable_list_keys_warnings = true

data/spec/support/sometimes.rb

@@ -35,11 +35,11 @@ RSpec.configure do |config|
         d.filtered_examples.select {|e| e.metadata[:sometimes] && e.metadata[:retried] > 1 }
       end
     end.flatten
-    formatter.message color[retried_examples.empty? ? :green : :yellow, "\n\nRetried examples: #{retried_examples.count}"]
+    formatter.message color[retried_examples.empty? ? :success_color : :pending_color, "\n\nRetried examples: #{retried_examples.count}"]
     unless retried_examples.empty?
       retried_examples.each do |e|
         formatter.message "  #{e.full_description}"
-        formatter.message(color[:yellow, "  [#{e.metadata[:retried]}/#{e.metadata[:retries]}] "] + RSpec::Core::Metadata::relative_path(e.location))
+        formatter.message(color[:pending_color, "  [#{e.metadata[:retried]}/#{e.metadata[:retries]}] "] + RSpec::Core::Metadata::relative_path(e.location))
       end
     end
   end

data/spec/support/unified_backend_examples.rb

@@ -259,6 +259,10 @@ shared_examples_for "Unified backend API" do
     it "should find keys for a range query" do
       @backend.get_index('test', 'index_int', 19..21).should =~ ["19","20", "21"]
     end
+
+    it "should return an empty array for a query that does not match any keys" do
+      @backend.get_index('test', 'index_int', 10000).should == []
+    end
   end
 
   # mapred

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.4.0
 platform: ruby
 authors:
 - Sean Cribbs
+- Bryce Kerley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +21,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,103 +28,90 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +119,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +133,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +140,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: innertube
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +147,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -176,6 +156,7 @@ description: riak-client is a rich client for Riak, the distributed database by
   bucket configuration, link-walking, secondary indexes and map-reduce.
 email:
 - sean@basho.com
+- bryce@basho.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -198,6 +179,7 @@ files:
 - lib/riak.rb
 - lib/riak/bucket.rb
 - lib/riak/client.rb
+- lib/riak/client/beefcake/message_codes.rb
 - lib/riak/client/beefcake/messages.rb
 - lib/riak/client/beefcake/object_methods.rb
 - lib/riak/client/beefcake_protobuffs_backend.rb
@@ -205,6 +187,8 @@ files:
 - lib/riak/client/excon_backend.rb
 - lib/riak/client/feature_detection.rb
 - lib/riak/client/http_backend.rb
+- lib/riak/client/http_backend/bucket_streamer.rb
+- lib/riak/client/http_backend/chunked_json_streamer.rb
 - lib/riak/client/http_backend/configuration.rb
 - lib/riak/client/http_backend/key_streamer.rb
 - lib/riak/client/http_backend/object_methods.rb
@@ -225,11 +209,14 @@ files:
 - lib/riak/core_ext/stringify_keys.rb
 - lib/riak/core_ext/symbolize_keys.rb
 - lib/riak/core_ext/to_param.rb
+- lib/riak/counter.rb
 - lib/riak/encoding.rb
 - lib/riak/failed_request.rb
 - lib/riak/i18n.rb
+- lib/riak/index_collection.rb
 - lib/riak/json.rb
 - lib/riak/link.rb
+- lib/riak/list_buckets.rb
 - lib/riak/locale/en.yml
 - lib/riak/locale/fr.yml
 - lib/riak/map_reduce.rb
@@ -237,6 +224,7 @@ files:
 - lib/riak/map_reduce/phase.rb
 - lib/riak/map_reduce/results.rb
 - lib/riak/map_reduce_error.rb
+- lib/riak/multiget.rb
 - lib/riak/node.rb
 - lib/riak/node/configuration.rb
 - lib/riak/node/console.rb
@@ -248,6 +236,7 @@ files:
 - lib/riak/rcontent.rb
 - lib/riak/robject.rb
 - lib/riak/search.rb
+- lib/riak/secondary_index.rb
 - lib/riak/serializers.rb
 - lib/riak/stamp.rb
 - lib/riak/test_server.rb
@@ -273,6 +262,7 @@ files:
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
 - spec/integration/riak/cluster_spec.rb
+- spec/integration/riak/counters_spec.rb
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
@@ -283,6 +273,7 @@ files:
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
+- spec/riak/counter_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
 - spec/riak/feature_detection_spec.rb
@@ -291,15 +282,19 @@ files:
 - spec/riak/http_backend/object_methods_spec.rb
 - spec/riak/http_backend/transport_methods_spec.rb
 - spec/riak/http_backend_spec.rb
+- spec/riak/index_collection_spec.rb
 - spec/riak/link_spec.rb
+- spec/riak/list_buckets_spec.rb
 - spec/riak/map_reduce/filter_builder_spec.rb
 - spec/riak/map_reduce/phase_spec.rb
 - spec/riak/map_reduce_spec.rb
+- spec/riak/multiget_spec.rb
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/node_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
+- spec/riak/secondary_index_spec.rb
 - spec/riak/serializers_spec.rb
 - spec/riak/stamp_spec.rb
 - spec/riak/stream_parser_spec.rb
@@ -319,33 +314,26 @@ files:
 - spec/support/version_filter.rb
 homepage: http://github.com/basho/riak-ruby-client
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 20034304450029998
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 20034304450029998
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
 test_files:
 - spec/failover/failover.rb
@@ -361,6 +349,7 @@ test_files:
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
 - spec/integration/riak/cluster_spec.rb
+- spec/integration/riak/counters_spec.rb
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
@@ -371,6 +360,7 @@ test_files:
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
+- spec/riak/counter_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
 - spec/riak/feature_detection_spec.rb
@@ -379,15 +369,19 @@ test_files:
 - spec/riak/http_backend/object_methods_spec.rb
 - spec/riak/http_backend/transport_methods_spec.rb
 - spec/riak/http_backend_spec.rb
+- spec/riak/index_collection_spec.rb
 - spec/riak/link_spec.rb
+- spec/riak/list_buckets_spec.rb
 - spec/riak/map_reduce/filter_builder_spec.rb
 - spec/riak/map_reduce/phase_spec.rb
 - spec/riak/map_reduce_spec.rb
+- spec/riak/multiget_spec.rb
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/node_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
+- spec/riak/secondary_index_spec.rb
 - spec/riak/serializers_spec.rb
 - spec/riak/stamp_spec.rb
 - spec/riak/stream_parser_spec.rb