riak-client 0.9.1 → 0.9.2

data/Gemfile

@@ -7,7 +7,7 @@ gem 'fakeweb', ">=1.2"
 gem 'rack', '>=1.0'
 gem 'rake'
 gem 'bundler'
-gem 'excon', "~>0.5.7"
+gem 'excon', "~>0.6.1"
 gem 'beefcake', '~>0.3.1'
 
 platforms :mri do

data/lib/riak.rb

@@ -13,52 +13,14 @@
 #    limitations under the License.
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 
-require 'base64'
-require 'uri'
-require 'cgi'
-require 'set'
-require 'net/http'
-require 'yaml'
-require 'riak/i18n'
-
-# Load JSON
-unless defined? JSON
-  begin
-    require 'yajl/json_gem'
-  rescue LoadError
-    require 'json'
-  end
-end
-
 require 'riak/core_ext'
+require 'riak/client'
+require 'riak/map_reduce'
 
-# The Riak module contains all aspects of the HTTP client interface
-# to Riak.
+# The Riak module contains all aspects of the client interface to
+# Riak.
 module Riak
-  # Domain objects
-  autoload :Bucket,          "riak/bucket"
-  autoload :Client,          "riak/client"
-  autoload :Link,            "riak/link"
-  autoload :WalkSpec,        "riak/walk_spec"
-  autoload :RObject,         "riak/robject"
-  autoload :MapReduce,       "riak/map_reduce"
-
-  # Cache store - only supports Rails 3 style
-  autoload :CacheStore,      "riak/cache_store"
-
-  # Exceptions
-  autoload :FailedRequest,   "riak/failed_request"
-  autoload :InvalidResponse, "riak/invalid_response"
-  autoload :MapReduceError,  "riak/map_reduce_error"
-
-  # Test server
-  autoload :TestServer,      "riak/test_server"
-
   # Utility classes and mixins
   module Util
-    autoload :Escape,        "riak/util/escape"
-    autoload :Headers,       "riak/util/headers"
-    autoload :Multipart,     "riak/util/multipart"
-    autoload :Translation,   "riak/util/translation"
   end
 end

data/lib/riak/bucket.rb

@@ -11,7 +11,12 @@
 #    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/util/translation'
+require 'riak/util/escape'
+require 'riak/client'
+require 'riak/robject'
+require 'riak/failed_request'
 
 module Riak
   # Represents and encapsulates operations on a Riak bucket.  You may retrieve a bucket

data/lib/riak/cache_store.rb

@@ -11,8 +11,14 @@
 #    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 'yaml'
+require 'riak/client'
+require 'riak/bucket'
+require 'riak/robject'
+require 'riak/failed_request'
 require 'active_support/version'
+
 if ActiveSupport::VERSION::STRING < "3.0.0"
   raise LoadError, "ActiveSupport 3.0.0 or greater is required to use Riak::CacheStore."
 else

data/lib/riak/client.rb

@@ -11,10 +11,20 @@
 #    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 'tempfile'
 require 'delegate'
+require 'riak'
+require 'riak/util/translation'
+require 'riak/util/escape'
 require 'riak/failed_request'
+require 'riak/client/http_backend'
+require 'riak/client/net_http_backend'
+require 'riak/client/curb_backend'
+require 'riak/client/excon_backend'
+require 'riak/client/protobuffs_backend'
+require 'riak/client/beefcake_protobuffs_backend'
+require 'riak/bucket'
 
 module Riak
   # A client connection to Riak.
@@ -22,15 +32,6 @@ module Riak
     include Util::Translation
     include Util::Escape
 
-    autoload :Pump,           "riak/client/pump"
-    autoload :HTTPBackend,    "riak/client/http_backend"
-    autoload :NetHTTPBackend, "riak/client/net_http_backend"
-    autoload :CurbBackend,    "riak/client/curb_backend"
-    autoload :ExconBackend,   "riak/client/excon_backend"
-
-    autoload :ProtobuffsBackend, "riak/client/protobuffs_backend"
-    autoload :BeefcakeProtobuffsBackend, "riak/client/beefcake_protobuffs_backend"
-
     # When using integer client IDs, the exclusive upper-bound of valid values.
     MAX_CLIENT_ID = 4294967296
 

data/lib/riak/client/beefcake/messages.rb

@@ -11,8 +11,6 @@
 #    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/link'
 require 'beefcake'
 
 module Riak

data/lib/riak/client/beefcake/object_methods.rb

@@ -11,7 +11,9 @@
 #    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/robject'
+require 'riak/link'
+require 'riak/client/beefcake/messages'
 
 module Riak
   class Client

data/lib/riak/client/beefcake_protobuffs_backend.rb

@@ -11,7 +11,10 @@
 #    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/json'
+require 'riak/client'
+require 'riak/failed_request'
 require 'riak/client/protobuffs_backend'
 require 'riak/client/pump'
 
@@ -22,7 +25,7 @@ module Riak
         begin
           require 'beefcake'
           require 'riak/client/beefcake/messages'
-          require "riak/client/beefcake/object_methods"
+          require 'riak/client/beefcake/object_methods'
           true
         rescue LoadError, NameError
           false

data/lib/riak/client/curb_backend.rb

@@ -11,8 +11,11 @@
 #    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 'thread'
+require 'riak/client/http_backend'
 require 'riak/client/pump'
+require 'riak/failed_request'
 
 module Riak
   class Client

data/lib/riak/client/excon_backend.rb

@@ -11,7 +11,10 @@
 #    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/failed_request'
+require 'riak/client/http_backend'
+require 'riak/client/http_backend/request_headers'
 require 'riak/client/pump'
 
 module Riak
@@ -42,18 +45,23 @@ module Riak
         params[:body] = data if [:put,:post].include?(method)
         params[:idempotent] = (method != :post)
 
-        block = Pump.new(block) if block_given?
+        if block_given?
+          pump = Pump.new(block)
+          # Later versions of Excon pass multiple arguments to the block
+          block = lambda {|*args| pump.pump(args.first) }
+        end
 
         response = connection.request(params, &block)
+        response_headers.initialize_http_header(response.headers)
+
         if valid_response?(expect, response.status)
-          response_headers.initialize_http_header(response.headers)
           result = {:headers => response_headers.to_hash, :code => response.status}
           if return_body?(method, response.status, block_given?)
             result[:body] = response.body
           end
           result
         else
-          raise HTTPFailedRequest.new(method, expect, response.status, response.headers, response.body)
+          raise HTTPFailedRequest.new(method, expect, response.status, response_headers.to_hash, response.body)
         end
       end
 

data/lib/riak/client/http_backend.rb

@@ -11,7 +11,18 @@
 #    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/util/escape'
+require 'riak/util/translation'
+require 'riak/util/multipart'
+require 'riak/util/multipart/stream_parser'
+require 'riak/json'
+require 'riak/client'
+require 'riak/bucket'
+require 'riak/robject'
+require 'riak/client/http_backend/transport_methods'
+require 'riak/client/http_backend/object_methods'
+require 'riak/client/http_backend/configuration'
 
 module Riak
   class Client
@@ -21,18 +32,13 @@ module Riak
     # {TransportMethods#perform} method for library-specific
     # semantics.
     class HTTPBackend
-      autoload :RequestHeaders,   "riak/client/http_backend/request_headers"
-      autoload :TransportMethods, "riak/client/http_backend/transport_methods"
-      autoload :ObjectMethods,    "riak/client/http_backend/object_methods"
-      autoload :Configuration,    "riak/client/http_backend/configuration"
-
+      include Util::Escape
+      include Util::Translation
+      
       include TransportMethods
       include ObjectMethods
       include Configuration
 
-      include Util::Escape
-      include Util::Translation
-
       # The Riak::Client that uses this backend
       attr_reader :client
 

data/lib/riak/client/http_backend/configuration.rb

@@ -11,7 +11,10 @@
 #    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/failed_request'
+require 'riak/client/http_backend'
+require 'riak/link'
 
 module Riak
   class Client

data/lib/riak/client/http_backend/object_methods.rb

@@ -11,8 +11,13 @@
 #    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 'uri'
+require 'set'
 require 'time'
+require 'riak/client/http_backend'
+require 'riak/robject'
+require 'riak/link'
+require 'riak/util/multipart'
 
 module Riak
   class Client

data/lib/riak/client/http_backend/request_headers.rb

@@ -11,7 +11,8 @@
 #    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/util/headers'
 
 module Riak
   class Client

data/lib/riak/client/http_backend/transport_methods.rb

@@ -11,8 +11,11 @@
 #    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 'base64'
+require 'uri'
+require 'riak/client'
+require 'riak/util/headers'
 
 module Riak
   class Client

data/lib/riak/client/net_http_backend.rb

@@ -11,7 +11,9 @@
 #    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/http_backend'
+require 'riak/failed_request'
 
 module Riak
   class Client
@@ -21,6 +23,7 @@ module Riak
       def self.configured?
         begin
           require 'net/http'
+          require 'openssl'
           true
         rescue LoadError, NameError
           false

data/lib/riak/client/protobuffs_backend.rb

@@ -15,6 +15,7 @@ require 'riak'
 require 'socket'
 require 'base64'
 require 'digest/sha1'
+require 'riak/util/translation'
 
 module Riak
   class Client

data/lib/riak/client/pump.rb

@@ -11,7 +11,7 @@
 #    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'
+
 begin
   require 'fiber'
 rescue LoadError

data/lib/riak/failed_request.rb

@@ -11,7 +11,9 @@
 #    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/util/translation'
+require 'riak/json'
 
 module Riak
   # Exception raised when receiving an unexpected client response from

data/lib/riak/json.rb

@@ -0,0 +1,9 @@
+
+# Load JSON
+unless defined? JSON
+  begin
+    require 'yajl/json_gem'
+  rescue LoadError
+    require 'json'
+  end
+end

data/lib/riak/link.rb

@@ -11,7 +11,10 @@
 #    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/util/translation'
+require 'riak/util/escape'
+require 'riak/walk_spec'
 
 module Riak
   # Represents a link from one object to another in Riak

data/lib/riak/locale/en.yml

@@ -32,6 +32,7 @@ en:
     invalid_function_value: "invalid value for function: %{value}"
     invalid_options: "Invalid configuration options given."
     invalid_phase_type: "type must be :map, :reduce, or :link"
+    invalid_response: "Expected %{expected} but received %{received} from Riak %{extra}"
     invalid_ssl_verify_mode: "%{invalid} is not a valid :verify_mode option for SSL. Valid options are 'peer' and 'none'."
     loading_bucket: "while loading bucket '%{name}'"    
     missing_block: "A block must be given."

data/lib/riak/map_reduce.rb

@@ -11,7 +11,18 @@
 #    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/util/translation'
+require 'riak/util/escape'
+require 'riak/json'
+require 'riak/client'
+require 'riak/bucket'
+require 'riak/robject'
+require 'riak/walk_spec'
+require 'riak/failed_request'
+require 'riak/map_reduce_error'
+require 'riak/map_reduce/phase'
+require 'riak/map_reduce/filter_builder'
 
 module Riak
   # Class for invoking map-reduce jobs using the HTTP interface.
@@ -19,9 +30,6 @@ module Riak
     include Util::Translation
     include Util::Escape
 
-    autoload :Phase,         "riak/map_reduce/phase"
-    autoload :FilterBuilder, "riak/map_reduce/filter_builder"
-
     # @return [Array<[bucket,key]>,String,Hash<:bucket,:filters>] The
     #       bucket/keys for input to the job, or the bucket (all
     #       keys), or a hash containing the bucket and key-filters.

data/lib/riak/map_reduce/filter_builder.rb

@@ -11,7 +11,8 @@
 #    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/util/translation'
 
 module Riak
   class MapReduce

data/lib/riak/map_reduce/phase.rb

@@ -11,7 +11,10 @@
 #    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/json'
+require 'riak/util/translation'
+require 'riak/walk_spec'
 
 module Riak
   class MapReduce

data/lib/riak/map_reduce_error.rb

@@ -11,7 +11,7 @@
 #    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/util/translation'
 
 module Riak
   # Raised when an error occurred in the Javascript map-reduce chain.

data/lib/riak/robject.rb

@@ -11,9 +11,14 @@
 #    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 'set'
 require 'time'
+require 'yaml'
+require 'riak/util/translation'
+require 'riak/util/escape'
+require 'riak/bucket'
+require 'riak/link'
+require 'riak/walk_spec'
 
 module Riak
   # Represents the data and metadata stored in a bucket/key pair in

data/lib/riak/search.rb

@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-require 'riak'
+require 'riak/json'
 require 'riak/client'
 require 'riak/bucket'
 require 'riak/map_reduce'

data/lib/riak/test_server.rb

@@ -11,7 +11,7 @@
 #    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 'tempfile'
 require 'expect'
 require 'open3'

data/lib/riak/util/escape.rb

@@ -11,7 +11,7 @@
 #    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 'cgi'
 
 module Riak
   module Util

data/lib/riak/util/headers.rb

@@ -11,7 +11,7 @@
 #    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 'net/http'
 
 # Splits headers into < 8KB chunks
 # @private

data/lib/riak/util/multipart.rb

@@ -11,13 +11,12 @@
 #    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/util/headers'
 
 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

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

@@ -10,7 +10,8 @@
 #    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.
+#    limitations under the License
+require 'riak/util/translation'
 require 'riak/util/multipart'
 
 module Riak

data/lib/riak/util/tcp_socket_extensions.rb

@@ -11,6 +11,7 @@
 #    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 'time'
 require 'timeout'
 require 'socket'
 

data/lib/riak/util/translation.rb

@@ -11,7 +11,7 @@
 #    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/i18n'
 
 module Riak
   module Util

data/lib/riak/walk_spec.rb

@@ -11,7 +11,9 @@
 #    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/util/translation'
+require 'riak/util/escape'
+require 'riak/link'
 
 module Riak
   # The specification of how to follow links from one object to another in Riak,

data/riak-client.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-client}
-  s.version = "0.9.0"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-04-07}
+  s.date = %q{2011-04-11}
   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/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-mapreduce.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.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/json.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-mapreduce.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.7.2}

data/spec/spec_helper.rb

@@ -21,6 +21,7 @@ require 'fakeweb'
 
 begin
   require 'yaml'
+  require 'riak/test_server'
   config = YAML.load_file("spec/support/test_server.yml")
   $test_server = Riak::TestServer.new(config.symbolize_keys)
   $test_server.prepare!
@@ -35,7 +36,7 @@ Dir[File.join(File.dirname(__FILE__), "support", "*.rb")].each {|f| require f }
 
 RSpec.configure do |config|
   config.mock_with :rspec
-
+  
   config.before(:each) do
     FakeWeb.clean_registry
   end

data/spec/support/http_backend_implementation_examples.rb

@@ -239,4 +239,41 @@ shared_examples_for "HTTP backend" do
       response[:code].should == 200
     end
   end
+
+  describe "Invalid responses" do
+
+    def bad_request(method)
+      if method == :post || method == :put
+        @backend.send(method, 200, "/riak/","foo", "body")
+      else
+        @backend.send(method, 200, "/riak/","foo")
+      end
+    end
+
+    [:get, :post, :put, :delete].each do |method|
+      context method.to_s do
+
+        before(:each) do
+          setup_http_mock(method, @backend.path("/riak/","foo").to_s, :body => "Failure!", :status => 400, 'Content-Type' => 'text/plain' )
+        end
+
+        it "raises an HTTPFailedRequest exeption" do
+          lambda { bad_request(method) }.should raise_error(Riak::HTTPFailedRequest)
+        end
+
+        it "should normalize the response header keys to lower case" do
+          begin
+            bad_request(method)
+          rescue Riak::HTTPFailedRequest => fr
+            fr.headers.keys.should =~ fr.headers.keys.collect(&:downcase)
+          else
+            fail "No exception raised!"
+          end
+        end
+
+      end
+    end
+    
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: riak-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 Z
+date: 2011-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -138,7 +138,7 @@ files:
 - lib/riak/core_ext.rb
 - lib/riak/failed_request.rb
 - lib/riak/i18n.rb
-- lib/riak/invalid_response.rb
+- lib/riak/json.rb
 - lib/riak/link.rb
 - lib/riak/locale/en.yml
 - lib/riak/map_reduce/filter_builder.rb

data/lib/riak/invalid_response.rb

@@ -1,25 +0,0 @@
-# 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'
-
-module Riak
-  # Raised when Riak returns a response that is in an unexpected format
-  class InvalidResponse < StandardError
-    def initialize(expected, received, extra="")
-      expected = expected.inspect if Hash === expected
-      received = received.inspect if Hash === received
-      super "Expected #{expected} but received #{received} from Riak #{extra}"
-    end
-  end
-end