aws-s3 0.2.1 → 0.3.0

data/lib/aws/s3/parsing.rb

@@ -39,35 +39,6 @@ module AWS
           end
         end
       end
-
-      class CoercibleString < String
-        attr_accessor :generator
-        class << self
-          def coerce(string)
-            new(string).coerce
-          end
-        end
-        
-        def coerce
-          case self
-          when 'true':          true
-          when 'false':         false
-          when  /^\d+$/:        Integer(self)
-          when datetime_format: Time.parse(self)
-          else
-            self
-          end
-        end
-        
-        private
-          
-          # Lame hack since Date._parse is so accepting. S3 dates are of the form: '2006-10-29T23:14:47.000Z'
-          # so unless the string looks like that, don't even try, otherwise it might convert an object's
-          # key from something like '03 1-2-3-Apple-Tree.mp3' to Sat Feb 03 00:00:00 CST 2001.
-          def datetime_format
-            /^\d{4}-\d{2}-\d{2}\w\d{2}:\d{2}:\d{2}/
-          end
-      end
       
       class XmlParser < Hash
         include Typecasting

data/lib/aws/s3/response.rb

@@ -57,7 +57,7 @@ module AWS
         memoized :parsed
     
         def inspect
-          "#<#{self.class}:0x#{object_id} #{response.code} #{response.message}>"
+          "#<%s:0x%s %s %s>" % [self.class, object_id, response.code, response.message]
         end
       end
     end
@@ -119,7 +119,7 @@ module AWS
         end
       
         def inspect
-          "#<#{self.class.name}:0x#{object_id}  #{response.code} #{error.code}: '#{error.message}'>"
+          "#<%s:0x%s %s %s: '%s'>" % [self.class.name, object_id, response.code, error.code, error.message]
         end
       end
     end

data/lib/aws/s3/version.rb

@@ -2,8 +2,8 @@ module AWS
   module S3
     module VERSION #:nodoc:
       MAJOR    = '0'
-      MINOR    = '2'
-      TINY     = '1' 
+      MINOR    = '3'
+      TINY     = '0' 
       BETA     = nil # Time.now.to_i.to_s
     end
     

data/support/faster-xml-simple/lib/faster_xml_simple.rb

@@ -37,7 +37,7 @@ class FasterXmlSimple
   end
   
   def out
-    {doc.root.name => collapse(doc.root, doc.root.name)}
+    {doc.root.name => collapse(doc.root)}
   end
   
   private
@@ -45,14 +45,17 @@ class FasterXmlSimple
       {'contentkey' => '__content__', 'forcearray' => []}
     end
   
-    def collapse(element, key_name)
+    def collapse(element)
       result = hash_of_attributes(element) 
       if text_node? element
         text = collapse_text(element)
         result.merge!(content_key => text) if text =~ /\S/
       elsif element.children?
         element.inject(result) do |hash, child|
-          (hash[child.name] ||= []) << collapse(child, element.name) unless child.text?
+          unless child.text?
+            child_result = collapse(child) 
+            (hash[child.name] ||= []) << child_result
+          end
           hash
         end
       end
@@ -61,15 +64,14 @@ class FasterXmlSimple
       end
       # Compact them to ensure it complies with the user's requests
       inline_single_element_arrays(result) 
-      suppress_empty(result) if suppress_empty?
-
+      suppress_empty_content(result) unless force_content?
+      remove_empty_elements(result) if suppress_empty?
+      
       result
     end
   
     def empty_element
-      if options['suppressempty'] == true
-        raise 'unimplemented'
-      elsif !options.has_key? 'suppressempty'
+      if !options.has_key? 'suppressempty'
         {}
       else
         options['suppressempty']
@@ -92,12 +94,26 @@ class FasterXmlSimple
       end    
     end
   
-    def suppress_empty(result)
+    def remove_empty_elements(result)
+      result.each do |key, value|
+        if value == empty_element
+          result.delete key
+        end
+      end
+    end
+    
+    def suppress_empty?
+      options['suppressempty'] == true
+    end
+
+
+
+    def suppress_empty_content(result)
       result.delete content_key if result[content_key] !~ /\S/ 
     end
   
-    def suppress_empty?
-      options.has_key? 'suppressempty'
+    def force_content?
+      options['forcecontent']
     end
   
     # a text node is one with 1 or more child nodes which are
@@ -122,6 +138,9 @@ class FasterXmlSimple
     end
   
     def parse(string)
