riak-client 0.9.8 → 1.0.0.beta

data/spec/riak/bucket_spec.rb

@@ -1,17 +1,4 @@
-# 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__))
+require 'spec_helper'
 
 describe Riak::Bucket do
   before :each do
@@ -38,17 +25,11 @@ describe Riak::Bucket do
   end
 
   describe "accessing keys" do
-    it "should load the keys if not present" do
+    it "should list the keys" do
       @backend.should_receive(:list_keys).with(@bucket).and_return(["bar"])
       @bucket.keys.should == ["bar"]
     end
 
-    it "should allow reloading of the keys" do
-      @backend.should_receive(:list_keys).with(@bucket).and_return(["bar"])
-      @bucket.instance_variable_set(:@keys, ["foo"])
-      @bucket.keys(:reload => true).should == ["bar"]
-    end
-
     it "should allow streaming keys through block" do
       @backend.should_receive(:list_keys).with(@bucket).and_yield([]).and_yield(["bar"]).and_yield(["baz"])
       all_keys = []
@@ -58,15 +39,17 @@ describe Riak::Bucket do
       all_keys.should == ["bar", "baz"]
     end
 
-    it "should invalidate the key cache when streaming" do
-      @backend.should_receive(:list_keys).once.and_return(['a'])
-      @backend.should_receive(:list_keys).once.and_yield(['b'])
-      @backend.should_receive(:list_keys).once.and_return(['c'])
-      @bucket.keys.should == ['a']
-      keys = []
-      @bucket.keys {|kl| keys.concat(kl) }
-      keys.should == ['b']
-      @bucket.keys.should == ['c']
+    it "should not cache the list of keys" do
+      @backend.should_receive(:list_keys).with(@bucket).twice.and_return(["bar"])
+      2.times { @bucket.keys.should == ['bar'] }
+    end
+
+    it "should warn about the expense of list-keys when warnings are not disabled" do
+      Riak.disable_list_keys_warnings = false
+      @backend.stub!(:list_keys).and_return(%w{test test2})
+      @bucket.should_receive(:warn)
+      @bucket.keys
+      Riak.disable_list_keys_warnings = true
     end
   end
 
@@ -104,12 +87,12 @@ describe Riak::Bucket do
 
   describe "fetching an object" do
     it "should fetch the object via the backend" do
-      @backend.should_receive(:fetch_object).with(@bucket, "db", nil).and_return(nil)
+      @backend.should_receive(:fetch_object).with(@bucket, "db", {}).and_return(nil)
       @bucket.get("db")
     end
 
     it "should use the specified R quroum" do
-      @backend.should_receive(:fetch_object).with(@bucket, "db", 2).and_return(nil)
+      @backend.should_receive(:fetch_object).with(@bucket, "db", {:r => 2}).and_return(nil)
       @bucket.get("db", :r => 2)
     end
   end
@@ -126,7 +109,7 @@ describe Riak::Bucket do
   describe "fetching or creating a new object" do
     it "should return the existing object if present" do
       @object = mock("RObject")
-      @backend.should_receive(:fetch_object).with(@bucket,"db", nil).and_return(@object)
+      @backend.should_receive(:fetch_object).with(@bucket,"db", {}).and_return(@object)
       @bucket.get_or_new('db').should == @object
     end
 
@@ -144,11 +127,18 @@ describe Riak::Bucket do
 
     it "should pass along the given R quorum parameter" do
       @object = mock("RObject")
-      @backend.should_receive(:fetch_object).with(@bucket,"db", "all").and_return(@object)
+      @backend.should_receive(:fetch_object).with(@bucket,"db", {:r => "all"}).and_return(@object)
       @bucket.get_or_new('db', :r => "all").should == @object
     end
   end
 
+  describe "querying an index" do
+    it "should list the matching keys" do
+      @backend.should_receive(:get_index).with(@bucket, "test_bin", "testing").and_return(["bar"])
+      @bucket.get_index("test_bin", "testing").should == ["bar"]
+    end
+  end
+
   describe "get/set allow_mult property" do
     before :each do
       @backend.stub!(:get_bucket_props).and_return({"allow_mult" => false})
