riak-client 0.9.8 → 1.0.0.beta

data/spec/support/integration_setup.rb

@@ -0,0 +1,10 @@
+# auto-tag all integration specs with :integration => true
+module IntegrationSpecs
+  def self.included(klass)
+    klass.metadata[:integration] = true
+  end
+end
+
+RSpec.configure do |config|
+  config.include IntegrationSpecs, :example_group => { :file_path => %r{spec/integration} }
+end

data/spec/support/mock_server.rb

@@ -1,18 +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");
-#    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.
-
 # Based on code from Rob Styles and Chris Tierney found at:
 #   http://dynamicorange.com/2009/02/18/ruby-mock-web-server/
 require 'rack'

data/spec/support/mocks.rb

@@ -1,16 +1,3 @@
-# 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.
 
 def mock_response(overrides={})
   {:headers => {"content-type" => ["application/json"]}, :body => '{}'}.merge(overrides)

data/spec/support/test_server.rb

@@ -0,0 +1,30 @@
+require 'riak/test_server'
+
+RSpec.configure do |config|
+  config.before(:each, :integration => true) do
+    begin
+      unless $test_server
+        config = YAML.load_file("spec/support/test_server.yml")
+        $test_server = Riak::TestServer.create(:root => config['root'],
+                                               :source => config['source'],
+                                               :min_port => config['min_port'] || 15000)
+        at_exit { $test_server.stop }
+      end
+      if example.metadata[:test_server] == false
+        $test_server.stop
+      else
+        $test_server.create unless $test_server.exist?
+        $test_server.start
+      end
+    rescue => e
+      warn "Can't run integration specs without the test server. Please create spec/support/test_server.yml."
+      warn e.inspect
+    end
+  end
+
+  config.after(:each, :integration => true) do
+    if $test_server && example.metadata[:test_server] != false
+      $test_server.drop
+    end
+  end
+end

data/spec/support/test_server.yml.example

@@ -1,2 +1,14 @@
-bin_dir: /Users/sean/Development/riak/rel/riak/bin
-temp_dir: /Users/sean/Development/ripple/.riaktest
+# This is where the test server node will be generated. Something on
+# /tmp is usually ok.
+root: /tmp/riak-client-test-server
+
+# This is where Riak is installed on your system, that is, the path to
+# the 'riak' and 'riak-admin' scripts. I use a self-built node, but
+# here's where it will generally be on various platforms:
+#
+#                Linux:  /usr/sbin
+#  Solaris/OpenSolaris:  /opt/riak/bin
+#  Mac OS/X (Homebrew):  /usr/local/bin
+#    Source/Self built:  /path/to/your/install/rel/riak/bin
+#
+source: /Users/sean/Development/riak/rel/riak/bin

data/spec/support/unified_backend_examples.rb

@@ -1,16 +1,3 @@
-# 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.
 
 shared_examples_for "Unified backend API" do
   # ping
@@ -22,6 +9,7 @@ shared_examples_for "Unified backend API" do
   context "fetching an object" do
     before do
       @robject = Riak::RObject.new(@client.bucket("test"), "fetch")
+      @robject.indexes['test_bin'] << 'pass'
       @robject.content_type = "application/json"
       @robject.data = { "test" => "pass" }
       @backend.store_object(@robject)
@@ -45,11 +33,24 @@ shared_examples_for "Unified backend API" do
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept a R value of #{q.inspect} for the request" do
-        robj = @backend.fetch_object("test", "fetch", q)
+        robj = @backend.fetch_object("test", "fetch", :r => q)
+        robj.should be_kind_of(Riak::RObject)
+        robj.data.should == { "test" => "pass" }
+      end
+
+      it "should accept a PR value of #{q.inspect} for the request" do
+        robj = @backend.fetch_object("test", "fetch", :pr => q)
         robj.should be_kind_of(Riak::RObject)
         robj.data.should == { "test" => "pass" }
       end
     end
+
+    it "should marshal indexes properly" do
+      # This really tests both storing and fetching indexes, given the setup
+      robj = @backend.fetch_object('test', 'fetch')
+      robj.indexes['test_bin'].should be
+      robj.indexes['test_bin'].should include('pass')
+    end
   end
 
   # reload_object
