aws-s3 0.1.1 → 0.1.2

data/lib/aws/s3.rb

@@ -6,7 +6,6 @@ require 'digest/sha1'
 require 'net/https'
 require 'time'
 require 'date'
-require 'generator'
 
 $:.unshift(File.dirname(__FILE__))
 require 's3/extensions'
@@ -42,6 +41,7 @@ AWS::S3::S3Object.class_eval do
   include AWS::S3::BitTorrent
 end
 
+require_library_or_gem 'xmlsimple' unless defined? XmlSimple
 # XmlSimple is a very convenient way of dealing with the xml needs of this library, but unfortunately
 # it is powered by REXML which is both very slow (even for me who does not privilege performance)
 # and consumes way too much memory (beach balls a MacBookPro with 2GB of memory for 2 minutes while parsing 60KB of xml).
@@ -49,16 +49,15 @@ end
 # So, if libxml is installed, we use the FasterXmlSimple library, that provides most of the functionality of XmlSimple
 # except it uses the xml/libxml library for xml parsing. If libxml isn't installed, we just fall back on
 # XmlSimple.
-AWS::S3::Parsing.parser = 
+AWS::S3::Parsing.parser =
   begin
-    # N.B. Push, don't shift
-    $:.push(File.join(File.dirname(__FILE__), '..', '..', 'support', 'faster-xml-simple', 'lib'))
-    require_library_or_gem 'faster_xml_simple'
+    require_library_or_gem 'xml/libxml'
     # Older version of libxml aren't stable (bus error when requesting attributes that don't exist) so we
     # have to use a version greater than '0.3.8.2'.
     raise LoadError unless XML::Parser::VERSION > '0.3.8.2'
+    $:.push(File.join(File.dirname(__FILE__), '..', '..', 'support', 'faster-xml-simple', 'lib'))
+    require_library_or_gem 'faster_xml_simple' 
     FasterXmlSimple
   rescue LoadError
-    require_library_or_gem 'xmlsimple' unless defined? XmlSimple
     XmlSimple
   end

data/lib/aws/s3/parsing.rb

@@ -33,7 +33,7 @@ module AWS
             keys   = hash.keys.map {|key| key.underscore}
             values = hash.values.map {|value| typecast(value)}
             keys.inject({}) do |new_hash, key|
-              new_hash[key] = values.shift
+              new_hash[key] = values.slice!(0)
               new_hash
             end
           end
@@ -49,35 +49,23 @@ module AWS
         end
         
         def coerce
-          attempt = nil
-          break unless (attempt = coercions.next).nil? while coercions.next?
-          attempt.nil? ? self : attempt
+          case self
+          when 'true':          true
+          when 'false':         false
+          when  /^\d+$/:        Integer(self)
+          when datetime_format: Time.parse(self)
+          else
+            self
+          end
         end
         
         private
-        
-          def coercions
-            Generator.new do |self.generator|
-              try { self == 'true' }
-              try { [self == 'false', false] }
-              try { Integer(self) }
-              try { Time.parse(self) } if appears_to_be_date?
-            end
-          end
-          memoized :coercions
-        
-          def try
-            attempt, desired = yield
-            generator.yield(desired.nil? ? attempt : desired) if attempt
-          rescue ArgumentError
-            generator.yield nil
-          end
           
           # 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 appears_to_be_date?
-            self =~ /^\d{4}-\d{2}-\d{2}\w\d{2}:\d{2}:\d{2}/
+          def datetime_format
+            /^\d{4}-\d{2}-\d{2}\w\d{2}:\d{2}:\d{2}/
           end
       end
       

data/lib/aws/s3/version.rb

@@ -3,10 +3,10 @@ module AWS
     module VERSION #:nodoc:
       MAJOR    = '0'
       MINOR    = '1'
-      TINY     = '1'
-      REVISION = '$Revision: 84 $'[/\d+/]
+      TINY     = '2' 
+      BETA     =  nil # Time.now.to_i.to_s
     end
     
-    Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY || VERSION::REVISION] * '.'
+    Version = [VERSION::MAJOR, VERSION::MINOR, VERSION::TINY, VERSION::BETA].compact * '.'
   end
 end

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

