s33r 0.3.1 → 0.4

data/examples/fores33r/public/robots.txt

@@ -0,0 +1 @@
+# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file

data/examples/fores33r/public/stylesheets/core.css

@@ -0,0 +1,37 @@
+* {
+  font-family: "Trebuchet MS", "Lucida Grande", "Verdana", arial, helvetica, sans-serif;
+}
+#left_pane {
+  float: left;
+  width: 20%;
+  background-color: #EEEEEE;
+  font-size: 1em;
+}
+#left_pane p {
+  padding-left: 1em;
+}
+#main_pane {
+  float: right;
+  width: 78%;
+  padding-left: 2%;
+}
+#main_pane h2 {
+  margin-top: 0em;
+}
+#flash {
+  color: green;
+}
+.bucket_name {
+  color: blue;
+}
+form {
+  border: 1px #808080 dotted;
+  padding: 5px;
+  font-size: 80%;
+}
+.menu_link {
+  font-size: 90%;
+}
+a {
+  text-decoration: none;
+}

data/examples/fores33r/script/about

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/about'

data/examples/fores33r/script/breakpointer

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/breakpointer'

data/examples/fores33r/script/console

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/console'

data/examples/fores33r/script/destroy

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/destroy'

data/examples/fores33r/script/generate

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/generate'

data/examples/fores33r/script/performance/benchmarker

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/benchmarker'

data/examples/fores33r/script/performance/profiler

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/profiler'

data/examples/fores33r/script/plugin

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/plugin'

data/examples/fores33r/script/process/reaper

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/reaper'

data/examples/fores33r/script/process/spawner

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/spawner'

data/examples/fores33r/script/runner

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/runner'

data/examples/fores33r/script/server

@@ -0,0 +1,3 @@
+#!/opt/lampp/bin/ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/server'

data/examples/fores33r/test/test_helper.rb

@@ -0,0 +1,28 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require 'test_help'
+
+class Test::Unit::TestCase
+  # Transactional fixtures accelerate your tests by wrapping each test method
+  # in a transaction that's rolled back on completion.  This ensures that the
+  # test database remains unchanged so your fixtures don't have to be reloaded
+  # between every test method.  Fewer database queries means faster tests.
+  #
+  # Read Mike Clark's excellent walkthrough at
+  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
+  #
+  # Every Active Record database supports transactions except MyISAM tables
+  # in MySQL.  Turn off transactional fixtures in this case; however, if you
+  # don't care one way or the other, switching from MyISAM to InnoDB tables
+  # is recommended.
+  self.use_transactional_fixtures = true
+
+  # Instantiated fixtures are slow, but give you @david where otherwise you
+  # would need people(:david).  If you don't want to migrate your existing
+  # test cases which use the @david style and don't mind the speed hit (each
+  # instantiated fixtures translates to a database query per test method),
+  # then set this back to true.
+  self.use_instantiated_fixtures  = false
+
+  # Add more helper methods to be used by all tests here...
+end

data/examples/s3.yaml

@@ -0,0 +1,11 @@
+# note you can use ERB code in this file
+aws_access_key: 'yourkey'
+aws_secret_access_key: 'yoursecretkey'
+options:
+  default_expires: '12th November 2033'
+  use_ssl: true
+  dump_requests: false
+  default_prefix: 'someprefix'
+  default_bucket: 'somebucket'
+  from_email: 'elliot@example.com'
+  to_email: 'elliot@example.com'

data/html/classes/Net/HTTPGenericRequest.html

@@ -157,18 +157,18 @@ to <a href="../S33r/Client.html">S33r::Client</a> constructor.
             onclick="toggleCode('M000003-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000003-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 46</span>
-46:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
-47:     <span class="ruby-identifier">str</span> = <span class="ruby-value str">&quot;*******\n&quot;</span> <span class="ruby-operator">+</span>
-48:     <span class="ruby-node">&quot;#{self.class::METHOD} #{@path} HTTP/1.1\n&quot;</span> <span class="ruby-operator">+</span>
-49:     <span class="ruby-node">&quot;Host: #{S33r::HOST}\n&quot;</span>
-50: 
-51:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">each_capitalized</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
-52:       <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;#{key}: #{value}\n&quot;</span>
-53:     <span class="ruby-keyword kw">end</span>
-54:     <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">&quot;*******\n\n&quot;</span>
-55:     <span class="ruby-identifier">str</span>
-56:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 47</span>
+47:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+48:     <span class="ruby-identifier">str</span> = <span class="ruby-value str">&quot;*******\n&quot;</span> <span class="ruby-operator">+</span>
+49:     <span class="ruby-node">&quot;#{self.class::METHOD} #{@path} HTTP/1.1\n&quot;</span> <span class="ruby-operator">+</span>
+50:     <span class="ruby-node">&quot;Host: #{S33r::HOST}\n&quot;</span>
+51: 
+52:     <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">each_capitalized</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
+53:       <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-node">&quot;#{key}: #{value}\n&quot;</span>
+54:     <span class="ruby-keyword kw">end</span>
+55:     <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">&quot;*******\n\n&quot;</span>
+56:     <span class="ruby-identifier">str</span>
+57:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -193,26 +193,26 @@ Minor alterations to original source to enable variable chunk sizes.
             onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000004-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 60</span>