@@ -210,12 +200,12 @@ describe Riak::Bucket do
 
   describe "deleting an object" do
     it "should delete a key from within the bucket" do
-      @backend.should_receive(:delete_object).with(@bucket, "bar", nil)
+      @backend.should_receive(:delete_object).with(@bucket, "bar", {})
       @bucket.delete('bar')
     end
 
     it "should use the specified RW quorum" do
-      @backend.should_receive(:delete_object).with(@bucket, "bar", "all")
+      @backend.should_receive(:delete_object).with(@bucket, "bar", {:rw => "all"})
       @bucket.delete('bar', :rw => "all")
     end
   end

data/spec/riak/client_spec.rb

@@ -1,17 +1,4 @@
-# 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__))
+require 'spec_helper'
 
 describe Riak::Client do
   describe "when initializing" do
@@ -74,23 +61,33 @@ describe Riak::Client do
 
     it "should accept a mapreduce path" do
       client = Riak::Client.new(:mapred => "/mr")
-      client.mapred.should == "/mr"
+      client.http_paths[:mapred].should == "/mr"
     end
 
     it "should default the mapreduce path to /mapred if not specified" do
-      Riak::Client.new.mapred.should == "/mapred"
+      Riak::Client.new.http_paths[:mapred].should == "/mapred"
     end
 
     it "should accept a luwak path" do
       client = Riak::Client.new(:luwak => "/beans")
-      client.luwak.should == "/beans"
+      client.http_paths[:luwak].should == "/beans"
     end
 
     it "should default the luwak path to /luwak if not specified" do
-      Riak::Client.new.luwak.should == "/luwak"
+      Riak::Client.new.http_paths[:luwak].should == "/luwak"
+    end
+
+    it "should accept a solr path" do
+      client = Riak::Client.new(:solr => "/solar")
+      client.http_paths[:solr].should == "/solar"
     end
   end
 
+  it "should expose a Stamp object" do
+    subject.should respond_to(:stamp)
+    subject.stamp.should be_kind_of(Riak::Stamp)
+  end
+
   describe "reconfiguring" do
     before :each do
       @client = Riak::Client.new
@@ -180,6 +177,8 @@ describe Riak::Client do
     end
 
     it "should allow setting the prefix" do
+      @client.http_paths.should be_kind_of(Hash)
+      @client.http_paths.include?(:prefix).should == true
       @client.should respond_to(:prefix=)
       @client.prefix = "/another-prefix"
       @client.prefix.should == "/another-prefix"
@@ -210,11 +209,9 @@ describe Riak::Client 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
+      @client = Riak::Client.new
+      @client.http_backend = :Excon
+      @client.http.should be_instance_of(Riak::Client::ExconBackend)
     end
 
     it "should raise an error when the chosen backend is not valid" do
@@ -273,11 +270,6 @@ describe Riak::Client do
       @client.bucket("foo", :props => true)
     end
 
-    it "should fetch keys if asked" do
-      @backend.should_receive(:list_keys) {|b| b.name.should == "foo"; ["bar"] }
-      @client.bucket("foo", :keys => true)
-    end
-
     it "should memoize bucket parameters" do
       @bucket = mock("Bucket")
       Riak::Bucket.should_receive(:new).with(@client, "baz").once.and_return(@bucket)
@@ -286,16 +278,30 @@ describe Riak::Client do
     end
   end
 