+      if string == ''
+        string = ' '
+      end
       XML::Parser.string(string).parse
     end
 end

data/support/faster-xml-simple/test/regression_test.rb

@@ -1,7 +1,6 @@
-require 'faster_xml_simple'
-require 'test/unit'
+require File.dirname(__FILE__) + '/test_helper'
 
-class RegressionTest < Test::Unit::TestCase
+class RegressionTest < FasterXSTest
   def test_content_nil_regressions
     expected = {"asdf"=>{"jklsemicolon"=>{}}}
     assert_equal expected, FasterXmlSimple.xml_in("<asdf><jklsemicolon /></asdf>")
@@ -23,8 +22,15 @@ class RegressionTest < Test::Unit::TestCase
     assert_equal Hash.new, FasterXmlSimple.xml_in(str)["asdf"]["fdsa"]
     assert_nil FasterXmlSimple.xml_in(str, 'suppressempty'=>nil)["asdf"]["fdsa"]
     assert_equal '', FasterXmlSimple.xml_in(str, 'suppressempty'=>'')["asdf"]["fdsa"]
-#    assert !FasterXmlSimple.xml_in(str, 'suppressempty'=>true)["asdf"].has_key?("fdsa")
+    assert !FasterXmlSimple.xml_in(str, 'suppressempty'=>true)["asdf"].has_key?("fdsa")
+  end
+
+  def test_empty_string_doesnt_crash
+    assert_raise(XML::Parser::ParseError) do
+      silence_stderr do 
+        FasterXmlSimple.xml_in('')
+      end
+    end
   end
-  
   
 end

data/support/faster-xml-simple/test/test_helper.rb

@@ -0,0 +1,17 @@
+
+require 'test/unit'
+require 'faster_xml_simple'
+
+class FasterXSTest < Test::Unit::TestCase
+  def default_test
+  end
+  
+  def silence_stderr
+    str = STDERR.dup
+    STDERR.reopen("/dev/null")
+    STDERR.sync=true
+    yield
+  ensure
+    STDERR.reopen(str)
+  end
+end

data/support/faster-xml-simple/test/xml_simple_comparison_test.rb

@@ -1,8 +1,7 @@
-require 'faster_xml_simple'
-require 'test/unit'
+require File.dirname(__FILE__) + '/test_helper'
 require 'yaml'
 
-class XmlSimpleComparisonTest < Test::Unit::TestCase
+class XmlSimpleComparisonTest < FasterXSTest
   
   # Define test methods
   

data/test/acl_test.rb

@@ -102,6 +102,17 @@ class PolicyTest < Test::Unit::TestCase
       assert_nil policy.grants.delete(non_grant)
     end
   end
+  
+  def test_grant_list_comparison
+    policy  = ACL::Policy.new
+    policy2 = ACL::Policy.new
+    
+    grant_names = [:public_read, :public_read_acp, :authenticated_write]
+    grant_names.each {|grant_name| policy.grants << ACL::Grant.grant(grant_name)}
+    grant_names.reverse_each {|grant_name| policy2.grants << ACL::Grant.grant(grant_name)}
+    
+    assert_equal policy.grants, policy2.grants
+  end
 end
 
 class GrantTest < Test::Unit::TestCase
@@ -123,7 +134,7 @@ class GrantTest < Test::Unit::TestCase
     
     grant = nil
     assert_nothing_raised do
-      grant = ACL::Grant.grant :public_read
+      grant = ACL::Grant.grant(:public_read)
     end
     
     assert grant
@@ -240,4 +251,4 @@ class ACLOptionProcessorTest < Test::Unit::TestCase
     def acl(options)
       options['x-amz-acl']
     end
-end
+end

data/test/connection_test.rb

@@ -27,6 +27,14 @@ class ConnectionTest < Test::Unit::TestCase
     assert_equal 'https://', connection.protocol
   end
   
+  def test_connection_is_persistent_by_default
+    connection = Connection.new(@keys)
+    assert connection.persistent?
+    
+    connection = Connection.new(@keys.merge(:persistent => false))
+    assert !connection.persistent?
+  end
+  
   def test_server_and_port_are_passed_onto_connection
     connection = Connection.new(@keys)
     options    = connection.instance_variable_get('@options')

data/test/extensions_test.rb

@@ -64,6 +64,37 @@ class StringExtensionsTest < Test::Unit::TestCase
       assert_equal after, before.to_header
     end
   end
