riak-client 1.0.5 → 1.1.0

data/spec/spec_helper.rb

@@ -13,11 +13,13 @@ Riak.disable_list_keys_warnings = true
    version_filter
    sometimes
    http_backend_implementation_examples
+   search_corpus_setup
    unified_backend_examples
    mocks
    mock_server
    drb_mock_server
-   test_server].each do |file|
+   test_server
+   riak_test].each do |file|
   require File.join("support", file)
 end
 

data/spec/support/riak_test.rb

@@ -0,0 +1,77 @@
+require 'riak/test_server'
+
+# This class is used for running the integration suite against
+# existing Riak nodes that have been preconfigured for test mode, e.g.
+# as part of the riak_test integration suite. This is only supported
+# on Riak versions > 1.2, with the KV backend set to memory with the
+# 'test' flag, and the Search backend set to the backend bundled with
+# the client (called riak_search_test_backend).
+class PrebuiltTestServer
+  def self.valid?
+    %W{RIAK_ROOT_DIR RIAK_NODE_NAME HTTP_PORT PB_PORT RIAK_VERSION}.all? {|e| ENV[e] }
+  end
+
+  attr_reader :http_port, :pb_port, :version, :root, :name
+
+  def initialize
+    @root = Pathname(ENV['RIAK_ROOT_DIR'])
+    @name = ENV['RIAK_NODE_NAME'].dup
+    @version = ENV['RIAK_VERSION'].dup[/\d+\.\d+\.\d+/, 0]
+    @http_port = ENV['HTTP_PORT'].to_i
+    @pb_port = ENV['PB_PORT'].to_i
+  end
+
+  def pipe
+    # Have to remove leading slash on root
+    @pipe ||= Pathname("/tmp") + @root.to_s[1..-1]
+  end
+
+  def exist?; true; end
+  def stop; end
+  def start; end
+  def started?; true; end
+
+  def drop
+    begin
+      maybe_attach
+      @console.command "riak_kv_memory_backend:reset()."
+      @console.command "riak_search_test_backend:reset()."
+    rescue IOError
+      retry
+    end
+  end
+
+  def attach
+    Riak::Node::Console.open self
+  end
+
+  protected
+  # Tries to reattach the console if it's closed
+  def maybe_attach
+    unless open?
+      @console.close if @console && !@console.frozen?
+      @console = attach
+    end
+  end
+
+  def open?
+    @console && @console.open?
+  end
+end
+
+module PrebuiltTestServerSupport
+  def test_server
+    unless $test_server
+      if PrebuiltTestServer.valid?
+        $test_server = PrebuiltTestServer.new
+      else
+        super
+      end
+    end
+    $test_server
+  end
+end
+
+RSpec.configure do |config|
+  config.include PrebuiltTestServerSupport, :integration => true
+end

data/spec/support/search_corpus_setup.rb

@@ -0,0 +1,18 @@
+shared_context "search corpus setup" do
+  before do
+    @bucket = @client.bucket('search_test')
+    orig_proto, @client.protocol = @client.protocol, :http
+    @bucket.enable_index!
+    @client.protocol = orig_proto
+    idx = 0
+    IO.foreach("spec/fixtures/munchausen.txt") do |para|
+      next if para =~ /^\s*$|introduction|chapter/i
+      idx += 1
+      Riak::RObject.new(@bucket, "munchausen-#{idx}") do |obj|
+        obj.content_type = 'text/plain'
+        obj.raw_data = para
+        @backend.store_object(obj)
+      end
+    end
+  end
+end

data/spec/support/sometimes.rb

@@ -39,7 +39,7 @@ RSpec.configure do |config|
     unless retried_examples.empty?
       retried_examples.each do |e|
         formatter.message "  #{e.full_description}"
-        formatter.message(color[:yellow, "  [#{e.metadata[:retried]}/#{e.metadata[:retries]}] "] + formatter.class.relative_path(e.location))
+        formatter.message(color[:yellow, "  [#{e.metadata[:retried]}/#{e.metadata[:retries]}] "] + RSpec::Core::Metadata::relative_path(e.location))
       end
     end
   end

data/spec/support/test_server.rb

@@ -50,7 +50,7 @@ RSpec.configure do |config|
   end
 
   config.after(:each, :integration => true) do
