table_setter 0.2.6 → 0.2.7

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :build: 
 :minor: 2
-:patch: 6
+:patch: 7

data/doc/TableFu/Formatting.html

@@ -311,16 +311,16 @@ TableFu formatters.
       <pre class="lines">
 
 
-218
-219
-220
-221
 222
 223
-224</pre>
+224
+225
+226
+227
+228</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 218</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 222</span>
 
 <span class='def def kw'>def</span> <span class='bar identifier id'>bar</span><span class='lparen token'>(</span><span class='percent identifier id'>percent</span><span class='rparen token'>)</span>
   <span class='percent identifier id'>percent</span> <span class='assign token'>=</span> <span class='percent identifier id'>percent</span><span class='dot token'>.</span><span class='to_f identifier id'>to_f</span>
@@ -359,12 +359,12 @@ join multiple columns, with optional delimiter
       <pre class="lines">
 
 
-251
-252
-253</pre>
+255
+256
+257</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 251</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 255</span>
 
 <span class='def def kw'>def</span> <span class='join identifier id'>join</span><span class='lparen token'>(</span><span class='mult op'>*</span><span class='args identifier id'>args</span><span class='rparen token'>)</span>
   <span class='args identifier id'>args</span><span class='dot token'>.</span><span class='join identifier id'>join</span><span class='lparen token'>(</span><span class='string val'>&quot; &quot;</span><span class='rparen token'>)</span>
@@ -388,12 +388,12 @@ join multiple columns, with optional delimiter
       <pre class="lines">
 
 
-255
-256
-257</pre>
+259
+260
+261</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 255</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 259</span>
 
 <span class='def def kw'>def</span> <span class='joinbr identifier id'>joinbr</span><span class='lparen token'>(</span><span class='mult op'>*</span><span class='args identifier id'>args</span><span class='rparen token'>)</span>
   <span class='args identifier id'>args</span><span class='dot token'>.</span><span class='join identifier id'>join</span><span class='lparen token'>(</span><span class='string val'>&quot;&lt;br&gt;&quot;</span><span class='rparen token'>)</span>
@@ -417,12 +417,12 @@ join multiple columns, with optional delimiter
       <pre class="lines">
 
 
-259
-260
-261</pre>
+263
+264
+265</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 259</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 263</span>
 
 <span class='def def kw'>def</span> <span class='joincomma identifier id'>joincomma</span><span class='lparen token'>(</span><span class='mult op'>*</span><span class='args identifier id'>args</span><span class='rparen token'>)</span>
   <span class='args identifier id'>args</span><span class='dot token'>.</span><span class='join identifier id'>join</span><span class='lparen token'>(</span><span class='string val'>&quot;, &quot;</span><span class='rparen token'>)</span>
@@ -457,17 +457,17 @@ format as a link, if the href is empty don&#8217;t make the link active
       <pre class="lines">
 
 
-231
-232
-233
-234
 235
 236
 237
