riak-client 0.8.1 → 0.8.2

data/Rakefile

@@ -9,7 +9,7 @@ gemspec = Gem::Specification.new do |gem|
   gem.email = "seancribbs@gmail.com"
   gem.homepage = "http://seancribbs.github.com/ripple"
   gem.authors = ["Sean Cribbs"]
-  gem.add_development_dependency "rspec", "~>2.0.0.beta.11"
+  gem.add_development_dependency "rspec", "~>2.0.0"
   gem.add_development_dependency "fakeweb", ">=1.2"
   gem.add_development_dependency "rack", ">=1.0"
   gem.add_development_dependency "curb", ">=0.6"
@@ -27,6 +27,7 @@ gemspec = Gem::Specification.new do |gem|
   files.exclude '**/*.rej'
   files.exclude /^pkg/
   files.exclude 'riak-client.gemspec'
+  files.exclude 'spec/support/test_server.yml'
 
   gem.files = files.to_a
 

data/lib/riak/client.rb

@@ -12,6 +12,8 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 require 'riak'
+require 'tempfile'
+require 'delegate'
 
 module Riak
   # A client connection to Riak.
@@ -44,6 +46,9 @@ module Riak
     # @return [String] The URL path to the map-reduce HTTP endpoint
     attr_accessor :mapred
 
+    # @return [String] The URL path to the luwak HTTP endpoint
+    attr_accessor :luwak
+
     # Creates a client connection to Riak
     # @param [Hash] options configuration options for the client
     # @option options [String] :host ('127.0.0.1') The host or IP address for the Riak endpoint
@@ -53,12 +58,13 @@ module Riak
     # @option options [Fixnum, String] :client_id (rand(MAX_CLIENT_ID)) The internal client ID used by Riak to route responses
     # @raise [ArgumentError] raised if any options are invalid
     def initialize(options={})
-      options.assert_valid_keys(:host, :port, :prefix, :client_id, :mapred)
+      options.assert_valid_keys(:host, :port, :prefix, :client_id, :mapred, :luwak)
       self.host      = options[:host]      || "127.0.0.1"
       self.port      = options[:port]      || 8098
       self.client_id = options[:client_id] || make_client_id
       self.prefix    = options[:prefix]    || "/riak/"
       self.mapred    = options[:mapred]    || "/mapred"
+      self.luwak     = options[:luwak]     || "/luwak"
       raise ArgumentError, t("missing_host_and_port") unless @host && @port
     end
 
@@ -122,6 +128,73 @@ module Riak
     end
     alias :[] :bucket
 
+    # Stores a large file/IO object in Riak via the "Luwak" interface.
+    # @overload store_file(filename, content_type, data)
+    #   Stores the file at the given key/filename
+    #   @param [String] filename the key/filename for the object
+    #   @param [String] content_type the MIME Content-Type for the data
+    #   @param [IO, String] data the contents of the file
+    # @overload store_file(content_type, data)
+    #   Stores the file with a server-determined key/filename
+    #   @param [String] content_type the MIME Content-Type for the data
+    #   @param [IO, String] data the contents of the file
+    # @return [String] the key/filename where the object was stored
+    def store_file(*args)
+      data, content_type, filename = args.reverse
+      if filename
+        http.put(204, luwak, escape(filename), data, {"Content-Type" => content_type})
+        filename
+      else
+        response = http.post(201, luwak, data, {"Content-Type" => content_type})
+        response[:headers]["location"].first.split("/").last
+      end
+    end
+
+    # Retrieves a large file/IO object from Riak via the "Luwak"
+    # interface. Streams the data to a temporary file unless a block
+    # is given.
+    # @param [String] filename the key/filename for the object
+    # @return [IO, nil] the file (also having content_type and
+    #   original_filename accessors). The file will need to be
+    #   reopened to be read. nil will be returned if a block is given.
+    # @yield [chunk] stream contents of the file through the
+    #     block. Passing the block will result in nil being returned
+    #     from the method.
+    # @yieldparam [String] chunk a single chunk of the object's data
+    def get_file(filename, &block)
+      if block_given?
+        http.get(200, luwak, escape(filename), &block)
+        nil
+      else
+        tmpfile = LuwakFile.new(escape(filename))
+        begin
+          response = http.get(200, luwak, escape(filename)) do |chunk|
+            tmpfile.write chunk
+          end
+          tmpfile.content_type = response[:headers]['content-type'].first
+          tmpfile
+        ensure
+          tmpfile.close
+        end
+      end
+    end
+
+    # Deletes a file stored via the "Luwak" interface
+    # @param [String] filename the key/filename to delete
+    def delete_file(filename)
+      http.delete([204,404], luwak, escape(filename))
+      true
+    end
+    
+    # Checks whether a file exists in "Luwak".
+    # @param [String] key the key to check
+    # @return [true, false] whether the key exists in "Luwak"
+    def file_exists?(key)
+      result = http.head([200,404], luwak, escape(key))
+      result[:code] == 200
+    end
+    alias :file_exist? :file_exists?
+
     # @return [String] A representation suitable for IRB and debugging output.
     def inspect
       "#<Riak::Client #{http.root_uri.to_s}>"
