aws-s3 0.4.0 → 0.5.0

data/test/remote/object_test.rb

@@ -315,7 +315,7 @@ class RemoteS3ObjectTest < Test::Unit::TestCase
     S3Object.delete('name with spaces', TEST_BUCKET)
   end
   
-  def test_copying_an_object_should_copy_over_its_acl_also
+  def test_copying_an_object_should_copy_over_its_acl_also_if_requested
     key      = 'copied-objects-inherit-acl'
     copy_key = key + '2'
     S3Object.store(key, 'value does not matter', TEST_BUCKET)
@@ -328,7 +328,7 @@ class RemoteS3ObjectTest < Test::Unit::TestCase
     acl = S3Object.acl(key, TEST_BUCKET)
     assert_equal 3, acl.grants.size
     
-    S3Object.copy(key, copy_key, TEST_BUCKET)
+    S3Object.copy(key, copy_key, TEST_BUCKET, :copy_acl => true)
     copied_object = S3Object.find(copy_key, TEST_BUCKET)
     assert_equal acl.grants, copied_object.acl.grants
   ensure

data/test/response_test.rb

@@ -34,11 +34,9 @@ end
 
 class S3ObjectResponseTest < Test::Unit::TestCase
   def test_etag_extracted
-    S3Object.in_test_mode do
-      S3Object.request_returns :headers => {"etag"=>"\"acbd18db4cc2f85cedef654fccc4a4d8\""}
-      object_response = S3Object.create('name_does_not_matter', 'data does not matter', 'bucket does not matter')
-      assert_equal "acbd18db4cc2f85cedef654fccc4a4d8", object_response.etag 
-    end
+    mock_connection_for(S3Object, :returns => {:headers => {"etag" => %("acbd18db4cc2f85cedef654fccc4a4d8")}}).once
+    object_response = S3Object.create('name_does_not_matter', 'data does not matter', 'bucket does not matter')
+    assert_equal "acbd18db4cc2f85cedef654fccc4a4d8", object_response.etag 
   end
 end
 

data/test/service_test.rb

@@ -2,25 +2,22 @@ require File.dirname(__FILE__) + '/test_helper'
 
 class ServiceTest < Test::Unit::TestCase  
   def test_bucket_list_with_empty_bucket_list
-    Service.request_always_returns :body => Fixtures::Buckets.empty_bucket_list, :code => 200 do
-      list = Service.buckets(:reload)
-      assert_equal [], list
-    end
+    mock_connection_for(Service, :returns => {:body => Fixtures::Buckets.empty_bucket_list, :code => 200})
+    list = Service.buckets(:reload)
+    assert_equal [], list
   end
 
   def test_bucket_list_with_bucket_list_containing_one_bucket
-    Service.request_always_returns :body => Fixtures::Buckets.bucket_list_with_one_bucket, :code => 200 do
-      list = Service.buckets(:reload)
-      assert_equal 1, list.size
-      assert_equal 'marcel_molina', list.first.name
-    end
+    mock_connection_for(Service, :returns => {:body => Fixtures::Buckets.bucket_list_with_one_bucket, :code => 200})
+    list = Service.buckets(:reload)
+    assert_equal 1, list.size
+    assert_equal 'marcel_molina', list.first.name
   end
 
   def test_bucket_list_with_bucket_list_containing_more_than_one_bucket
-    Service.request_always_returns :body => Fixtures::Buckets.bucket_list_with_more_than_one_bucket, :code => 200 do
-      list = Service.buckets(:reload)
-      assert_equal 2, list.size
-      assert_equal %w(marcel_molina marcel_molina_jr), list.map {|bucket| bucket.name}.sort
-    end
+    mock_connection_for(Service, :returns => {:body => Fixtures::Buckets.bucket_list_with_more_than_one_bucket, :code => 200})    
+    list = Service.buckets(:reload)
+    assert_equal 2, list.size
+    assert_equal %w(marcel_molina marcel_molina_jr), list.map {|bucket| bucket.name}.sort
   end
 end

data/test/test_helper.rb

@@ -1,9 +1,12 @@
 require 'test/unit'
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'aws/s3'
-require File.dirname(__FILE__) + '/mocks/base'
+require File.dirname(__FILE__) + '/mocks/fake_response'
 require File.dirname(__FILE__) + '/fixtures'
-require_library_or_gem 'breakpoint'
+require_library_or_gem 'ruby-debug'
+require_library_or_gem 'flexmock'
+require_library_or_gem 'flexmock/test_unit'
+
 
 # Data copied from http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAuthentication.html
 module AmazonDocExampleData
@@ -83,4 +86,22 @@ class Test::Unit::TestCase
   def sample_proxy_settings
     {:host => 'http://google.com', :port => 8080, :user => 'marcel', :password => 'secret'}
   end
+  
+  def mock_connection_for(klass, options = {})
+    data = options[:returns]
+    return_values = case data
+    when Hash
+      FakeResponse.new(data)
+    when Array
+      data.map {|hash| FakeResponse.new(hash)}
+    else
+      abort "Response data for mock connection must be a Hash or an Array. Was #{data.inspect}."
+    end
+    
+    connection = flexmock('Mock connection') do |mock|
+      mock.should_receive(:request).and_return(*return_values).at_least.once
+    end
+
+    flexmock(klass).should_receive(:connection).and_return(connection)
+  end
 end

metadata