-238</pre>
+238
+239
+240
+241
+242</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 231</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 235</span>
 
 <span class='def def kw'>def</span> <span class='link identifier id'>link</span><span class='lparen token'>(</span><span class='linkname identifier id'>linkname</span><span class='comma token'>,</span> <span class='href identifier id'>href</span><span class='rparen token'>)</span>
   <span class='title identifier id'>title</span> <span class='assign token'>=</span> <span class='linkname identifier id'>linkname</span><span class='dot token'>.</span><span class='to_s identifier id'>to_s</span><span class='dot token'>.</span><span class='gsub identifier id'>gsub</span><span class='lparen token'>(</span><span class='regexp val'>/([&quot;])/</span><span class='comma token'>,</span> <span class='string val'>&quot;'&quot;</span><span class='rparen token'>)</span>
@@ -507,12 +507,12 @@ markdown formatting in tablefu cells
       <pre class="lines">
 
 
-226
-227
-228</pre>
+230
+231
+232</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 226</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 230</span>
 
 <span class='def def kw'>def</span> <span class='markdown identifier id'>markdown</span><span class='lparen token'>(</span><span class='cell identifier id'>cell</span><span class='rparen token'>)</span>
   <span class='RDiscount constant id'>RDiscount</span><span class='dot token'>.</span><span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='cell identifier id'>cell</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='to_html identifier id'>to_html</span>
@@ -547,12 +547,12 @@ make it small
       <pre class="lines">
 
 
-246
-247
-248</pre>
+250
+251
+252</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 246</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 250</span>
 
 <span class='def def kw'>def</span> <span class='small identifier id'>small</span><span class='lparen token'>(</span><span class='cell identifier id'>cell</span><span class='rparen token'>)</span>
   <span class='dstring node'>&quot;&lt;small&gt;#{cell}&lt;/small&gt;&quot;</span>
@@ -587,12 +587,12 @@ make it strong
       <pre class="lines">
 
 
-241
-242
-243</pre>
+245
+246
+247</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 241</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 245</span>
 
 <span class='def def kw'>def</span> <span class='strong identifier id'>strong</span><span class='lparen token'>(</span><span class='cell identifier id'>cell</span><span class='rparen token'>)</span>
   <span class='dstring node'>&quot;&lt;strong&gt;#{cell}&lt;/strong&gt;&quot;</span>
@@ -608,7 +608,7 @@ make it strong
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:17 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/TableSetter/App.html

@@ -171,7 +171,7 @@ Returns the value of attribute cache_timeout
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/TableSetter/Command.html

@@ -234,7 +234,8 @@ A new instance of Command
 34
 35
 36
-37</pre>
+37
+38</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 25</span>
@@ -242,6 +243,7 @@ A new instance of Command
 <span class='def def kw'>def</span> <span class='initialize identifier id'>initialize</span>
   <span class='@prefix ivar id'>@prefix</span> <span class='assign token'>=</span> <span class='string val'>&quot;&quot;</span>
   <span class='parse_options identifier id'>parse_options</span>
+  <span class='@prefix ivar id'>@prefix</span> <span class='assign token'>=</span> <span class='dstring node'>&quot;/#{@prefix}/&quot;</span><span class='dot token'>.</span><span class='gsub identifier id'>gsub</span><span class='lparen token'>(</span><span class='regexp val'>/^\/\//</span><span class='comma token'>,</span> <span class='string val'>&quot;/&quot;</span><span class='rparen token'>)</span>
   <span class='command identifier id'>command</span> <span class='assign token'>=</span> <span class='ARGV constant id'>ARGV</span><span class='dot token'>.</span><span class='shift identifier id'>shift</span>
   <span class='@directory ivar id'>@directory</span> <span class='assign token'>=</span> <span class='ARGV constant id'>ARGV</span><span class='dot token'>.</span><span class='shift identifier id'>shift</span> <span class='orop op'>||</span> <span class='string val'>'.'</span>
   <span class='TableSetter constant id'>TableSetter</span><span class='dot token'>.</span><span class='configure identifier id'>configure</span> <span class='@directory ivar id'>@directory</span>
@@ -278,6 +280,7 @@ A new instance of Command
       <pre class="lines">
 
 
+53
 54
 55
 56
@@ -285,20 +288,19 @@ A new instance of Command
 58
 59
 60
-61
-62</pre>
+61</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 54</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 53</span>
 
 <span class='def def kw'>def</span> <span class='build_out identifier id'>build_out</span>
   <span class='@out_dir ivar id'>@out_dir</span> <span class='assign token'>=</span> <span class='File constant id'>File</span><span class='dot token'>.</span><span class='join identifier id'>join</span><span class='lparen token'>(</span><span class='TableSetter constant id'>TableSetter</span><span class='dot token'>.</span><span class='config_path identifier id'>config_path</span><span class='comma token'>,</span> <span class='string val'>'out'</span><span class='comma token'>,</span> <span class='@prefix ivar id'>@prefix</span><span class='rparen token'>)</span>
   <span class='puts identifier id'>puts</span> <span class='string val'>&quot;\nBuilding your TableSetter files...\n\n&quot;</span>
   <span class='app identifier id'>app</span> <span class='assign token'>=</span> <span class='build_rack identifier id'>build_rack</span>
-  <span class='request identifier id'>request</span> <span class='assign token'>=</span> <span class='Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='MockRequest constant id'>MockRequest</span><span class='dot token'>.</span><span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='app identifier id'>app</span><span class='rparen token'>)</span>
-  <span class='build_index identifier id'>build_index</span> <span class='request identifier id'>request</span>
+  <span class='@request ivar id'>@request</span> <span class='assign token'>=</span> <span class='Rack constant id'>Rack</span><span class='colon2 op'>::</span><span class='MockRequest constant id'>MockRequest</span><span class='dot token'>.</span><span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='app identifier id'>app</span><span class='rparen token'>)</span>
+  <span class='build_index identifier id'>build_index</span>
   <span class='build_assets identifier id'>build_assets</span>
-  <span class='build_tables identifier id'>build_tables</span> <span class='request identifier id'>request</span>
+  <span class='build_tables identifier id'>build_tables</span>
 <span class='end end kw'>end</span>
 </pre>
     </td>
@@ -319,16 +321,16 @@ A new instance of Command
       <pre class="lines">
 
 
-44
 45
 46
 47
 48
 49
-50</pre>
+50
+51</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 44</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 45</span>
 
 <span class='def def kw'>def</span> <span class='install_assets identifier id'>install_assets</span>
   <span class='FileUtils constant id'>FileUtils</span><span class='dot token'>.</span><span class='mkdir_p identifier id'>mkdir_p</span> <span class='@directory ivar id'>@directory</span> <span class='unless unless_mod kw'>unless</span> <span class='File constant id'>File</span><span class='dot token'>.</span><span class='exists? fid id'>exists?</span> <span class='@directory ivar id'>@directory</span>
