riak-client 0.9.2 → 0.9.3

data/lib/riak/client/http_backend/key_streamer.rb

@@ -0,0 +1,56 @@
+# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License
+require 'riak/util/escape'
+require 'riak/json'
+
+module Riak
+   class Client
+     class HTTPBackend
+       # @private
+       class KeyStreamer
+         include Util::Escape
+
+         def initialize(block)
+           @buffer = ""
+           @block = block
+         end
+
+         def accept(chunk)
+           @buffer << chunk
+           consume
+         end
+
+         def to_proc
+           method(:accept).to_proc
+         end
+
+         private
+         def consume
+           while @buffer =~ /\}\{/
+             stream($~.pre_match + '}')
+             @buffer = '{' + $~.post_match
+           end
+         end
+
+         def stream(str)
+           obj = JSON.parse(str) rescue nil
+           if obj && obj['keys']
+             @block.call obj['keys'].map(&method(:unescape))
+           end
+         end
+       end
+     end
+   end
+ end
+

data/lib/riak/client/http_backend.rb

@@ -23,6 +23,7 @@ require 'riak/robject'
 require 'riak/client/http_backend/transport_methods'
 require 'riak/client/http_backend/object_methods'
 require 'riak/client/http_backend/configuration'
+require 'riak/client/http_backend/key_streamer'
 
 module Riak
   class Client
@@ -142,12 +143,8 @@ module Riak
       # @return [Array<String>] the list of keys, if no block was given
       def list_keys(bucket, &block)
         bucket = bucket.name if Bucket === bucket
-        if block_given?
-          get(200, riak_kv_wm_raw, escape(bucket), {:props => false, :keys => 'stream'}, {}) do |chunk|
-            obj = JSON.parse(chunk) rescue nil
-            next unless obj && obj['keys']
-            yield obj['keys'].map {|k| unescape(k) }
-          end
+        if block_given?          
+          get(200, riak_kv_wm_raw, escape(bucket), {:props => false, :keys => 'stream'}, {}, &KeyStreamer.new(block))
         else
           response = get(200, riak_kv_wm_raw, escape(bucket), {:props => false, :keys => true}, {})
           obj = JSON.parse(response[:body])

data/lib/riak/core_ext/blank.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 unless Object.new.respond_to? :blank?
   class Object
     def blank?

data/riak-client.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-04-11}
+  s.date = %q{2011-04-18}
   s.description = %q{riak-client is a rich client for Riak, the distributed database by Basho. It supports the full HTTP interface including storage operations, bucket configuration, link-walking and map-reduce.}
   s.email = %q{sean@basho.com}
-  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/beefcake/messages.rb", "lib/riak/client/beefcake/object_methods.rb", "lib/riak/client/beefcake_protobuffs_backend.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.rb", "lib/riak/client/http_backend/object_methods.rb", "lib/riak/client/http_backend/request_headers.rb", "lib/riak/client/http_backend/transport_methods.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client/protobuffs_backend.rb", "lib/riak/client/pump.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/json.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart/stream_parser.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-mapreduce.txt", "spec/fixtures/multipart-with-body.txt", "spec/fixtures/server.cert.crt", "spec/fixtures/server.cert.key", "spec/fixtures/test.pem", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_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/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example", "spec/support/unified_backend_examples.rb"]
+  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/beefcake/messages.rb", "lib/riak/client/beefcake/object_methods.rb", "lib/riak/client/beefcake_protobuffs_backend.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.rb", "lib/riak/client/http_backend/key_streamer.rb", "lib/riak/client/http_backend/object_methods.rb", "lib/riak/client/http_backend/request_headers.rb", "lib/riak/client/http_backend/transport_methods.rb", "lib/riak/client/http_backend.rb", "lib/riak/client/net_http_backend.rb", "lib/riak/client/protobuffs_backend.rb", "lib/riak/client/pump.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/json.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "lib/riak/map_reduce.rb", "lib/riak/map_reduce_error.rb", "lib/riak/robject.rb", "lib/riak/search.rb", "lib/riak/test_server.rb", "lib/riak/util/escape.rb", "lib/riak/util/fiber1.8.rb", "lib/riak/util/headers.rb", "lib/riak/util/multipart/stream_parser.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-mapreduce.txt", "spec/fixtures/multipart-with-body.txt", "spec/fixtures/server.cert.crt", "spec/fixtures/server.cert.key", "spec/fixtures/test.pem", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_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/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb", "spec/spec_helper.rb", "spec/support/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example", "spec/support/unified_backend_examples.rb"]
   s.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.7.2}

data/spec/riak/robject_spec.rb

@@ -73,11 +73,11 @@ describe Riak::RObject do
       end
 
       it "should serialize into a YAML stream" do
-        @object.serialize({"foo" => "bar"}).should == "--- \nfoo: bar\n"
+        @object.serialize({"foo" => "bar"}).should == YAML.dump({"foo" => "bar"})
       end
 
       it "should deserialize a YAML stream" do
-        @object.deserialize("--- \nfoo: bar\n").should == {"foo" => "bar"}
+        @object.deserialize(YAML.dump({"foo" => "bar"})).should == {"foo" => "bar"}
       end
     end
 

data/spec/support/unified_backend_examples.rb

@@ -168,7 +168,20 @@ shared_examples_for "Unified backend API" do
       @backend.list_keys("test").should == ["keys"]
     end
 
-    context "streaming through a block" do
+    context "streaming through a block" do      
+      it "should handle a large number of keys" do
+        obj = Riak::RObject.new(@client.bucket("test"))
+        obj.content_type = "application/json"
+        obj.data = [1]
+        750.times do |i|
+          obj.key = i.to_s
+          obj.store(:w => 1, :dw => 0, :returnbody => false)
+        end
+        @backend.list_keys("test") do |keys|
+          keys.should be_all {|k| k == 'keys' || (0..749).include?(k.to_i) }
+        end
+      end
+      
       it "should pass an array of keys to the block" do
         @backend.list_keys("test") do |keys|
           keys.should == ["keys"] unless keys.empty?

metadata

@@ -2,7 +2,7 @@
 name: riak-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 Z
+date: 2011-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -121,6 +121,7 @@ files:
 - lib/riak/client/curb_backend.rb
 - lib/riak/client/excon_backend.rb
 - lib/riak/client/http_backend/configuration.rb
+- lib/riak/client/http_backend/key_streamer.rb
 - lib/riak/client/http_backend/object_methods.rb
 - lib/riak/client/http_backend/request_headers.rb
 - lib/riak/client/http_backend/transport_methods.rb