@@ -56,7 +56,9 @@ class FasterXmlSimple
           hash
         end
       end
-      return nil if result.empty?
+      if result.empty?
+        return empty_element
+      end
       # Compact them to ensure it complies with the user's requests
       inline_single_element_arrays(result) 
       suppress_empty(result) if suppress_empty?
@@ -64,12 +66,22 @@ class FasterXmlSimple
       result
     end
   
+    def empty_element
+      if options['suppressempty'] == true
+        raise 'unimplemented'
+      elsif !options.has_key? 'suppressempty'
+        {}
+      else
+        options['suppressempty']
+      end
+    end
+  
     def content_key
       options['contentkey']
     end
   
     def force_array?(key_name)
-      options['forcearray'].include?(key_name)
+      Array(options['forcearray']).include?(key_name)
     end
   
     def inline_single_element_arrays(result)
@@ -112,4 +124,10 @@ class FasterXmlSimple
     def parse(string)
       XML::Parser.string(string).parse
     end
+end
+
+class XmlSimple
+  def self.xml_in(*args)
+    FasterXmlSimple.xml_in *args
+  end
 end

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

@@ -1,10 +1,9 @@
 require 'faster_xml_simple'
 require 'test/unit'
-require 'pp'
 
 class RegressionTest < Test::Unit::TestCase
   def test_content_nil_regressions
-    expected = {"asdf"=>{"jklsemicolon"=>nil}}
+    expected = {"asdf"=>{"jklsemicolon"=>{}}}
     assert_equal expected, FasterXmlSimple.xml_in("<asdf><jklsemicolon /></asdf>")
     assert_equal expected, FasterXmlSimple.xml_in("<asdf><jklsemicolon /></asdf>", 'forcearray'=>['asdf'])
   end
@@ -13,4 +12,19 @@ class RegressionTest < Test::Unit::TestCase
     str = File.read("test/fixtures/test-7.xml")
     assert_nil FasterXmlSimple.xml_in(str)["AccessControlPolicy"]["AccessControlList"]["__content__"]
   end
+  
+  def test_xml_simple_transparency
+    assert_equal XmlSimple.xml_in("<asdf />"), FasterXmlSimple.xml_in("<asdf />")
+  end
+  
+  def test_suppress_empty_variations
+    str = "<asdf><fdsa /></asdf>"
+    
+    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")
+  end
+  
+  
 end

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

@@ -10,13 +10,38 @@ class XmlSimpleComparisonTest < Test::Unit::TestCase
     xml_file_name = file_name
     method_name = File.basename(file_name, ".xml").gsub('-', '_')
     yml_file_name = file_name.gsub('xml', 'yml')
+    rails_yml_file_name = file_name.gsub('xml', 'rails.yml')
     class_eval <<-EOV, __FILE__, __LINE__
       def #{method_name}
         assert_equal YAML.load(File.read('#{yml_file_name}')), 
-              FasterXmlSimple.xml_in(File.read('#{xml_file_name}'), 'forcearray'=>['something-else', 'Grant'])
+              FasterXmlSimple.xml_in(File.read('#{xml_file_name}'), default_options )
+      end
+      
+      def #{method_name}_rails
+        assert_equal YAML.load(File.read('#{rails_yml_file_name}')), 
+              FasterXmlSimple.xml_in(File.read('#{xml_file_name}'), rails_options)
       end
     EOV
   end
   
+  def default_options
+    {
+       'keeproot'      => true, 
+       'contentkey'    => '__content__', 
+       'forcecontent'  => true, 
+       'suppressempty' => nil,
+       'forcearray'    => ['something-else']
+    }
+  end
+  
+  def rails_options
+    {
+      'forcearray'   => false,
+      'forcecontent' => true,
+      'keeproot'     => true,
+      'contentkey'   => '__content__'
+    }
+  end
+  
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: aws-s3
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-11-28 00:00:00 -06:00
+  version: 0.1.2
+date: 2006-11-30 00:00:00 -06:00
 summary: Client library for Amazon's Simple Storage Service's REST API
 require_paths: 
 - lib