@@ -356,13 +358,13 @@ A new instance of Command
       <pre class="lines">
 
 
-39
 40
 41
-42</pre>
+42
+43</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/command.rb', line 40</span>
 
 <span class='def def kw'>def</span> <span class='start_server identifier id'>start_server</span>
   <span class='app identifier id'>app</span> <span class='assign token'>=</span> <span class='build_rack identifier id'>build_rack</span>
@@ -379,7 +381,7 @@ A new instance of Command
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/TableSetter/Table.html

@@ -784,14 +784,14 @@ time.
       <pre class="lines">
 
 
-110
-111
-112
-113
-114</pre>
+115
+116
+117
+118
+119</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 110</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 115</span>
 
 <span class='def def kw'>def</span> <span class='method_missing identifier id'>method_missing</span><span class='lparen token'>(</span><span class='method identifier id'>method</span><span class='rparen token'>)</span>
   <span class='if if kw'>if</span> <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='method identifier id'>method</span><span class='rbrack token'>]</span>
@@ -1105,20 +1105,20 @@ accessing the @data attribute will throw and error.
       <pre class="lines">
 
 
-176
-177
-178
-179
 180
 181
 182
-183</pre>
+183
+184
+185
+186
+187</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 176</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 180</span>
 
 <span class='def def kw'>def</span> <span class='all identifier id'>all</span>
-  <span class='tables identifier id'>tables</span><span class='assign token'>=</span><span class='lbrack token'>[</span><span class='rbrack token'>]</span> 
+  <span class='tables identifier id'>tables</span><span class='assign token'>=</span><span class='lbrack token'>[</span><span class='rbrack token'>]</span>
   <span class='Dir constant id'>Dir</span><span class='dot token'>.</span><span class='glob identifier id'>glob</span><span class='lparen token'>(</span><span class='dstring node'>&quot;#{TableSetter.table_path}/*.yml&quot;</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='each identifier id'>each</span> <span class='do do kw'>do</span> <span class='bitor op'>|</span><span class='file identifier id'>file</span><span class='bitor op'>|</span>
     <span class='table identifier id'>table</span> <span class='assign token'>=</span> <span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='File constant id'>File</span><span class='dot token'>.</span><span class='basename identifier id'>basename</span><span class='lparen token'>(</span><span class='file identifier id'>file</span><span class='comma token'>,</span> <span class='string val'>&quot;.yml&quot;</span><span class='rparen token'>)</span><span class='comma token'>,</span> <span class='symbol val'>:defer</span> <span class='assign token'>=</span><span class='gt op'>&gt;</span> <span class='true true kw'>true</span><span class='rparen token'>)</span>
     <span class='tables identifier id'>tables</span> <span class='lshft op'>&lt;&lt;</span> <span class='table identifier id'>table</span> <span class='if if_mod kw'>if</span> <span class='table identifier id'>table</span><span class='dot token'>.</span><span class='live identifier id'>live</span>
@@ -1168,12 +1168,12 @@ Does a table with this slug exist?
       <pre class="lines">
 
 
-207
-208
-209</pre>
+211
+212
+213</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 207</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 211</span>
 
 <span class='def def kw'>def</span> <span class='exists? fid id'>exists?</span><span class='lparen token'>(</span><span class='slug identifier id'>slug</span><span class='rparen token'>)</span>
   <span class='File constant id'>File</span><span class='dot token'>.</span><span class='exists? fid id'>exists?</span> <span class='table_path identifier id'>table_path</span><span class='lparen token'>(</span><span class='slug identifier id'>slug</span><span class='rparen token'>)</span>
@@ -1210,10 +1210,6 @@ probably a more unix-y way to do this but for now this is plenty speedy.
       <pre class="lines">
 
 
-188
-189
-190
-191
 192
 193
 194
@@ -1221,10 +1217,14 @@ probably a more unix-y way to do this but for now this is plenty speedy.
 196
 197
 198