@@ -135,5 +208,15 @@ module Riak
     def b64encode(n)
       Base64.encode64([n].pack("N")).chomp
     end
+
+    # @private
+    class LuwakFile < DelegateClass(Tempfile)
+      attr_accessor :original_filename, :content_type
+      alias :key :original_filename
+      def initialize(fn)
+        super(Tempfile.new(fn))
+        @original_filename = fn
+      end
+    end
   end
 end

data/lib/riak/locale/en.yml

@@ -16,6 +16,7 @@ en:
     bucket_link_conversion: "Can't convert a bucket link to a walk spec"
     client_type: "invalid argument %{client} is not a Riak::Client"
     content_type_undefined: "content_type is not defined!"
+    empty_map_reduce_query: "Specify one or more query phases to your MapReduce."
     failed_request: "Expected %{expected} from Riak but received %{code}. %{body}"
     hash_type: "invalid argument %{hash} is not a Hash"
     hostname_invalid: "host must be a valid hostname"
@@ -30,6 +31,8 @@ en:
     port_invalid: "port must be an integer between 0 and 65535"
     request_body_type: "Request body must be a string or IO."
     resource_path_short: "Resource path too short"
+    search_docs_require_id: "Search index documents must include the 'id' field."
+    search_remove_requires_id_or_query: "Search index documents to be removed must have 'id' or 'query' keys."
     stored_function_invalid: "function must have :bucket and :key when a hash"
     string_type: "invalid_argument %{string} is not a String"
     too_few_arguments: "too few arguments: %{params}"

data/lib/riak/map_reduce.rb

@@ -18,7 +18,7 @@ module Riak
   class MapReduce
     include Util::Translation
     include Util::Escape
-    
+
     # @return [Array<[bucket,key]>,String] The bucket/keys for input to the job, or the bucket (all keys).
     # @see #add
     attr_accessor :inputs
@@ -134,11 +134,11 @@ module Riak
       return self
     end
     alias :timeout= :timeout
-    
+
     # Convert the job to JSON for submission over the HTTP interface.
     # @return [String] the JSON representation
     def to_json(options={})
-      hash = {"inputs" => inputs, "query" => query.map(&:as_json)}
+      hash = {"inputs" => inputs.as_json, "query" => query.map(&:as_json)}
       hash['timeout'] = @timeout.to_i if @timeout
       ActiveSupport::JSON.encode(hash, options)
     end
@@ -146,6 +146,7 @@ module Riak
     # Executes this map-reduce job.
     # @return [Array<Array>] similar to link-walking, each element is an array of results from a phase where "keep" is true. If there is only one "keep" phase, only the results from that phase will be returned.
     def run
+      raise MapReduceError.new(t("empty_map_reduce_query")) if @query.empty?
       response = @client.http.post(200, @client.mapred, to_json, {"Content-Type" => "application/json", "Accept" => "application/json"})
       if response.try(:[], :headers).try(:[],'content-type').include?("application/json")
         ActiveSupport::JSON.decode(response[:body])

data/lib/riak/search.rb

