riak-client 0.8.2 → 0.8.3

data/spec/integration/riak/cache_store_spec.rb

@@ -12,6 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'riak/cache_store'
 
 describe Riak::CacheStore do
   before :all do
@@ -137,7 +138,7 @@ describe Riak::CacheStore do
   end
 
   it "should return the default value when fetching on miss" do
-    @cache.fetch('foo'){'baz'}.should == 'baz'
+    @cache.fetch('foo'){ 'baz' }.should == 'baz'
   end
 
   it "should return the default value when forcing a miss" do

data/spec/riak/client_spec.rb

@@ -144,15 +144,21 @@ describe Riak::Client do
       @client = Riak::Client.new
     end
 
-    it "should choose the Curb backend if Curb is available" do
-      @client.should_receive(:require).with('curb').and_return(true)
-      @client.http.should be_instance_of(Riak::Client::CurbBackend)
+    it "should choose the selected backend" do
+      @client.http_backend = :NetHTTP
+      @client.http.should be_instance_of(Riak::Client::NetHTTPBackend)
+
+      unless defined? JRUBY_VERSION
+        @client = Riak::Client.new
+        @client.http_backend = :Curb
+        @client.http.should be_instance_of(Riak::Client::CurbBackend)
+      end
     end
 
-    it "should choose the Net::HTTP backend if Curb is unavailable" do
-      @client.should_receive(:require).with('curb').and_raise(LoadError)
-      @client.should_receive(:warn).and_return(true)
-      @client.http.should be_instance_of(Riak::Client::NetHTTPBackend)
+    it "should raise an error when the chosen backend is not valid" do
+      Riak::Client::NetHTTPBackend.should_receive(:configured?).and_return(false)
+      @client = Riak::Client.new(:http_backend => :NetHTTP)
+      lambda { @client.http }.should raise_error
     end
   end
 
@@ -233,13 +239,13 @@ describe Riak::Client do
     @http.should_receive(:delete).with([204,404], "/luwak", "greeting.txt")
     @client.delete_file("greeting.txt")
   end
-  
+
   it "should return true if the file exists" do
     @client = Riak::Client.new
     @client.http.should_receive(:head).and_return(:code => 200)
     @client.file_exists?("foo").should be_true
   end
-  
+
   it "should return false if the file doesn't exist" do
     @client = Riak::Client.new
     @client.http.should_receive(:head).and_return(:code => 404)

data/spec/riak/curb_backend_spec.rb

@@ -18,8 +18,8 @@ begin
 rescue LoadError
   warn "Skipping CurbBackend specs, curb library not found."
 else
-  $server = MockServer.new
-  at_exit { $server.stop }
+  $mock_server = DrbMockServer
+  $mock_server.maybe_start
 
   describe Riak::Client::CurbBackend do
     def setup_http_mock(method, uri, options={})
@@ -31,17 +31,21 @@ else
       body = options[:body] || []
       headers = options[:headers] || {}
       headers['Content-Type'] ||= "text/plain"
-      $server.attach do |env|
-        env["REQUEST_METHOD"].should == method
-        env["PATH_INFO"].should == path
-        env["QUERY_STRING"].should == query
-        [status, headers, Array(body)]
-      end
+      @_mock_set = [status, headers, method, path, query, body]
+      $mock_server.expect(*@_mock_set)
     end
 
     before :each do
-      @client = Riak::Client.new(:port => $server.port) # Point to our mock
-      @backend = Riak::Client::CurbBackend.new(@client)
+      @client = Riak::Client.new(:port => $mock_server.port, :http_backend => :Curb) # Point to our mock
+      @backend = @client.http
+      @_mock_set = false
+    end
+
+    after :each do
+      if @_mock_set
+        $mock_server.satisfied.should be_true("Expected #{@_mock_set.inspect}, failed")
+      end
+      Thread.current[:curl_easy_handle] = nil
     end
 
     it_should_behave_like "HTTP backend"
@@ -68,10 +72,5 @@ else
         @backend.post(200, "/riak/", "foo", file, {})
       end.should_not raise_error
     end
-
-    after :each do
-      $server.detach
-      Thread.current[:curl_easy_handle] = nil
-    end
   end
 end

data/spec/riak/excon_backend_spec.rb