-    if test_server && !test_server_fatal && example.metadata[:test_server] != false
+    if test_server && !test_server_fatal && test_server.started? && example.metadata[:test_server] != false
       test_server.drop
     end
   end

data/spec/support/unified_backend_examples.rb

@@ -1,4 +1,3 @@
-
 shared_examples_for "Unified backend API" do
   # ping
   it "should ping the server" do
@@ -38,14 +37,14 @@ shared_examples_for "Unified backend API" do
         robj.data.should == { "test" => "pass" }
       end
 
-      it "should accept a PR value of #{q.inspect} for the request", :version => "1.0.0" do
+      it "should accept a PR value of #{q.inspect} for the request", :version => ">= 1.0.0" do
         robj = @backend.fetch_object("test", "fetch", :pr => q)
         robj.should be_kind_of(Riak::RObject)
         robj.data.should == { "test" => "pass" }
       end
     end
 
-    sometimes "should marshal indexes properly", :version => "1.0.0", :retries => 5 do
+    sometimes "should marshal indexes properly", :version => ">= 1.0.0", :retries => 5 do
       robj = @backend.fetch_object('test', 'fetch')
       robj.indexes['test_bin'].should be
       robj.indexes['test_bin'].should include('pass')
@@ -73,7 +72,7 @@ shared_examples_for "Unified backend API" do
         @backend.reload_object(@robject, :r => q)
       end
 
-      it "should accept a valid PR value of #{q.inspect} for the request", :version => "1.0.0" do
+      it "should accept a valid PR value of #{q.inspect} for the request", :version => ">= 1.0.0" do
         @backend.reload_object(@robject, :pr => q)
       end
     end
@@ -113,12 +112,12 @@ shared_examples_for "Unified backend API" do
         @backend.store_object(@robject, :returnbody => false, :w => :all, :dw => q)
       end
 
-      it "should accept a PW value of #{q.inspect} for the request", :version => "1.0.0" do
+      it "should accept a PW value of #{q.inspect} for the request", :version => ">= 1.0.0" do
         @backend.store_object(@robject, :returnbody => false, :pw => q)
       end
     end
 
-    it "should store an object with indexes", :version => "1.0.0" do
+    it "should store an object with indexes", :version => ">= 1.0.0" do
       @robject.indexes['foo_bin'] << 'bar'
       @backend.store_object(@robject, :returnbody => true)
       @robject.indexes.should include('foo_bin')
@@ -126,7 +125,7 @@ shared_examples_for "Unified backend API" do
     end
 
     after do
-      expect { @backend.fetch_object("test", "store") }.should_not raise_error(Riak::FailedRequest)
+      expect { @backend.fetch_object("test", "store") }.to_not raise_error(Riak::FailedRequest)
     end
   end
 
@@ -272,10 +271,30 @@ shared_examples_for "Unified backend API" do
       @mapred = Riak::MapReduce.new(@client).add("test").map("Riak.mapValuesJson", :keep => true)
     end
 
+    it "should raise an error without phases", :version => "< 1.1.0" do
+      @mapred.query.clear
+      expect { @backend.mapred(@mapred) }.to raise_error(Riak::MapReduceError)
+    end
+
+    it "should not raise an error without phases", :version => ">= 1.1.0" do
+      @mapred.query.clear
+      @backend.mapred(@mapred)
+    end
+
     it "should perform a simple MapReduce request" do
       @backend.mapred(@mapred).should == [{"value" => "1"}]
     end
 
+    it "should return an ordered array of results when multiple phases are kept" do
+      @mapred.reduce("function(objects){ return objects; }", :keep => true)
+      @backend.mapred(@mapred).should == [[{"value" => "1"}], [{"value" => "1"}]]
+    end
+
+    it "should not remove empty phase results when multiple phases are kept" do
+      @mapred.reduce("function(){ return []; }", :keep => true)
+      @backend.mapred(@mapred).should == [[{"value" => "1"}], []]
+    end
+
     context "streaming results through a block" do
       it "should pass phase number and result to the block" do
         @backend.mapred(@mapred) do |phase, result|
@@ -303,4 +322,31 @@ shared_examples_for "Unified backend API" do
       end
     end
   end