@@ -0,0 +1,157 @@
+# 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'
+require 'riak/client'
+require 'riak/bucket'
+require 'riak/map_reduce'
+require 'builder' # Needed to generate Solr XML
+
+module Riak
+  class Client
+    # @return [String] The URL path prefix to the Solr HTTP endpoint
+    attr_accessor :solr
+
+    # @private
+    alias :initialize_core :initialize
+    # @option options [String] :solr ('/solr') The URL path prefix to the Solr HTTP endpoint
+    def initialize(options={})
+      self.solr = options.delete(:solr) || "/solr"
+      initialize_core(options)
+    end
+
+    # Performs a search via the Solr interface.
+    # @overload search(index, query, options={})
+    #   @param [String] index the index to query on
+    #   @param [String] query a Lucene query string
+    # @overload search(query, options={})
+    #   Queries the default index
+    #   @param [String] query a Lucene query string
+    # @param [Hash] options extra options for the Solr query
+    # @option options [String] :df the default field to search in
+    # @option options [String] :'q.op' the default operator between terms ("or", "and")
+    # @option options [String] :wt ("json") the response type - "json" and "xml" are valid
+    # @option options [String] :sort ('none') the field and direction to sort, e.g. "name asc"
+    # @option options [Fixnum] :start (0) the offset into the query to start from, e.g. for pagination
+    # @option options [Fixnum] :rows (10) the number of results to return
+    # @return [Hash] the query result, containing the 'responseHeaders' and 'response' keys
+    def search(*args)
+      options = args.extract_options!
+      index, query = args[-2], args[-1]  # Allows nil index, while keeping it as first argument
+      path = [solr, index, "select", {"q" => query, "wt" => "json"}.merge(options.stringify_keys), {}].compact
+      response = http.get(200, *path)
+      if response[:headers]['content-type'].include?("application/json")
+        ActiveSupport::JSON.decode(response[:body])
+      else
+        response[:body]
+      end
+    end
+    alias :select :search
+
+    # Adds documents to a search index via the Solr interface.
+    # @overload index(index, *docs)
+    #   Adds documents to the specified search index
+    #   @param [String] index the index in which to add/update the given documents
+    #   @param [Array<Hash>] docs unnested document hashes, with one key per field
+    # @overload index(*docs)
+    #   Adds documents to the default search index
+    #   @param [Array<Hash>] docs unnested document hashes, with one key per field
+    # @raise [ArgumentError] if any documents don't include 'id' key
+    def index(*args)
+      index = args.shift if String === args.first # Documents must be hashes of fields
+      raise ArgumentError.new(t("search_docs_require_id")) unless args.all? {|d| d.key?("id") || d.key?(:id) }
+      xml = Builder::XmlMarkup.new
+      xml.add do
+        args.each do |doc|
+          xml.doc do
+            doc.each do |k,v|
+              xml.field('name' => k.to_s) { xml.text!(v.to_s) }
+            end
+          end
+        end
+      end
+      path = [solr, index, "update", xml.target!, {'Content-Type' => 'text/xml'}].compact
+      http.post(200, *path)
+      true
+    end
+    alias :add_doc :index
+
+    # Removes documents from a search index via the Solr interface.
+    # @overload remove(index, specs)
+    #   Removes documents from the specified index
+    #   @param [String] index the index from which to remove documents
+    #   @param [Array<Hash>] specs the specificaiton of documents to remove (must contain 'id' or 'query' keys)
+    # @overload remove(specs)
+    #   Removes documents from the default index
+    #   @param [Array<Hash>] specs the specification of documents to remove (must contain 'id' or 'query' keys)
+    # @raise [ArgumentError] if any document specs don't include 'id' or 'query' keys
+    def remove(*args)
+      index = args.shift if String === args.first
+      raise ArgumentError.new(t("search_remove_requires_id_or_query")) unless args.all? {|s| s.stringify_keys.key?("id") || s.stringify_keys.key?("query") }
+      xml = Builder::XmlMarkup.new
+      xml.delete do
+        args.each do |spec|
+          spec.each do |k,v|
+            xml.tag!(k.to_sym, v)
+          end
+        end
+      end
+      path = [solr, index, "update", xml.target!, {'Content-Type' => 'text/xml'}].compact
+      http.post(200, *path)
+      true
+    end
+    alias :delete_doc :remove
+    alias :deindex :remove
+  end
+
+  class Bucket
+    # The precommit specification for kv/search integration
+    SEARCH_PRECOMMIT_HOOK = {"mod" => "riak_search_kv_hook", "fun" => "precommit"}
+
+    # Installs a precommit hook that automatically indexes objects
+    # into riak_search.
+    def enable_index!
+      unless is_indexed?
+        self.props = {"precommit" => (props['precommit'] + [SEARCH_PRECOMMIT_HOOK])}
+      end
+    end
+
+    # Removes the precommit hook that automatically indexes objects
+    # into riak_search.
+    def disable_index!
+      if is_indexed?
+        self.props = {"precommit" => (props['precommit'] - [SEARCH_PRECOMMIT_HOOK])}
+      end
+    end
+
+    # Detects whether the bucket is automatically indexed into
+    # riak_search.
+    # @return [true,false] whether the bucket includes the search indexing hook
+    def is_indexed?
+      props['precommit'].include?(SEARCH_PRECOMMIT_HOOK)
+    end
+  end
+
+  class MapReduce
+    # Use a search query to start a map/reduce job.
+    # @param [String, Bucket] bucket the bucket/index to search
+    # @param [String] query the query to run
+    # @return [MapReduce] self
+    def search(bucket, query)
+      bucket = bucket.name if bucket.respond_to?(:name)
+      @inputs = {:module => "riak_search", :function => "mapred_search", :arg => [bucket, query]}
+      self
+    end
+  end
+end