-  it "should list buckets" do
-    @client = Riak::Client.new
-    @backend = mock("Backend")
-    @client.stub!(:backend).and_return(@backend)
-    @backend.should_receive(:list_buckets).and_return(%w{test test2})
-    buckets = @client.buckets
-    buckets.should have(2).items
-    buckets.should be_all {|b| b.is_a?(Riak::Bucket) }
-    buckets[0].name.should == "test"
-    buckets[1].name.should == "test2"
+  describe "listing buckets" do
+    before do
+      @client = Riak::Client.new
+      @backend = mock("Backend")
+      @client.stub!(:backend).and_return(@backend)
+    end
+
+    after { Riak.disable_list_keys_warnings = true }
+
+    it "should list buckets" do
+      @backend.should_receive(:list_buckets).and_return(%w{test test2})
+      buckets = @client.buckets
+      buckets.should have(2).items
+      buckets.should be_all {|b| b.is_a?(Riak::Bucket) }
+      buckets[0].name.should == "test"
+      buckets[1].name.should == "test2"
+    end
+
+    it "should warn about the expense of list-buckets when warnings are not disabled" do
+      Riak.disable_list_keys_warnings = false
+      @backend.stub!(:list_buckets).and_return(%w{test test2})
+      @client.should_receive(:warn)
+      @client.buckets
+    end
   end
 
   describe "Luwak (large-files) support" do

data/spec/riak/escape_spec.rb

@@ -1,18 +1,5 @@
-# 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__)
+
+require 'spec_helper'
 
 describe Riak::Util::Escape do
   before :each do
@@ -20,24 +7,63 @@ describe Riak::Util::Escape do
     @object.extend(Riak::Util::Escape)
   end
 
-  it "should escape standard non-safe characters" do
-    @object.escape("some string").should == "some%20string"
-    @object.escape("another^one").should == "another%5Eone"
-    @object.escape("bracket[one").should == "bracket%5Bone"
+  it "should use URI by default for escaping" do
+    Riak.escaper.should == URI
   end
 
-  it "should escape slashes" do
-    @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
-  end
-  
-  it "should convert the bucket or key to a string before escaping" do
-    @object.escape(125).should == '125'
+  context "when using CGI for escaping" do
+    before { @oldesc, Riak.escaper = Riak.escaper, CGI }
+    after { Riak.escaper = @oldesc }
+
+    it "should escape standard non-safe characters" do
+      @object.escape("some string").should == "some%20string"
+      @object.escape("another^one").should == "another%5Eone"
+      @object.escape("bracket[one").should == "bracket%5Bone"
+    end
+
+    it "should escape slashes" do
+      @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
+    end
+
+    it "should convert the bucket or key to a string before escaping" do
+      @object.escape(125).should == '125'
+    end
+
+    it "should unescape escaped strings" do
+      @object.unescape("some%20string").should == "some string"
+      @object.unescape("another%5Eone").should == "another^one"
+      @object.unescape("bracket%5Bone").should == "bracket[one"
+      @object.unescape("some%2Finner%2Fpath").should == "some/inner/path"
+    end
   end
 
-  it "should unescape escaped strings" do
-    @object.unescape("some%20string").should == "some string"
-    @object.unescape("another%5Eone").should == "another^one"
-    @object.unescape("bracket%5Bone").should == "bracket[one"
-    @object.unescape("some%2Finner%2Fpath").should == "some/inner/path"
+  context "when using URI for escaping" do
+    before { @oldesc, Riak.escaper = Riak.escaper, URI }
+    after { Riak.escaper = @oldesc }
+
+    it "should escape standard non-safe characters" do
+      @object.escape("some string").should == "some%20string"
+      @object.escape("another^one").should == "another%5Eone"
+    end
+
+    it "should allow URI-safe characters" do
+      @object.escape("bracket[one").should == "bracket[one"
+      @object.escape("sean@basho").should == "sean@basho"
+    end
+
+    it "should escape slashes" do
+      @object.escape("some/inner/path").should == "some%2Finner%2Fpath"
+    end
+
+    it "should convert the bucket or key to a string before escaping" do
+      @object.escape(125).should == '125'
+    end
+
+    it "should unescape escaped strings" do
+      @object.unescape("some%20string").should == "some string"
+      @object.unescape("another%5Eone").should == "another^one"
+      @object.unescape("bracket%5Bone").should == "bracket[one"
+      @object.unescape("some%2Finner%2Fpath").should == "some/inner/path"
+    end
   end
 end

