s33r 0.4.1 → 0.4.2

data/html/files/lib/s33r/sync_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Tue Sep 26 11:41:33 BST 2006</td>
+      <td>Wed Jan 03 11:27:57 GMT 2007</td>
     </tr>
     </table>
   </div>

data/html/files/lib/s33r_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Mon Aug 21 15:21:33 BST 2006</td>
+      <td>Wed Jan 03 11:27:58 GMT 2007</td>
     </tr>
     </table>
   </div>

data/html/fr_class_index.html

@@ -45,6 +45,7 @@
     <a href="classes/S33r/S33rException/MissingRequiredHeaders.html">S33r::S33rException::MissingRequiredHeaders</a><br />
     <a href="classes/S33r/S33rException/MissingResource.html">S33r::S33rException::MissingResource</a><br />
     <a href="classes/S33r/S33rException/S3FallenOver.html">S33r::S33rException::S3FallenOver</a><br />
+    <a href="classes/S33r/S33rException/TryingToPutEmptyResource.html">S33r::S33rException::TryingToPutEmptyResource</a><br />
     <a href="classes/S33r/S33rException/UnsupportedCannedACL.html">S33r::S33rException::UnsupportedCannedACL</a><br />
     <a href="classes/S33r/S33rException/UnsupportedHTTPMethod.html">S33r::S33rException::UnsupportedHTTPMethod</a><br />
     <a href="classes/S33r/S3ACL.html">S33r::S3ACL</a><br />

data/html/fr_file_index.html

@@ -29,12 +29,14 @@
     <a href="files/lib/s33r/client_rb.html">lib/s33r/client.rb</a><br />
     <a href="files/lib/s33r/core_rb.html">lib/s33r/core.rb</a><br />
     <a href="files/lib/s33r/libxml_extensions_rb.html">lib/s33r/libxml_extensions.rb</a><br />
+    <a href="files/lib/s33r/libxml_loader_rb.html">lib/s33r/libxml_loader.rb</a><br />
     <a href="files/lib/s33r/logging_rb.html">lib/s33r/logging.rb</a><br />
     <a href="files/lib/s33r/mimetypes_rb.html">lib/s33r/mimetypes.rb</a><br />
     <a href="files/lib/s33r/named_bucket_rb.html">lib/s33r/named_bucket.rb</a><br />
     <a href="files/lib/s33r/s33r_exception_rb.html">lib/s33r/s33r_exception.rb</a><br />
     <a href="files/lib/s33r/s33r_http_rb.html">lib/s33r/s33r_http.rb</a><br />
     <a href="files/lib/s33r/s3_acl_rb.html">lib/s33r/s3_acl.rb</a><br />
+    <a href="files/lib/s33r/s3_obj_rb.html">lib/s33r/s3_obj.rb</a><br />
     <a href="files/lib/s33r/sync_rb.html">lib/s33r/sync.rb</a><br />
   </div>
 </div>

data/html/fr_method_index.html

