frivol 0.1.4 → 0.1.5

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/marcheiligers/frivol"
     gem.authors = ["Marc Heiligers"]
     gem.add_dependency "json", ">= 1.2.0"
-    gem.add_dependency "redis", ">= 0.1.2"
+    gem.add_dependency "redis", ">= 2.0.10"
     gem.add_development_dependency "shoulda", ">= 2.11.1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/doc/classes/Frivol.html

@@ -107,6 +107,24 @@ Module <a href="Frivol/Config.html" class="link">Frivol::Config</a><br />
 
     </div>
 
+    <div id="constants-list">
+      <h3 class="section-bar">Constants</h3>
+
+      <div class="name-list">
+        <table summary="Constants">
+        <tr class="top-aligned-row context-row">
+          <td class="context-item-name">NEVER_EXPIRE</td>
+          <td>=</td>
+          <td class="context-item-value">nil</td>
+          <td width="3em">&nbsp;</td>
+          <td class="context-item-desc">
+Defines a constant to indicate that storage should never expire
+
+</td>
+        </tr>
+        </table>
+      </div>
+    </div>
 
 
 
@@ -121,7 +139,8 @@ Module <a href="Frivol/Config.html" class="link">Frivol::Config</a><br />
         <a name="M000005"></a>
 
         <div class="method-heading">
-          <a href="#M000005" class="method-signature">
+          <a href="Frivol.src/M000005.html" target="Code" class="method-signature"
+            onclick="popupCode('Frivol.src/M000005.html');return false;">
           <span class="method-name">delete_storage</span><span class="method-args">()</span>
           </a>
         </div>
@@ -130,16 +149,6 @@ Module <a href="Frivol/Config.html" class="link">Frivol::Config</a><br />
           <p>
 Deletes the stored values.
 </p>
-          <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000005-source">
-<pre>
-<span class="ruby-comment cmt"># File lib/frivol.rb, line 105</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete_storage</span>
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">delete_hash</span> <span class="ruby-keyword kw">self</span>
-  <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 
@@ -147,8 +156,9 @@ Deletes the stored values.
         <a name="M000006"></a>
 
         <div class="method-heading">
-          <a href="#M000006" class="method-signature">
-          <span class="method-name">expire_storage</span><span class="method-args">(time)</span>
+          <a href="Frivol.src/M000006.html" target="Code" class="method-signature"
+            onclick="popupCode('Frivol.src/M000006.html');return false;">
+          <span class="method-name">expire_storage</span><span class="method-args">(time, bucket = nil)</span>
           </a>
         </div>
       
@@ -156,17 +166,6 @@ Deletes the stored values.
           <p>
 Expire the stored data in <tt>time</tt> seconds.
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 110</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expire_storage</span>(<span class="ruby-identifier">time</span>)
-    <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">time</span>.<span class="ruby-identifier">nil?</span>
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Config</span>.<span class="ruby-identifier">redis</span>.<span class="ruby-identifier">expire</span> <span class="ruby-identifier">storage_key</span>, <span class="ruby-identifier">time</span>
-  <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 
@@ -174,7 +173,8 @@ Expire the stored data in <tt>time</tt> seconds.
         <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="#M000004" class="method-signature">
+          <a href="Frivol.src/M000004.html" target="Code" class="method-signature"
+            onclick="popupCode('Frivol.src/M000004.html');return false;">
           <span class="method-name">retrieve</span><span class="method-args">(keys_and_defaults)</span>
           </a>
         </div>
@@ -198,21 +198,6 @@ to get the default from a method named after that symbol. If the class does
 not <tt>respond_to?</tt> a method by that name, the symbol will assumed to
 be the default.
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 95</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve</span>(<span class="ruby-identifier">keys_and_defaults</span>)
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span> <span class="ruby-keyword kw">self</span>
-    <span class="ruby-identifier">result</span> = <span class="ruby-identifier">keys_and_defaults</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">default</span><span class="ruby-operator">|</span>
-      <span class="ruby-ivar">@frivol_hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] <span class="ruby-operator">||</span> (<span class="ruby-identifier">default</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Symbol</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">default</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">send</span>(<span class="ruby-identifier">default</span>)) <span class="ruby-operator">||</span> <span class="ruby-identifier">default</span>
-    <span class="ruby-keyword kw">end</span>
-    <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">first</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">==</span> <span class="ruby-value">1</span>
-    <span class="ruby-identifier">result</span>
-  <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 
@@ -220,8 +205,9 @@ be the default.
         <a name="M000007"></a>
 
         <div class="method-heading">