-60:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_request_with_body_stream</span>(<span class="ruby-identifier">sock</span>, <span class="ruby-identifier">ver</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">f</span>) <span class="ruby-comment cmt"># :doc:</span>
-61:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Content-Length not given and Transfer-Encoding is not `chunked'&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">content_length</span>() <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">chunked?</span>
-62:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">content_type</span>()
-63:       <span class="ruby-identifier">warn</span> <span class="ruby-value str">'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">$VERBOSE</span>
-64:       <span class="ruby-identifier">set_content_type</span> <span class="ruby-value str">'application/x-www-form-urlencoded'</span>
-65:     <span class="ruby-keyword kw">end</span>
-66:     <span class="ruby-ivar">@chunk_size</span> <span class="ruby-operator">||=</span> <span class="ruby-value">1024</span>
-67:     <span class="ruby-identifier">write_header</span> <span class="ruby-identifier">sock</span>, <span class="ruby-identifier">ver</span>, <span class="ruby-identifier">path</span>
-68:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">chunked?</span>
-69:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">s</span> = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>(<span class="ruby-ivar">@chunk_size</span>)
-70:         <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span>(<span class="ruby-identifier">sprintf</span>(<span class="ruby-value str">&quot;%x\r\n&quot;</span>, <span class="ruby-identifier">s</span>.<span class="ruby-identifier">length</span>) <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">s</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot;\r\n&quot;</span>)
-71:       <span class="ruby-keyword kw">end</span>
-72:       <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span> <span class="ruby-value str">&quot;0\r\n\r\n&quot;</span>
-73:     <span class="ruby-keyword kw">else</span>
-74:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">s</span> = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>(<span class="ruby-ivar">@chunk_size</span>)
-75:         <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span> <span class="ruby-identifier">s</span>
-76:       <span class="ruby-keyword kw">end</span>
-77:     <span class="ruby-keyword kw">end</span>
-78:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 61</span>
+61:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">send_request_with_body_stream</span>(<span class="ruby-identifier">sock</span>, <span class="ruby-identifier">ver</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">f</span>) <span class="ruby-comment cmt"># :doc:</span>
+62:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-value str">&quot;Content-Length not given and Transfer-Encoding is not `chunked'&quot;</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">content_length</span>() <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">chunked?</span>
+63:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">content_type</span>()
+64:       <span class="ruby-identifier">warn</span> <span class="ruby-value str">'net/http: warning: Content-Type did not set; using application/x-www-form-urlencoded'</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">$VERBOSE</span>
+65:       <span class="ruby-identifier">set_content_type</span> <span class="ruby-value str">'application/x-www-form-urlencoded'</span>
+66:     <span class="ruby-keyword kw">end</span>
+67:     <span class="ruby-ivar">@chunk_size</span> <span class="ruby-operator">||=</span> <span class="ruby-value">1024</span>
+68:     <span class="ruby-identifier">write_header</span> <span class="ruby-identifier">sock</span>, <span class="ruby-identifier">ver</span>, <span class="ruby-identifier">path</span>
+69:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">chunked?</span>
+70:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">s</span> = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>(<span class="ruby-ivar">@chunk_size</span>)
+71:         <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span>(<span class="ruby-identifier">sprintf</span>(<span class="ruby-value str">&quot;%x\r\n&quot;</span>, <span class="ruby-identifier">s</span>.<span class="ruby-identifier">length</span>) <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">s</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">&quot;\r\n&quot;</span>)
+72:       <span class="ruby-keyword kw">end</span>
+73:       <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span> <span class="ruby-value str">&quot;0\r\n\r\n&quot;</span>
+74:     <span class="ruby-keyword kw">else</span>
+75:       <span class="ruby-keyword kw">while</span> <span class="ruby-identifier">s</span> = <span class="ruby-identifier">f</span>.<span class="ruby-identifier">read</span>(<span class="ruby-ivar">@chunk_size</span>)
+76:         <span class="ruby-identifier">sock</span>.<span class="ruby-identifier">write</span> <span class="ruby-identifier">s</span>
+77:       <span class="ruby-keyword kw">end</span>
+78:     <span class="ruby-keyword kw">end</span>
+79:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/html/classes/Net/HTTPResponse.html

@@ -152,9 +152,10 @@ Adds some convenience functions for checking response status.
 <pre>
     <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 11</span>
 11:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">check_s3_availability</span>
-12:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">S3FallenOver</span>, <span class="ruby-node">&quot;S3 has fallen over! (got a #{code} code in response)&quot;</span> \
-13:     <span class="ruby-keyword kw">if</span> (<span class="ruby-value">500</span><span class="ruby-operator">..</span><span class="ruby-value">503</span>).<span class="ruby-identifier">include?</span> <span class="ruby-identifier">code</span>.<span class="ruby-identifier">to_i</span>
-14:   <span class="ruby-keyword kw">end</span>
+12:     <span class="ruby-keyword kw">if</span> (<span class="ruby-value">500</span><span class="ruby-operator">..</span><span class="ruby-value">503</span>).<span class="ruby-identifier">include?</span> <span class="ruby-identifier">code</span>.<span class="ruby-identifier">to_i</span>
+13:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">S3FallenOver</span>, <span class="ruby-node">&quot;S3 has fallen over! (got a #{code} code in response)&quot;</span>
+14:     <span class="ruby-keyword kw">end</span>
+15:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -174,10 +175,10 @@ Adds some convenience functions for checking response status.
             onclick="toggleCode('M000008-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000008-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 24</span>
-24:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">not_found</span>
-25:     <span class="ruby-identifier">code</span> = <span class="ruby-value str">'404'</span>
-26:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 25</span>
+25:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">not_found</span>
+26:     <span class="ruby-identifier">code</span> = <span class="ruby-value str">'404'</span>
+27:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -197,10 +198,10 @@ Adds some convenience functions for checking response status.
             onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000006-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 16</span>
-16:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ok?</span>
-17:     <span class="ruby-identifier">success</span>
-18:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 17</span>
+17:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">ok?</span>
+18:     <span class="ruby-identifier">success</span>
+19:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -220,10 +221,10 @@ Adds some convenience functions for checking response status.
             onclick="toggleCode('M000007-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000007-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 20</span>
-20:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">success</span>
-21:     <span class="ruby-identifier">code</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'200'</span>
-22:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 21</span>
+21:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">success</span>
+22:     <span class="ruby-identifier">code</span> <span class="ruby-operator">==</span> <span class="ruby-value str">'200'</span>
+23:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -243,10 +244,10 @@ Adds some convenience functions for checking response status.
             onclick="toggleCode('M000009-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000009-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 28</span>
-28:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
-29:     <span class="ruby-identifier">body</span>
-30:   <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/s33r/s33r_http.rb, line 29</span>
+29:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">to_s</span>
+30:     <span class="ruby-identifier">body</span>
+31:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>

data/html/classes/S33r.html

@@ -62,10 +62,18 @@
                 <a href="../files/lib/s33r/client_rb.html">
                 lib/s33r/client.rb
                 </a>
+        <br />
+                <a href="../files/lib/s33r/builder_rb.html">
+                lib/s33r/builder.rb
+                </a>
         <br />
                 <a href="../files/lib/s33r/bucket_listing_rb.html">
                 lib/s33r/bucket_listing.rb
                 </a>
+        <br />
+                <a href="../files/lib/s33r/s3_acl_rb.html">
+                lib/s33r/s3_acl.rb
+                </a>
         <br />
                 <a href="../files/lib/s33r/core_rb.html">
                 lib/s33r/core.rb
@@ -78,6 +86,10 @@
                 <a href="../files/lib/s33r/s33r_exception_rb.html">
                 lib/s33r/s33r_exception.rb
                 </a>
+        <br />
+                <a href="../files/lib/s33r/logging_rb.html">
+                lib/s33r/logging.rb
+                </a>
         <br />
             </td>
         </tr>
@@ -130,11 +142,16 @@ their license:
       <a href="#M000049">generate_querystring</a>&nbsp;&nbsp;
       <a href="#M000043">generate_signature</a>&nbsp;&nbsp;
       <a href="#M000047">guess_mime_type</a>&nbsp;&nbsp;
-      <a href="#M000053">keys_to_symbols</a>&nbsp;&nbsp;
+      <a href="#M000056">keys_to_symbols</a>&nbsp;&nbsp;
       <a href="#M000045">metadata_headers</a>&nbsp;&nbsp;
-      <a href="#M000052">s3_authenticated_url</a>&nbsp;&nbsp;
-      <a href="#M000051">s3_public_url</a>&nbsp;&nbsp;
-      <a href="#M000050">url_join</a>&nbsp;&nbsp;
+      <a href="#M000057">parse_expiry</a>&nbsp;&nbsp;
+      <a href="#M000058">remove_namespace</a>&nbsp;&nbsp;
+      <a href="#M000050">s3_acl_path</a>&nbsp;&nbsp;
+      <a href="#M000055">s3_authenticated_url</a>&nbsp;&nbsp;
+      <a href="#M000051">s3_logging_path</a>&nbsp;&nbsp;
+      <a href="#M000054">s3_path</a>&nbsp;&nbsp;
+      <a href="#M000053">s3_public_url</a>&nbsp;&nbsp;
+      <a href="#M000052">s3_url</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -156,12 +173,14 @@ their license:
       <h3 class="section-bar">Classes and Modules</h3>
 
       Module <a href="S33r/S33rException.html" class="link">S33r::S33rException</a><br />
+Module <a href="S33r/S3ACL.html" class="link">S33r::S3ACL</a><br />
 Module <a href="S33r/Sync.html" class="link">S33r::Sync</a><br />
 Class <a href="S33r/BucketListing.html" class="link">S33r::BucketListing</a><br />
 Class <a href="S33r/Client.html" class="link">S33r::Client</a><br />
+Class <a href="S33r/LoggingResource.html" class="link">S33r::LoggingResource</a><br />
 Class <a href="S33r/NamedBucket.html" class="link">S33r::NamedBucket</a><br />
+Class <a href="S33r/OrderlyXmlMarkup.html" class="link">S33r::OrderlyXmlMarkup</a><br />
 Class <a href="S33r/S3Object.html" class="link">S33r::S3Object</a><br />
-Class <a href="S33r/S3User.html" class="link">S33r::S3User</a><br />
 
     </div>
 
@@ -196,7 +215,8 @@ Class <a href="S33r/S3User.html" class="link">S33r::S3User</a><br />
           <td class="context-item-value">1048576</td>
           <td width="3em">&nbsp;</td>
           <td class="context-item-desc">
-Size of each chunk (in bytes) to be sent per request when putting files.
+Size of each chunk (in bytes) to be sent per request when putting files
+(1Mb).
 
 </td>
         </tr>
@@ -229,6 +249,11 @@ Headers which must be included with every request to S3.
           <td class="context-item-name">CANNED_ACLS</td>
           <td>=</td>
           <td class="context-item-value">['private', 'public-read', 'public-read-write', 'authenticated-read']</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+Canned ACLs made available by S3.
+
+</td>
         </tr>
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">METHOD_VERBS</td>
@@ -261,6 +286,61 @@ Default number of seconds an authenticated URL will last for (15 minutes).
 
 </td>
         </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">RESPONSE_NAMESPACE_URI</td>
+          <td>=</td>
+          <td class="context-item-value">&quot;http://s3.amazonaws.com/doc/2006-03-01/&quot;</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+The namespace used for response body <a href="XML.html">XML</a> documents.
+
+</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">PERMISSIONS</td>
+          <td>=</td>
+          <td class="context-item-value">{      :read =&gt; 'READ',  # permission to read     :write =&gt; 'WRITE',  # permission to write     :read_acl =&gt; 'READ_ACP',  # permission to read ACL settings     :all =&gt; 'FULL_CONTROL'</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+Permissions which can be set within a &lt;Grant&gt; (see <a
+href="http://docs.amazonwebservices.com/AmazonS3/2006-03-01/UsingPermissions.html">docs.amazonwebservices.com/AmazonS3/2006-03-01/UsingPermissions.html</a>).
+
+<p>
+NB I&#8217;ve missed out the WRITE_ACP permission as this is functionally
+equivalent to FULL_CONTROL.
+</p>
+</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">NAMESPACE</td>
+          <td>=</td>
+          <td class="context-item-value">'xsi'</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+Used for generating ACL <a href="XML.html">XML</a> documents.
+
+</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">NAMESPACE_URI</td>
+          <td>=</td>
+          <td class="context-item-value">'http://www.w3.org/2001/XMLSchema-instance'</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">GRANTEE_TYPES</td>
+          <td>=</td>
+          <td class="context-item-value">{     :amazon_customer =&gt; 'AmazonCustomerByEmail',      :canonical_user =&gt; 'CanonicalUser',     :group =&gt; 'Group'</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">S3_GROUP_TYPES</td>
+          <td>=</td>
+          <td class="context-item-value">{     :all_users =&gt; 'global/AllUsers',     :authenticated_users =&gt; 'global/AuthenticatedUsers',     :log_delivery =&gt; 's3/LogDelivery'</td>
+        </tr>
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">GROUP_ACL_URI_BASE</td>
+          <td>=</td>
+          <td class="context-item-value">'http://acs.amazonaws.com/groups/'</td>
+        </tr>
         </table>
       </div>
     </div>
@@ -274,31 +354,107 @@ Default number of seconds an authenticated URL will last for (15 minutes).
     <div id="methods">
       <h3 class="section-bar">Public Class methods</h3>
 
-      <div id="method-M000053" class="method-detail">
-        <a name="M000053"></a>
+      <div id="method-M000056" class="method-detail">
+        <a name="M000056"></a>
 
         <div class="method-heading">
-          <a href="#M000053" class="method-signature">
+          <a href="#M000056" class="method-signature">
           <span class="method-name">keys_to_symbols</span><span class="method-args">(hsh)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Turn keys in a hash hsh into symbols. Returns a hash with
-&#8216;symbolised&#8217; keys.
+Turn keys in a hash <tt>hsh</tt> into symbols.
+</p>
+<p>
+Returns a hash with &#8216;symbolised&#8217; keys.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000053-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000053-source">
+            onclick="toggleCode('M000056-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000056-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 255</span>
+255:   <span class="ruby-keyword kw">def</span> <span class="ruby-constant">S33r</span>.<span class="ruby-identifier">keys_to_symbols</span>(<span class="ruby-identifier">hsh</span>)
+256:     <span class="ruby-identifier">symbolised</span> = <span class="ruby-identifier">hsh</span>.<span class="ruby-identifier">inject</span>({}) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">symbolised</span>, <span class="ruby-identifier">key_value</span><span class="ruby-operator">|</span>
+257:       <span class="ruby-identifier">symbolised</span>.<span class="ruby-identifier">merge</span>({<span class="ruby-identifier">key_value</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">to_sym</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">key_value</span>[<span class="ruby-value">1</span>]})
+258:     <span class="ruby-keyword kw">end</span>
+259:     <span class="ruby-identifier">symbolised</span>
+260:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000057" class="method-detail">
+        <a name="M000057"></a>
+
+        <div class="method-heading">
+          <a href="#M000057" class="method-signature">
+          <span class="method-name">parse_expiry</span><span class="method-args">(expires)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Parse an expiry date to seconds since the epoch.
+</p>
+<p>
+<tt>expires</tt> can be set to &#8216;forever&#8217; to get a time 20 years
+in the future; &#8216;default&#8217; to use the current time +
+DEFAULT_EXPIRY_SECS; or to a specific date (parseable by ParseDate); or to
+an integer representing seconds since the epoch.
+</p>
+<p>
+TODO: testing for this
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000057-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000057-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 270</span>
+270:   <span class="ruby-keyword kw">def</span> <span class="ruby-constant">S33r</span>.<span class="ruby-identifier">parse_expiry</span>(<span class="ruby-identifier">expires</span>)
+271:     <span class="ruby-identifier">base_expires</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>.<span class="ruby-identifier">to_i</span>
+272:     <span class="ruby-keyword kw">if</span> <span class="ruby-value str">'forever'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">expires</span>
+273:       <span class="ruby-comment cmt"># 20 years (same as forever in computer terms)</span>
+274:       <span class="ruby-identifier">expires</span> = <span class="ruby-identifier">base_expires</span> <span class="ruby-operator">+</span> (<span class="ruby-value">60</span> <span class="ruby-operator">*</span> <span class="ruby-value">60</span> <span class="ruby-operator">*</span> <span class="ruby-value">24</span> <span class="ruby-operator">*</span> <span class="ruby-value">365.25</span> <span class="ruby-operator">*</span> <span class="ruby-value">20</span>).<span class="ruby-identifier">to_i</span>
+275:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-value str">'default'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">expires</span>
+276:       <span class="ruby-comment cmt"># default to DEFAULT_EXPIRY_SECS seconds from now if expires not set</span>
+277:       <span class="ruby-identifier">expires</span> = <span class="ruby-identifier">base_expires</span> <span class="ruby-operator">+</span> <span class="ruby-constant">DEFAULT_EXPIRY_SECS</span>
+278:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">expires</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">String</span>)
+279:       <span class="ruby-identifier">datetime_parts</span> = <span class="ruby-constant">ParseDate</span>.<span class="ruby-identifier">parsedate</span>(<span class="ruby-identifier">expires</span>)
+280:       <span class="ruby-identifier">expires</span> = <span class="ruby-constant">Time</span>.<span class="ruby-identifier">gm</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">datetime_parts</span>).<span class="ruby-identifier">to_i</span>
+281:     <span class="ruby-keyword kw">end</span>
+282:     <span class="ruby-identifier">expires</span>
+283:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000058" class="method-detail">
+        <a name="M000058"></a>
+
+        <div class="method-heading">
+          <a href="#M000058" class="method-signature">
+          <span class="method-name">remove_namespace</span><span class="method-args">(xml_in)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Remove the namespace declaration from S3 <a href="XML.html">XML</a>
+response bodies (libxml isn&#8217;t fond of it).
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000058-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000058-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 215</span>
-215:   <span class="ruby-keyword kw">def</span> <span class="ruby-constant">S33r</span>.<span class="ruby-identifier">keys_to_symbols</span>(<span class="ruby-identifier">hsh</span>)
-216:     <span class="ruby-identifier">symbolised</span> = <span class="ruby-identifier">hsh</span>.<span class="ruby-identifier">inject</span>({}) <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">symbolised</span>, <span class="ruby-identifier">key_value</span><span class="ruby-operator">|</span>
-217:       <span class="ruby-identifier">symbolised</span>.<span class="ruby-identifier">merge</span>({<span class="ruby-identifier">key_value</span>[<span class="ruby-value">0</span>].<span class="ruby-identifier">to_sym</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">key_value</span>[<span class="ruby-value">1</span>]})
-218:     <span class="ruby-keyword kw">end</span>
-219:     <span class="ruby-identifier">symbolised</span>
-220:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 287</span>
+287:   <span class="ruby-keyword kw">def</span> <span class="ruby-constant">S33r</span>.<span class="ruby-identifier">remove_namespace</span>(<span class="ruby-identifier">xml_in</span>)
+288:     <span class="ruby-identifier">namespace</span> = <span class="ruby-constant">RESPONSE_NAMESPACE_URI</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-value str">'/'</span>, <span class="ruby-value str">'\/'</span>)
+289:     <span class="ruby-identifier">xml_in</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-node">/ xmlns=&quot;#{namespace}&quot;/</span>, <span class="ruby-value str">''</span>)
+290:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -318,29 +474,29 @@ Turn keys in a hash hsh into symbols. Returns a hash with
         <div class="method-description">
           <p>
 Build the headers required with every S3 request (Date and Content-Type);
-options hash can contain extra header settings, as follows: :date and
-:content_type are required headers, and set to defaults if not supplied
+options hash can contain extra header settings; +:date+ and +:content_type+
+are required headers, and set to defaults if not supplied
 </p>
           <p><a class="source-toggle" href="#"
             onclick="toggleCode('M000044-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000044-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 111</span>
-111:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_default_headers</span>(<span class="ruby-identifier">headers</span>, <span class="ruby-identifier">options</span>={})
-112:     <span class="ruby-comment cmt"># set the default headers required by AWS</span>
-113:     <span class="ruby-identifier">missing_headers</span> = <span class="ruby-constant">REQUIRED_HEADERS</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">keys</span>
-114: 
-115:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">'Content-Type'</span>)
-116:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:content_type</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">''</span>
-117:     <span class="ruby-keyword kw">end</span>
-118: 
-119:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">'Date'</span>)
-120:       <span class="ruby-identifier">date</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:date</span>] <span class="ruby-operator">||</span> <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
-121:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Date'</span>] = <span class="ruby-identifier">date</span>.<span class="ruby-identifier">httpdate</span>
-122:     <span class="ruby-keyword kw">end</span>
-123: 
-124:     <span class="ruby-identifier">headers</span>
-125:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 144</span>
+144:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">add_default_headers</span>(<span class="ruby-identifier">headers</span>, <span class="ruby-identifier">options</span>={})
+145:     <span class="ruby-comment cmt"># set the default headers required by AWS</span>
+146:     <span class="ruby-identifier">missing_headers</span> = <span class="ruby-constant">REQUIRED_HEADERS</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">keys</span>
+147: 
+148:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">'Content-Type'</span>)
+149:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Content-Type'</span>] = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:content_type</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">''</span>
+150:     <span class="ruby-keyword kw">end</span>
+151: 
+152:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-value str">'Date'</span>)
+153:       <span class="ruby-identifier">date</span> = <span class="ruby-identifier">options</span>[<span class="ruby-identifier">:date</span>] <span class="ruby-operator">||</span> <span class="ruby-constant">Time</span>.<span class="ruby-identifier">now</span>
+154:       <span class="ruby-identifier">headers</span>[<span class="ruby-value str">'Date'</span>] = <span class="ruby-identifier">date</span>.<span class="ruby-identifier">httpdate</span>
+155:     <span class="ruby-keyword kw">end</span>
+156: 
+157:     <span class="ruby-identifier">headers</span>
+158:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -363,12 +519,12 @@ Ensure that a bucket_name is well-formed (no leading or trailing slash).
             onclick="toggleCode('M000048-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000048-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 156</span>
-156:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">bucket_name_valid?</span>(<span class="ruby-identifier">bucket_name</span>)
-157:     <span class="ruby-keyword kw">if</span> (<span class="ruby-value str">'/'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">bucket_name</span>[<span class="ruby-value">0</span>,<span class="ruby-value">1</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">bucket_name</span>[<span class="ruby-value">-1</span>,<span class="ruby-value">1</span>])
-158:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MalformedBucketName</span>, <span class="ruby-value str">&quot;Bucket name cannot have a leading or trailing slash&quot;</span>
-159:     <span class="ruby-keyword kw">end</span>
-160:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 190</span>
+190:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">bucket_name_valid?</span>(<span class="ruby-identifier">bucket_name</span>)
+191:     <span class="ruby-keyword kw">if</span> (<span class="ruby-value str">'/'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">bucket_name</span>[<span class="ruby-value">0</span>,<span class="ruby-value">1</span>] <span class="ruby-operator">||</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">bucket_name</span>[<span class="ruby-value">-1</span>,<span class="ruby-value">1</span>])
+192:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MalformedBucketName</span>, <span class="ruby-value str">&quot;Bucket name cannot have a leading or trailing slash&quot;</span>
+193:     <span class="ruby-keyword kw">end</span>
+194:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -391,16 +547,16 @@ Add a canned ACL setter header.
             onclick="toggleCode('M000046-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000046-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 137</span>
-137:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">canned_acl_header</span>(<span class="ruby-identifier">canned_acl</span>, <span class="ruby-identifier">headers</span>={})
-138:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">canned_acl</span>.<span class="ruby-identifier">nil?</span>
-139:       <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">CANNED_ACLS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">canned_acl</span>)
-140:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">UnsupportedCannedACL</span>, <span class="ruby-node">&quot;The canned ACL #{canned_acl} is not supported&quot;</span>
-141:       <span class="ruby-keyword kw">end</span>
-142:       <span class="ruby-identifier">headers</span>[<span class="ruby-constant">AWS_HEADER_PREFIX</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'acl'</span>] = <span class="ruby-identifier">canned_acl</span>
-143:     <span class="ruby-keyword kw">end</span>
-144:     <span class="ruby-identifier">headers</span>
-145:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 171</span>
+171:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">canned_acl_header</span>(<span class="ruby-identifier">canned_acl</span>, <span class="ruby-identifier">headers</span>={})
+172:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">canned_acl</span>.<span class="ruby-identifier">nil?</span>
+173:       <span class="ruby-keyword kw">unless</span> <span class="ruby-constant">CANNED_ACLS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">canned_acl</span>)
+174:         <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">UnsupportedCannedACL</span>, <span class="ruby-node">&quot;The canned ACL #{canned_acl} is not supported&quot;</span>
+175:       <span class="ruby-keyword kw">end</span>
+176:       <span class="ruby-identifier">headers</span>[<span class="ruby-constant">AWS_HEADER_PREFIX</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'acl'</span>] = <span class="ruby-identifier">canned_acl</span>
+177:     <span class="ruby-keyword kw">end</span>
+178:     <span class="ruby-identifier">headers</span>
+179:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -423,22 +579,22 @@ Get the value for the AWS authentication header.
             onclick="toggleCode('M000042-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000042-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 85</span>
-85:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_auth_header_value</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>, <span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">aws_secret_access_key</span>)
-86:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MethodNotAvailable</span>, <span class="ruby-value str">&quot;Method %s not available&quot;</span> <span class="ruby-operator">%</span> <span class="ruby-identifier">method</span> <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">METHOD_VERBS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">method</span>)
-87: 
-88:     <span class="ruby-comment cmt"># check the headers needed for authentication have been set</span>
-89:     <span class="ruby-identifier">missing_headers</span> = <span class="ruby-constant">REQUIRED_HEADERS</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">keys</span>
-90:     <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">empty?</span>)
-91:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MissingRequiredHeaders</span>,
-92:         <span class="ruby-value str">&quot;Headers required for AWS auth value are missing: &quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">', '</span>)
-93:     <span class="ruby-keyword kw">end</span>
-94: 
-95:     <span class="ruby-comment cmt"># get the AWS header</span>
-96:     <span class="ruby-identifier">canonical_string</span> = <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>)
-97:     <span class="ruby-identifier">signature</span> = <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">canonical_string</span>)
-98:     <span class="ruby-constant">AWS_AUTH_HEADER_VALUE</span> <span class="ruby-operator">%</span> [<span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">signature</span>]
-99:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 118</span>
+118:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_auth_header_value</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>, <span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">aws_secret_access_key</span>)
+119:     <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MethodNotAvailable</span>, <span class="ruby-value str">&quot;Method %s not available&quot;</span> <span class="ruby-operator">%</span> <span class="ruby-identifier">method</span> <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">METHOD_VERBS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">method</span>)
+120: 
+121:     <span class="ruby-comment cmt"># check the headers needed for authentication have been set</span>
+122:     <span class="ruby-identifier">missing_headers</span> = <span class="ruby-constant">REQUIRED_HEADERS</span> <span class="ruby-operator">-</span> <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">keys</span>
+123:     <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span>(<span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">empty?</span>)
+124:       <span class="ruby-identifier">raise</span> <span class="ruby-constant">S33rException</span><span class="ruby-operator">::</span><span class="ruby-constant">MissingRequiredHeaders</span>,
+125:         <span class="ruby-value str">&quot;Headers required for AWS auth value are missing: &quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">missing_headers</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">', '</span>)
+126:     <span class="ruby-keyword kw">end</span>
+127: 
+128:     <span class="ruby-comment cmt"># get the AWS header</span>
+129:     <span class="ruby-identifier">canonical_string</span> = <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>)
+130:     <span class="ruby-identifier">signature</span> = <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">canonical_string</span>)
+131:     <span class="ruby-constant">AWS_AUTH_HEADER_VALUE</span> <span class="ruby-operator">%</span> [<span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">signature</span>]
+132:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -462,46 +618,48 @@ sample code.
             onclick="toggleCode('M000041-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000041-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 44</span>
-44:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>={}, <span class="ruby-identifier">expires</span>=<span class="ruby-keyword kw">nil</span>)
-45:     <span class="ruby-identifier">interesting_headers</span> = {}
-46:     <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
-47:       <span class="ruby-identifier">lk</span> = <span class="ruby-identifier">key</span>.<span class="ruby-identifier">downcase</span>
-48:       <span class="ruby-keyword kw">if</span> (<span class="ruby-constant">INTERESTING_HEADERS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">lk</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">lk</span> <span class="ruby-operator">=~</span> <span class="ruby-node">/^#{AWS_HEADER_PREFIX}/o</span>)
-49:         <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-identifier">lk</span>] = <span class="ruby-identifier">value</span>
-50:       <span class="ruby-keyword kw">end</span>
-51:     <span class="ruby-keyword kw">end</span>
-52: 
-53:     <span class="ruby-comment cmt"># these fields get empty strings if they don't exist.</span>
-54:     <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'content-type'</span>] <span class="ruby-operator">||=</span> <span class="ruby-value str">''</span>
-55:     <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'content-md5'</span>] <span class="ruby-operator">||=</span> <span class="ruby-value str">''</span>
-56: 
-57:     <span class="ruby-comment cmt"># if you're using expires for query string auth, then it trumps date</span>
-58:     <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-identifier">expires</span>.<span class="ruby-identifier">nil?</span>
-59:       <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'date'</span>] = <span class="ruby-identifier">expires</span>
-60:     <span class="ruby-keyword kw">end</span>
-61: 
-62:     <span class="ruby-identifier">buf</span> = <span class="ruby-node">&quot;#{method}\n&quot;</span>
-63:     <span class="ruby-identifier">interesting_headers</span>.<span class="ruby-identifier">sort</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span>, <span class="ruby-identifier">b</span><span class="ruby-operator">|</span> <span class="ruby-identifier">a</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">b</span>[<span class="ruby-value">0</span>] }.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
-64:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span> <span class="ruby-operator">=~</span> <span class="ruby-node">/^#{AWS_HEADER_PREFIX}/o</span>
-65:         <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;#{key}:#{value}\n&quot;</span>
-66:       <span class="ruby-keyword kw">else</span>
-67:         <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;#{value}\n&quot;</span>
-68:       <span class="ruby-keyword kw">end</span>
-69:     <span class="ruby-keyword kw">end</span>
-70: 
-71:     <span class="ruby-comment cmt"># ignore everything after the question mark...</span>
-72:     <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">path</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/\?.*$/</span>, <span class="ruby-value str">''</span>)
-73: 
-74:     <span class="ruby-comment cmt"># ...unless there is an acl or torrent parameter</span>
-75:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/[&amp;?]acl($|&amp;|=)/</span>
-76:       <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'?acl'</span>
-77:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/[&amp;?]torrent($|&amp;|=)/</span>
-78:       <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'?torrent'</span>
-79:     <span class="ruby-keyword kw">end</span>
-80: 
-81:     <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">buf</span>
-82:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 75</span>
+ 75:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-identifier">method</span>, <span class="ruby-identifier">path</span>, <span class="ruby-identifier">headers</span>={}, <span class="ruby-identifier">expires</span>=<span class="ruby-keyword kw">nil</span>)
+ 76:     <span class="ruby-identifier">interesting_headers</span> = {}
+ 77:     <span class="ruby-identifier">headers</span>.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
+ 78:       <span class="ruby-identifier">lk</span> = <span class="ruby-identifier">key</span>.<span class="ruby-identifier">downcase</span>
+ 79:       <span class="ruby-keyword kw">if</span> (<span class="ruby-constant">INTERESTING_HEADERS</span>.<span class="ruby-identifier">include?</span>(<span class="ruby-identifier">lk</span>) <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">lk</span> <span class="ruby-operator">=~</span> <span class="ruby-node">/^#{AWS_HEADER_PREFIX}/o</span>)
+ 80:         <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-identifier">lk</span>] = <span class="ruby-identifier">value</span>
+ 81:       <span class="ruby-keyword kw">end</span>
+ 82:     <span class="ruby-keyword kw">end</span>
+ 83: 
+ 84:     <span class="ruby-comment cmt"># These fields get empty strings if they don't exist.</span>
+ 85:     <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'content-type'</span>] <span class="ruby-operator">||=</span> <span class="ruby-value str">''</span>
+ 86:     <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'content-md5'</span>] <span class="ruby-operator">||=</span> <span class="ruby-value str">''</span>
+ 87: 
+ 88:     <span class="ruby-comment cmt"># If you're using expires for query string auth, then it trumps date.</span>
+ 89:     <span class="ruby-keyword kw">if</span> <span class="ruby-keyword kw">not</span> <span class="ruby-identifier">expires</span>.<span class="ruby-identifier">nil?</span>
+ 90:       <span class="ruby-identifier">interesting_headers</span>[<span class="ruby-value str">'date'</span>] = <span class="ruby-identifier">expires</span>
+ 91:     <span class="ruby-keyword kw">end</span>
+ 92: 
+ 93:     <span class="ruby-identifier">buf</span> = <span class="ruby-node">&quot;#{method}\n&quot;</span>
+ 94:     <span class="ruby-identifier">interesting_headers</span>.<span class="ruby-identifier">sort</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">a</span>, <span class="ruby-identifier">b</span><span class="ruby-operator">|</span> <span class="ruby-identifier">a</span>[<span class="ruby-value">0</span>] <span class="ruby-operator">&lt;=&gt;</span> <span class="ruby-identifier">b</span>[<span class="ruby-value">0</span>] }.<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span>
+ 95:       <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">key</span> <span class="ruby-operator">=~</span> <span class="ruby-node">/^#{AWS_HEADER_PREFIX}/o</span>
+ 96:         <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;#{key}:#{value}\n&quot;</span>
+ 97:       <span class="ruby-keyword kw">else</span>
+ 98:         <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-node">&quot;#{value}\n&quot;</span>
+ 99:       <span class="ruby-keyword kw">end</span>
+100:     <span class="ruby-keyword kw">end</span>
+101: 
+102:     <span class="ruby-comment cmt"># Ignore everything after the question mark...</span>
+103:     <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-identifier">path</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/\?.*$/</span>, <span class="ruby-value str">''</span>)
+104: 
+105:     <span class="ruby-comment cmt"># ...unless there is an acl, logging or torrent parameter</span>
+106:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/[&amp;?]acl($|&amp;|=)/</span>
+107:       <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'?acl'</span>
+108:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/[&amp;?]torrent($|&amp;|=)/</span>
+109:       <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'?torrent'</span>
+110:     <span class="ruby-keyword kw">elsif</span> <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/[&amp;?]logging($|&amp;|=)/</span>
+111:       <span class="ruby-identifier">buf</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-value str">'?logging'</span>
+112:     <span class="ruby-keyword kw">end</span>
+113: 
+114:     <span class="ruby-identifier">buf</span>
+115:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -525,14 +683,14 @@ variable can be a string or symbol.
             onclick="toggleCode('M000049-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000049-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 164</span>