data/spec/riak/excon_backend_spec.rb

@@ -1,17 +1,4 @@
-# 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__))
+require 'spec_helper'
 
 begin
   require 'excon'
@@ -54,7 +41,7 @@ else
       # 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(", ") })
+        @backend.put(200, @backend.path("/riak", "foo"), "body", {"Long-Header" => (["12345678"*10]*100).join(", ") })
       end.should_not raise_error
     end
 
@@ -62,13 +49,13 @@ else
       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, {})
+        @backend.put(200, @backend.path("/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, {})
+        @backend.post(200, @backend.path("/riak/", "foo"), file)
         $mock_server.satisfied.should be_true
       end.should_not raise_error
     end

data/spec/riak/headers_spec.rb

@@ -1,17 +1,4 @@
-# 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__))
+require 'spec_helper'
 
 describe Riak::Util::Headers do
   it "should include the Net::HTTPHeader module" do

data/spec/riak/http_backend/configuration_spec.rb

@@ -1,28 +1,203 @@
-# 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__))
+require 'spec_helper'
 
 describe Riak::Client::HTTPBackend::Configuration do
-  before do
-    @client = Riak::Client.new
-    @backend = Riak::Client::HTTPBackend.new(@client)
+  let(:client){ Riak::Client.new }
+  subject { Riak::Client::HTTPBackend.new(client) }
+  let(:uri){ URI.parse("http://127.0.0.1:8098/") }
+
+  context "generating resource URIs" do
+    context "when using the old scheme" do
+      before { subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => ['</riak>; rel="riak_kv_wm_raw", </ping>; rel="riak_kv_wm_ping", </stats>; rel="riak_kv_wm_stats", </mapred>; rel="riak_kv_wm_mapred"']}) }
+
+      it "should generate a ping path" do
+        url = subject.ping_path
+        url.should be_kind_of(URI)
+        url.path.should == '/ping'
+      end
+
+      it "should generate a stats path" do
+        url = subject.stats_path
+        url.should be_kind_of(URI)
+        url.path.should == '/stats'
+      end
+
+      it "should generate a mapred path" do
+        url = subject.mapred_path :chunked => true
+        url.should be_kind_of(URI)
+        url.path.should == '/mapred'
+        url.query.should == "chunked=true"
+      end
+
+      it "should generate a bucket list path" do
+        url = subject.bucket_list_path
+        url.should be_kind_of(URI)
+        url.path.should == '/riak'
+        url.query.should == 'buckets=true'
+      end
+
+      it "should generate a bucket properties path" do
+        url = subject.bucket_properties_path('test ')
+        url.should be_kind_of(URI)
+        url.path.should == '/riak/test%20'
+        url.query.should == "keys=false&props=true"
+      end
+
+      it "should generate a key list path" do
+        url = subject.key_list_path('test ')
+        url.should be_kind_of(URI)
+        url.path.should == '/riak/test%20'
+        url.query.should == 'keys=true&props=false'
+        url = subject.key_list_path('test ', :keys => :stream)
+        url.path.should == '/riak/test%20'
+        url.query.should == 'keys=stream&props=false'
+      end
+
+      it "should generate an object path" do
+        url = subject.object_path('test ', 'object/', :r => 3)
+        url.should be_kind_of(URI)
+        url.path.should == '/riak/test%20/object%2F'
+        url.query.should == 'r=3'
+      end
+
+      it "should generate a link-walking path" do
+        url = subject.link_walk_path('test ', 'object/', [Riak::WalkSpec.new(:bucket => 'foo')])
+        url.should be_kind_of(URI)
+        url.path.should == '/riak/test%20/object%2F/foo,_,_'
+      end
+
+      it "should raise an error when generating an index range path" do
+        expect { subject.index_range_path('test', 'index_bin', 'a', 'b') }.to raise_error
+      end
+
+      it "should raise an error when generating an index equal path" do
+        expect { subject.index_eq_path('test', 'index_bin', 'a') }.to raise_error
+      end
+    end
+
+    context "when using the new scheme" do
+      before { subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => ['</buckets>; rel="riak_kv_wm_buckets", </ping>; rel="riak_kv_wm_ping", </stats>; rel="riak_kv_wm_stats", </mapred>; rel="riak_kv_wm_mapred"']}) }
+
+      it "should generate a ping path" do
+        url = subject.ping_path
+        url.should be_kind_of(URI)
+        url.path.should == '/ping'
+      end
+
+      it "should generate a stats path" do
+        url = subject.stats_path
+        url.should be_kind_of(URI)
+        url.path.should == '/stats'
+      end
+
+      it "should generate a mapred path" do
+        url = subject.mapred_path :chunked => true
+        url.should be_kind_of(URI)
+        url.path.should == '/mapred'
+        url.query.should == "chunked=true"
+      end
+
+      it "should generate a bucket list path" do
+        url = subject.bucket_list_path
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets'
+        url.query.should == 'buckets=true'
+      end
+
+      it "should generate a bucket properties path" do
+        url = subject.bucket_properties_path('test ')
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/props'
+        url.query.should be_nil
+      end
+
+      it "should generate a key list path" do
+        url = subject.key_list_path('test ')
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/keys'
+        url.query.should == 'keys=true'
+        url = subject.key_list_path('test ', :keys => :stream)
+        url.path.should == '/buckets/test%20/keys'
+        url.query.should == 'keys=stream'
+      end
+
+      it "should generate an object path" do
+        url = subject.object_path('test ', 'object/', :r => 3)
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/keys/object%2F'
+        url.query.should == 'r=3'
+      end
+
+      it "should generate a link-walking path" do
+        url = subject.link_walk_path('test ', 'object/', [Riak::WalkSpec.new(:bucket => 'foo')])
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/keys/object%2F/foo,_,_'
+      end
+
+      it "should generate an index range path" do
+        url = subject.index_range_path('test ', 'test_bin', 'a', 'b')
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/index/test_bin/a/b'
+      end
+
+      it "should generate an index equal path" do
+        url = subject.index_eq_path('test ', 'test_bin', 'a')
+        url.should be_kind_of(URI)
+        url.path.should == '/buckets/test%20/index/test_bin/a'
+      end
+    end
   end
 
   it "should memoize the server config" do