-          <a href="#M000007" class="method-signature">
-          <span class="method-name">storage_key</span><span class="method-args">()</span>
+          <a href="Frivol.src/M000007.html" target="Code" class="method-signature"
+            onclick="popupCode('Frivol.src/M000007.html');return false;">
+          <span class="method-name">storage_key</span><span class="method-args">(bucket = nil)</span>
           </a>
         </div>
       
@@ -231,20 +217,15 @@ The base key used for storage in Redis.
 </p>
 <p>
 This method has been implemented for use with ActiveRecord and uses
-<tt>&quot;#{self.class.name}-#{id}&quot;</tt> If you are not using
-ActiveRecord, or using classes that don&#8216;t respond to id, you should
-override this method in your class.
+<tt>&quot;#{self.class.name}-#{id}&quot;</tt> for the default bucket and
+<tt>&quot;#{self.class.name}-#{id}-#{bucket}&quot;</tt> for a named bucket.
+If you are not using ActiveRecord, or using classes that don&#8216;t
+respond to id, you should override this method in your class.
+</p>
+<p>
+NOTE: This method has changed since version 0.1.4, and now has the bucket
+parameter (default: nil)
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 120</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_key</span>
-    <span class="ruby-ivar">@frivol_key</span> <span class="ruby-operator">||=</span> <span class="ruby-node">&quot;#{self.class.name}-#{id}&quot;</span>
-  <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 
@@ -252,7 +233,8 @@ override this method in your class.
         <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="#M000003" class="method-signature">
+          <a href="Frivol.src/M000003.html" target="Code" class="method-signature"
+            onclick="popupCode('Frivol.src/M000003.html');return false;">
           <span class="method-name">store</span><span class="method-args">(keys_and_values)</span>
           </a>
         </div>
@@ -271,20 +253,6 @@ call <tt><a href="Frivol.html#M000003">store</a> :value2 =&gt; 2</tt> and
 retrieves data is intended to be hidden and while it is true that it
 currently uses a <tt>Hash#to_json</tt> you should not rely on this.
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 78</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>(<span class="ruby-identifier">keys_and_values</span>)
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span> <span class="ruby-keyword kw">self</span>
-    <span class="ruby-identifier">keys_and_values</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>
-      <span class="ruby-ivar">@frivol_hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] = <span class="ruby-identifier">value</span>
-    <span class="ruby-keyword kw">end</span>
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">store_hash</span> <span class="ruby-keyword kw">self</span>
-  <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 

data/doc/classes/Frivol.src/M000003.html

@@ -10,13 +10,13 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 68</span>
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 97</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">store</span>(<span class="ruby-identifier">keys_and_values</span>)
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span> <span class="ruby-keyword kw">self</span>
+    <span class="ruby-identifier">hash</span> = <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span>(<span class="ruby-keyword kw">self</span>)
     <span class="ruby-identifier">keys_and_values</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>
-      <span class="ruby-ivar">@frivol_hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] = <span class="ruby-identifier">value</span>
+      <span class="ruby-identifier">hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] = <span class="ruby-identifier">value</span>
     <span class="ruby-keyword kw">end</span>
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">store_hash</span> <span class="ruby-keyword kw">self</span>
+    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">store_hash</span>(<span class="ruby-keyword kw">self</span>, <span class="ruby-identifier">hash</span>)
   <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/Frivol.src/M000004.html

@@ -10,11 +10,11 @@
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 85</span>
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 114</span>
   <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">retrieve</span>(<span class="ruby-identifier">keys_and_defaults</span>)
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span> <span class="ruby-keyword kw">self</span>
+    <span class="ruby-identifier">hash</span> = <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">retrieve_hash</span>(<span class="ruby-keyword kw">self</span>)
     <span class="ruby-identifier">result</span> = <span class="ruby-identifier">keys_and_defaults</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">key</span>, <span class="ruby-identifier">default</span><span class="ruby-operator">|</span>