-199</pre>
+199
+200
+201
+202
+203</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 188</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 192</span>
 
 <span class='def def kw'>def</span> <span class='fresh_yaml_time identifier id'>fresh_yaml_time</span>
   <span class='newest_file identifier id'>newest_file</span> <span class='assign token'>=</span> <span class='Dir constant id'>Dir</span><span class='lbrack token'>[</span><span class='dstring node'>&quot;#{TableSetter.table_path}/*.yml&quot;</span><span class='rbrack token'>]</span><span class='dot token'>.</span><span class='inject identifier id'>inject</span> <span class='do do kw'>do</span> <span class='bitor op'>|</span><span class='memo identifier id'>memo</span><span class='comma token'>,</span> <span class='obj identifier id'>obj</span><span class='bitor op'>|</span>
@@ -1232,7 +1232,7 @@ probably a more unix-y way to do this but for now this is plenty speedy.
     <span class='obj_time identifier id'>obj_time</span> <span class='assign token'>=</span> <span class='File constant id'>File</span><span class='dot token'>.</span><span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='File constant id'>File</span><span class='dot token'>.</span><span class='expand_path identifier id'>expand_path</span> <span class='obj identifier id'>obj</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='mtime identifier id'>mtime</span>
     <span class='if if kw'>if</span> <span class='memo_time identifier id'>memo_time</span> <span class='gt op'>&gt;</span> <span class='obj_time identifier id'>obj_time</span>
       <span class='memo identifier id'>memo</span>
-    <span class='else else kw'>else</span> 
+    <span class='else else kw'>else</span>
       <span class='obj identifier id'>obj</span>
     <span class='end end kw'>end</span>
   <span class='end end kw'>end</span>
@@ -1268,12 +1268,12 @@ Convenience method for looking up by slug.
       <pre class="lines">
 
 
-202
-203
-204</pre>
+206
+207
+208</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 202</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 206</span>
 
 <span class='def def kw'>def</span> <span class='table_path identifier id'>table_path</span><span class='lparen token'>(</span><span class='slug identifier id'>slug</span><span class='rparen token'>)</span>
   <span class='dstring node'>&quot;#{TableSetter.table_path}#{slug}.yml&quot;</span>
@@ -1316,15 +1316,15 @@ file.
       <pre class="lines">
 
 
-39
-40
-41
 42
 43
-44</pre>
+44
+45
+46
+47</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 42</span>
 
 <span class='def def kw'>def</span> <span class='csv_data identifier id'>csv_data</span>
   <span class='case case kw'>case</span>
@@ -1372,12 +1372,12 @@ file.
       <pre class="lines">
 
 
-62
-63
-64</pre>
+65
+66
+67</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 62</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 65</span>
 
 <span class='def def kw'>def</span> <span class='faceted? fid id'>faceted?</span>
   <span class='notop op'>!</span><span class='@facets ivar id'>@facets</span><span class='dot token'>.</span><span class='nil? fid id'>nil?</span>
@@ -1425,12 +1425,12 @@ hard_paginate instructs the app to render batches of a table.
       <pre class="lines">
 
 
-72
-73
-74</pre>
+75
+76
+77</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 72</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 75</span>
 
 <span class='def def kw'>def</span> <span class='hard_paginate? fid id'>hard_paginate?</span>
   <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:hard_paginate</span><span class='rbrack token'>]</span> <span class='eq op'>==</span> <span class='true true kw'>true</span>
@@ -1476,13 +1476,19 @@ control against unnecessary http requests.
 32
 33
 34
-35</pre>
+35
+36
+37
+38</pre>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 27</span>
 
 <span class='def def kw'>def</span> <span class='load identifier id'>load</span>
   <span class='csv identifier id'>csv</span> <span class='assign token'>=</span> <span class='csv_data identifier id'>csv_data</span>
+  <span class='if if kw'>if</span> <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:column_options</span><span class='rbrack token'>]</span>
+    <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:column_options</span><span class='rbrack token'>]</span><span class='lbrack token'>[</span><span class='string val'>'style'</span><span class='rbrack token'>]</span> <span class='opasgn op'>||=</span> <span class='lbrace token'>{</span><span class='rbrace token'>}</span>
+  <span class='end end kw'>end</span>
   <span class='@data ivar id'>@data</span> <span class='assign token'>=</span> <span class='TableFu constant id'>TableFu</span><span class='dot token'>.</span><span class='new identifier id'>new</span><span class='lparen token'>(</span><span class='csv_data identifier id'>csv_data</span><span class='comma token'>,</span> <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:column_options</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='lbrace token'>{</span><span class='rbrace token'>}</span><span class='rparen token'>)</span>
   <span class='if if kw'>if</span> <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:faceting</span><span class='rbrack token'>]</span>
     <span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='col_opts identifier id'>col_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:ignored</span><span class='rbrack token'>]</span> <span class='assign token'>=</span> <span class='lbrack token'>[</span><span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:faceting</span><span class='rbrack token'>]</span><span class='lbrack token'>[</span><span class='symbol val'>:facet_by</span><span class='rbrack token'>]</span><span class='rbrack token'>]</span>
@@ -1534,24 +1540,24 @@ computes the page attributes which are nil and meaningless otherwise.
       <pre class="lines">
 
 
-83
-84
-85
 86
 87
 88
 89
 90