data/spec/riak/client_spec.rb

@@ -1,4 +1,4 @@
-60# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
+# 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.
@@ -62,6 +62,15 @@ describe Riak::Client do
     it "should default the mapreduce path to /mapred if not specified" do
       Riak::Client.new.mapred.should == "/mapred"
     end
+
+    it "should accept a luwak path" do
+      client = Riak::Client.new(:luwak => "/beans")
+      client.luwak.should == "/beans"
+    end
+
+    it "should default the luwak path to /luwak if not specified" do
+      Riak::Client.new.luwak.should == "/luwak"
+    end
   end
 
   describe "reconfiguring" do
@@ -171,4 +180,87 @@ describe Riak::Client do
       @client.bucket("foo/bar ", :keys => false)
     end
   end
+
+  describe "storing a file" do
+    before :each do
+      @client = Riak::Client.new
+      @http = mock(Riak::Client::HTTPBackend)
+      @client.stub!(:http).and_return(@http)
+    end
+
+    it "should store the file in Luwak and return the key/filename when no filename is given" do
+      @http.should_receive(:post).with(201, "/luwak", anything, {"Content-Type" => "text/plain"}).and_return(:code => 201, :headers => {"location" => ["/luwak/123456789"]})
+      @client.store_file("text/plain", "Hello, world").should == "123456789"
+    end
+
+    it "should store the file in Luwak and return the key/filename when the filename is given" do
+      @http.should_receive(:put).with(204, "/luwak", "greeting.txt", anything, {"Content-Type" => "text/plain"}).and_return(:code => 204, :headers => {})
+      @client.store_file("greeting.txt", "text/plain", "Hello, world").should == "greeting.txt"
+    end
+  end
+
+  describe "retrieving a file" do
+    before :each do
+      @client = Riak::Client.new
+      @http = mock(Riak::Client::HTTPBackend)
+      @client.stub!(:http).and_return(@http)
+      @http.should_receive(:get).with(200, "/luwak", "greeting.txt").and_yield("Hello,").and_yield(" world!").and_return({:code => 200, :headers => {"content-type" => ["text/plain"]}})
+    end
+
+    it "should stream the data to a temporary file" do
+      file = @client.get_file("greeting.txt")
+      file.open {|f| f.read.should == "Hello, world!" }
+    end
+
+    it "should stream the data through the given block, returning nil" do
+      string = ""
+      result = @client.get_file("greeting.txt"){|chunk| string << chunk }
+      result.should be_nil
+      string.should == "Hello, world!"
+    end
+
+    it "should expose the original key and content-type on the temporary file" do
+      file = @client.get_file("greeting.txt")
+      file.content_type.should == "text/plain"
+      file.original_filename.should == "greeting.txt"
+    end
+  end
+
+  it "should delete a file" do
+    @client = Riak::Client.new
+    @http = mock(Riak::Client::HTTPBackend)
+    @client.stub!(:http).and_return(@http)
+    @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)
+    @client.file_exists?("foo").should be_false
+  end
+
+  it "should escape the filename when storing, retrieving or deleting files" do
+    @client = Riak::Client.new
+    @http = mock(Riak::Client::HTTPBackend)
+    @client.stub!(:http).and_return(@http)
+    # Delete escapes keys
+    @http.should_receive(:delete).with([204,404], "/luwak", "docs%2FA%20Big%20PDF.pdf")
+    @client.delete_file("docs/A Big PDF.pdf")
+    # Get escapes keys
+    @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
+    @client.get_file("docs/A Big PDF.pdf")
+    # Streamed get escapes keys
+    @http.should_receive(:get).with(200, "/luwak", "docs%2FA%20Big%20PDF.pdf").and_yield("foo").and_return(:headers => {"content-type" => ["text/plain"]}, :code => 200)
+    @client.get_file("docs/A Big PDF.pdf"){|chunk| chunk }
+    # Put escapes keys
+    @http.should_receive(:put).with(204, "/luwak", "docs%2FA%20Big%20PDF.pdf", "foo", {"Content-Type" => "text/plain"})
+    @client.store_file("docs/A Big PDF.pdf", "text/plain", "foo")
+  end
 end