@@ -61,7 +62,7 @@ shared_examples_for "Unified backend API" do
       @backend.store_object(@robject)
       @robject2 = @backend.fetch_object("test", "reload")
       @robject2.data["test"] = "second"
-      @backend.store_object(@robject2, true)
+      @backend.store_object(@robject2, :returnbody => true)
     end
 
     it "should modify the object with the reloaded data" do
@@ -70,7 +71,11 @@ shared_examples_for "Unified backend API" do
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept a valid R value of #{q.inspect} for the request" do
-        @backend.reload_object(@robject, q)
+        @backend.reload_object(@robject, :r => q)
+      end
+
+      it "should accept a valid PR value of #{q.inspect} for the request" do
+        @backend.reload_object(@robject, :pr => q)
       end
     end
 
@@ -93,23 +98,27 @@ shared_examples_for "Unified backend API" do
     end
 
     it "should modify the object with the returned data if returnbody" do
-      @backend.store_object(@robject, true)
+      @backend.store_object(@robject, :returnbody => true)
       @robject.vclock.should be_present
     end
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept a W value of #{q.inspect} for the request" do
-        @backend.store_object(@robject, false, q)
+        @backend.store_object(@robject, :returnbody => false, :w => q)
         @client.bucket("test").exists?("store").should be_true
       end
 
       it "should accept a DW value of #{q.inspect} for the request" do
-        @backend.store_object(@robject, false, nil, q)
+        @backend.store_object(@robject, :returnbody => false, :w => :all, :dw => q)
+      end
+
+      it "should accept a PW value of #{q.inspect} for the request" do
+        @backend.store_object(@robject, :returnbody => false, :pw => q)
       end
     end
 
     after do
-      @client.bucket("test").exists?("store").should be_true
+      expect { @backend.fetch_object("test", "store") }.should_not raise_error(Riak::FailedRequest)
     end
   end
 
@@ -129,10 +138,14 @@ shared_examples_for "Unified backend API" do
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept an RW value of #{q.inspect} for the request" do
-        @backend.delete_object("test", "delete", q)
+        @backend.delete_object("test", "delete", :rw => q)
       end
     end
 
+    it "should accept a vclock value for the request" do
+      @backend.delete_object("test", "delete", :vclock => @obj.vclock)
+    end
+
     after do
       @obj.bucket.exists?("delete").should be_false
     end
@@ -168,7 +181,7 @@ shared_examples_for "Unified backend API" do
       @backend.list_keys("test").should == ["keys"]
     end
 
-    context "streaming through a block" do      
+    context "streaming through a block" do
       it "should handle a large number of keys" do
         obj = Riak::RObject.new(@client.bucket("test"))
         obj.content_type = "application/json"
@@ -181,7 +194,7 @@ shared_examples_for "Unified backend API" do
           keys.should be_all {|k| k == 'keys' || (0..749).include?(k.to_i) }
         end
       end
-      
+
       it "should pass an array of keys to the block" do
         @backend.list_keys("test") do |keys|
           keys.should == ["keys"] unless keys.empty?
@@ -261,8 +274,4 @@ shared_examples_for "Unified backend API" do
       end
     end
   end
-
-  after do
-    $test_server.recycle if $test_server.started?
-  end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: riak-client
 version: !ruby/object:Gem::Version 
-  hash: 43
-  prerelease: 
+  hash: 31098193
+  prerelease: 6
   segments: 
+  - 1
   - 0
-  - 9
-  - 8
-  version: 0.9.8
+  - 0
+  - beta
+  version: 1.0.0.beta
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 -05:00
+date: 2011-11-08 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +27,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 2
-        - 4
+        - 6
         - 0
-        version: 2.4.0
+        version: 2.6.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -65,34 +66,35 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: curb
+  name: excon
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 6
-        version: "0.6"
+        - 1
+        version: 0.6.1
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: excon
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 49
         segments: 
         - 0
-        - 5
+        - 8
         - 7
-        version: 0.5.7
+        version: 0.8.7
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -117,7 +119,7 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 15
         segments: 
@@ -133,18 +135,35 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 29
         segments: 
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 7
+        version: 0.3.7
   type: :runtime
   version_requirements: *id008
-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: sean@basho.com
+- !ruby/object:Gem::Dependency 
+  name: multi_json
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id009
+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.
+email: 
+- sean@basho.com
 executables: []
 
 extensions: []