-    @backend.should_receive(:get).with(200, "/", {}, {}).once.and_return(:headers => {'link' => ['</riak>; rel="riak_kv_wm_link_walker",</mapred>; rel="riak_kv_wm_mapred",</ping>; rel="riak_kv_wm_ping",</riak>; rel="riak_kv_wm_raw",</stats>; rel="riak_kv_wm_stats"']})
-    @backend.send(:riak_kv_wm_link_walker).should == "/riak"
-    @backend.send(:riak_kv_wm_raw).should == "/riak"
+    subject.should_receive(:get).with(200, uri).once.and_return(:headers => {'link' => ['</riak>; rel="riak_kv_wm_link_walker",</mapred>; rel="riak_kv_wm_mapred",</ping>; rel="riak_kv_wm_ping",</riak>; rel="riak_kv_wm_raw",</stats>; rel="riak_kv_wm_stats"']})
+    subject.send(:riak_kv_wm_link_walker).should == "/riak"
+    subject.send(:riak_kv_wm_raw).should == "/riak"
+  end
+
+  context "generating Solr paths" do
+    context "when Riak Search is disabled" do
+      before {
+        subject.should_receive(:get).with(200, uri).once.and_return(:headers => {'link' => ['</riak>; rel="riak_kv_wm_link_walker",</mapred>; rel="riak_kv_wm_mapred",</ping>; rel="riak_kv_wm_ping",</riak>; rel="riak_kv_wm_raw",</stats>; rel="riak_kv_wm_stats"']})
+      }
+
+      it "should raise an error" do
+        expect { subject.solr_select_path('foo', 'a:b') }.to raise_error
+        expect { subject.solr_update_path('foo') }.to raise_error
+      end
+    end
+
+    context "when Riak Search is enabled" do
+      before {
+        subject.should_receive(:get).with(200, uri).once.and_return(:headers => {'link' => ['</riak>; rel="riak_kv_wm_link_walker",</mapred>; rel="riak_kv_wm_mapred",</ping>; rel="riak_kv_wm_ping",</riak>; rel="riak_kv_wm_raw",</stats>; rel="riak_kv_wm_stats", </solr>; rel="riak_solr_indexer_wm", </solr>; rel="riak_solr_searcher_wm"']})
+      }
+
+      it "should generate a search path for the default index" do
+        url = subject.solr_select_path(nil, 'a:b')
+        url.should be_kind_of(URI)
+        url.path.should == '/solr/select'
+        url.query.should include("q=a%3Ab")
+        url.query.should include('wt=json')
+      end
+
+      it "should generate a search path for a specified index" do
+        url = subject.solr_select_path('foo', 'a:b', 'wt' => 'xml')
+        url.should be_kind_of(URI)
+        url.path.should == '/solr/foo/select'
+        url.query.should include("q=a%3Ab")
+        url.query.should include('wt=xml')
+      end
+
+      it "should generate an indexing path for the default index" do
+        url = subject.solr_update_path(nil)
+        url.should be_kind_of(URI)
+        url.path.should == '/solr/update'
+      end
+
+      it "should generate an indexing path for a specified index" do
+        url = subject.solr_update_path('foo')
+        url.should be_kind_of(URI)
+        url.path.should == '/solr/foo/update'
+      end
+    end
   end
 
   {
@@ -31,16 +206,18 @@ describe Riak::Client::HTTPBackend::Configuration do
     :riak_kv_wm_mapred => :mapred
   }.each do |resource, alternate|
     it "should detect the #{resource} resource from the configuration URL" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_return(:headers => {'link' => [%Q{</path>; rel="#{resource}"}]})