-164:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_querystring</span>(<span class="ruby-identifier">pairs</span>={})
-165:     <span class="ruby-identifier">str</span> = <span class="ruby-value str">''</span>
-166:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">pairs</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
-167:       <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">&quot;?&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">pairs</span>.<span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{key}=#{CGI::escape(value.to_s)}&quot;</span> }.<span class="ruby-identifier">join</span>(<span class="ruby-value str">'&amp;'</span>)
-168:     <span class="ruby-keyword kw">end</span>
-169:     <span class="ruby-identifier">str</span>
-170:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 198</span>
+198:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_querystring</span>(<span class="ruby-identifier">pairs</span>={})
+199:     <span class="ruby-identifier">str</span> = <span class="ruby-value str">''</span>
+200:     <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">pairs</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">&gt;</span> <span class="ruby-value">0</span>
+201:       <span class="ruby-identifier">str</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">&quot;?&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">pairs</span>.<span class="ruby-identifier">map</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span> <span class="ruby-node">&quot;#{key}=#{CGI::escape(value.to_s)}&quot;</span> }.<span class="ruby-identifier">join</span>(<span class="ruby-value str">'&amp;'</span>)
+202:     <span class="ruby-keyword kw">end</span>
+203:     <span class="ruby-identifier">str</span>
+204:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -556,11 +714,11 @@ sha1 sum, and then base64 encoding it.
             onclick="toggleCode('M000043-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000043-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 103</span>