@@ -22,149 +22,158 @@
   <div id="index-entries">
     <a href="classes/S33r/S3ACL/Grant.html#M000084">== (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/Grantee.html#M000074">== (S33r::S3ACL::Grantee)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000095">[] (S33r::NamedBucket)</a><br />
-    <a href="classes/MIME/Types.html#M000011">[] (MIME::Types)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000111">[] (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000155">[] (S33r::BucketListing)</a><br />
     <a href="classes/MIME/Types.html#M000015">[] (MIME::Types)</a><br />
-    <a href="classes/S33r/OrderlyXmlMarkup.html#M000148">_insert_attributes (S33r::OrderlyXmlMarkup)</a><br />
+    <a href="classes/MIME/Types.html#M000011">[] (MIME::Types)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000102">[] (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/OrderlyXmlMarkup.html#M000157">_insert_attributes (S33r::OrderlyXmlMarkup)</a><br />
     <a href="classes/MIME/Types.html#M000014">add (MIME::Types)</a><br />
     <a href="classes/MIME/Types.html#M000018">add (MIME::Types)</a><br />
-    <a href="classes/S33r/Client.html#M000142">add_client_headers (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000145">add_client_headers (S33r::Client)</a><br />
     <a href="classes/S33r.html#M000044">add_default_headers (S33r)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000067">add_grant (S33r::S3ACL::ACLDoc)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000072">add_log_target_grants (S33r::S3ACL::ACLDoc)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000070">add_public_read_grant (S33r::S3ACL::ACLDoc)</a><br />
     <a href="classes/MIME/Type.html#M000032">ascii? (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000031">binary? (MIME::Type)</a><br />
-    <a href="classes/S33r/Client.html#M000124">bucket_exists? (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000126">bucket_exists? (S33r::Client)</a><br />
     <a href="classes/S33r.html#M000048">bucket_name_valid? (S33r)</a><br />
     <a href="classes/S33r.html#M000046">canned_acl_header (S33r)</a><br />
     <a href="classes/Net/HTTPResponse.html#M000005">check_s3_availability (Net::HTTPResponse)</a><br />
     <a href="classes/MIME/Type.html#M000036">complete? (MIME::Type)</a><br />
-    <a href="classes/S33r/Client.html#M000122">create_bucket (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000124">create_bucket (S33r::Client)</a><br />
     <a href="classes/MIME/Type.html#M000020">default_encoding (MIME::Type)</a><br />
-    <a href="classes/S33r/S3Object.html#M000088">delete (S33r::S3Object)</a><br />
-    <a href="classes/S33r/Client.html#M000123">delete_bucket (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000105">delete_resource (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000141">delete_resource (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000098">destroy (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000134">disable_log_target (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000136">disable_logging (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000147">do_delete (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000143">do_get (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000144">do_head (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000145">do_post (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000146">do_put (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000117">do_request (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000113">delete (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/S3Object.html#M000096">delete (S33r::S3Object)</a><br />
+    <a href="classes/S33r/Client.html#M000125">delete_bucket (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000144">delete_resource (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000106">destroy (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000137">disable_log_target (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000139">disable_logging (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000150">do_delete (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000146">do_get (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000147">do_head (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000148">do_post (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000149">do_put (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000119">do_request (S33r::Client)</a><br />
     <a href="classes/MIME/Type.html#M000023">docs= (MIME::Type)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000100">each_item (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000133">enable_log_target (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000135">enable_logging (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000097">exists? (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000108">each_object (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000136">enable_log_target (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000138">enable_logging (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000105">exists? (S33r::NamedBucket)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000078">for_amazon_customer (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000079">for_canonical_user (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000080">for_group (S33r::S3ACL::Grant)</a><br />
     <a href="classes/MIME/Type.html#M000026">from_array (MIME::Type)</a><br />
+    <a href="classes/S33r/S3Object.html#M000089">from_file (S33r::S3Object)</a><br />
     <a href="classes/MIME/Type.html#M000027">from_hash (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000028">from_mime_type (MIME::Type)</a><br />
+    <a href="classes/S33r/S3Object.html#M000093">from_response (S33r::S3Object)</a><br />
     <a href="classes/S33r/S3ACL/CanonicalUser.html#M000062">from_xml (S33r::S3ACL::CanonicalUser)</a><br />
     <a href="classes/S33r/S3ACL/Grantee.html#M000076">from_xml (S33r::S3ACL::Grantee)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000065">from_xml (S33r::S3ACL::ACLDoc)</a><br />
+    <a href="classes/S33r/S3Object.html#M000091">from_xml_node (S33r::S3Object)</a><br />
+    <a href="classes/S33r/S3Object.html#M000090">from_xml_string (S33r::S3Object)</a><br />
     <a href="classes/S33r.html#M000042">generate_auth_header_value (S33r)</a><br />
     <a href="classes/S33r.html#M000041">generate_canonical_string (S33r)</a><br />
     <a href="classes/S33r.html#M000049">generate_querystring (S33r)</a><br />
     <a href="classes/S33r.html#M000043">generate_signature (S33r)</a><br />
-    <a href="classes/S33r/Client.html#M000128">get_acl (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000114">get_client (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000137">get_logging (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000127">get_object (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000118">get_requester (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000125">get_resource (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000131">get_acl (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000116">get_client (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000140">get_logging (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000127">get_named_bucket (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000130">get_object (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000103">get_raw (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000120">get_requester (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000128">get_resource (S33r::Client)</a><br />
     <a href="classes/XML.html#M000002">get_xml_doc (XML)</a><br />
     <a href="classes/S33r.html#M000047">guess_mime_type (S33r)</a><br />
-    <a href="classes/S33r/Client.html#M000115">init (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000091">init (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000101">key_exists? (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000099">keys (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000098">init (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000117">init (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000109">key_exists? (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000107">keys (S33r::NamedBucket)</a><br />
     <a href="classes/S33r.html#M000056">keys_to_symbols (S33r)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000110">last_key (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000154">last_key (S33r::BucketListing)</a><br />
     <a href="classes/MIME/Type.html#M000019">like? (MIME::Type)</a><br />
-    <a href="classes/S33r/Client.html#M000120">list (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000121">list_bucket (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000119">list_buckets (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000096">listing (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000116">load_config (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000122">list (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000123">list_bucket (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000121">list_buckets (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000104">listing (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/S3Object.html#M000095">load (S33r::S3Object)</a><br />
+    <a href="classes/S33r/Client.html#M000118">load_config (S33r::Client)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000082">log_target_grants (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000071">log_targetable? (S33r::S3ACL::ACLDoc)</a><br />
-    <a href="classes/S33r/Client.html#M000132">make_private (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000131">make_public (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000135">make_private (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000134">make_public (S33r::Client)</a><br />
     <a href="classes/S33r/Sync.html#M000059">md5sum (S33r::Sync)</a><br />
     <a href="classes/S33r.html#M000045">metadata_headers (S33r)</a><br />
     <a href="classes/S33r/S3ACL/Grantee.html#M000075">method_missing (S33r::S3ACL::Grantee)</a><br />
-    <a href="classes/S33r/S3ACL/AmazonCustomer.html#M000063">new (S33r::S3ACL::AmazonCustomer)</a><br />
-    <a href="classes/S33r/Client.html#M000113">new (S33r::Client)</a><br />
-    <a href="classes/MIME/Type.html#M000029">new (MIME::Type)</a><br />
-    <a href="classes/S33r/LoggingResource.html#M000085">new (S33r::LoggingResource)</a><br />
     <a href="classes/S33r/S3ACL/Group.html#M000060">new (S33r::S3ACL::Group)</a><br />
-    <a href="classes/S33r/S3Object.html#M000087">new (S33r::S3Object)</a><br />
-    <a href="classes/S33r/S3ACL/CanonicalUser.html#M000061">new (S33r::S3ACL::CanonicalUser)</a><br />
-    <a href="classes/MIME/Types.html#M000010">new (MIME::Types)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000064">new (S33r::S3ACL::ACLDoc)</a><br />
+    <a href="classes/S33r/S3ACL/CanonicalUser.html#M000061">new (S33r::S3ACL::CanonicalUser)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000077">new (S33r::S3ACL::Grant)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000107">new (S33r::BucketListing)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000092">new (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000151">new (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/S3Object.html#M000087">new (S33r::S3Object)</a><br />
+    <a href="classes/MIME/Types.html#M000010">new (MIME::Types)</a><br />
+    <a href="classes/MIME/Type.html#M000029">new (MIME::Type)</a><br />
+    <a href="classes/S33r/LoggingResource.html#M000085">new (S33r::LoggingResource)</a><br />
+    <a href="classes/S33r/Client.html#M000115">new (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000099">new (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/S3ACL/AmazonCustomer.html#M000063">new (S33r::S3ACL::AmazonCustomer)</a><br />
     <a href="classes/Net/HTTPResponse.html#M000008">not_found (Net::HTTPResponse)</a><br />
     <a href="classes/MIME/Type.html#M000022">obsolete? (MIME::Type)</a><br />
     <a href="classes/MIME/Types.html#M000013">of (MIME::Types)</a><br />
     <a href="classes/MIME/Types.html#M000017">of (MIME::Types)</a><br />
     <a href="classes/Net/HTTPResponse.html#M000006">ok? (Net::HTTPResponse)</a><br />
     <a href="classes/S33r.html#M000057">parse_expiry (S33r)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000109">parse_listing (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000153">parse_listing (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/S3Object.html#M000094">parse_response (S33r::S3Object)</a><br />
+    <a href="classes/S33r/S3Object.html#M000092">parse_xml_node (S33r::S3Object)</a><br />
     <a href="classes/MIME/Type.html#M000035">platform? (MIME::Type)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000112">pretty (S33r::BucketListing)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000093">public_contents? (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000156">pretty (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000100">public_contents? (S33r::NamedBucket)</a><br />
     <a href="classes/S33r/S3ACL/Grant.html#M000081">public_read_grant (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000069">public_readable? (S33r::S3ACL::ACLDoc)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000103">put_file (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000140">put_file (S33r::Client)</a><br />
-    <a href="classes/S33r/Client.html#M000138">put_resource (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000104">put_stream (S33r::NamedBucket)</a><br />
-    <a href="classes/S33r/Client.html#M000139">put_text (S33r::Client)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000102">put_text (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000143">put_file (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000111">put_file (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000141">put_resource (S33r::Client)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000112">put_stream (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000110">put_text (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/Client.html#M000142">put_text (S33r::Client)</a><br />
     <a href="classes/MIME/Type.html#M000030">registered? (MIME::Type)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000068">remove_grant (S33r::S3ACL::ACLDoc)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000073">remove_log_target_grants (S33r::S3ACL::ACLDoc)</a><br />
     <a href="classes/S33r.html#M000058">remove_namespace (S33r)</a><br />
-    <a href="classes/S33r/Client.html#M000126">resource_exists? (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000129">resource_exists? (S33r::Client)</a><br />
     <a href="classes/S33r.html#M000050">s3_acl_path (S33r)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000106">s3_authenticated_url (S33r::NamedBucket)</a><br />
     <a href="classes/S33r.html#M000055">s3_authenticated_url (S33r)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000114">s3_authenticated_url (S33r::NamedBucket)</a><br />
     <a href="classes/S33r.html#M000051">s3_logging_path (S33r)</a><br />
     <a href="classes/S33r.html#M000054">s3_path (S33r)</a><br />
     <a href="classes/S33r.html#M000053">s3_public_url (S33r)</a><br />
     <a href="classes/S33r.html#M000052">s3_url (S33r)</a><br />
+    <a href="classes/S33r/S3Object.html#M000097">save (S33r::S3Object)</a><br />
     <a href="classes/Net/HTTPGenericRequest.html#M000004">send_request_with_body_stream (Net::HTTPGenericRequest)</a><br />
-    <a href="classes/S33r/Client.html#M000129">set_acl (S33r::Client)</a><br />
-    <a href="classes/S33r/S3Object.html#M000090">set_from_node (S33r::S3Object)</a><br />
-    <a href="classes/S33r/S3Object.html#M000089">set_from_xml_string (S33r::S3Object)</a><br />
-    <a href="classes/S33r/BucketListing.html#M000108">set_listing_xml (S33r::BucketListing)</a><br />
-    <a href="classes/S33r/Client.html#M000130">set_logging (S33r::Client)</a><br />
+    <a href="classes/S33r/Client.html#M000132">set_acl (S33r::Client)</a><br />
+    <a href="classes/S33r/BucketListing.html#M000152">set_listing_xml (S33r::BucketListing)</a><br />
+    <a href="classes/S33r/Client.html#M000133">set_logging (S33r::Client)</a><br />
+    <a href="classes/S33r/S3Object.html#M000088">set_properties (S33r::S3Object)</a><br />
     <a href="classes/MIME/Type.html#M000033">signature? (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000025">simplified (MIME::Type)</a><br />
-    <a href="classes/S33r/NamedBucket.html#M000094">strict? (S33r::NamedBucket)</a><br />
+    <a href="classes/S33r/NamedBucket.html#M000101">strict? (S33r::NamedBucket)</a><br />
     <a href="classes/Net/HTTPResponse.html#M000007">success (Net::HTTPResponse)</a><br />
     <a href="classes/MIME/Type.html#M000034">system? (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000039">to_a (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000040">to_hash (MIME::Type)</a><br />
+    <a href="classes/MIME/Type.html#M000037">to_s (MIME::Type)</a><br />
     <a href="classes/Net/HTTPResponse.html#M000009">to_s (Net::HTTPResponse)</a><br />
     <a href="classes/Net/HTTPGenericRequest.html#M000003">to_s (Net::HTTPGenericRequest)</a><br />
-    <a href="classes/MIME/Type.html#M000037">to_s (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000038">to_str (MIME::Type)</a><br />
-    <a href="classes/S33r/S3ACL/Grant.html#M000083">to_xml (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/LoggingResource.html#M000086">to_xml (S33r::LoggingResource)</a><br />
+    <a href="classes/S33r/S3ACL/Grant.html#M000083">to_xml (S33r::S3ACL::Grant)</a><br />
     <a href="classes/S33r/S3ACL/ACLDoc.html#M000066">to_xml (S33r::S3ACL::ACLDoc)</a><br />
-    <a href="classes/MIME/Types.html#M000012">type_for (MIME::Types)</a><br />
     <a href="classes/MIME/Types.html#M000016">type_for (MIME::Types)</a><br />
+    <a href="classes/MIME/Types.html#M000012">type_for (MIME::Types)</a><br />
     <a href="classes/MIME/Type.html#M000024">urls (MIME::Type)</a><br />
     <a href="classes/MIME/Type.html#M000021">use_instead (MIME::Type)</a><br />
     <a href="classes/XML.html#M000001">xget (XML)</a><br />

data/lib/s33r/bucket_listing.rb

@@ -1,6 +1,6 @@
-require 'date'
-require 'xml/libxml'
-require File.join(File.dirname(__FILE__), 's3_acl')
+base = File.dirname(__FILE__)
+require File.join(base, 'libxml_loader')
+require File.join(base, 's3_acl')
 
 module S33r
   # Object representation of the content of a bucket.
@@ -15,6 +15,9 @@ module S33r
     attr_accessor :named_bucket
     # The last key listed in this BucketListing.
     attr_reader :last_key
+    # Set to true to show raw parsing errors, instead of the catch all error message 
+    # (useful for debugging).
+    attr_accessor :raw
 
     # Create a new object representing a ListBucketResult.
     # 
@@ -24,28 +27,44 @@ module S33r
     # +named_bucket+ can be set to an existing NamedBucket instance, so that any objects
     # inside this listing can be associated with that instance. This enables objects to be easily deleted
     # without having to create a new Client instance.
-    def initialize(bucket_listing_xml, named_bucket=nil)
+    # 
+    # If +raw+ is set to true, you get ugly parser errors.
+    def initialize(bucket_listing_xml, named_bucket=nil, raw=false)
       @contents = {}
       @common_prefixes = {}
       # the NamedBucket instance associated with this listing (if any)
       @named_bucket = named_bucket
+      @raw = raw
       set_listing_xml(bucket_listing_xml)
     end
 
     # Convert a ListBucketResult XML document into an object representation.
     def set_listing_xml(bucket_listing_xml)
-      begin
+      # proc to remove the namespace and parse the listing
+      work = lambda do |bucket_listing_xml|
         # remove the namespace declaration: libxml doesn't like it
         bucket_listing_xml = S33r.remove_namespace(bucket_listing_xml)
         parse_listing(bucket_listing_xml)
-      rescue
-        message = "Cannot create bucket listing from supplied XML"
-        message += " (was nil)" if bucket_listing_xml.nil?
-        raise S33rException::InvalidBucketListing, message
+      end
+      
+      if @raw
+        work.call(bucket_listing_xml)
+      else
+        begin
+          work.call(bucket_listing_xml)
+        rescue
+          message = "Cannot create bucket listing from supplied XML"
+          message += " (was nil)" if bucket_listing_xml.nil?
+          raise S33rException::InvalidBucketListing, message
+        end
       end
     end
 
     # Parse raw XML ListBucketResponse from S3 into object instances.
+    # The S3Objects are skeletons, and are not automatically populated 
+    # from S3 (their @value attributes are nil). To load the data into 
+    # an object, grab it from the listing and call its load method to 
+    # pull the data down from S3.
     def parse_listing(bucket_listing_xml)
       doc = XML.get_xml_doc(bucket_listing_xml)
 
@@ -64,7 +83,7 @@ module S33r
 
       # contents
       doc.find('//Contents').to_a.each do |node|
-        obj = S3Object.new(node)
+        obj = S3Object.from_xml_node(node)
         # Add to the content listing for the bucket
         @contents[obj.key] = obj
       end
@@ -102,48 +121,4 @@ module S33r
       end
 
   end
-
-  # Representation of an object stored in a bucket.
-  class S3Object
-    attr_reader :named_bucket, :key, :last_modified, :etag, :size, :owner, :storage_class
-    attr_writer :named_bucket
-    
-    # Create from a node.
-    def initialize(node=nil, named_bucket=nil)
-      @named_bucket = named_bucket
-      self.set_from_node(node) unless node.nil?
-    end
-    
-    # Remove this object from associated NamedBucket.
-    def delete
-      @named_bucket.delete_key(@key) unless @named_bucket.nil?
-    end
-
-    # Set properties of the object from an XML string.
-    # 
-    # +xml_str+ should be a string representing a full XML document,
-    # containing a <Contents> element as its root element.
-    def set_from_xml_string(xml_str)
-      set_from_node(XML.get_xml_doc(xml_str))
-    end
-
-    # Set properties of the object from an XML document.
-    # 
-    # +doc+: XML::Document instance to parse to get properties for this object.
-    def set_from_node(doc)
-      @key = doc.xget('Key')
-      @last_modified = DateTime.parse(doc.xget('LastModified'))
-      @etag = doc.xget('ETag').gsub("\"", "")
-      @size = doc.xget('Size').to_i
-      
-      # Build representation of the owner.
-      user_xml_doc = doc.find('Owner').to_a.first
-      @owner = S3ACL::CanonicalUser.from_xml(user_xml_doc)
-      
-      # TODO: if setting from a full object listing (GET on a resource key),
-      # do additional field setting here (e.g. x-amz-meta- headers)
-      # and assign the response body to some data field; detect whether
-      # these fields exist before attempting to set properties
-    end
-  end
-end
+end

data/lib/s33r/client.rb

@@ -2,8 +2,9 @@ require 'net/https'
 require 'cgi'
 require 'erb'
 require 'yaml'
-require File.join(File.dirname(__FILE__), 's3_acl')
-require File.join(File.dirname(__FILE__), 's33r_exception')
+base = File.dirname(__FILE__)
+require File.join(base, 's3_acl')
+require File.join(base, 's33r_exception')
 
 module S33r
   include Net
@@ -36,6 +37,10 @@ module S33r
     
     # Default log bucket location.
     attr_accessor :log_bucket
+    
+    # The options used to create the client (useful when spawning
+    # NamedBucket instances from Client instances).
+    attr_reader :options
 
     # Configure either an SSL-enabled or plain HTTP client.
     # (If using SSL, no verification of server certificate is performed.)
@@ -46,6 +51,7 @@ module S33r
     def initialize(aws_access_key, aws_secret_access_key, options={})
       @use_ssl = true
       @use_ssl = false if (false == options[:use_ssl])
+      options[:use_ssl] = @use_ssl
       
       @dump_requests = (true == options[:dump_requests])
 
@@ -60,6 +66,9 @@ module S33r
 
       # headers sent with every request made by this client
       @client_headers = {}
+      
+      # keep a record of the options used to create this instance
+      @options = options
     end
     
     # Get an HTTP client instance.
@@ -95,9 +104,9 @@ module S33r
     # Note that the loader also runs the config. file through ERB, so you can
     # add dynamic blocks of ERB (Ruby) code into your files.
     # 
-    # The +options+ section contains settings specific to Client and NamedClient instances; +custom+ 
-    # contains extra settings specific to your application.
-    # +options+ and +custom+ sections can be omitted, but settings for AWS keys are required.
+    # The +options+ section contains other settings, either specific to the Client or 
+    # NamedBucket classes, or general application settings.
+    # The +options+ section can be omitted, but settings for AWS keys are required.
     # 
     # Returns an array <tt>[aws_access_key, aws_secret_access_key, options]</tt>, where +options+
     # is a hash.
@@ -160,7 +169,8 @@ module S33r
       client.start do
         response = client.request(req, data)
         
-        # Check the response to see whether S3 is down.
+        # Check the response to see whether S3 is down;
+        # raises an S3FallenOver error if S3 returns a 500-503 response code
         response.check_s3_availability
         
         response
@@ -175,7 +185,9 @@ module S33r
 
     # List all buckets.
     # 
-    # Returns an Array of NamedBucket instances.
+    # Returns an array of NamedBucket instances; array will be empty if
+    # the BucketListing parse fails for any reason (i.e. no <Bucket> elements
+    # occur in it).
     def list_buckets
       bucket_list_xml = do_get('/').body
       doc = XML.get_xml_doc(S33r.remove_namespace(bucket_list_xml))
@@ -184,8 +196,12 @@ module S33r
       
       doc.find("//Bucket").to_a.each do |node|
         bucket_name = node.xget('Name')
-        named_buckets << NamedBucket.new(@aws_access_key, @aws_secret_access_key, 
-        {:default_bucket => bucket_name, :dump_request => self.dump_requests})
+        if bucket_name
+          # The NamedBucket instances inherit the request dumping behaviour
+          # of this client.
+          named_buckets << NamedBucket.new(@aws_access_key, @aws_secret_access_key, 
+          {:default_bucket => bucket_name, :dump_request => self.dump_requests})
+        end
       end
       
       named_buckets
@@ -226,7 +242,7 @@ module S33r
         raise S33rException::BucketListingMaxKeysError, "max_keys option to list bucket cannot be > #{BUCKET_LIST_MAX_MAX_KEYS}" \
         if max_keys > BUCKET_LIST_MAX_MAX_KEYS
 
-        # convert max_keys parameter to :max-keys parameter
+        # convert :max_keys querystring parameter to 'max-keys' parameter
         query_params['max-keys'] = query_params.delete(:max_keys)
       end
       
@@ -261,36 +277,51 @@ module S33r
     end
 
     # Check whether a bucket exists or not.
-    # 
-    # Returns true if bucket exists.
     def bucket_exists?(bucket_name)
       resource_exists?(bucket_name)
     end
     
+    # Create a NamedBucket instance.
+    # 
+    # +options+ is a hash of extra options to use when creating
+    # the NamedBucket instance (see NamedBucket.initialize);
+    # specify :parent to use the same options used to create this Client
+    # instance.
+    def get_named_bucket(bucket_name, options={}, &block)
+      options = @options if :parent == options
+      options[:default_bucket] = bucket_name
+      named_bucket = NamedBucket.new(@aws_access_key, @aws_secret_access_key, options)
+      yield named_bucket if block_given?
+      named_bucket
+    end
+    
     # Fetch a resource.
+    #
+    # Returns a plain response, not an S3Object: if you want an object back,
+    # use get_object instead.
     def get_resource(bucket_name, resource_key, headers={})
       do_get("/#{bucket_name}/#{resource_key}", headers)
     end
     
     # Check whether a bucket contains a key.
     # 
-    # Returns true if resource_key exists inside bucket_name exists.
+    # Returns true if resource_key exists inside bucket_name.
     def resource_exists?(bucket_name, resource_key=nil)
       path = "/#{bucket_name}"
       path += "/#{resource_key}" unless resource_key.nil?
       do_head(path).ok?
     end
     
-    # Fetch an object.
-    # 
-    # TODO: return S3Object
-    def get_object(bucket_name, resource_key, headers)
+    # Fetch an object. Note that this actually pulls down the 
+    # object from S3 and instantiates the S3Object instance with it.
+    def get_object(bucket_name, resource_key, headers={})
       response = get_resource(bucket_name, resource_key, headers)
+      S3Object.from_response(resource_key, response)
     end
     
     # Fetch the ACL document for a resource.
     # 
-    # Returns nil if there is a problem with the resource
+    # Raises an exception if there is a problem with the resource
     # (e.g. it doesn't exist).
     def get_acl(bucket_name, resource_key='')
       path = s3_acl_path(bucket_name, resource_key)
@@ -302,7 +333,7 @@ module S33r
       end
     end
     
-    # Put the ACL document for a resource.
+    # Put the ACL document back to a resource.
     # 
     # +acl_doc+ is an S33r::S3ACL::ACLDoc instance.
     # 
@@ -338,7 +369,7 @@ module S33r
       end
     end
     
-    # TODO
+    #-- TODO
     def make_private
     end
     
@@ -369,7 +400,7 @@ module S33r
       !acl.log_targetable?
     end
     
-    # Enable logging for a resource (bucket or key).
+    # Enable logging for a resource (only buckets are supported presently).
     # 
     # +log_prefix+ is the prefix for the logs.
     # +bucket_name+ is the bucket to log.
@@ -380,8 +411,10 @@ module S33r
     #   (NB this is not currently supported by S3).
     #   +:log_prefix => 'prefix'+ is the (optional) log file prefix
     #   (defaults to bucket_name + '-')
-    # 
+    #
+    #-- TODO: tests
     def enable_logging(bucket_name, log_bucket=nil, options={})
+      # Set to the default log_bucket if not set explicitly.
       log_bucket ||= @log_bucket
     
       resource_key = options[:for_key]
@@ -398,17 +431,24 @@ module S33r
       set_logging(logging_resource, bucket_name, resource_key)
     end
     
-    # TODO
+    # Turn off logging of a resource.
+    #-- TODO
     def disable_logging
     end
     
-    # TODO
+    # Get the logging status of a resource.
+    #-- TODO
     def get_logging
     end
 
     # Put some generic resource onto S3.
+    # 
+    # To stream with this method, +data+ should respond to the +stat+ 
+    # method; examples of data types which respond to this include File instances.
     def put_resource(bucket_name, resource_key, data, headers={})
-      do_put("/#{bucket_name}/" + "#{CGI::escape(resource_key)}", data, headers)
+      raise S33r::S33rException::TryingToPutEmptyResource, "No data to put for key '#{resource_key}'" unless data
+      resp = do_put("/#{bucket_name}/" + "#{CGI::escape(resource_key)}", data, headers)
+      resp.ok?
     end
 
     # Put a string onto S3.
@@ -447,13 +487,15 @@ module S33r
         # (MIME::Types returns an array of possible MIME types)
         mime_type = MIME::Types[headers[:content_type]][0]
       else
+        # we're not going to use this much, just for parsing the content type etc.
         mime_type = guess_mime_type(filename)
       end
       content_type = mime_type.simplified
       headers['Content-Type'] = content_type
       headers['Content-Transfer-Encoding'] = 'binary' if mime_type.binary?
 
-      # the data we want to put (handle to file, so we can stream from it)
+      # Open the file, and pass the handle to the HTTP client so content
+      # can be streamed.
       File.open(filename) do |data|
         # send the put request
         put_resource(bucket_name, resource_key, data, headers)
@@ -462,7 +504,7 @@ module S33r
     
     # Delete a resource from S3.
     # 
-    # Note that S3 returns the same response code () regardless
+    # Note that S3 returns the same response code regardless
     # of whether the resource was successfully deleted, or didn't exist
     # in the first place.
     def delete_resource(bucket_name, resource_key, headers={})
@@ -500,4 +542,4 @@ module S33r
     end
 
   end
-end
+end