-      @backend.send(resource).should == "/path"
+      subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => [%Q{</path>; rel="#{resource}"}]})
+      subject.send(resource).should == "/path"
     end
-    it "should fallback to client.#{alternate} if the #{resource} resource is not found" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_return(:headers => {'link' => ['</>; rel="top"']})
-      @backend.send(resource).should == @client.send(alternate)
+
+    it "should fallback to client.http_paths[:#{alternate}] if the #{resource} resource is not found" do
+      subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => ['</>; rel="top"']})
+      subject.send(resource).should == client.http_paths[alternate]
     end
-    it "should fallback to client.#{alternate} if request fails" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, ""))
-      @backend.send(resource).should == @client.send(alternate)
+
+    it "should fallback to client.http_paths[:#{alternate}] if request fails" do
+      subject.should_receive(:get).with(200, uri).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, ""))
+      subject.send(resource).should == client.http_paths[alternate]
     end
   end
 
@@ -49,16 +226,16 @@ describe Riak::Client::HTTPBackend::Configuration do
     :riak_kv_wm_stats => "/stats"
   }.each do |resource, default|
     it "should detect the #{resource} resource from the configuration URL" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_return(:headers => {'link' => [%Q{</path>; rel="#{resource}"}]})
-      @backend.send(resource).should == "/path"
+      subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => [%Q{</path>; rel="#{resource}"}]})
+      subject.send(resource).should == "/path"
     end
     it "should fallback to #{default.inspect} if the #{resource} resource is not found" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_return(:headers => {'link' => ['</>; rel="top"']})
-      @backend.send(resource).should == default
+      subject.should_receive(:get).with(200, uri).and_return(:headers => {'link' => ['</>; rel="top"']})
+      subject.send(resource).should == default
     end
     it "should fallback to #{default.inspect} if request fails" do
-      @backend.should_receive(:get).with(200, "/", {}, {}).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, ""))
-      @backend.send(resource).should == default
+      subject.should_receive(:get).with(200, uri).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, ""))
+      subject.send(resource).should == default
     end
   end
 end