@@ -1,36 +1,56 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: aws-s3
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
-date: 2007-07-08 00:00:00 -05:00
-summary: Client library for Amazon's Simple Storage Service's REST API
-require_paths: 
-- lib
-email: marcel@vernix.org
-homepage: http://amazon.rubyforge.org
-rubyforge_project: amazon
-description: Client library for Amazon's Simple Storage Service's REST API
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.5.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Marcel Molina Jr.
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-07 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: xml-simple
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: Client library for Amazon's Simple Storage Service's REST API
+email: marcel@vernix.org
+executables: 
+- s3sh
+extensions: []
+
+extra_rdoc_files: 
+- README
+- COPYING
+- INSTALL
 files: 
 - Rakefile
-- lib/aws/s3.rb
 - lib/aws/s3/acl.rb
 - lib/aws/s3/authentication.rb
 - lib/aws/s3/base.rb
@@ -47,6 +67,7 @@ files:
 - lib/aws/s3/response.rb
 - lib/aws/s3/service.rb
 - lib/aws/s3/version.rb
+- lib/aws/s3.rb
 - bin/s3sh
 - bin/setup.rb
 - support/faster-xml-simple/lib/faster_xml_simple.rb
@@ -57,6 +78,37 @@ files:
 - README
 - COPYING
 - INSTALL
+has_rdoc: true
+homepage: http://amazon.rubyforge.org
+post_install_message: 
+rdoc_options: 
+- --title
+- AWS::S3 -- Support for Amazon S3's REST api
+- --main
+- README
+- --line-numbers
+- --inline-source
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: amazon
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: Client library for Amazon's Simple Storage Service's REST API
 test_files: 
 - test/acl_test.rb
 - test/authentication_test.rb
@@ -66,15 +118,6 @@ test_files:
 - test/error_test.rb
 - test/extensions_test.rb
 - test/fixtures
-- test/fixtures.rb
-- test/logging_test.rb
-- test/mocks
-- test/object_test.rb
-- test/parsing_test.rb
-- test/remote
-- test/response_test.rb
-- test/service_test.rb
-- test/test_helper.rb
 - test/fixtures/buckets.yml
 - test/fixtures/errors.yml
 - test/fixtures/headers.yml
@@ -82,7 +125,13 @@ test_files:
 - test/fixtures/loglines.yml
 - test/fixtures/logs.yml
 - test/fixtures/policies.yml
-- test/mocks/base.rb
+- test/fixtures.rb
+- test/logging_test.rb
+- test/mocks
+- test/mocks/fake_response.rb
+- test/object_test.rb
+- test/parsing_test.rb
+- test/remote
 - test/remote/acl_test.rb
 - test/remote/bittorrent_test.rb
 - test/remote/bucket_test.rb
@@ -90,48 +139,6 @@ test_files:
 - test/remote/object_test.rb
 - test/remote/test_file.data
 - test/remote/test_helper.rb
-rdoc_options: 
-- --title
-- AWS::S3 -- Support for Amazon S3's REST api
-- --main
-- README
-- --line-numbers
-- --inline-source
-extra_rdoc_files: 
-- README
-- COPYING
-- INSTALL
-executables: 
-- s3sh
-extensions: []
-
-requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: xml-simple
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 
+- test/response_test.rb
+- test/service_test.rb
+- test/test_helper.rb

data/test/mocks/base.rb

@@ -1,89 +0,0 @@
-require_library_or_gem 'flexmock'
-
-module AWS
-  module S3
-    class FakeResponse < String
-      attr_reader :code, :body, :headers
-      def initialize(options = {})
-        @code    = options.delete(:code)  || 200 
-        @body    = options.delete(:body)  || ''
-        @headers = {'content-type' => 'application/xml'}.merge(options.delete(:headers) || {})
-        super(@body)
-      end
-
-      # For ErrorResponse
-      def response
-        self
-      end
-      
-      def [](header)
-        headers[header]
-      end
-      
-      def each(&block)
-        headers.each(&block)
-      end
-      alias_method :each_header, :each
-    end
-    
-    class Base
-      class << self
-        @@responses          = []
-        @@in_test_mode       = false
-        @@catch_all_response = nil
-        
-        def in_test_mode=(boolean)
-          @@in_test_mode = boolean
-        end
-        
-        def responses
-          @@responses
-        end
-        
-        def catch_all_response
-          @@catch_all_response
-        end
-
-        def reset!
-          responses.clear
-        end
-        
-        def request_returns(response_data)
-          responses.concat [response_data].flatten.map {|data| FakeResponse.new(data)}
-        end
-        
-        def request_always_returns(response_data, &block)
-          in_test_mode do
-            @@catch_all_response = FakeResponse.new(response_data)
-            yield
-            @@catch_all_response = nil
-          end
-        end
-        
-        def in_test_mode(&block)
-          self.in_test_mode = true
-          yield
-        ensure
-          self.in_test_mode = false
-        end
-        
-        alias_method :old_connection, :connection
-        def connection
-          if @@in_test_mode
-            @mock_connection ||= 
-              begin
-                mock_connection = FlexMock.new
-                mock_connection.mock_handle(:request) do
-                  raise 'No responses left' unless response = catch_all_response || responses.shift
-                  response
-                end
-                mock_connection
-              end
-          else
-            old_connection
-          end
-        end
-      end
-    end
-  end
-end