-103:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">str</span>)
-104:     <span class="ruby-identifier">digest</span> = <span class="ruby-constant">OpenSSL</span><span class="ruby-operator">::</span><span class="ruby-constant">HMAC</span><span class="ruby-operator">::</span><span class="ruby-identifier">digest</span>(<span class="ruby-constant">OpenSSL</span><span class="ruby-operator">::</span><span class="ruby-constant">Digest</span><span class="ruby-operator">::</span><span class="ruby-constant">Digest</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;SHA1&quot;</span>), <span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">str</span>)
-105:     <span class="ruby-constant">Base64</span>.<span class="ruby-identifier">encode64</span>(<span class="ruby-identifier">digest</span>).<span class="ruby-identifier">strip</span>
-106:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 136</span>
+136:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">str</span>)
+137:     <span class="ruby-identifier">digest</span> = <span class="ruby-constant">OpenSSL</span><span class="ruby-operator">::</span><span class="ruby-constant">HMAC</span><span class="ruby-operator">::</span><span class="ruby-identifier">digest</span>(<span class="ruby-constant">OpenSSL</span><span class="ruby-operator">::</span><span class="ruby-constant">Digest</span><span class="ruby-operator">::</span><span class="ruby-constant">Digest</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;SHA1&quot;</span>), <span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">str</span>)
+138:     <span class="ruby-constant">Base64</span>.<span class="ruby-identifier">encode64</span>(<span class="ruby-identifier">digest</span>).<span class="ruby-identifier">strip</span>
+139:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -584,12 +742,12 @@ guessed, &quot;text/plain&quot; is used.
             onclick="toggleCode('M000047-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000047-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 149</span>