-      <span class="ruby-ivar">@frivol_hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] <span class="ruby-operator">||</span> (<span class="ruby-identifier">default</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Symbol</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">default</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">send</span>(<span class="ruby-identifier">default</span>)) <span class="ruby-operator">||</span> <span class="ruby-identifier">default</span>
+      <span class="ruby-identifier">hash</span>[<span class="ruby-identifier">key</span>.<span class="ruby-identifier">to_s</span>] <span class="ruby-operator">||</span> (<span class="ruby-identifier">default</span>.<span class="ruby-identifier">is_a?</span>(<span class="ruby-constant">Symbol</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">respond_to?</span>(<span class="ruby-identifier">default</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-identifier">send</span>(<span class="ruby-identifier">default</span>)) <span class="ruby-operator">||</span> <span class="ruby-identifier">default</span>
     <span class="ruby-keyword kw">end</span>
     <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">first</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">result</span>.<span class="ruby-identifier">size</span> <span class="ruby-operator">==</span> <span class="ruby-value">1</span>
     <span class="ruby-identifier">result</span>

data/doc/classes/Frivol.src/M000005.html

@@ -5,15 +5,14 @@
 
 <html>
 <head>
-  <title>expire_storage (Frivol)</title>
+  <title>delete_storage (Frivol)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 95</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expire_storage</span>(<span class="ruby-identifier">time</span>)
-    <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">time</span>.<span class="ruby-identifier">nil?</span>
-    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Config</span>.<span class="ruby-identifier">redis</span>.<span class="ruby-identifier">expire</span> <span class="ruby-identifier">storage_key</span>, <span class="ruby-identifier">time</span>
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 124</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">delete_storage</span>
+    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Helpers</span>.<span class="ruby-identifier">delete_hash</span> <span class="ruby-keyword kw">self</span>
   <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/Frivol.src/M000006.html

@@ -5,14 +5,15 @@
 
 <html>
 <head>
-  <title>storage_key (Frivol)</title>
+  <title>expire_storage (Frivol)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 105</span>
-  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_key</span>
-    <span class="ruby-ivar">@frivol_key</span> <span class="ruby-operator">||=</span> <span class="ruby-node">&quot;#{self.class.name}-#{id}&quot;</span>
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 129</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">expire_storage</span>(<span class="ruby-identifier">time</span>, <span class="ruby-identifier">bucket</span> = <span class="ruby-keyword kw">nil</span>)
+    <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">time</span>.<span class="ruby-identifier">nil?</span>
+    <span class="ruby-constant">Frivol</span><span class="ruby-operator">::</span><span class="ruby-constant">Config</span>.<span class="ruby-identifier">redis</span>.<span class="ruby-identifier">expire</span> <span class="ruby-identifier">storage_key</span>(<span class="ruby-identifier">bucket</span>), <span class="ruby-identifier">time</span>
   <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/Frivol.src/M000007.html

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>storage_key (Frivol)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 142</span>
+  <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_key</span>(<span class="ruby-identifier">bucket</span> = <span class="ruby-keyword kw">nil</span>)
+    <span class="ruby-ivar">@frivol_key</span> <span class="ruby-operator">||=</span> <span class="ruby-node">&quot;#{self.class.name}-#{id}&quot;</span>
+    <span class="ruby-identifier">bucket</span>.<span class="ruby-identifier">nil?</span> <span class="ruby-value">? </span><span class="ruby-ivar">@frivol_key</span> <span class="ruby-operator">:</span> <span class="ruby-node">&quot;#{@frivol_key}-#{bucket}&quot;</span>
+  <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>

data/doc/classes/Frivol/ClassMethods.html

@@ -88,6 +88,7 @@ href="../Frivol.html">Frivol</a> is included in the class.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
+      <a href="#M000010">storage_bucket</a>&nbsp;&nbsp;
       <a href="#M000008">storage_expires_in</a>&nbsp;&nbsp;
       <a href="#M000009">storage_expiry</a>&nbsp;&nbsp;
       </div>
@@ -111,29 +112,72 @@ href="../Frivol.html">Frivol</a> is included in the class.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
+      <div id="method-M000010" class="method-detail">
+        <a name="M000010"></a>
+
+        <div class="method-heading">
+          <a href="ClassMethods.src/M000010.html" target="Code" class="method-signature"
+            onclick="popupCode('ClassMethods.src/M000010.html');return false;">
+          <span class="method-name">storage_bucket</span><span class="method-args">(bucket, options = {})</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p>
+Create a storage bucket. <a href="../Frivol.html">Frivol</a> creates
+store_#{bucket} and retrieve_#{bucket} methods automatically. These methods
+work exactly like the default store and retrieve methods except that the
+bucket is stored in it&#8216;s own key in Redis and can have it&#8216;s own
+expiry time.
+</p>
+<p>
+Counters are special in that they do not store a hash but only a single
+integer value and also that the data in a counter is not cached for the
+lifespan of the object, but rather each call hits Redis. This is intended
+to make counters thread safe (for example you may have multiple workers
+working on a job and they can each increment a progress counter which would
+not work with the default retrieve/store method that normal buckets use).
+For this to actually be thread safe you need to pass the thread safe option
+to the config when you make the connection.
+</p>
+<p>
+In the case of a counter, the methods work slightly differently:
+</p>
+<ul>
+<li>store_#{bucket} only takes an integer value to store (no key)
+
+</li>
+<li>retrieve_#{bucket} only takes an integer default, and returns only the
+integer value
+
+</li>
+<li>there is an added increment_#{bucket} method which increments the counter
+by 1
+
+</li>
+</ul>
+<p>
+Options are :expires_in which sets the expiry time for a bucket, and
+:counter to create a special counter storage bucket.
+</p>
+        </div>
+      </div>
+
       <div id="method-M000008" class="method-detail">
         <a name="M000008"></a>
 
         <div class="method-heading">
-          <a href="#M000008" class="method-signature">
-          <span class="method-name">storage_expires_in</span><span class="method-args">(time)</span>
+          <a href="ClassMethods.src/M000008.html" target="Code" class="method-signature"
+            onclick="popupCode('ClassMethods.src/M000008.html');return false;">
+          <span class="method-name">storage_expires_in</span><span class="method-args">(time, bucket = nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Set the storage expiry time in seconds.
+Set the storage expiry time in seconds for the default bucket or the bucket
+passed.
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 190</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_expires_in</span>(<span class="ruby-identifier">time</span>)
-      <span class="ruby-ivar">@frivol_storage_expiry</span> = <span class="ruby-identifier">time</span>
-    <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 
@@ -141,25 +185,17 @@ Set the storage expiry time in seconds.
         <a name="M000009"></a>
 
         <div class="method-heading">
-          <a href="#M000009" class="method-signature">
-          <span class="method-name">storage_expiry</span><span class="method-args">()</span>
+          <a href="ClassMethods.src/M000009.html" target="Code" class="method-signature"
+            onclick="popupCode('ClassMethods.src/M000009.html');return false;">
+          <span class="method-name">storage_expiry</span><span class="method-args">(bucket = nil)</span>
           </a>
         </div>
       
         <div class="method-description">
           <p>
-Get the storage expiry time in seconds.
+Get the storage expiry time in seconds for the default bucket or the bucket
+passed.
 </p>
-          <p><a class="source-toggle" href="#"
-            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/frivol.rb, line 195</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_expiry</span>
-      <span class="ruby-ivar">@frivol_storage_expiry</span>
-    <span class="ruby-keyword kw">end</span>
-</pre>
-          </div>
         </div>
       </div>
 

data/doc/classes/Frivol/ClassMethods.src/M000008.html

@@ -5,14 +5,15 @@
 
 <html>
 <head>
-  <title>storage_expiry (Frivol::ClassMethods)</title>
+  <title>storage_expires_in (Frivol::ClassMethods)</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
   <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
 </head>
 <body class="standalone-code">
-  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 174</span>
-    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_expiry</span>
-      <span class="ruby-ivar">@frivol_storage_expiry</span>
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 246</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_expires_in</span>(<span class="ruby-identifier">time</span>, <span class="ruby-identifier">bucket</span> = <span class="ruby-keyword kw">nil</span>)
+      <span class="ruby-ivar">@frivol_storage_expiry</span> <span class="ruby-operator">||=</span> {}
+      <span class="ruby-ivar">@frivol_storage_expiry</span>[<span class="ruby-identifier">bucket</span>.<span class="ruby-identifier">to_s</span>] = <span class="ruby-identifier">time</span>
     <span class="ruby-keyword kw">end</span></pre>
 </body>
 </html>

data/doc/classes/Frivol/ClassMethods.src/M000009.html

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+<head>
+  <title>storage_expiry (Frivol::ClassMethods)</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="../../.././rdoc-style.css" type="text/css" media="screen" />
+</head>
+<body class="standalone-code">
+  <pre><span class="ruby-comment cmt"># File lib/frivol.rb, line 252</span>
+    <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">storage_expiry</span>(<span class="ruby-identifier">bucket</span> = <span class="ruby-keyword kw">nil</span>)
+      <span class="ruby-ivar">@frivol_storage_expiry</span> <span class="ruby-operator">||=</span> {}
+      <span class="ruby-ivar">@frivol_storage_expiry</span>.<span class="ruby-identifier">key?</span>(<span class="ruby-identifier">bucket</span>.<span class="ruby-identifier">to_s</span>) <span class="ruby-operator">?</span> <span class="ruby-ivar">@frivol_storage_expiry</span>[<span class="ruby-identifier">bucket</span>.<span class="ruby-identifier">to_s</span>] <span class="ruby-operator">:</span> <span class="ruby-constant">NEVER_EXPIRE</span>
+    <span class="ruby-keyword kw">end</span></pre>
+</body>
+</html>