@@ -0,0 +1,76 @@
+# 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 File.expand_path("../spec_helper", File.dirname(__FILE__))
+
+begin
+  require 'excon'
+rescue LoadError
+  warn "Skipping ExconBackend specs, excon library not found."
+else
+  $mock_server = DrbMockServer
+  $mock_server.maybe_start
+
+  describe Riak::Client::ExconBackend do
+    def setup_http_mock(method, uri, options={})
+      method = method.to_s.upcase
+      uri = URI.parse(uri)
+      path = uri.path || "/"
+      query = uri.query || ""
+      status = options[:status] ? Array(options[:status]).first.to_i : 200
+      body = options[:body] || []
+      headers = options[:headers] || {}
+      headers['Content-Type'] ||= "text/plain"
+      @_mock_set = [status, headers, method, path, query, body]
+      $mock_server.expect(*@_mock_set)
+    end
+
+    before :each do
+      @client = Riak::Client.new(:port => $mock_server.port, :http_backend => :Excon) # Point to our mock
+      @backend = @client.http
+      @_mock_set = false
+    end
+
+    after :each do
+      if @_mock_set
+        $mock_server.satisfied.should be_true("Expected #{@_mock_set.inspect}, failed")
+      end
+    end
+
+    it_should_behave_like "HTTP backend"
+
+    it "should split long headers into 8KB chunks" do
+      # TODO: This doesn't actually inspect the emitted headers. How
+      # can it?
+      setup_http_mock(:put, @backend.path("/riak/","foo").to_s, :body => "ok")
+      lambda do
+        @backend.put(200, "/riak/", "foo", "body",{"Long-Header" => (["12345678"*10]*100).join(", ") })
+      end.should_not raise_error
+    end
+
+    it "should support IO objects as the request body" do
+      file = File.open(File.expand_path("../../fixtures/cat.jpg", __FILE__), 'rb')
+      lambda do
+        setup_http_mock(:put, @backend.path("/riak/","foo").to_s, :body => "ok")
+        @backend.put(200, "/riak/", "foo", file, {})
+        $mock_server.satisfied.should be_true
+      end.should_not raise_error
+      file.rewind # Have to rewind the file or we hang
+      lambda do
+        setup_http_mock(:post, @backend.path("/riak/","foo").to_s, :body => "ok")
+        @backend.post(200, "/riak/", "foo", file, {})
+        $mock_server.satisfied.should be_true
+      end.should_not raise_error
+    end
+  end
+end

data/spec/riak/link_spec.rb

@@ -32,20 +32,6 @@ describe Riak::Link do
       result[1].key.should == nil
       result[1].rel.should == "up"
     end
-    
-    it "should set url properly, and set bucket and key to nil for non-Riak links" do
-      result = Riak::Link.parse('<http://www.example.com/123.html>; riaktag="tag", </riak/foo>; rel="up"')
-      result[0].url.should == "http://www.example.com/123.html"
-      result[0].bucket.should == nil
-      result[0].key.should == nil
-      result[0].rel.should == "tag"
-
-      result = Riak::Link.parse('<http://www.example.com/>; riaktag="tag", </riak/foo>; rel="up"')
-      result[0].url.should == "http://www.example.com/"
-      result[0].bucket.should == nil
-      result[0].key.should == nil
-      result[0].rel.should == "tag"
-    end
   end
 
   it "should convert to a string appropriate for use in the Link header" do
@@ -79,4 +65,12 @@ describe Riak::Link do
     link.bucket.should == "bucket"
     link.key.should == "key"
   end
+
+  it "should construct from bucket, key and tag" do
+    link = Riak::Link.new("bucket", "key", "tag")
+    link.bucket.should == "bucket"
+    link.key.should == "key"
+    link.tag.should == "tag"
+    link.url.should == "/riak/bucket/key"
+  end
 end

data/spec/riak/object_spec.rb

@@ -88,15 +88,11 @@ describe Riak::RObject do
 
       it "should serialize into a JSON blob" do
         @object.serialize({"foo" => "bar"}).should == '{"foo":"bar"}'
-        @object.serialize(2).should == "2"
-        @object.serialize("Some text").should == '"Some text"'
         @object.serialize([1,2,3]).should == "[1,2,3]"
       end
 
       it "should deserialize a JSON blob" do
         @object.deserialize('{"foo":"bar"}').should == {"foo" => "bar"}
-        @object.deserialize("2").should == 2
-        @object.deserialize('"Some text"').should == "Some text"
         @object.deserialize('[1,2,3]').should == [1,2,3]
       end
     end

data/spec/riak/search_spec.rb

@@ -69,12 +69,12 @@ describe "Search mixins" do
 
       it "should build a Solr <add> request" do
         expect_update_body('<add><doc><field name="id">1</field><field name="field">value</field></doc></add>')
-        @client.index({:id => 1, :field => "value"})
+        @client.index({'id' => 1, 'field' => "value"})
       end
 
       it "should include multiple documents in the <add> request" do
         expect_update_body('<add><doc><field name="id">1</field><field name="field">value</field></doc><doc><field name="id">2</field><field name="foo">bar</field></doc></add>')
-        @client.index({:id => 1, :field => "value"}, {:id => 2, :foo => "bar"})
+        @client.index({'id' => 1, 'field' => "value"}, {'id' => 2, 'foo' => "bar"})
       end
     end
     describe "removing documents" do