+
+  # search
+  context "searching fulltext indexes", :version => ">= 1.2.0" do
+    # Search functionality existed since Riak 0.13, but PBC only
+    # entered into the picture in 1.2. PBC can support searches
+    # against 1.1 and earlier nodes using MapReduce emulation, but has
+    # limited functionality. We'll enter separate tests for the
+    # pre-1.2 functionality.
+    include_context "search corpus setup"
+
+    it 'should find indexed documents, returning ids' do
+      results = @backend.search 'search_test', 'fearless elephant rushed', :fl => 'id'
+      results.should have_key 'docs'
+      results.should have_key 'max_score'
+      results.should have_key 'num_found'
+      results['docs'].should include({"id" => "munchausen-605"})
+    end
+
+    it 'should find indexed documents, returning documents' do
+      # For now use '*' until #122 is merged into riak_search
+      results = @backend.search 'search_test', 'fearless elephant rushed', :fl => '*'
+      results.should have_key 'docs'
+      results.should have_key 'max_score'
+      results.should have_key 'num_found'
+      results['docs'].should include({"id" => "munchausen-605", "value" => "Fearless I advanced against the elephant, desirous to take alive the haughty Tippoo Sahib; but he drew a pistol from his belt, and discharged it full in my face as I rushed upon him, which did me no further harm than wound my cheek-bone, which disfigures me somewhat under my left eye. I could not withstand the rage and impulse of that moment, and with one blow of my sword separated his head from his body.\n"})
+    end
+  end
 end

data/spec/support/version_filter.rb

@@ -1,17 +1,10 @@
 require 'rubygems'
 
 RSpec.configure do |config|
-  config.before(:each, :integration => true,
-                :version => lambda {|v| !!v },
-                :test_server => lambda {|ts| ts != false }) do
-    required = example.metadata[:version]
+  config.before(:each, :version => lambda {|v| !!v }) do
+    required = Gem::Requirement.create(example.metadata[:version])
     actual = Gem::Version.new(test_server.version)
-    case required
-    when String
-      required = Gem::Requirement.create(">= #{required}")
-    when Range
-      required = Gem::Requirement.create([">= #{required.begin}", "<= #{required.end}"])
-    end
-    pending("SKIP: Tests feature for Riak #{required.to_s}, but testing against #{actual.to_s}") unless required.satisfied_by?(actual)
+    pending("SKIP: Tests feature for Riak #{required.to_s}, but testing against #{actual.to_s}",
+            :unless => required.satisfied_by?(actual))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +155,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: innertube
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: riak-client is a rich client for Riak, the distributed database by Basho.
   It supports the full HTTP and Protocol Buffers interfaces including storage operations,
   bucket configuration, link-walking, secondary indexes and map-reduce.
@@ -164,33 +180,43 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .document
+- .gitignore
+- .rspec
+- Gemfile
+- Guardfile
+- LICENSE
+- README.markdown
+- RELEASE_NOTES.md
+- Rakefile
 - erl_src/riak_kv_test014_backend.beam
 - erl_src/riak_kv_test014_backend.erl
 - erl_src/riak_kv_test_backend.beam
 - erl_src/riak_kv_test_backend.erl
 - erl_src/riak_search_test_backend.beam
 - erl_src/riak_search_test_backend.erl
-- Gemfile
-- Guardfile
+- lib/riak.rb
 - lib/riak/bucket.rb
+- lib/riak/client.rb
 - lib/riak/client/beefcake/messages.rb
 - lib/riak/client/beefcake/object_methods.rb
 - lib/riak/client/beefcake_protobuffs_backend.rb
 - lib/riak/client/decaying.rb
 - lib/riak/client/excon_backend.rb
+- lib/riak/client/feature_detection.rb
+- lib/riak/client/http_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/node.rb
-- lib/riak/client/pool.rb
 - lib/riak/client/protobuffs_backend.rb
 - lib/riak/client/search.rb
-- lib/riak/client.rb
 - lib/riak/cluster.rb
+- lib/riak/conflict.rb
+- lib/riak/core_ext.rb
 - lib/riak/core_ext/blank.rb
 - lib/riak/core_ext/deep_dup.rb
 - lib/riak/core_ext/extract_options.rb
@@ -199,7 +225,6 @@ files:
 - 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/encoding.rb
 - lib/riak/failed_request.rb
 - lib/riak/i18n.rb
@@ -207,10 +232,12 @@ files:
 - lib/riak/link.rb
 - lib/riak/locale/en.yml
 - lib/riak/locale/fr.yml