@@ -154,14 +173,16 @@ extra_rdoc_files: []
 files: 
 - 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/active_support/cache/riak_store.rb
 - lib/riak/bucket.rb
 - lib/riak/cache_store.rb
 - lib/riak/client/beefcake/messages.rb
 - lib/riak/client/beefcake/object_methods.rb
 - lib/riak/client/beefcake_protobuffs_backend.rb
-- lib/riak/client/curb_backend.rb
 - lib/riak/client/excon_backend.rb
 - lib/riak/client/http_backend/configuration.rb
 - lib/riak/client/http_backend/key_streamer.rb
@@ -172,14 +193,19 @@ files:
 - lib/riak/client/net_http_backend.rb
 - lib/riak/client/protobuffs_backend.rb
 - lib/riak/client/pump.rb
+- lib/riak/client/search.rb
 - lib/riak/client.rb
+- lib/riak/cluster.rb
 - lib/riak/core_ext/blank.rb
+- lib/riak/core_ext/deep_dup.rb
 - lib/riak/core_ext/extract_options.rb
+- lib/riak/core_ext/json.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/encoding.rb
 - lib/riak/failed_request.rb
 - lib/riak/i18n.rb
 - lib/riak/json.rb
@@ -189,8 +215,18 @@ files:
 - lib/riak/map_reduce/phase.rb
 - lib/riak/map_reduce.rb
 - lib/riak/map_reduce_error.rb
+- lib/riak/node/configuration.rb
+- lib/riak/node/console.rb
+- lib/riak/node/control.rb
+- lib/riak/node/defaults.rb
+- lib/riak/node/generation.rb
+- lib/riak/node/log.rb
+- lib/riak/node/version.rb
+- lib/riak/node.rb
 - lib/riak/robject.rb
 - lib/riak/search.rb
+- lib/riak/serializers.rb
+- lib/riak/stamp.rb
 - lib/riak/test_server.rb
 - lib/riak/util/escape.rb
 - lib/riak/util/fiber1.8.rb
@@ -199,6 +235,7 @@ files:
 - lib/riak/util/multipart.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
 - Rakefile
@@ -207,18 +244,21 @@ files:
 - 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/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
 - spec/integration/riak/cache_store_spec.rb
+- spec/integration/riak/cluster_spec.rb
 - spec/integration/riak/http_backends_spec.rb
+- spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
-- spec/riak/curb_backend_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
 - spec/riak/headers_spec.rb
@@ -234,15 +274,20 @@ files:
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
+- spec/riak/serializers_spec.rb
+- spec/riak/stamp_spec.rb
 - spec/riak/stream_parser_spec.rb
 - spec/riak/walk_spec_spec.rb
 - spec/spec_helper.rb
 - spec/support/drb_mock_server.rb
 - spec/support/http_backend_implementation_examples.rb
+- spec/support/integration_setup.rb
 - spec/support/mock_server.rb
 - spec/support/mocks.rb
+- spec/support/test_server.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
+- .gitignore
 has_rdoc: true
 homepage: http://seancribbs.github.com/ripple
 licenses: []
@@ -264,12 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -278,15 +325,25 @@ signing_key:
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
 test_files: 
+- spec/fixtures/cat.jpg
+- 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/server.cert.crt
+- spec/fixtures/server.cert.key
+- spec/fixtures/test.pem
 - spec/integration/riak/cache_store_spec.rb
+- spec/integration/riak/cluster_spec.rb
 - spec/integration/riak/http_backends_spec.rb
+- spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
-- spec/riak/curb_backend_spec.rb
 - spec/riak/escape_spec.rb
 - spec/riak/excon_backend_spec.rb
 - spec/riak/headers_spec.rb
@@ -302,5 +359,17 @@ test_files:
 - spec/riak/net_http_backend_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
+- spec/riak/serializers_spec.rb
+- spec/riak/stamp_spec.rb
 - spec/riak/stream_parser_spec.rb
 - spec/riak/walk_spec_spec.rb
+- spec/spec_helper.rb
+- spec/support/drb_mock_server.rb
+- spec/support/http_backend_implementation_examples.rb
+- spec/support/integration_setup.rb
+- spec/support/mock_server.rb
+- spec/support/mocks.rb
+- spec/support/test_server.rb
+- spec/support/test_server.yml.example
+- spec/support/unified_backend_examples.rb
+- .gitignore