+  
+  def test_utf8?
+    assert !"318597/620065/GTL_75\24300_A600_A610.zip".utf8?
+    assert "318597/620065/GTL_75£00_A600_A610.zip".utf8?
+  end
+  
+  def test_remove_extended
+    assert "318597/620065/GTL_75\24300_A600_A610.zip".remove_extended.utf8?
+    assert "318597/620065/GTL_75£00_A600_A610.zip".remove_extended.utf8?
+  end
+end
+
+class CoercibleStringTest < Test::Unit::TestCase  
+  
+  def test_coerce
+    coercions = [
+      ['1', 1],
+      ['false', false],
+      ['true',  true],
+      ['2006-10-29T23:14:47.000Z', Time.parse('2006-10-29T23:14:47.000Z')],
+      ['Hello!', 'Hello!'],
+      ['false23', 'false23'],
+      ['03 1-2-3-Apple-Tree.mp3', '03 1-2-3-Apple-Tree.mp3']
+    ]
+    
+    coercions.each do |before, after|
+      assert_nothing_raised do
+        assert_equal after, CoercibleString.coerce(before)
+      end
+    end
+  end
 end
 
 class KerneltExtensionsTest < Test::Unit::TestCase
@@ -122,6 +153,11 @@ class ModuleExtensionsTest < Test::Unit::TestCase
         Time.now
       end
     end
+    
+    def quux
+      Time.now
+    end
+    memoized :quux
   end
   
   def setup
@@ -129,19 +165,38 @@ class ModuleExtensionsTest < Test::Unit::TestCase
   end
   
   def test_memoize
+    assert !@instance.instance_variables.include?('@foo')
     cached_result = @instance.foo
     assert_equal cached_result, @instance.foo
+    assert @instance.instance_variables.include?('@foo')
     assert_equal cached_result, @instance.send(:instance_variable_get, :@foo)
-    assert_not_equal cached_result, @instance.foo(:reload)
+    assert_not_equal cached_result, new_cache = @instance.foo(:reload)
+    assert_equal new_cache, @instance.foo
+    assert_equal new_cache, @instance.send(:instance_variable_get, :@foo)
   end
   
-  def test_customizing_storage
+  def test_customizing_memoize_storage
+    assert !@instance.instance_variables.include?('@bar')
+    assert !@instance.instance_variables.include?('@baz')
     cached_result = @instance.bar
+    assert !@instance.instance_variables.include?('@bar')
+    assert @instance.instance_variables.include?('@baz')
     assert_equal cached_result, @instance.bar
     assert_equal cached_result, @instance.send(:instance_variable_get, :@baz)
     assert_nil @instance.send(:instance_variable_get, :@bar)
   end
   
+  def test_memoized
+    assert !@instance.instance_variables.include?('@quux')
+    cached_result = @instance.quux
+    assert_equal cached_result, @instance.quux
+    assert @instance.instance_variables.include?('@quux')
+    assert_equal cached_result, @instance.send(:instance_variable_get, :@quux)
+    assert_not_equal cached_result, new_cache = @instance.quux(:reload)
+    assert_equal new_cache, @instance.quux
+    assert_equal new_cache, @instance.send(:instance_variable_get, :@quux)
+  end
+  
   def test_constant_setting
     some_module = Module.new
     assert !some_module.const_defined?(:FOO)
@@ -164,8 +219,6 @@ class ModuleExtensionsTest < Test::Unit::TestCase
     assert_equal 'bar', some_module::FOO
     assert_equal 'bar', some_module.foo
   end
-  
-  
 end
 
 class AttributeProxyTest < Test::Unit::TestCase

data/test/fixtures/loglines.yml

@@ -0,0 +1,5 @@
+bucket_get:
+  "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [14/Nov/2006:06:36:48 +0000] 67.165.183.125 bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 8B5297D428A05432 REST.GET.BUCKET - \"GET /marcel HTTP/1.1\" 200 - 4534 - 398 395 \"-\" \"-\"\n"
+  
+browser_get:
+  "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [25/Nov/2006:06:26:23 +0000] 67.165.183.125 65a011a29cdf8ec533ec3d1ccaae921c 41521D07CA012312 REST.GET.OBJECT kiss.jpg \"GET /marcel/kiss.jpg HTTP/1.1\" 200 - 67748 67748 259 104 \"-\" \"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0\"\n"

data/test/fixtures/logs.yml