data/spec/riak/map_reduce_spec.rb

@@ -207,21 +207,30 @@ describe Riak::MapReduce do
       @mr.timeout(50000)
       @mr.to_json.should include('"timeout":50000')
     end
+  end
 
-    it "should return self from setting the timeout" do
-      @mr.timeout(5000).should == @mr
-    end
+  it "should return self from setting the timeout" do
+    @mr.timeout(5000).should == @mr
   end
 
   describe "executing the map reduce job" do
+    before :each do
+      @mr.map("Riak.mapValues",:keep => true)
+    end
+
+    it "should raise an exception when no phases are defined" do
+      @mr.query.clear
+      lambda { @mr.run }.should raise_error(Riak::MapReduceError)
+    end
+
     it "should issue POST request to the mapred endpoint" do
-      @http.should_receive(:post).with(200, "/mapred", @mr.to_json, hash_including("Content-Type" => "application/json")).and_return({:headers => {'content-type' => ["application/json"]}, :body => "{}"})
+      @http.should_receive(:post).with(200, "/mapred", @mr.to_json, hash_including("Content-Type" => "application/json")).and_return({:headers => {'content-type' => ["application/json"]}, :body => "[]"})
       @mr.run
     end
 
     it "should vivify JSON responses" do
-      @http.stub!(:post).and_return(:headers => {'content-type' => ["application/json"]}, :body => '{"key":"value"}')
-      @mr.run.should == {"key" => "value"}
+      @http.stub!(:post).and_return(:headers => {'content-type' => ["application/json"]}, :body => '[{"key":"value"}]')
+      @mr.run.should == [{"key" => "value"}]
     end
 
     it "should return the full response hash for non-JSON responses" do
@@ -335,7 +344,7 @@ describe Riak::MapReduce::Phase do
           @phase.to_json.should include('"name":"Riak.mapValues"')
           @phase.to_json.should_not include('"source"')
         end
-        
+
         it "should include the bucket and key when referring to a stored function" do
           @phase.function = {:bucket => "design", :key => "wordcount_map"}
           @phase.to_json.should include('"bucket":"design"')

data/spec/riak/search_spec.rb