-149:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">guess_mime_type</span>(<span class="ruby-identifier">file_name</span>)
-150:     <span class="ruby-identifier">mime_type</span> = <span class="ruby-constant">MIME</span><span class="ruby-operator">::</span><span class="ruby-constant">Types</span>.<span class="ruby-identifier">type_for</span>(<span class="ruby-identifier">file_name</span>)[<span class="ruby-value">0</span>]
-151:     <span class="ruby-identifier">mime_type</span> <span class="ruby-operator">||=</span> <span class="ruby-constant">MIME</span><span class="ruby-operator">::</span><span class="ruby-constant">Types</span>[<span class="ruby-value str">'text/plain'</span>][<span class="ruby-value">0</span>]
-152:     <span class="ruby-identifier">mime_type</span>
-153:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 183</span>
+183:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">guess_mime_type</span>(<span class="ruby-identifier">file_name</span>)
+184:     <span class="ruby-identifier">mime_type</span> = <span class="ruby-constant">MIME</span><span class="ruby-operator">::</span><span class="ruby-constant">Types</span>.<span class="ruby-identifier">type_for</span>(<span class="ruby-identifier">file_name</span>)[<span class="ruby-value">0</span>]
+185:     <span class="ruby-identifier">mime_type</span> <span class="ruby-operator">||=</span> <span class="ruby-constant">MIME</span><span class="ruby-operator">::</span><span class="ruby-constant">Types</span>[<span class="ruby-value str">'text/plain'</span>][<span class="ruby-value">0</span>]
+186:     <span class="ruby-identifier">mime_type</span>
+187:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -606,56 +764,90 @@ guessed, &quot;text/plain&quot; is used.
       
         <div class="method-description">
           <p>