@@ -0,0 +1,7 @@
+simple_log:
+  - "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [14/Nov/2006:06:36:48 +0000] 67.165.183.125 bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 8B5297D428A05432 REST.GET.BUCKET - \"GET /marcel HTTP/1.1\" 200 - 4534 - 398 395 \"-\" \"-\"\n"
+  - "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [14/Nov/2006:06:38:58 +0000] 67.165.183.125 bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 8F6F3C4027849420 REST.GET.BUCKET - \"GET /marcel HTTP/1.1\" 200 - 4534 - 458 456 \"-\" \"-\"\n"
+  
+requests_from_a_browser:
+  - "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [25/Nov/2006:06:26:23 +0000] 67.165.183.125 65a011a29cdf8ec533ec3d1ccaae921c 41521D07CA012312 REST.GET.OBJECT kiss.jpg \"GET /marcel/kiss.jpg HTTP/1.1\" 200 - 67748 67748 259 104 \"-\" \"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0\"\n"
+  - "bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1 marcel [25/Nov/2006:06:26:27 +0000] 67.165.183.125 65a011a29cdf8ec533ec3d1ccaae921c 88629578AFDDD9B5 REST.GET.TORRENT kiss.jpg \"GET /marcel/kiss.jpg?torrent HTTP/1.1\" 200 - 215 - 379 - \"-\" \"Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0\"\n"

data/test/logging_test.rb

@@ -27,10 +27,63 @@ class LoggingStatusReadingTest < Test::Unit::TestCase
 end
 
 class LoggingStatusWritingTest < LoggingStatusReadingTest
-  
   def setup
     super
     @disabled = Logging::Status.new(Parsing::XmlParser.new(@disabled.to_xml))
     @enabled  = Logging::Status.new(Parsing::XmlParser.new(@enabled.to_xml))
   end
+end
+
+class LogTest < Test::Unit::TestCase
+  def test_value_converted_to_log_lines
+    log_object = S3Object.new
+    log_object.value = Fixtures::Logs.simple_log.join
+    log = Logging::Log.new(log_object)
+    assert_nothing_raised do
+      log.lines
+    end
+    
+    assert_equal 2, log.lines.size
+    assert_kind_of Logging::Log::Line, log.lines.first
+    assert_equal 'marcel', log.lines.first.bucket
+  end
+end
+
+class LogLineTest < Test::Unit::TestCase
+  def setup
+    @line = Logging::Log::Line.new(Fixtures::Loglines.bucket_get)
+  end
+  
+  def test_field_accessors
+    expected_results = {
+      :owner            => Owner.new('id' => 'bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1'),
+      :bucket           => 'marcel',
+      :time             => Time.parse('11/14/2006 06:36:48 +0000'),
+      :remote_ip        => '67.165.183.125',
+      :request_id       => '8B5297D428A05432',
+      :requestor        => Owner.new('id' => 'bb2041a25975c3d4ce9775fe9e93e5b77a6a9fad97dc7e00686191f3790b13f1'),
+      :operation        => 'REST.GET.BUCKET',
+      :key              => nil,
+      :request_uri      => 'GET /marcel HTTP/1.1',
+      :http_status      => 200,
+      :error_code       => nil,
+      :bytes_sent       => 4534,
+      :object_size      => nil,
+      :total_time       => 398,
+      :turn_around_time => 395,
+      :referrer         => nil,
+      :user_agent       => nil
+    }
+     
+     expected_results.each do |field, expected|
+       assert_equal expected, @line.send(field)
+     end
+     
+     assert_equal expected_results, @line.attributes
+   end
+   
+  def test_user_agent
+    line = Logging::Log::Line.new(Fixtures::Loglines.browser_get)
+    assert_equal 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1) Gecko/20061010 Firefox/2.0', line.user_agent
+  end
 end

data/test/object_test.rb

@@ -105,6 +105,21 @@ class ObjectTest < Test::Unit::TestCase
       about = S3Object.about('foo', 'bar')
       assert_kind_of S3Object::About, about
       assert_equal headers, about
+      
+      S3Object.request_returns :code => 404
+      assert_raises(NoSuchKey) do
+        S3Object.about('foo', 'bar')
+      end
+    end
+  end
+  
+  def test_exists?
+    S3Object.in_test_mode do
+      S3Object.request_returns :code => 404
+      assert_equal false, S3Object.exists?('foo', 'bar')
+      
+      S3Object.request_returns :code => 200
+      assert_equal true, S3Object.exists?('foo', 'bar')
     end
   end