riak-client 0.9.0.beta → 0.9.0.beta2

data/lib/riak/util/multipart.rb

@@ -17,27 +17,15 @@ module Riak
   module Util
     # Utility methods for handling multipart/mixed responses
     module Multipart
+      autoload :StreamParser, "riak/util/multipart/stream_parser"
       extend self
       # Parses a multipart/mixed body into its constituent parts, including nested multipart/mixed sections
       # @param [String] data the multipart body data
       # @param [String] boundary the boundary string given in the Content-Type header
       def parse(data, boundary)
-        contents = data.match(/\r?\n--#{Regexp.escape(boundary)}--\r?\n/).pre_match rescue ""
-        contents.split(/\r?\n--#{Regexp.escape(boundary)}\r?\n/).reject(&:blank?).map do |part|
-          headers = Headers.new
-          if md = part.match(/\r?\n\r?\n/)
-            body = md.post_match
-            md.pre_match.split(/\r?\n/).each do |line|
-              headers.parse(line)
-            end
-
-            if headers["content-type"] =~ /multipart\/mixed/
-              boundary = extract_boundary(headers.to_hash["content-type"].first)
-              parse(body, boundary)
-            else
-              {:headers => headers.to_hash, :body => body}
-            end
-          end
+        contents = data.match(end_boundary_regex(boundary)).pre_match rescue ""
+        contents.split(inner_boundary_regex(boundary)).reject(&:blank?).map do |part|
+          parse_multipart_section(part)
         end.compact
       end
 
@@ -47,6 +35,32 @@ module Riak
       def extract_boundary(header_string)
         $1 if header_string =~ /boundary=([A-Za-z0-9\'()+_,-.\/:=?]+)/
       end
+
+      private
+      def end_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}--\r?\n/
+      end
+
+      def inner_boundary_regex(boundary)
+        /\r?\n--#{Regexp.escape(boundary)}\r?\n/
+      end
+
+      def parse_multipart_section(part)
+        headers = Headers.new
+        if md = part.match(/\r?\n\r?\n/)
+          body = md.post_match
+          md.pre_match.split(/\r?\n/).each do |line|
+            headers.parse(line)
+          end
+
+          if headers["content-type"] =~ /multipart\/mixed/
+            boundary = extract_boundary(headers.to_hash["content-type"].first)
+            parse(body, boundary)
+          else
+            {:headers => headers.to_hash, :body => body}
+          end
+        end
+      end
     end
   end
 end

data/lib/riak/util/multipart/stream_parser.rb

@@ -0,0 +1,74 @@
+# 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/util/multipart'
+
+module Riak
+  module Util
+    module Multipart
+      # This class is parses chunked/streamed multipart HTTP
+      # streams. It is used by streaming MapReduce queries, and in the
+      # future streaming key-lists (once implemented on the Riak side).
+      class StreamParser
+        include Multipart
+        include Translation
+        # Creates a new StreamParser.
+        #
+        # Example usage:
+        #     http.get(200, "/riak", "foo", {}, &StreamParser.new {|part| ... })
+        #
+        # @yield [Hash] parts of the multipart/mixed stream,
+        #               containing :headers and :body keys
+        def initialize(&block)
+          raise ArgumentError, t('missing_block') unless block_given?
+          @buffer = ""
+          @block = block
+          @state = :get_boundary
+        end
+
+        # Accepts a chunk of the HTTP response stream, and yields to
+        # the block when appropriate.
+        def accept(chunk)
+          @buffer << chunk
+          @state = send(@state)
+        end
+
+        # Returns a Proc that can be passed to an HTTP request method.
+        def to_proc
+          method(:accept).to_proc
+        end
+
+        private
+        CAPTURE_BOUNDARY = /^--([A-Za-z0-9\'()+_,-.\/:=?]+)\r?\n/
+
+        def get_boundary
+          if @buffer =~ CAPTURE_BOUNDARY
+            @re = /\r?\n--#{Regexp.escape($1)}(?:--)?\r?\n/
+            @buffer = $~.post_match
+            buffering
+          else
+            :get_boundary
+          end
+        end
+
+        def buffering
+          while @buffer =~ @re
+            @block.call parse_multipart_section($~.pre_match)
+            @buffer = $~.post_match
+          end
+          :buffering
+        end
+      end
+    end
+  end
+end

data/riak-client.gemspec

@@ -2,48 +2,50 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.9.0.beta"
+  s.version = "0.9.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2010-12-29}
+  s.date = %q{2011-03-28}
   s.description = %q{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.}
   s.email = %q{sean@basho.com}
-  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "lib/active_support/cache/riak_store.rb", "lib/riak/bucket.rb", "lib/riak/cache_store.rb", "lib/riak/client/curb_backend.rb", "lib/riak/client/excon_backend.rb", "lib/riak/client/http_backend/configuration.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.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/invalid_response.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "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", "lib/riak/util/headers.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-with-body.txt", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "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/drb_mock_server.rb", "spec/support/http_backend_implementation_examples.rb", "spec/support/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example"]
+  s.files = ["erl_src/riak_kv_test_backend.beam", "erl_src/riak_kv_test_backend.erl", "Gemfile", "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/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/protobuffs_backend.rb", "lib/riak/client/pump.rb", "lib/riak/client.rb", "lib/riak/core_ext/blank.rb", "lib/riak/core_ext/extract_options.rb", "lib/riak/core_ext/slice.rb", "lib/riak/core_ext/stringify_keys.rb", "lib/riak/core_ext/symbolize_keys.rb", "lib/riak/core_ext/to_param.rb", "lib/riak/core_ext.rb", "lib/riak/failed_request.rb", "lib/riak/i18n.rb", "lib/riak/invalid_response.rb", "lib/riak/link.rb", "lib/riak/locale/en.yml", "lib/riak/map_reduce/filter_builder.rb", "lib/riak/map_reduce/phase.rb", "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", "lib/riak/util/headers.rb", "lib/riak/util/multipart/stream_parser.rb", "lib/riak/util/multipart.rb", "lib/riak/util/tcp_socket_extensions.rb", "lib/riak/util/translation.rb", "lib/riak/walk_spec.rb", "lib/riak.rb", "Rakefile", "riak-client.gemspec", "spec/fixtures/cat.jpg", "spec/fixtures/multipart-blank.txt", "spec/fixtures/multipart-with-body.txt", "spec/fixtures/server.cert.crt", "spec/fixtures/server.cert.key", "spec/fixtures/test.pem", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_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/mock_server.rb", "spec/support/mocks.rb", "spec/support/test_server.yml.example", "spec/support/unified_backend_examples.rb"]
   s.homepage = %q{http://seancribbs.github.com/ripple}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{riak-client is a rich client for Riak, the distributed database by Basho.}
-  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce_spec.rb", "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"]
+  s.test_files = ["lib/riak/walk_spec.rb", "spec/integration/riak/cache_store_spec.rb", "spec/integration/riak/http_backends_spec.rb", "spec/integration/riak/protobuffs_backends_spec.rb", "spec/integration/riak/test_server_spec.rb", "spec/riak/bucket_spec.rb", "spec/riak/client_spec.rb", "spec/riak/curb_backend_spec.rb", "spec/riak/escape_spec.rb", "spec/riak/excon_backend_spec.rb", "spec/riak/headers_spec.rb", "spec/riak/http_backend/configuration_spec.rb", "spec/riak/http_backend/object_methods_spec.rb", "spec/riak/http_backend/transport_methods_spec.rb", "spec/riak/http_backend_spec.rb", "spec/riak/link_spec.rb", "spec/riak/map_reduce/filter_builder_spec.rb", "spec/riak/map_reduce/phase_spec.rb", "spec/riak/map_reduce_spec.rb", "spec/riak/multipart_spec.rb", "spec/riak/net_http_backend_spec.rb", "spec/riak/robject_spec.rb", "spec/riak/search_spec.rb", "spec/riak/stream_parser_spec.rb", "spec/riak/walk_spec_spec.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_development_dependency(%q<fakeweb>, [">= 1.2"])
       s.add_development_dependency(%q<rack>, [">= 1.0"])
       s.add_development_dependency(%q<curb>, [">= 0.6"])
-      s.add_development_dependency(%q<excon>, ["~> 0.3.4"])
+      s.add_development_dependency(%q<excon>, ["~> 0.5.7"])
       s.add_runtime_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_runtime_dependency(%q<beefcake>, ["~> 0.2.0"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.4.0"])
       s.add_dependency(%q<fakeweb>, [">= 1.2"])
       s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<curb>, [">= 0.6"])
-      s.add_dependency(%q<excon>, ["~> 0.3.4"])
+      s.add_dependency(%q<excon>, ["~> 0.5.7"])
       s.add_dependency(%q<i18n>, [">= 0.4.0"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
+      s.add_dependency(%q<beefcake>, ["~> 0.2.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.4.0"])
     s.add_dependency(%q<fakeweb>, [">= 1.2"])
     s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<curb>, [">= 0.6"])
-    s.add_dependency(%q<excon>, ["~> 0.3.4"])
+    s.add_dependency(%q<excon>, ["~> 0.5.7"])
     s.add_dependency(%q<i18n>, [">= 0.4.0"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])
+    s.add_dependency(%q<beefcake>, ["~> 0.2.0"])
   end
 end

data/spec/fixtures/server.cert.crt

@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICPzCCAagCCQDfZhEdJjSgTDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCTkMxEjAQBgNVBAcTCUNoYXJsb3R0ZTEOMAwGA1UEChMFQmFz
+aG8xEDAOBgNVBAsTB1N1cHBvcnQxEjAQBgNVBAMTCTEyNy4wLjAuMTAeFw0xMTAz
+MjYxNjMzMzNaFw0zODA4MTAxNjMzMzNaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+EwJOQzESMBAGA1UEBxMJQ2hhcmxvdHRlMQ4wDAYDVQQKEwVCYXNobzEQMA4GA1UE
+CxMHU3VwcG9ydDESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAIqt1A5Ah7s2oUoYQ8YCKC83fKbXbbNCiLFLwIzy
+TGYXd8j7JTfeY8ettbtitlYgP+ouf23LzonuMo47GRuMgVKRWm4l+ZVMP5Qbkx9t
+uspx+6lHUWnMT9aRdP9/2I7dscyfuhtzs0UxddADLzL9Cif4Y06E1NhR/KK+zo46
+Nep8
+-----END CERTIFICATE-----

data/spec/fixtures/server.cert.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+AoGBAJIguzdPPgBTId8VKSes+lVupie9oo3qy8NaeBfGGCIixAnisbmHzIpNcUb/
+3CcuggQ4LODcrWvTtiTr2QBZx1FL7E4POBJl/N7zJMaQd+pGjmrJGfv5haSSQN+H
+r74Ix3HCd0RPdSgt5pmlT4KfsqkfRmqsPd6Nw54zbyLFMlTpAkEA4ar3ZJi2+Y+u
+FH3AycXuPdDtVW0tKFtxfvKlS48gshB6gmkd06Ugss5eZkdbSY0voAp88Tr2shOJ
++pXc++Zl6wJBAMTN9K9k728cVCf41pR6mDVxIaaqjJeY4DWppGQFSqw/fmYz/Quu
+PlTvk6pGRYiGN6y9CZFNoL2I/SWcd4ukrXMCQCyfYOHsbKn2Zka5Awki8VQZ3wQ4
+XWiQhGXE1ziUqbNsHL1yyaoTCd8xfWseCwgFOficek49CZD22h7JyXOqAFcCQCn2
+mFPFu9//NFqJjod+VHIgu0IkX3H7oOMQVwMUtcVgjH0SXMRe1N+bbesCrNTdeYWV
+kTKwULPZP9EDOeJGrM0CQQCsX+8VZ15yKTy6ADINrOt26PNpD4ib4552TE6T/1wG
+LKdjn5l0qB5K7ILc22z3LCenNBa0Uxbg5/RSdoX57aHA
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/test.pem

@@ -0,0 +1 @@
+i-am-a-pem

data/spec/integration/riak/http_backends_spec.rb

@@ -0,0 +1,45 @@
+# Copyright 2010 Sean Cribbs  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__))
+
+describe "HTTP" do
+  before :all do
+    if $test_server
+      @web_port = 9000
+      $test_server.start
+    end
+  end
+
+  before do
+    @web_port ||= 8098
+    @client = Riak::Client.new(:port => @web_port)
+  end
+
+  after do
+    $test_server.recycle if $test_server.started?
+  end
+
+  [:CurbBackend, :ExconBackend, :NetHTTPBackend].each do |klass|
+    bklass = Riak::Client.const_get(klass)
+    if bklass.configured?
+      describe klass.to_s do
+        before do
+          @backend = bklass.new(@client)
+        end
+
+        it_should_behave_like "Unified backend API"
+      end
+    end
+  end
+end

data/spec/integration/riak/protobuffs_backends_spec.rb

@@ -0,0 +1,45 @@
+# Copyright 2010 Sean Cribbs  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__))
+
+describe "Protocol Buffers" do
+  before :all do
+    if $test_server
+      @pbc_port = 9002
+      $test_server.start
+    end
+  end
+
+  before do
+    @pbc_port ||= 8087
+    @client = Riak::Client.new(:port => @pbc_port, :protocol => "pbc")
+  end
+
+  after do
+    $test_server.recycle if $test_server.started?
+  end
+
+  [:BeefcakeProtobuffsBackend].each do |klass|
+    bklass = Riak::Client.const_get(klass)
+    if bklass.configured?
+      describe klass.to_s do
+        before do
+          @backend = bklass.new(@client)
+        end
+
+        it_should_behave_like "Unified backend API"
+      end
+    end
+  end
+end

data/spec/integration/riak/test_server_spec.rb

@@ -43,9 +43,9 @@ if $test_server
           config[0..0].should == '['
         end
 
-        it "should set the backend to use the cache backend" do
+        it "should set the backend to use the test backend" do
           File.readlines(@app_config).should be_any do |line|
-            line =~ /\{storage_backend\s*,\s*(.*)\}/ && $1 == "riak_kv_cache_backend"
+            line =~ /\{storage_backend\s*,\s*(.*)\}/ && $1 == "riak_kv_test_backend"
           end
         end
 

data/spec/riak/bucket_spec.rb

@@ -120,15 +120,15 @@ describe Riak::Bucket do
     end
 
     it "should create a new blank object if the key does not exist" do
-      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, 200, 404, {}, "File not found"))
+      @backend.should_receive(:fetch_object).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 404, {}, "File not found"))
       obj = @bucket.get_or_new('db')
       obj.key.should == 'db'
       obj.data.should be_blank
     end
 
     it "should bubble up non-ok non-missing errors" do
-      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, 200, 500, {}, "File not found"))
-      lambda { @bucket.get_or_new('db') }.should raise_error(Riak::FailedRequest)
+      @backend.should_receive(:fetch_object).and_raise(Riak::HTTPFailedRequest.new(:get, 200, 500, {}, "File not found"))
+      lambda { @bucket.get_or_new('db') }.should raise_error(Riak::HTTPFailedRequest)
     end
 
     it "should pass along the given R quorum parameter" do
@@ -192,7 +192,7 @@ describe Riak::Bucket do
     end
 
     it "should return false if the object doesn't exist" do
-      @backend.should_receive(:fetch_object).and_raise(Riak::FailedRequest.new(:get, [200,300], 404, {}, "not found"))
+      @backend.should_receive(:fetch_object).and_raise(Riak::HTTPFailedRequest.new(:get, [200,300], 404, {}, "not found"))
       @bucket.exists?("foo").should be_false
     end
   end

data/spec/riak/client_spec.rb

@@ -21,6 +21,11 @@ describe Riak::Client do
       client.port.should == 8098
     end
 
+    it "should accept a protocol" do
+      client = Riak::Client.new :protocol => 'https'
+      client.protocol.should eq('https')
+    end
+
     it "should accept a host" do
       client = Riak::Client.new :host => "riak.basho.com"
       client.host.should == "riak.basho.com"
@@ -31,6 +36,15 @@ describe Riak::Client do
       client.port.should == 9000
     end
 
+    it "should default the port to 8087 when the protocol is pbc" do
+      Riak::Client.new(:protocol => "pbc").port.should == 8087
+    end
+    
+    it "should accept basic_auth" do
+      client = Riak::Client.new :basic_auth => "user:pass"
+      client.basic_auth.should eq("user:pass")
+    end
+
     it "should accept a client ID" do
       client = Riak::Client.new :client_id => "AAAAAA=="
       client.client_id.should == "AAAAAA=="
@@ -78,6 +92,25 @@ describe Riak::Client do
       @client = Riak::Client.new
     end
 
+    describe "setting the protocol" do
+      it "should allow setting the protocol" do
+        @client.should respond_to(:protocol=)
+        @client.protocol = "https"
+        @client.protocol.should eq("https")
+      end
+
+      it "should require a valid protocol to be set" do
+        lambda { @client.protocol = 'invalid-protocol' }.should(
+          raise_error(ArgumentError, /^'invalid-protocol' is not a valid protocol/))
+      end
+
+      it "should reset the unified backend when changing the protocol" do
+        old = @client.backend
+        @client.protocol = "pbc"
+        old.should_not eq(@client.backend)
+      end
+    end
+
     describe "setting the host" do
       it "should allow setting the host" do
         @client.should respond_to(:host=)
@@ -112,6 +145,18 @@ describe Riak::Client do
       end
     end
 
+    describe "setting http auth" do
+      it "should allow setting basic_auth" do
+        @client.should respond_to(:basic_auth=)
+        @client.basic_auth = "user:pass"
+        @client.basic_auth.should eq("user:pass")
+      end 
+
+      it "should require that basic auth splits into two even parts" do
+        lambda { @client.basic_auth ="user" }.should raise_error(ArgumentError, "basic auth must be set using 'user:pass'")
+      end
+    end
+
     it "should allow setting the prefix" do
       @client.should respond_to(:prefix=)
       @client.prefix = "/another-prefix"
@@ -157,11 +202,45 @@ describe Riak::Client do
 
     it "should raise an error when the chosen backend is not valid" do
       Riak::Client::NetHTTPBackend.should_receive(:configured?).and_return(false)
-      @client = Riak::Client.new(:http_backend => :NetHTTP)
+      # @client = Riak::Client.new(:http_backend => :NetHTTP)
       lambda { @client.http }.should raise_error
     end
   end
 
+  describe "choosing a Protobuffs backend" do
+    before :each do
+      @client = Riak::Client.new(:protocol => "pbc")
+    end
+
+    it "should choose the selected backend" do
+      @client.protobuffs_backend = :Beefcake
+      @client.protobuffs.should be_instance_of(Riak::Client::BeefcakeProtobuffsBackend)      
+    end
+
+    it "should raise an error when the chosen backend is not valid" do
+      Riak::Client::BeefcakeProtobuffsBackend.should_receive(:configured?).and_return(false)
+      lambda { @client.protobuffs }.should raise_error
+    end
+  end
+
+  describe "choosing a unified backend" do
+    before :each do
+      @client = Riak::Client.new
+    end
+
+    it "should use HTTP when the protocol is http or https" do
+      %w[http https].each do |p|
+        @client.protocol = p
+        @client.backend.should be_kind_of(Riak::Client::HTTPBackend)
+      end
+    end
+    
+    it "should use Protobuffs when the protocol is pbc" do
+      @client.protocol = "pbc"
+      @client.backend.should be_kind_of(Riak::Client::ProtobuffsBackend)
+    end
+  end
+  
   describe "retrieving a bucket" do
     before :each do
       @client = Riak::Client.new
@@ -183,7 +262,6 @@ describe Riak::Client do
       @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)
@@ -282,10 +360,138 @@ describe Riak::Client do
       @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 }
+      @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
+
+  describe "ssl", :ssl => true do
+    before :each do
+      @client = Riak::Client.new
+    end
+
+    it "should allow passing ssl options into the initializer" do
+      lambda { client = Riak::Client.new(:ssl => {:verify_mode => "peer"}) }.should_not raise_error
+    end
+
+    it "should not have ssl options by default" do
+      @client.ssl_options.should be_nil
+    end
+
+    it "should have a blank hash for ssl options if the protocol is set to https" do
+      @client.protocol = 'https'
+      @client.ssl_options.should be_a(Hash)
+    end
+
+    # The api should have an ssl= method for setting up all of the ssl
+    # options.  Once the ssl options have been assigned via `ssl=` they should
+    # be read back out using the read only `ssl_options`.  This is to provide
+    # a seperate api for setting ssl options via client configuration and
+    # reading them inside of a http backend.
+    it "should not allow reading ssl options via ssl" do
+      @client.should_not respond_to(:ssl)
+    end
+
+    it "should now allow writing ssl options via ssl_options=" do
+      @client.should_not respond_to(:ssl_options=)
+    end
+
+    it "should allow setting ssl to true" do
+      @client.ssl = true
+      @client.ssl_options[:verify_mode].should eq('none')
+    end
+
+    it "should allow setting ssl options as a hash" do
+      @client.ssl = {:verify_mode => "peer"}
+      @client.ssl_options[:verify_mode].should eq('peer')
+    end
+
+    it "should set the protocol to https when setting ssl to true" do
+      @client.ssl = true
+      @client.protocol.should eq("https")
+    end
+
+    it "should set the protocol to http when setting ssl to false" do
+      @client.protocol = 'https'
+      @client.ssl = false
+      @client.protocol.should eq('http')
+    end
+
+    it "should should clear ssl options when setting ssl to false" do
+      @client.ssl = true
+      @client.ssl_options.should_not be_nil
+      @client.ssl = false
+      @client.ssl_options.should be_nil
+    end
+
+    it "should set the protocol to https when setting ssl options" do
+      @client.ssl = {:verify_mode => "peer"}
+      @client.protocol.should eq("https")
+    end
+
+    it "should allow setting the verify_mode to none" do
+      @client.ssl = {:verify_mode => "none"}
+      @client.ssl_options[:verify_mode].should eq("none")
+    end
+
+    it "should allow setting the verify_mode to peer" do
+      @client.ssl = {:verify_mode => "peer"}
+      @client.ssl_options[:verify_mode].should eq("peer")
+    end
+
+    it "should not allow setting the verify_mode to anything else" do
+      lambda {@client.ssl = {:verify_mode => :your_mom}}.should raise_error(ArgumentError)
+    end
+
+    it "should default verify_mode to none" do
+      @client.ssl = true
+      @client.ssl_options[:verify_mode].should eq("none")
+    end
+
+    it "should let the backend know if ssl is enabled" do
+      @client.should_not be_ssl_enabled
+      @client.ssl = true
+      @client.should be_ssl_enabled
+    end
+
+    it "should allow setting the pem" do
+      @client.ssl = {:pem => 'i-am-a-pem'}
+      @client.ssl_options[:pem].should eq('i-am-a-pem')
+    end
+    
+    it "should set them pem from the contents of pem_file" do
+      filepath = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/test.pem'))
+      @client.ssl = {:pem_file => filepath}
+      @client.ssl_options[:pem].should eq("i-am-a-pem\n")
+    end
+
+    it "should allow setting the pem_password" do
+      @client.ssl = {:pem_password => 'pem-pass'}
+      @client.ssl_options[:pem_password].should eq('pem-pass')
+    end
+
+    it "should allow setting the ca_file" do
+      @client.ssl = {:ca_file => '/path/to/ca.crt'}
+      @client.ssl_options[:ca_file].should eq('/path/to/ca.crt')
+    end
+
+    it "should allow setting the ca_path" do
+      @client.ssl = {:ca_path => '/path/to/certs/'}
+      @client.ssl_options[:ca_path].should eq('/path/to/certs/')
+    end
+
+    %w[pem ca_file ca_path].each do |option|
+      it "should default the verify_mode to peer when setting the #{option}" do
+        @client.ssl = {option.to_sym => 'test-data'}
+        @client.ssl_options[:verify_mode].should eq("peer")
+      end
+
+      it "should allow setting the verify mode when setting the #{option}" do
+        @client.ssl = {option.to_sym => 'test-data', :verify_mode => "none"}
+        @client.ssl_options[:verify_mode].should eq("none")
+      end
+    end
+  end
 end