+- lib/riak/map_reduce.rb
 - lib/riak/map_reduce/filter_builder.rb
 - lib/riak/map_reduce/phase.rb
-- lib/riak/map_reduce.rb
+- lib/riak/map_reduce/results.rb
 - lib/riak/map_reduce_error.rb
+- lib/riak/node.rb
 - lib/riak/node/configuration.rb
 - lib/riak/node/console.rb
 - lib/riak/node/control.rb
@@ -218,7 +245,7 @@ files:
 - lib/riak/node/generation.rb
 - lib/riak/node/log.rb
 - lib/riak/node/version.rb
-- lib/riak/node.rb
+- lib/riak/rcontent.rb
 - lib/riak/robject.rb
 - lib/riak/search.rb
 - lib/riak/serializers.rb
@@ -226,25 +253,22 @@ files:
 - lib/riak/test_server.rb
 - lib/riak/util/escape.rb
 - lib/riak/util/headers.rb
-- lib/riak/util/multipart/stream_parser.rb
 - lib/riak/util/multipart.rb
+- lib/riak/util/multipart/stream_parser.rb
 - lib/riak/util/tcp_socket_extensions.rb
 - lib/riak/util/translation.rb
 - lib/riak/version.rb
 - lib/riak/walk_spec.rb
-- lib/riak.rb
-- LICENSE
-- Rakefile
-- README.markdown
-- RELEASE_NOTES.md
 - riak-client.gemspec
 - spec/failover/failover.rb
 - spec/fixtures/cat.jpg
+- spec/fixtures/multipart-basic-conflict.txt
 - spec/fixtures/multipart-blank.txt
 - spec/fixtures/multipart-mapreduce.txt
 - spec/fixtures/multipart-with-body.txt
 - spec/fixtures/multipart-with-marked-tombstones.txt
 - spec/fixtures/multipart-with-unmarked-tombstone.txt
+- spec/fixtures/munchausen.txt
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
@@ -261,6 +285,7 @@ files:
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
+- spec/riak/feature_detection_spec.rb
 - spec/riak/headers_spec.rb
 - spec/riak/http_backend/configuration_spec.rb
 - spec/riak/http_backend/object_methods_spec.rb
@@ -273,7 +298,6 @@ files:
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/node_spec.rb
-- spec/riak/pool_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/serializers_spec.rb
@@ -286,12 +310,13 @@ files:
 - spec/support/integration_setup.rb
 - spec/support/mock_server.rb
 - spec/support/mocks.rb
+- spec/support/riak_test.rb
+- spec/support/search_corpus_setup.rb
 - spec/support/sometimes.rb
 - spec/support/test_server.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
 - spec/support/version_filter.rb
-- .gitignore
 homepage: http://github.com/basho/riak-ruby-client
 licenses: []
 post_install_message: 
@@ -304,12 +329,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4120452227137147580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4120452227137147580
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -319,11 +350,13 @@ summary: riak-client is a rich client for Riak, the distributed database by Bash
 test_files:
 - spec/failover/failover.rb
 - spec/fixtures/cat.jpg
+- spec/fixtures/multipart-basic-conflict.txt
 - spec/fixtures/multipart-blank.txt
 - spec/fixtures/multipart-mapreduce.txt
 - spec/fixtures/multipart-with-body.txt
 - spec/fixtures/multipart-with-marked-tombstones.txt
 - spec/fixtures/multipart-with-unmarked-tombstone.txt
+- spec/fixtures/munchausen.txt
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
@@ -340,6 +373,7 @@ test_files:
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
+- spec/riak/feature_detection_spec.rb
 - spec/riak/headers_spec.rb
 - spec/riak/http_backend/configuration_spec.rb
 - spec/riak/http_backend/object_methods_spec.rb
@@ -352,7 +386,6 @@ test_files:
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/node_spec.rb
-- spec/riak/pool_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/serializers_spec.rb
@@ -365,9 +398,10 @@ test_files:
 - spec/support/integration_setup.rb
 - spec/support/mock_server.rb
 - spec/support/mocks.rb
+- spec/support/riak_test.rb
+- spec/support/search_corpus_setup.rb
 - spec/support/sometimes.rb
 - spec/support/test_server.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
 - spec/support/version_filter.rb
-- .gitignore