data/spec/support/drb_mock_server.rb

@@ -0,0 +1,39 @@
+require 'drb/drb'
+DRBURI="druby://localhost:8787"
+
+module DrbMockServer
+  extend self
+
+  def start_client
+    # JRuby doesn't support fork
+    if defined? JRUBY_VERSION
+      @server = MockServer.new
+      at_exit { @server.stop }
+    else
+      child_pid = Process.fork do
+        start_server
+      end
+      sleep 1
+      at_exit { Process.kill("HUP", child_pid); Process.wait2 }
+      DRb.start_service
+      @server = DRbObject.new_with_uri(DRBURI)
+    end
+    true
+  end
+
+  def maybe_start
+    start_client unless @server
+  end
+
+  def method_missing(meth, *args, &block)
+    @server.send(meth, *args, &block)
+  end
+
+  private
+  def start_server
+    server = MockServer.new
+    DRb.start_service(DRBURI, server)
+    Signal.trap("HUP") { server.stop; exit }
+    DRb.thread.join
+  end
+end

data/spec/support/mock_server.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +19,8 @@ require 'rack'
 
 class MockServer
   attr_accessor :port
-  
+  attr_accessor :satisfied
+
   def initialize(pause = 1)
     self.port = 4000 + rand(61535)
     @block = nil
@@ -33,6 +35,15 @@ class MockServer
     Thread.kill(@thread)
   end
 
+  def expect(status, headers, method, path, query, body)
+    attach do |env|
+      @satisfied = (env["REQUEST_METHOD"] == method &&
+                    env["PATH_INFO"] == path &&
+                    env["QUERY_STRING"] == query)
+      [status, headers, Array(body)]
+    end
+  end
+
   def attach(&block)
     @block = block
   end
@@ -46,8 +57,10 @@ class MockServer
       raise "Specify a handler for the request using attach(block), the block should return a valid rack response and can test expectations" unless @block
       @block.call(env)
     rescue Exception => e
-      @parent_thread.raise e
-      [ 500, { 'Content-Type' => 'text/plain', 'Content-Length' => '13' }, [ 'Bad test code' ]]
+      @satisfied = false
+      # @parent_thread.raise e
+      body = "Bad test code\n#{e.inspect}\n#{e.backtrace}"
+      [ 500, { 'Content-Type' => 'text/plain', 'Content-Length' => body.length.to_s }, [ body ]]
     end
   end
 

data/spec/support/test_server.yml.example

@@ -0,0 +1,2 @@
+bin_dir: /Users/sean/Development/riak/rel/riak/bin
+temp_dir: /Users/sean/Development/ripple/.riaktest

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -04:00
+date: 2010-12-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,19 +75,19 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: excon
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 2
+        - 0
         - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
+        - 4
+        version: 0.3.4
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: i18n
@@ -95,7 +95,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -104,8 +104,23 @@ dependencies:
         version: 0.4.0
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: builder
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        version: 2.1.2
+  type: :runtime
+  version_requirements: *id007
 description: 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.
-email: seancribbs@gmail.com
+email: sean@basho.com
 executables: []
 
 extensions: []
@@ -116,14 +131,21 @@ files:
 - erl_src/riak_kv_test_backend.beam
 - erl_src/riak_kv_test_backend.erl
 - Gemfile
-- Gemfile.lock
 - lib/active_support/cache/riak_store.rb
 - lib/riak/bucket.rb
 - lib/riak/cache_store.rb
 - lib/riak/client/curb_backend.rb
+- lib/riak/client/excon_backend.rb
 - lib/riak/client/http_backend.rb
 - lib/riak/client/net_http_backend.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/invalid_response.rb
@@ -143,6 +165,7 @@ files:
 - lib/riak/walk_spec.rb
 - lib/riak.rb
 - Rakefile
+- riak-client.gemspec
 - spec/fixtures/cat.jpg
 - spec/fixtures/multipart-blank.txt
 - spec/fixtures/multipart-with-body.txt
@@ -152,6 +175,7 @@ files:
 - 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_spec.rb
 - spec/riak/link_spec.rb
@@ -162,9 +186,11 @@ files:
 - spec/riak/search_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
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
@@ -190,20 +216,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       segments: 
       - 0
       version: "0"
-requirements: 
-- `gem install curb` for better HTTP performance
+requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
 test_files: 
+- lib/riak/walk_spec.rb
 - spec/integration/riak/cache_store_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_spec.rb
 - spec/riak/link_spec.rb
@@ -213,7 +241,3 @@ test_files:
 - spec/riak/object_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/walk_spec_spec.rb
-- spec/spec_helper.rb
-- spec/support/http_backend_implementation_examples.rb
-- spec/support/mock_server.rb
-- spec/support/mocks.rb