-91</pre>
+91
+92
+93
+94</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 83</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 86</span>
 
 <span class='def def kw'>def</span> <span class='paginate! fid id'>paginate!</span><span class='lparen token'>(</span><span class='curr_page identifier id'>curr_page</span><span class='rparen token'>)</span>
   <span class='return return kw'>return</span> <span class='if if_mod kw'>if</span> <span class='notop op'>!</span><span class='hard_paginate? fid id'>hard_paginate?</span>
   <span class='@page ivar id'>@page</span> <span class='assign token'>=</span> <span class='curr_page identifier id'>curr_page</span><span class='dot token'>.</span><span class='to_i identifier id'>to_i</span>
   <span class='raise identifier id'>raise</span> <span class='ArgumentError constant id'>ArgumentError</span> <span class='if if_mod kw'>if</span> <span class='@page ivar id'>@page</span> <span class='lt op'>&lt;</span> <span class='integer val'>1</span> <span class='orop op'>||</span> <span class='@page ivar id'>@page</span> <span class='gt op'>&gt;</span> <span class='total_pages identifier id'>total_pages</span>
-  <span class='adj_page identifier id'>adj_page</span> <span class='assign token'>=</span> <span class='@page ivar id'>@page</span> <span class='minus op'>-</span> <span class='integer val'>1</span> <span class='gt op'>&gt;</span> <span class='integer val'>0</span> <span class='question op'>?</span> <span class='@page ivar id'>@page</span> <span class='minus op'>-</span> <span class='integer val'>1</span> <span class='colon op'>:</span> <span class='integer val'>0</span> 
+  <span class='adj_page identifier id'>adj_page</span> <span class='assign token'>=</span> <span class='@page ivar id'>@page</span> <span class='minus op'>-</span> <span class='integer val'>1</span> <span class='gt op'>&gt;</span> <span class='integer val'>0</span> <span class='question op'>?</span> <span class='@page ivar id'>@page</span> <span class='minus op'>-</span> <span class='integer val'>1</span> <span class='colon op'>:</span> <span class='integer val'>0</span>
   <span class='@prev_page ivar id'>@prev_page</span> <span class='assign token'>=</span> <span class='adj_page identifier id'>adj_page</span> <span class='gt op'>&gt;</span> <span class='integer val'>0</span> <span class='question op'>?</span> <span class='adj_page identifier id'>adj_page</span> <span class='colon op'>:</span> <span class='nil nil kw'>nil</span>
   <span class='@next_page ivar id'>@next_page</span> <span class='assign token'>=</span> <span class='page identifier id'>page</span> <span class='lt op'>&lt;</span> <span class='total_pages identifier id'>total_pages</span> <span class='integer val'>? </span><span class='lparen token'>(</span><span class='@page ivar id'>@page</span> <span class='plus op'>+</span> <span class='integer val'>1</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='nil nil kw'>nil</span>
   <span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='only! fid id'>only!</span><span class='lparen token'>(</span><span class='adj_page identifier id'>adj_page</span> <span class='mult op'>*</span> <span class='per_page identifier id'>per_page</span><span class='dot2 op'>..</span><span class='lparen token'>(</span><span class='@page ivar id'>@page</span> <span class='mult op'>*</span> <span class='per_page identifier id'>per_page</span> <span class='minus op'>-</span> <span class='integer val'>1</span><span class='rparen token'>)</span><span class='rparen token'>)</span>
@@ -1586,12 +1592,12 @@ The number of rows per page. Defaults to 20
       <pre class="lines">
 
 
-77
-78
-79</pre>
+80
+81
+82</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 77</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 80</span>
 
 <span class='def def kw'>def</span> <span class='per_page identifier id'>per_page</span>
   <span class='@table_opts ivar id'>@table_opts</span><span class='lbrack token'>[</span><span class='symbol val'>:per_page</span><span class='rbrack token'>]</span> <span class='orop op'>||</span> <span class='integer val'>20</span>
@@ -1626,18 +1632,22 @@ A convienence method to return the sort array for table setter.
       <pre class="lines">
 
 
-101
-102
-103
 104
-105</pre>
+105
+106
+107
+108
+109
+110</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 101</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 104</span>
 
 <span class='def def kw'>def</span> <span class='sort_array identifier id'>sort_array</span>
-  <span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='sorted_by identifier id'>sorted_by</span><span class='dot token'>.</span><span class='inject identifier id'>inject</span><span class='lparen token'>(</span><span class='lbrack token'>[</span><span class='rbrack token'>]</span><span class='rparen token'>)</span> <span class='do do kw'>do</span> <span class='bitor op'>|</span><span class='memo identifier id'>memo</span><span class='comma token'>,</span> <span class='lparen token'>(</span><span class='key identifier id'>key</span><span class='comma token'>,</span> <span class='value identifier id'>value</span><span class='rparen token'>)</span><span class='bitor op'>|</span>
-    <span class='memo identifier id'>memo</span> <span class='lshft op'>&lt;&lt;</span> <span class='lbrack token'>[</span><span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='columns identifier id'>columns</span><span class='dot token'>.</span><span class='index identifier id'>index</span><span class='lparen token'>(</span><span class='key identifier id'>key</span><span class='rparen token'>)</span><span class='comma token'>,</span> <span class='value identifier id'>value</span> <span class='eq op'>==</span> <span class='string val'>'descending'</span> <span class='question op'>?</span> <span class='integer val'>1</span> <span class='colon op'>:</span> <span class='integer val'>0</span><span class='rbrack token'>]</span>
+  <span class='if if kw'>if</span> <span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='sorted_by identifier id'>sorted_by</span>
+    <span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='sorted_by identifier id'>sorted_by</span><span class='dot token'>.</span><span class='inject identifier id'>inject</span><span class='lparen token'>(</span><span class='lbrack token'>[</span><span class='rbrack token'>]</span><span class='rparen token'>)</span> <span class='do do kw'>do</span> <span class='bitor op'>|</span><span class='memo identifier id'>memo</span><span class='comma token'>,</span> <span class='lparen token'>(</span><span class='key identifier id'>key</span><span class='comma token'>,</span> <span class='value identifier id'>value</span><span class='rparen token'>)</span><span class='bitor op'>|</span>
+      <span class='memo identifier id'>memo</span> <span class='lshft op'>&lt;&lt;</span> <span class='lbrack token'>[</span><span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='columns identifier id'>columns</span><span class='dot token'>.</span><span class='index identifier id'>index</span><span class='lparen token'>(</span><span class='key identifier id'>key</span><span class='rparen token'>)</span><span class='comma token'>,</span> <span class='value identifier id'>value</span> <span class='eq op'>==</span> <span class='string val'>'descending'</span> <span class='question op'>?</span> <span class='integer val'>1</span> <span class='colon op'>:</span> <span class='integer val'>0</span><span class='rbrack token'>]</span>
+    <span class='end end kw'>end</span>
   <span class='end end kw'>end</span>
 <span class='end end kw'>end</span>
 </pre>
@@ -1684,12 +1694,12 @@ multi-page paginated.
       <pre class="lines">
 
 
-67
-68
-69</pre>
+70
+71
+72</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 67</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 70</span>
 
 <span class='def def kw'>def</span> <span class='sortable? fid id'>sortable?</span>
   <span class='notop op'>!</span><span class='faceted? fid id'>faceted?</span> <span class='andop op'>&amp;&amp;</span> <span class='notop op'>!</span><span class='hard_paginate? fid id'>hard_paginate?</span>
@@ -1725,12 +1735,12 @@ so that we still have the full @data.rows.length
       <pre class="lines">
 
 
-96
-97
-98</pre>
+99
+100
+101</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 96</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 99</span>
 
 <span class='def def kw'>def</span> <span class='total_pages identifier id'>total_pages</span>
   <span class='@total_pages ivar id'>@total_pages</span> <span class='opasgn op'>||=</span> <span class='lparen token'>(</span><span class='@data ivar id'>@data</span><span class='dot token'>.</span><span class='rows identifier id'>rows</span><span class='dot token'>.</span><span class='length identifier id'>length</span> <span class='div op'>/</span> <span class='per_page identifier id'>per_page</span><span class='dot token'>.</span><span class='to_f identifier id'>to_f</span><span class='rparen token'>)</span><span class='dot token'>.</span><span class='ceil identifier id'>ceil</span>
@@ -1767,13 +1777,13 @@ break the cache.
       <pre class="lines">
 
 
-57
-58
-59
-60</pre>
+60
+61
+62
+63</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 57</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 60</span>
 
 <span class='def def kw'>def</span> <span class='updated_at identifier id'>updated_at</span>
   <span class='csv_time identifier id'>csv_time</span> <span class='assign token'>=</span> <span class='google_key identifier id'>google_key</span><span class='dot token'>.</span><span class='nil? fid id'>nil?</span> <span class='integer val'>? </span><span class='modification_time identifier id'>modification_time</span><span class='lparen token'>(</span><span class='uri identifier id'>uri</span><span class='rparen token'>)</span> <span class='colon op'>:</span> <span class='google_modification_time identifier id'>google_modification_time</span>
@@ -1809,19 +1819,19 @@ Returns a usable uri based on what sort of input we have.
       <pre class="lines">
 
 
-47
-48
-49
 50
 51
 52
-53</pre>
+53
+54
+55
+56</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 47</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter/table.rb', line 50</span>
 
 <span class='def def kw'>def</span> <span class='uri identifier id'>uri</span>
-  <span class='case case kw'>case</span> 
+  <span class='case case kw'>case</span>
   <span class='when when kw'>when</span> <span class='google_key identifier id'>google_key</span> <span class='then then kw'>then</span> <span class='dstring node'>&quot;http://spreadsheets.google.com/pub?key=#{google_key}&amp;output=csv&quot;</span>
   <span class='when when kw'>when</span> <span class='url identifier id'>url</span> <span class='then then kw'>then</span> <span class='url identifier id'>url</span>
   <span class='when when kw'>when</span> <span class='file identifier id'>file</span> <span class='then then kw'>then</span> <span class='File constant id'>File</span><span class='dot token'>.</span><span class='expand_path identifier id'>expand_path</span><span class='lparen token'>(</span><span class='dstring node'>&quot;#{TableSetter.table_path}#{file}&quot;</span><span class='rparen token'>)</span>
@@ -1838,7 +1848,7 @@ Returns a usable uri based on what sort of input we have.
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:17 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/TableSetter.html

@@ -208,12 +208,12 @@ Returns the value of attribute config_path
       <pre class="lines">
 
 
-22
-23
-24</pre>
+30
+31
+32</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 22</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 30</span>
 
 <span class='def def kw'>def</span> <span class='config_path identifier id'>config_path</span>
   <span class='@config_path ivar id'>@config_path</span>
@@ -244,12 +244,12 @@ Returns the value of attribute config_path
       <pre class="lines">
 
 
-24
-25
-26</pre>
+32
+33
+34</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 24</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 32</span>
 
 <span class='def def kw'>def</span> <span class='configure identifier id'>configure</span><span class='lparen token'>(</span><span class='path identifier id'>path</span><span class='rparen token'>)</span>
   <span class='@config_path ivar id'>@config_path</span> <span class='assign token'>=</span> <span class='File constant id'>File</span><span class='dot token'>.</span><span class='expand_path identifier id'>expand_path</span><span class='lparen token'>(</span><span class='path identifier id'>path</span><span class='rparen token'>)</span>
@@ -273,12 +273,12 @@ Returns the value of attribute config_path
       <pre class="lines">
 
 
-28
-29
-30</pre>
+36
+37
+38</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 28</span>
+      <pre class="code"><span class="info file"># File 'lib/table_setter.rb', line 36</span>
 
 <span class='def def kw'>def</span> <span class='table_path identifier id'>table_path</span>
   <span class='@config_path ivar id'>@config_path</span> <span class='plus op'>+</span> <span class='string val'>&quot;/tables/&quot;</span>
@@ -294,7 +294,7 @@ Returns the value of attribute config_path
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/_index.html

@@ -137,7 +137,7 @@
 </div></div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:05 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/file.README.html

@@ -59,7 +59,7 @@ locally or remotely in custom HTML.
 </div></div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:05 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/index.html

@@ -59,7 +59,7 @@ locally or remotely in custom HTML.
 </div></div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:16 2010 by 
+  Generated on Thu Apr 14 16:57:05 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/doc/method_list.html

@@ -133,17 +133,17 @@
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="TableSetter/Table.html#initialize-instance_method" title="TableSetter::Table#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="TableSetter/Command.html#initialize-instance_method" title="TableSetter::Command#initialize (method)">#initialize</a></span> 
     
-      <small>TableSetter::Table</small>
+      <small>TableSetter::Command</small>
     
   </li>
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="TableSetter/Command.html#initialize-instance_method" title="TableSetter::Command#initialize (method)">#initialize</a></span> 
+    <span class='object_link'><a href="TableSetter/Table.html#initialize-instance_method" title="TableSetter::Table#initialize (method)">#initialize</a></span> 
     
-      <small>TableSetter::Command</small>
+      <small>TableSetter::Table</small>
     
   </li>
   
@@ -301,17 +301,17 @@
   
 
   <li class="r1 ">
-    <span class='object_link'><a href="TableSetter/Table.html#table_path-class_method" title="TableSetter::Table.table_path (method)">table_path</a></span> 
+    <span class='object_link'><a href="TableSetter.html#table_path-class_method" title="TableSetter.table_path (method)">table_path</a></span> 
     
-      <small>TableSetter::Table</small>
+      <small>TableSetter</small>
     
   </li>
   
 
   <li class="r2 ">
-    <span class='object_link'><a href="TableSetter.html#table_path-class_method" title="TableSetter.table_path (method)">table_path</a></span> 
+    <span class='object_link'><a href="TableSetter/Table.html#table_path-class_method" title="TableSetter::Table.table_path (method)">table_path</a></span> 
     
-      <small>TableSetter</small>
+      <small>TableSetter::Table</small>
     
   </li>
   

data/doc/top-level-namespace.html

@@ -79,7 +79,7 @@
 </div>
     
     <div id="footer">
-  Generated on Thu Nov  4 18:34:17 2010 by 
+  Generated on Thu Apr 14 16:57:06 2011 by 
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.6.1 (ruby-1.8.7).
 </div>

data/documentation/index.html.erb

@@ -239,6 +239,8 @@ script/generate table-setter</pre>
       <a href="http://github.com/palewire">Ben Welsh</a>, and
       <a href="http://github.com/jpmckinney">James McKinney</a>.</p>
     <h2><a id="changes" href="#toc">Change Log</a></h2>
+    <strong>0.2.7</strong>
+    <p>404 and 500 pages have no layout now, please update your templates accordingly.</p>
     <strong>0.2.6</strong>
     <p>Fixed a bug in <strong>table-setter start</strong> thanks to <a href="http://github.com/jfkeefe">John Keefe</a>
       merged in some more changes from <a href="http://github.com/jpmckinney">James McKinney</a>

data/index.html

@@ -9,7 +9,7 @@
   </head>
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableSetter <small>&ndash; Version: 0.2.6</small></h1>
+    <h1>TableSetter <small>&ndash; Version: 0.2.7</small></h1>
     <p><a href="https://github.com/propublica/table-setter">TableSetter</a> is a Ruby app that provides an easy way to present CSVs hosted locally or remotely (e.g. on google, etc) in custom HTML. TableSetter in the wild: <a href="http://projects.propublica.org/tables/failed-banks">a list of all stimulus projects from last year</a>, <a href="http://projects.propublica.org/tables/stimulus-spending-progress">the stimulus spending progress</a>, or <a href="http://projects.propublica.org/tables/failed-banks">a list of failed banks due to the last recession</a>.</p>
     <p>Each table is filterable and sortable on multiple columns. Also each column can be formatted in one of many different styles. In production mode, <strong>TableSetter</strong> provides valid expires headers and can be coupled with an upstream cache like <a href="http://rtomayko.github.com/rack-cache/">Rack::Cache</a> or varnish for speedy presentation.</p>
     <h2><a id="toc">Table of Contents</a></h2>
@@ -234,6 +234,8 @@ script/generate table-setter</pre>
       <a href="http://github.com/palewire">Ben Welsh</a>, and
       <a href="http://github.com/jpmckinney">James McKinney</a>.</p>
     <h2><a id="changes" href="#toc">Change Log</a></h2>
+    <strong>0.2.7</strong>
+    <p>404 and 500 pages have no layout now, please update your templates accordingly.</p>
     <strong>0.2.6</strong>
     <p>Fixed a bug in <strong>table-setter start</strong> thanks to <a href="http://github.com/jfkeefe">John Keefe</a>
       merged in some more changes from <a href="http://github.com/jpmckinney">James McKinney</a>

data/lib/table_setter/app.rb

@@ -10,11 +10,11 @@ module TableSetter
     enable :static
 
     not_found do
-      show :"404"
+      erb :"404", {:layout => false}
     end
 
     error do
-      show :"500"
+      erb :"500", {:layout => false}
     end
 
     get "/" do

data/lib/table_setter/command.rb

@@ -74,7 +74,7 @@ options:
 
     def build_rack
       prefix = @prefix
-      config = File.join(@directory, "config.ru")
+      config = File.join(TableSetter.config_path, "config.ru")
 
       Rack::Builder.app do
         map prefix do

data/table_setter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{table_setter}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Larson"]
-  s.date = %q{2011-04-03}
+  s.date = %q{2011-04-14}
   s.description = %q{A sinatra based app for rendering CSVs hosted on google docs or locally in custom HTML}
   s.email = %q{thejefflarson@gmail.com}
   s.executables = ["table-setter", "table-setter"]

data/template/config.ru

@@ -16,7 +16,7 @@ require 'rubygems'
 require 'table_setter'
 TableSetter.configure(File.dirname(__FILE__))
 
-# Include custom formatters
+# You should put and custom formatters in lib/formatters.rb.
 require "#{File.expand_path(File.dirname(__FILE__))}/lib/formatters.rb"
 
 # You should probably enable Rack::Cache if you're not behind a caching proxy, by uncommenting the

data/template/views/404.erb

@@ -1,4 +1,8 @@
-<h2>404 Not Found</h2>
-
-<p>The table you asked for could not be found</p>
-<p>Go <a href="<%= url_for "/" %>">back</a>.</p>
+<!DOCTYPE html>
+<html>
+  <body>
+    <h2>404 Not Found</h2>
+    <p>The table you asked for could not be found</p>
+    <p>Go <a href="<%= url_for "/" %>">back</a>.</p>
+  </body>
+</html>

data/template/views/500.erb

@@ -1,4 +1,9 @@
-<h2>500 - Error</h2>
+<!DOCTYPE html>
+<html>
+  <body>
+    <h2>500 - Error</h2>
 
-<p>The table you asked for could not be found.</p>
-<p>Go <a href="<%= url_for "/" %>">back</a>.</p>
+    <p>The table you asked for could not be found.</p>
+    <p>Go <a href="<%= url_for "/" %>">back</a>.</p>
+  </body>
+</html>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: table_setter
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jeff Larson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 -04:00
+date: 2011-04-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency