riak-client 0.9.8 → 1.0.0.beta

data/lib/riak/util/headers.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.
 require 'net/http'
 
 # Splits headers into < 8KB chunks
@@ -44,7 +31,7 @@ module Riak
       def initialize
         initialize_http_header({})
       end
-      
+
       # Parse a single header line into its key and value
       # @param [String] chunk a single header line
       def self.parse(chunk)
@@ -54,7 +41,7 @@ module Riak
         m = /\A([^:]+):\s*/.match(line)
         [m[1], m.post_match] rescue [nil, nil]
       end
-      
+
       # Parses a header line and adds it to the header collection
       # @param [String] chunk a single header line
       def parse(chunk)

data/lib/riak/util/multipart.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.
 require 'riak/util/headers'
 
 module Riak

data/lib/riak/util/multipart/stream_parser.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
 require 'riak/util/translation'
 require 'riak/util/multipart'
 

data/lib/riak/util/tcp_socket_extensions.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.
 require 'time'
 require 'timeout'
 require 'socket'
@@ -18,7 +5,7 @@ require 'socket'
 # Borrowed from Webrat and Selenium client, watches for TCP port
 # liveness of the spawned server.
 # @private
-class TCPSocket  
+class TCPSocket
   def self.wait_for_service(options)
     verbose_wait until listening_service?(options)
   end

data/lib/riak/util/translation.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.
 require 'riak/i18n'
 
 module Riak

data/lib/riak/version.rb

@@ -0,0 +1,3 @@
+module Riak
+  VERSION = "1.0.0.beta"
+end

data/lib/riak/walk_spec.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.
 require 'riak/util/translation'
 require 'riak/util/escape'
 require 'riak/link'

data/riak-client.gemspec

@@ -1,51 +1,31 @@
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'riak/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{riak-client}
-  s.version = "0.9.7"
+Gem::Specification.new do |gem|
+  # Meta
+  gem.name = "riak-client"
+  gem.version = Riak::VERSION
+  gem.summary = %Q{riak-client is a rich client for Riak, the distributed database by Basho.}
+  gem.description = %Q{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.}
+  gem.email = ["sean@basho.com"]
+  gem.homepage = "http://seancribbs.github.com/ripple"
+  gem.authors = ["Sean Cribbs"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Sean Cribbs}]
-  s.date = %q{2011-07-26}
-  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 = [%q{erl_src/riak_kv_test_backend.beam}, %q{erl_src/riak_kv_test_backend.erl}, %q{Gemfile}, %q{lib/active_support/cache/riak_store.rb}, %q{lib/riak/bucket.rb}, %q{lib/riak/cache_store.rb}, %q{lib/riak/client/beefcake/messages.rb}, %q{lib/riak/client/beefcake/object_methods.rb}, %q{lib/riak/client/beefcake_protobuffs_backend.rb}, %q{lib/riak/client/curb_backend.rb}, %q{lib/riak/client/excon_backend.rb}, %q{lib/riak/client/http_backend/configuration.rb}, %q{lib/riak/client/http_backend/key_streamer.rb}, %q{lib/riak/client/http_backend/object_methods.rb}, %q{lib/riak/client/http_backend/request_headers.rb}, %q{lib/riak/client/http_backend/transport_methods.rb}, %q{lib/riak/client/http_backend.rb}, %q{lib/riak/client/net_http_backend.rb}, %q{lib/riak/client/protobuffs_backend.rb}, %q{lib/riak/client/pump.rb}, %q{lib/riak/client.rb}, %q{lib/riak/core_ext/blank.rb}, %q{lib/riak/core_ext/extract_options.rb}, %q{lib/riak/core_ext/slice.rb}, %q{lib/riak/core_ext/stringify_keys.rb}, %q{lib/riak/core_ext/symbolize_keys.rb}, %q{lib/riak/core_ext/to_param.rb}, %q{lib/riak/core_ext.rb}, %q{lib/riak/failed_request.rb}, %q{lib/riak/i18n.rb}, %q{lib/riak/json.rb}, %q{lib/riak/link.rb}, %q{lib/riak/locale/en.yml}, %q{lib/riak/map_reduce/filter_builder.rb}, %q{lib/riak/map_reduce/phase.rb}, %q{lib/riak/map_reduce.rb}, %q{lib/riak/map_reduce_error.rb}, %q{lib/riak/robject.rb}, %q{lib/riak/search.rb}, %q{lib/riak/test_server.rb}, %q{lib/riak/util/escape.rb}, %q{lib/riak/util/fiber1.8.rb}, %q{lib/riak/util/headers.rb}, %q{lib/riak/util/multipart/stream_parser.rb}, %q{lib/riak/util/multipart.rb}, %q{lib/riak/util/tcp_socket_extensions.rb}, %q{lib/riak/util/translation.rb}, %q{lib/riak/walk_spec.rb}, %q{lib/riak.rb}, %q{Rakefile}, %q{riak-client.gemspec}, %q{spec/fixtures/cat.jpg}, %q{spec/fixtures/multipart-blank.txt}, %q{spec/fixtures/multipart-mapreduce.txt}, %q{spec/fixtures/multipart-with-body.txt}, %q{spec/fixtures/server.cert.crt}, %q{spec/fixtures/server.cert.key}, %q{spec/fixtures/test.pem}, %q{spec/integration/riak/cache_store_spec.rb}, %q{spec/integration/riak/http_backends_spec.rb}, %q{spec/integration/riak/protobuffs_backends_spec.rb}, %q{spec/integration/riak/test_server_spec.rb}, %q{spec/riak/beefcake_protobuffs_backend_spec.rb}, %q{spec/riak/bucket_spec.rb}, %q{spec/riak/client_spec.rb}, %q{spec/riak/core_ext/to_param_spec.rb}, %q{spec/riak/curb_backend_spec.rb}, %q{spec/riak/escape_spec.rb}, %q{spec/riak/excon_backend_spec.rb}, %q{spec/riak/headers_spec.rb}, %q{spec/riak/http_backend/configuration_spec.rb}, %q{spec/riak/http_backend/object_methods_spec.rb}, %q{spec/riak/http_backend/transport_methods_spec.rb}, %q{spec/riak/http_backend_spec.rb}, %q{spec/riak/link_spec.rb}, %q{spec/riak/map_reduce/filter_builder_spec.rb}, %q{spec/riak/map_reduce/phase_spec.rb}, %q{spec/riak/map_reduce_spec.rb}, %q{spec/riak/multipart_spec.rb}, %q{spec/riak/net_http_backend_spec.rb}, %q{spec/riak/robject_spec.rb}, %q{spec/riak/search_spec.rb}, %q{spec/riak/stream_parser_spec.rb}, %q{spec/riak/walk_spec_spec.rb}, %q{spec/spec_helper.rb}, %q{spec/support/drb_mock_server.rb}, %q{spec/support/http_backend_implementation_examples.rb}, %q{spec/support/mock_server.rb}, %q{spec/support/mocks.rb}, %q{spec/support/test_server.yml.example}, %q{spec/support/unified_backend_examples.rb}]
-  s.homepage = %q{http://seancribbs.github.com/ripple}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{riak-client is a rich client for Riak, the distributed database by Basho.}
-  s.test_files = [%q{spec/integration/riak/cache_store_spec.rb}, %q{spec/integration/riak/http_backends_spec.rb}, %q{spec/integration/riak/protobuffs_backends_spec.rb}, %q{spec/integration/riak/test_server_spec.rb}, %q{spec/riak/beefcake_protobuffs_backend_spec.rb}, %q{spec/riak/bucket_spec.rb}, %q{spec/riak/client_spec.rb}, %q{spec/riak/core_ext/to_param_spec.rb}, %q{spec/riak/curb_backend_spec.rb}, %q{spec/riak/escape_spec.rb}, %q{spec/riak/excon_backend_spec.rb}, %q{spec/riak/headers_spec.rb}, %q{spec/riak/http_backend/configuration_spec.rb}, %q{spec/riak/http_backend/object_methods_spec.rb}, %q{spec/riak/http_backend/transport_methods_spec.rb}, %q{spec/riak/http_backend_spec.rb}, %q{spec/riak/link_spec.rb}, %q{spec/riak/map_reduce/filter_builder_spec.rb}, %q{spec/riak/map_reduce/phase_spec.rb}, %q{spec/riak/map_reduce_spec.rb}, %q{spec/riak/multipart_spec.rb}, %q{spec/riak/net_http_backend_spec.rb}, %q{spec/riak/robject_spec.rb}, %q{spec/riak/search_spec.rb}, %q{spec/riak/stream_parser_spec.rb}, %q{spec/riak/walk_spec_spec.rb}]
+  # Deps
+  gem.add_development_dependency "rspec", "~>2.6.0"
+  gem.add_development_dependency "fakeweb", ">=1.2"
+  gem.add_development_dependency "rack", ">=1.0"
+  gem.add_development_dependency "excon", "~>0.6.1"
+  gem.add_development_dependency 'rake', '~> 0.8.7'
+  gem.add_runtime_dependency "i18n", ">=0.4.0"
+  gem.add_runtime_dependency "builder", ">= 2.1.2"
+  gem.add_runtime_dependency "beefcake", "~>0.3.7"
+  gem.add_runtime_dependency "multi_json", "~>1.0.0"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      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.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.3.2"])
-    else
-      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.5.7"])
-      s.add_dependency(%q<i18n>, [">= 0.4.0"])
-      s.add_dependency(%q<builder>, ["~> 2.1.2"])
-      s.add_dependency(%q<beefcake>, ["= 0.3.2"])
-    end
-  else
-    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.5.7"])
-    s.add_dependency(%q<i18n>, [">= 0.4.0"])
-    s.add_dependency(%q<builder>, ["~> 2.1.2"])
-    s.add_dependency(%q<beefcake>, ["= 0.3.2"])
-  end
+  # Files
+  ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten
+  gem.files = (Dir['**/*','.gitignore'] - ignores).reject {|f| !File.file?(f) }
+  gem.test_files = (Dir['spec/**/*','.gitignore'] - ignores).reject {|f| !File.file?(f) }
+  # gem.executables   = Dir['bin/*'].map { |f| File.basename(f) }
+  gem.require_paths = ['lib']
 end

data/spec/fixtures/multipart-with-marked-tombstones.txt

@@ -0,0 +1,17 @@
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI
+Content-Type: multipart/mixed; boundary=Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvrNPcuWwZTIlMfKIOotdIIvCwA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 5bUNdzHJhZDdCr7KlWxXq
+Last-Modified: Tue, 18 Oct 2011 19:10:13 GMT
+X-Riak-Deleted: true
+
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy--
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI--

data/spec/fixtures/multipart-with-unmarked-tombstone.txt

@@ -0,0 +1,16 @@
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7
+Content-Type: multipart/mixed; boundary=E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvpN53+WwZTIlMfKcNVJ6ARfFgA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 50FOyLo7juvEVUO33MRJwP
+Last-Modified: Tue, 18 Oct 2011 18:35:01 GMT
+
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ--
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7--

data/spec/integration/riak/cache_store_spec.rb

@@ -1,51 +1,13 @@
-# Copyright 2010 Sean Cribbs, Sonian Inc., and Basho Technologies, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-require File.expand_path("../../spec_helper", File.dirname(__FILE__))
+require 'spec_helper'
 require 'riak/cache_store'
 
 describe Riak::CacheStore do
-  before :all do
-    if $test_server
-      @web_port = 9000
-      $test_server.start
-    end
-  end
-
   before do
-    @web_port ||= 8098
+    @web_port = $test_server.http_port
     @cache = ActiveSupport::Cache.lookup_store(:riak_store, :http_port => @web_port)
-    @cleanup = true
-  end
-
-  after do
-    if @cleanup
-      if $test_server
-        $test_server.recycle
-        Thread.current[:curl_easy_handle] = nil
-      else
-        @cache.bucket.keys(:force => true).each do |k|
-          @cache.bucket.delete(k, :rw => 1) unless k.blank?
-        end
-      end
-    end
   end
 
   describe "Riak integration" do
-    before do
-      @cleanup = false
-    end
-
     it "should have a client" do
       @cache.should respond_to(:client)
       @cache.client.should be_kind_of(Riak::Client)

data/spec/integration/riak/cluster_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+require 'riak/cluster'
+
+describe Riak::Cluster, :test_server => false, :slow => true do
+  let(:config) { YAML.load_file("spec/support/test_server.yml").symbolize_keys }
+  subject { described_class.new(config) }
+
+  it "should have a list of nodes" do
+    should respond_to(:nodes)
+    subject.nodes.should be_kind_of(Array)
+    subject.nodes.should have(4).items
+    subject.nodes.should be_all {|n| n.kind_of?(Riak::Node) }
+  end
+
+  it "should have a configuration" do
+    should respond_to(:configuration)
+    subject.configuration.should be_kind_of(Hash)
+  end
+
+  it "should require a :source and :root configuration keys" do
+    expect {
+      described_class.new({})
+    }.to raise_error(ArgumentError)
+  end
+
+  it "should not be created initially" do
+    should_not be_exist
+  end
+
+  context "creating the cluster" do
+    before { subject.create }
+    after { subject.destroy }
+
+    it "should generate all nodes inside its root" do
+      subject.root.should be_exist
+      subject.nodes.should be_all {|n| n.exist? }
+    end
+  end
+
+  context "destroying the cluster" do
+    before { subject.create; subject.should be_exist; subject.destroy }
+
+    it "should remove all nodes and its root directory" do
+      subject.should_not be_exist
+    end
+  end
+
+  context "dropping data from the cluster" do
+    it "should make all nodes drop their data" do
+      subject.nodes.each {|n| n.should_receive(:drop) }
+      subject.drop
+    end
+  end
+
+  context "starting the cluster", :slow => true do
+    before { subject.create }
+    after { subject.destroy }
+
+    it "should start all nodes in the cluster" do
+      subject.start
+      subject.nodes.should be_all {|n| n.started? }
+    end
+  end
+
+  context "stopping the cluster", :slow => true do
+    before { subject.create; subject.start; subject.should be_started }
+    after { subject.destroy }
+
+    it "should stop all nodes in the cluster" do
+      subject.stop
+      subject.nodes.should be_all {|n| n.stopped? }
+    end
+  end
+
+  context "joining the cluster together", :slow => true do
+    before { subject.create; subject.start; subject.should be_started }
+    after { subject.destroy }
+
+    it "should join nodes into a cluster" do
+      subject.join
+      node_names = subject.nodes.map {|n| n.name }.sort
+      subject.nodes.should be_all do |n|
+        n.peers.should have(3).items
+        n.peers.sort == (node_names - [n.name])
+      end
+    end
+  end
+end

data/spec/integration/riak/http_backends_spec.rb

@@ -1,36 +1,12 @@
-# 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__))
+require 'spec_helper'
 
 describe "HTTP" do
-  before :all do
-    if $test_server
-      @web_port = 9000
-      $test_server.start
-    end
-  end
-
   before do
-    @web_port ||= 8098
+    @web_port = $test_server.http_port
     @client = Riak::Client.new(:http_port => @web_port)
   end
 
-  after do
-    $test_server.recycle if $test_server.started?
-  end
-
-  [:CurbBackend, :ExconBackend, :NetHTTPBackend].each do |klass|
+  [:ExconBackend, :NetHTTPBackend].each do |klass|
     bklass = Riak::Client.const_get(klass)
     if bklass.configured?
       describe klass.to_s do
@@ -63,9 +39,9 @@ describe "HTTP" do
     let(:sized) { Reader.new(["foo", "bar", "baz"]) }
     let(:sizeless) { SizelessReader.new(["foo", "bar", "baz"]) }
     it "should set the content-length or transfer-encoding properly on IO uploads" do
-      lambda { subject.put(204, "/riak/nethttp", "test-file", file, {"Content-Type" => "text/plain"}) }.should_not raise_error
-      lambda { subject.put(204, "/riak/nethttp", "test-sized", sized, {"Content-Type" => "text/plain"}) }.should_not raise_error
-      lambda { subject.put(204, "/riak/nethttp", "test-file", sizeless, {"Content-Type" => "text/plain"}) }.should_not raise_error
+      lambda { subject.put(204, subject.object_path('nethttp', 'test-file'), file, {"Content-Type" => "text/plain"}) }.should_not raise_error
+      lambda { subject.put(204, subject.object_path('nethttp', 'test-sized'), sized, {"Content-Type" => "text/plain"}) }.should_not raise_error
+      lambda { subject.put(204, subject.object_path('nethttp', 'test-sizeless'), sizeless, {"Content-Type" => "text/plain"}) }.should_not raise_error
     end
   end
 end