@@ -0,0 +1,206 @@
+# 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__)
+
+describe "Search mixins" do
+  before :all do
+    require 'riak/search'
+  end
+
+  describe Riak::Client do
+    before :each do
+      @client = Riak::Client.new
+      @http = mock(Riak::Client::HTTPBackend)
+      @client.stub!(:http).and_return(@http)
+    end
+    describe "searching" do
+      it "should exclude the index from the URL when not specified" do
+        @http.should_receive(:get).with(200, "/solr", "select", hash_including("q" => "foo"), {}).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => "{}"})
+        @client.search("foo")
+      end
+
+      it "should include extra options in the query string" do
+        @http.should_receive(:get).with(200, "/solr", "select", hash_including('rows' => 30), {}).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => "{}"})
+        @client.search("foo", 'rows' => 30)
+      end
+
+      it "should include the index in the URL when specified" do
+        @http.should_receive(:get).with(200, "/solr", "search", "select", hash_including("q" => "foo"), {}).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => "{}"})
+        @client.search("search", "foo")
+      end
+
+      it "should vivify JSON responses" do
+        @http.should_receive(:get).and_return({:code => 200, :headers => {"content-type"=>["application/json"]}, :body => '{"response":{"docs":["foo"]}}'})
+        @client.search("foo").should == {"response" => {"docs" => ["foo"]}}
+      end
+
+      it "should return non-JSON responses raw" do
+        @http.should_receive(:get).and_return({:code => 200, :headers => {"content-type"=>["text/plain"]}, :body => '{"response":{"docs":["foo"]}}'})
+        @client.search("foo").should == '{"response":{"docs":["foo"]}}'
+      end
+    end
+    describe "indexing documents" do
+      it "should exclude the index from the URL when not specified" do
+        @http.should_receive(:post).with(200, "/solr", "update", anything, anything).and_return({:code => 200, :headers => {'content-type' => ['text/html']}, :body => ""})
+        @client.index({:id => 1, :field => "value"})
+      end
+
+      it "should include the index in the URL when specified" do
+        @http.should_receive(:post).with(200, "/solr", "foo", "update", anything, anything).and_return({:code => 200, :headers => {'content-type' => ['text/html']}, :body => ""})
+        @client.index("foo", {:id => 1, :field => "value"})
+      end
+
+      it "should raise an error when documents do not contain an id" do
+        @http.stub!(:post).and_return(true)
+        lambda { @client.index({:field => "value"}) }.should raise_error(ArgumentError)
+        lambda { @client.index({:id => 1, :field => "value"}) }.should_not raise_error(ArgumentError)
+      end
+
+      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"})
+      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"})
+      end
+    end
+    describe "removing documents" do
+      it "should exclude the index from the URL when not specified" do
+        @http.should_receive(:post).with(200, "/solr","update", anything, anything).and_return({:code => 200, :headers => {'content-type' => ['text/html']}, :body => ""})
+        @client.remove({:id => 1})
+      end
+
+      it "should include the index in the URL when specified" do
+        @http.should_receive(:post).with(200, "/solr", "foo", "update", anything, anything).and_return({:code => 200, :headers => {'content-type' => ['text/html']}, :body => ""})
+        @client.remove("foo", {:id => 1})
+      end
+
+      it "should raise an error when document specifications don't include an id or query" do
+        @http.stub!(:post).and_return({:code => 200})
+        lambda { @client.remove({:foo => "bar"}) }.should raise_error(ArgumentError)
+        lambda { @client.remove({:id => 1}) }.should_not raise_error
+      end
+
+      it "should build a Solr <delete> request" do
+        expect_update_body('<delete><id>1</id></delete>')
+        @client.remove(:id => 1)
+        expect_update_body('<delete><query>title:old</query></delete>')
+        @client.remove(:query => "title:old")
+      end
+
+      it "should include multiple specs in the <delete> request" do
+        expect_update_body('<delete><id>1</id><query>title:old</query></delete>')
+        @client.remove({:id => 1}, {:query => "title:old"})
+      end
+    end
+
+    def expect_update_body(body, index=nil)
+      args = [200, "/solr", index, "update", body, {"Content-Type" => "text/xml"}].compact
+      @http.should_receive(:post).with(*args).and_return({:code => 200, :headers => {'content-type' => ['text/html']}, :body => ""})
+    end
+  end
+
+  describe Riak::Bucket do
+    before :each do
+      @client = Riak::Client.new
+      @bucket = Riak::Bucket.new(@client, "foo")
+    end
+
+    def do_load(overrides={})
+      @bucket.load({
+                     :body => '{"props":{"name":"foo","n_val":3,"allow_mult":false,"last_write_wins":false,"precommit":[],"postcommit":[],"chash_keyfun":{"mod":"riak_core_util","fun":"chash_std_keyfun"},"linkfun":{"mod":"riak_kv_wm_link_walker","fun":"mapreduce_linkfun"},"old_vclock":86400,"young_vclock":20,"big_vclock":50,"small_vclock":10,"r":"quorum","w":"quorum","dw":"quorum","rw":"quorum"},"keys":["bar"]}',
+                     :headers => {
+                       "vary" => ["Accept-Encoding"],
+                       "server" => ["MochiWeb/1.1 WebMachine/1.5.1 (hack the charles gibson)"],
+                       "link" => ['</riak/foo/bar>; riaktag="contained"'],
+                       "date" => ["Tue, 12 Jan 2010 15:30:43 GMT"],
+                       "content-type" => ["application/json"],
+                       "content-length" => ["257"]
+                     }
+                   }.merge(overrides))
+    end
+    alias :load_without_index_hook :do_load
+
+    def load_with_index_hook
+      do_load(:body => '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}}')
+    end
+
+    it "should detect whether the indexing hook is installed" do
+      load_without_index_hook
+      @bucket.props['precommit'].should be_empty
+      @bucket.is_indexed?.should be_false
+
+      load_with_index_hook
+      @bucket.props['precommit'].should_not be_empty
+      @bucket.is_indexed?.should be_true
+    end
+
+    describe "enabling indexing" do
+      it "should add the index hook when not present" do
+        load_without_index_hook
+        @bucket.should_receive(:props=).with({"precommit" => [Riak::Bucket::SEARCH_PRECOMMIT_HOOK]})
+        @bucket.enable_index!
+      end
+
+      it "should not modify the precommit when the hook is present" do
+        load_with_index_hook
+        @bucket.should_not_receive(:props=)
+        @bucket.enable_index!
+      end
+    end
+
+    describe "disabling indexing" do
+      it "should remove the index hook when present" do
+        load_with_index_hook
+        @bucket.should_receive(:props=).with({"precommit" => []})
+        @bucket.disable_index!
+      end
+
+      it "should not modify the precommit when the hook is missing" do
+        load_without_index_hook
+        @bucket.should_not_receive(:props=)
+        @bucket.disable_index!
+      end
+    end
+  end
+
+  describe Riak::MapReduce do
+    before :each do
+      @client = Riak::Client.new
+      @mr = Riak::MapReduce.new(@client)
+    end
+
+    describe "using a search query as inputs" do
+      it "should accept a bucket name and query" do
+        @mr.search("foo", "bar OR baz")
+        @mr.inputs.should == {:module => "riak_search", :function => "mapred_search", :arg => ["foo", "bar OR baz"]}
+      end
+
+      it "should accept a Riak::Bucket and query" do
+        @mr.search(Riak::Bucket.new(@client, "foo"), "bar OR baz")
+        @mr.inputs.should == {:module => "riak_search", :function => "mapred_search", :arg => ["foo", "bar OR baz"]}
+      end
+
+      it "should emit the Erlang function and arguments" do
+        @mr.search("foo", "bar OR baz")
+        @mr.to_json.should include('"inputs":{')
+        @mr.to_json.should include('"module":"riak_search"')
+        @mr.to_json.should include('"function":"mapred_search"')
+        @mr.to_json.should include('"arg":["foo","bar OR baz"]')
+      end
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -04:00
+date: 2010-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,9 +29,7 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta
-        - 11
-        version: 2.0.0.beta.11
+        version: 2.0.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -115,11 +113,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin/htmldiff
-- bin/ldiff
-- bin/rackup
-- bin/rake
-- bin/rspec
 - erl_src/riak_kv_test_backend.beam
 - erl_src/riak_kv_test_backend.erl
 - Gemfile
@@ -139,6 +132,7 @@ files:
 - 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
@@ -165,12 +159,12 @@ files:
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - 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
-- spec/support/test_server.yml
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
@@ -217,6 +211,7 @@ test_files:
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - 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

data/bin/htmldiff

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'htmldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'htmldiff')

data/bin/ldiff

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'ldiff' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('diff-lcs', 'ldiff')

data/bin/rackup

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rackup' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rack', 'rackup')

data/bin/rake

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-#
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile", __FILE__)
-
-require 'rubygems'
-require 'bundler/setup'
-
-load Gem.bin_path('rspec-core', 'rspec')

data/spec/support/test_server.yml

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