-Add metadata headers, correctly prefixing them first. Returns headers with
-the metadata headers appended.
+Add metadata headers, correctly prefixing them first.
+</p>
+<p>
+Returns headers with the metadata headers appended.
 </p>
           <p><a class="source-toggle" href="#"
             onclick="toggleCode('M000045-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000045-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 129</span>
-129:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">metadata_headers</span>(<span class="ruby-identifier">headers</span>, <span class="ruby-identifier">metadata</span>={})
-130:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">metadata</span>.<span class="ruby-identifier">empty?</span>
-131:       <span class="ruby-identifier">metadata</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span> <span class="ruby-identifier">headers</span>[<span class="ruby-constant">METADATA_PREFIX</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span> }
-132:     <span class="ruby-keyword kw">end</span>
-133:     <span class="ruby-identifier">headers</span>
-134:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 163</span>
+163:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">metadata_headers</span>(<span class="ruby-identifier">headers</span>, <span class="ruby-identifier">metadata</span>={})
+164:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">metadata</span>.<span class="ruby-identifier">empty?</span>
+165:       <span class="ruby-identifier">metadata</span>.<span class="ruby-identifier">each</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">value</span><span class="ruby-operator">|</span> <span class="ruby-identifier">headers</span>[<span class="ruby-constant">METADATA_PREFIX</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">key</span>] = <span class="ruby-identifier">value</span> }
+166:     <span class="ruby-keyword kw">end</span>
+167:     <span class="ruby-identifier">headers</span>
+168:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000052" class="method-detail">
-        <a name="M000052"></a>
+      <div id="method-M000050" class="method-detail">
+        <a name="M000050"></a>
 
         <div class="method-heading">
-          <a href="#M000052" class="method-signature">
-          <span class="method-name">s3_authenticated_url</span><span class="method-args">(aws_access_key, aws_secret_access_key, bucket_name, resource_key, expires)</span>
+          <a href="#M000050" class="method-signature">
+          <span class="method-name">s3_acl_path</span><span class="method-args">(bucket_name, resource_key)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Return the location of the ACL for a resource.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000050-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000050-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 207</span>
+207:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_acl_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
+208:     <span class="ruby-identifier">s3_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;?acl&quot;</span>
+209:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000055" class="method-detail">
+        <a name="M000055"></a>
+
+        <div class="method-heading">
+          <a href="#M000055" class="method-signature">
+          <span class="method-name">s3_authenticated_url</span><span class="method-args">(aws_access_key, aws_secret_access_key, bucket_name, resource_key, expires=nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
 Generate a get-able URL for an S3 resource key which passes authentication
-in querystring. int expires: when the URL expires (seconds since the epoch)
+in querystring.
+</p>
+<p>
+int <tt>expires</tt>: when the URL expires (seconds since the epoch); NB
+you can use <a href="S33r.html#M000057">S33r.parse_expiry</a> to generate a
+suitable value from a string.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000052-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000052-source">
+            onclick="toggleCode('M000055-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000055-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 200</span>
-200:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_authenticated_url</span>(<span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>, 
-201:   <span class="ruby-identifier">expires</span>)
-202:     <span class="ruby-identifier">path</span> = <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">bucket_name</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">resource_key</span>
-203:     
-204:     <span class="ruby-identifier">canonical_string</span> = <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-value str">'GET'</span>, <span class="ruby-identifier">path</span>, {}, <span class="ruby-identifier">expires</span>)
-205:     <span class="ruby-identifier">signature</span> = <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">canonical_string</span>)
-206:     
-207:     <span class="ruby-identifier">querystring</span> = <span class="ruby-identifier">generate_querystring</span>({ <span class="ruby-value str">'Signature'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">signature</span>, <span class="ruby-value str">'Expires'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">expires</span>,
-208:     <span class="ruby-value str">'AWSAccessKeyId'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">aws_access_key</span> })
-209:     
-210:     <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">s3_public_url</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>) <span class="ruby-operator">+</span> <span class="ruby-identifier">querystring</span>
-211:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 238</span>
+238:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_authenticated_url</span>(<span class="ruby-identifier">aws_access_key</span>, <span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>, 
+239:   <span class="ruby-identifier">expires</span>=<span class="ruby-keyword kw">nil</span>)
+240:     <span class="ruby-identifier">path</span> = <span class="ruby-identifier">s3_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
+241:     <span class="ruby-identifier">expires</span> = <span class="ruby-constant">S33r</span>.<span class="ruby-identifier">parse_expiry</span>(<span class="ruby-identifier">expires</span>)
+242:     
+243:     <span class="ruby-identifier">canonical_string</span> = <span class="ruby-identifier">generate_canonical_string</span>(<span class="ruby-value str">'GET'</span>, <span class="ruby-identifier">path</span>, {}, <span class="ruby-identifier">expires</span>)
+244:     <span class="ruby-identifier">signature</span> = <span class="ruby-identifier">generate_signature</span>(<span class="ruby-identifier">aws_secret_access_key</span>, <span class="ruby-identifier">canonical_string</span>)
+245:     
+246:     <span class="ruby-identifier">querystring</span> = <span class="ruby-identifier">generate_querystring</span>({ <span class="ruby-value str">'Signature'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">signature</span>, <span class="ruby-value str">'Expires'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">expires</span>,
+247:     <span class="ruby-value str">'AWSAccessKeyId'</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">aws_access_key</span> })
+248:     
+249:     <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">s3_url</span>(<span class="ruby-identifier">path</span>) <span class="ruby-operator">+</span> <span class="ruby-identifier">querystring</span>
+250:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
@@ -666,63 +858,103 @@ in querystring. int expires: when the URL expires (seconds since the epoch)
 
         <div class="method-heading">
           <a href="#M000051" class="method-signature">
-          <span class="method-name">s3_public_url</span><span class="method-args">(bucket_name, resource_key)</span>
+          <span class="method-name">s3_logging_path</span><span class="method-args">(bucket_name, resource_key)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-The public URL for this key (which only works if public-read ACL is set).
+Return the location of the logging definition for a resource.
 </p>
           <p><a class="source-toggle" href="#"
             onclick="toggleCode('M000051-source');return false;">[Source]</a></p>
           <div class="method-source-code" id="M000051-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 194</span>
-194:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_public_url</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
-195:     <span class="ruby-value str">&quot;http://&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-constant">HOST</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">bucket_name</span> <span class="ruby-operator">+</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">resource_key</span>
-196:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 212</span>
+212:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_logging_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
+213:     <span class="ruby-identifier">s3_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>) <span class="ruby-operator">+</span> <span class="ruby-value str">&quot;?logging&quot;</span>
+214:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>
       </div>
 
-      <div id="method-M000050" class="method-detail">
-        <a name="M000050"></a>
+      <div id="method-M000054" class="method-detail">
+        <a name="M000054"></a>
 
         <div class="method-heading">
-          <a href="#M000050" class="method-signature">
-          <span class="method-name">url_join</span><span class="method-args">(*args)</span>
+          <a href="#M000054" class="method-signature">
+          <span class="method-name">s3_path</span><span class="method-args">(bucket_name, resource_key)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Build URLs from fragments. Does similar job to File.join but puts forward
-slash between arguments (only if it&#8217;s not already there).
+Returns the path for this bucket and key.
 </p>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000050-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000050-source">
+            onclick="toggleCode('M000054-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000054-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 228</span>
+228:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
+229:     <span class="ruby-identifier">path</span> = <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">bucket_name</span>
+230:     <span class="ruby-identifier">path</span> <span class="ruby-operator">+=</span> <span class="ruby-value str">'/'</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">resource_key</span> <span class="ruby-keyword kw">unless</span> <span class="ruby-value str">''</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">resource_key</span> <span class="ruby-keyword kw">or</span> <span class="ruby-identifier">resource_key</span>.<span class="ruby-identifier">nil?</span>
+231:     <span class="ruby-identifier">path</span>
+232:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000053" class="method-detail">
+        <a name="M000053"></a>
+
+        <div class="method-heading">
+          <a href="#M000053" class="method-signature">
+          <span class="method-name">s3_public_url</span><span class="method-args">(bucket_name, resource_key='')</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Public readable URL for a bucket and resource.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000053-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000053-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 222</span>
+222:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_public_url</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>=<span class="ruby-value str">''</span>)
+223:     <span class="ruby-identifier">path</span> = <span class="ruby-identifier">s3_path</span>(<span class="ruby-identifier">bucket_name</span>, <span class="ruby-identifier">resource_key</span>)
+224:     <span class="ruby-identifier">s3_url</span>(<span class="ruby-identifier">path</span>)
+225:   <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000052" class="method-detail">
+        <a name="M000052"></a>
+
+        <div class="method-heading">
+          <a href="#M000052" class="method-signature">
+          <span class="method-name">s3_url</span><span class="method-args">(path)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Prepend scheme and HOST to path.
+</p>
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000052-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000052-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 175</span>
-175:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">url_join</span>(<span class="ruby-operator">*</span><span class="ruby-identifier">args</span>)
-176:     <span class="ruby-identifier">url_start</span> = <span class="ruby-value str">''</span>
-177:     <span class="ruby-identifier">url_end</span> = <span class="ruby-identifier">args</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">'/'</span>)
-178:     
-179:     <span class="ruby-comment cmt"># string index where the scheme of the URL (xxxx://) ends</span>
-180:     <span class="ruby-identifier">scheme_ends_at</span> = (<span class="ruby-identifier">url_end</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/:\/\//</span>)
-181:     <span class="ruby-keyword kw">unless</span> <span class="ruby-identifier">scheme_ends_at</span>.<span class="ruby-identifier">nil?</span>
-182:       <span class="ruby-identifier">scheme_ends_at</span> = <span class="ruby-identifier">scheme_ends_at</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>
-183:       <span class="ruby-identifier">url_start</span> = <span class="ruby-identifier">url_end</span>[<span class="ruby-value">0</span><span class="ruby-operator">..</span><span class="ruby-identifier">scheme_ends_at</span>]
-184:       <span class="ruby-identifier">url_end</span> = <span class="ruby-identifier">url_end</span>[(<span class="ruby-identifier">scheme_ends_at</span> <span class="ruby-operator">+</span> <span class="ruby-value">1</span>)<span class="ruby-operator">..</span><span class="ruby-value">-1</span>]
-185:     <span class="ruby-keyword kw">end</span>
-186:     
-187:     <span class="ruby-comment cmt"># replace any multiple forward slashes (except those in the scheme)</span>
-188:     <span class="ruby-identifier">url_end</span> = <span class="ruby-identifier">url_end</span>.<span class="ruby-identifier">gsub</span>(<span class="ruby-regexp re">/\/{2,}/</span>, <span class="ruby-value str">'/'</span>)
-189:     
-190:     <span class="ruby-identifier">url_start</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">url_end</span>
-191:   <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/s33r/core.rb, line 217</span>
+217:   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">s3_url</span>(<span class="ruby-identifier">path</span>)
+218:     <span class="ruby-value str">&quot;http://&quot;</span> <span class="ruby-operator">+</span> <span class="ruby-constant">HOST</span> <span class="ruby-operator">+</span> <span class="ruby-identifier">path</span>
+219:   <span class="ruby-keyword kw">end</span>
 </pre>
           </div>
         </div>