RubyGems - table_setter - Versions diffs - 0.2.5 → 0.2.6 - Mend

table_setter 0.2.5 → 0.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

data/Rakefile +5 -5
data/VERSION.yml +2 -2
data/documentation/index.html.erb +6 -0
data/index.html +7 -1
data/lib/table_setter/command.rb +24 -11
data/lib/table_setter/table.rb +3 -0
data/table_setter.gemspec +18 -17
data/template/config.ru +6 -4
data/template/lib/formatters.rb +6 -0
metadata +22 -23

data/Rakefile CHANGED Viewed

@@ -13,13 +13,13 @@ begin
     gem.rubyforge_project = "table-setter"
     gem.add_development_dependency "rspec"
     gem.add_dependency "rack", ">= 1.1.0"
-    gem.add_dependency "thin", ">= 1.2.5"
-    gem.add_dependency "table_fu", ">= 0.3.2"
-    gem.add_dependency "sinatra", ">= 1.0.0"
+    gem.add_dependency "thin", ">= 1.2.4"
+    gem.add_dependency "table_fu", ">= 0.3.4"
+    gem.add_dependency "sinatra", ">= 1.2.1"
     gem.add_dependency "sinatra-static-assets", ">= 0.5.0"
     gem.add_dependency "emk-sinatra-url-for", ">= 0.2.1"
-    gem.add_dependency "curb", ">= 0.6.6.0"
-    gem.add_dependency "rdiscount", ">= 1.6.3.1"
+    gem.add_dependency "curb", ">= 0.7.15"
+    gem.add_dependency "rdiscount", ">= 1.6.8"
     gem.executables << "table-setter"
   end

data/VERSION.yml CHANGED Viewed

@@ -1,5 +1,5 @@
 ---
-:patch: 5
-:build:
 :major: 0
+:build:
 :minor: 2
+:patch: 6

data/documentation/index.html.erb CHANGED Viewed

@@ -239,6 +239,12 @@ 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.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>
+      and added a <strong>lib/formatters.rb</strong> in the <strong>template</strong>, which is the standard
+      place to stash your custom formatters. Also, the <strong>build</strong> command
+      now errors loudly and exits if there's an error.</p>
     <strong>0.2.5</strong>
     <p>Loads of bullet-proofing from <a href="http://github.com/jpmckinney">James McKinney</a> and js fixes from <a href="http://github.com/palewire">Ben Welsh</a>, you'll want to re-run <strong>table-setter install</strong> to grab the changes, as with previous releases.</p>
     <strong>0.2.4</strong>

data/index.html CHANGED Viewed

@@ -9,7 +9,7 @@
   </head>
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableSetter <small>&ndash; Version: 0.2.5</small></h1>
+    <h1>TableSetter <small>&ndash; Version: 0.2.6</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,12 @@ 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.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>
+      and added a <strong>lib/formatters.rb</strong> in the <strong>template</strong>, which is the standard
+      place to stash your custom formatters. Also, the <strong>build</strong> command
+      now errors loudly and exits if there's an error.</p>
     <strong>0.2.5</strong>
     <p>Loads of bullet-proofing from <a href="http://github.com/jpmckinney">James McKinney</a> and js fixes from <a href="http://github.com/palewire">Ben Welsh</a>, you'll want to re-run <strong>table-setter install</strong> to grab the changes, as with previous releases.</p>
     <strong>0.2.4</strong>

data/lib/table_setter/command.rb CHANGED Viewed

@@ -74,19 +74,24 @@ options:
     def build_rack
       prefix = @prefix
+      config = File.join(@directory, "config.ru")
       Rack::Builder.app do
         map prefix do
-          use Rack::CommonLogger, STDERR
-          use Rack::ShowExceptions
-          use Rack::Lint
-          run TableSetter::App
+          if(File.exists? config)
+            run Rack::Builder.parse_file(config).first
+          else
+            use Rack::CommonLogger, STDERR
+            use Rack::ShowExceptions
+            use Rack::Lint
+            run TableSetter::App
+          end
         end
       end
     end
     def build_index
-      install_file(@request.request("GET", "#{@prefix}").body,
-                      File.join(@out_dir, "index.html"))
+      build_file("#{@prefix}", "index.html")
     end
     def build_assets
@@ -95,18 +100,26 @@ options:
       end
     end
+    def build_file(url, out)
+      response = @request.get(url)
+      if response.errors.length > 0
+        puts "ERROR on #{url}:\n#{response.errors}" and exit 1
+      end
+      install_file(response.body, File.join(@out_dir, out))
+    end
     def build_tables
       TableSetter::Table.all.each do |table|
-        return if !table.live
+        next if !table.live
         puts "Building #{table.slug}"
-        install_file(@request.request("GET", "#{@prefix}#{table.slug}/").body,
-                    File.join(@out_dir, table.slug, "index.html"))
+        build_file("#{@prefix}#{table.slug}/", File.join(table.slug, "index.html"))
         if table.hard_paginate?
           table.load
           (1..table.total_pages).each do |page|
             puts "Building #{table.slug} #{page} of #{table.total_pages}"
-            install_file(@request.request("GET", "#{@prefix}#{table.slug}/#{page}/").body,
-                File.join(@out_dir, table.slug, page.to_s, "index.html"))
+            build_file("#{@prefix}#{table.slug}/#{page}/",
+                File.join(table.slug, page.to_s, "index.html"))
           end
         end
       end

data/lib/table_setter/table.rb CHANGED Viewed

@@ -26,6 +26,9 @@ module TableSetter
     # We're keeping this explicit to control against unnecessary http requests.
     def load
       csv = csv_data
+      if @table_opts[:column_options]
+        @table_opts[:column_options]['style'] ||= {}
+      end
       @data = TableFu.new(csv_data, @table_opts[:column_options] || {})
       if @table_opts[:faceting]
         @data.col_opts[:ignored] = [@table_opts[:faceting][:facet_by]]

data/table_setter.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{table_setter}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Larson"]
-  s.date = %q{2011-02-19}
+  s.date = %q{2011-04-03}
   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"]
@@ -102,6 +102,7 @@ Gem::Specification.new do |s|
     "spec/table-setter_spec.rb",
     "table_setter.gemspec",
     "template/config.ru",
+    "template/lib/formatters.rb",
     "template/public/favicon.ico",
     "template/public/images/th_arrow_asc.gif",
     "template/public/images/th_arrow_desc.gif",
@@ -141,34 +142,34 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
-      s.add_runtime_dependency(%q<thin>, [">= 1.2.5"])
-      s.add_runtime_dependency(%q<table_fu>, [">= 0.3.2"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<thin>, [">= 1.2.4"])
+      s.add_runtime_dependency(%q<table_fu>, [">= 0.3.4"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.2.1"])
       s.add_runtime_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
       s.add_runtime_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])
-      s.add_runtime_dependency(%q<curb>, [">= 0.6.6.0"])
-      s.add_runtime_dependency(%q<rdiscount>, [">= 1.6.3.1"])
+      s.add_runtime_dependency(%q<curb>, [">= 0.7.15"])
+      s.add_runtime_dependency(%q<rdiscount>, [">= 1.6.8"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rack>, [">= 1.1.0"])
-      s.add_dependency(%q<thin>, [">= 1.2.5"])
-      s.add_dependency(%q<table_fu>, [">= 0.3.2"])
-      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+      s.add_dependency(%q<thin>, [">= 1.2.4"])
+      s.add_dependency(%q<table_fu>, [">= 0.3.4"])
+      s.add_dependency(%q<sinatra>, [">= 1.2.1"])
       s.add_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
       s.add_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])
-      s.add_dependency(%q<curb>, [">= 0.6.6.0"])
-      s.add_dependency(%q<rdiscount>, [">= 1.6.3.1"])
+      s.add_dependency(%q<curb>, [">= 0.7.15"])
+      s.add_dependency(%q<rdiscount>, [">= 1.6.8"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rack>, [">= 1.1.0"])
-    s.add_dependency(%q<thin>, [">= 1.2.5"])
-    s.add_dependency(%q<table_fu>, [">= 0.3.2"])
-    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
+    s.add_dependency(%q<thin>, [">= 1.2.4"])
+    s.add_dependency(%q<table_fu>, [">= 0.3.4"])
+    s.add_dependency(%q<sinatra>, [">= 1.2.1"])
     s.add_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
     s.add_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])
-    s.add_dependency(%q<curb>, [">= 0.6.6.0"])
-    s.add_dependency(%q<rdiscount>, [">= 1.6.3.1"])
+    s.add_dependency(%q<curb>, [">= 0.7.15"])
+    s.add_dependency(%q<rdiscount>, [">= 1.6.8"])
   end
 end

data/template/config.ru CHANGED Viewed

@@ -4,10 +4,10 @@
 # enabled web server.
 #
 # For example this will spin up a thin instance:
-#
+#
 # thin start -R ./config.ru
-#
-# To run it in apache you should have Passenger enabled, and follow the instructions in the
+#
+# To run it in apache you should have Passenger enabled, and follow the instructions in the
 # passenger docs:
 #
 # http://www.modrails.com/documentation/Users%20guide.html#_deploying_a_rack_based_ruby_application
@@ -16,6 +16,8 @@ require 'rubygems'
 require 'table_setter'
 TableSetter.configure(File.dirname(__FILE__))
+# Include custom formatters
+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
 # lines below:
@@ -26,7 +28,7 @@ TableSetter.configure(File.dirname(__FILE__))
 #  :entitystore => "file:#{TableSetter.config_path}/tmp/body"
 #
 # You can tweak the cache timeout for TableSetter by setting the timeout variable on
-# TableSetter::App:
+# TableSetter::App:
 #
 TableSetter::App.cache_timeout = 60 * 15 # 15 minutes
 #

data/template/lib/formatters.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class TableFu::Formatting
+  class << self
+    # If you want custom formatters for your tables include them here.
+    # Some examples: https://github.com/propublica/table-fu/blob/master/lib/table_fu/formatting.rb
+  end
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_setter
 version: !ruby/object:Gem::Version
-  hash: 29
+  hash: 27
   prerelease: false
   segments:
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors:
 - Jeff Larson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-02-19 00:00:00 -05:00
+date: 2011-04-03 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -56,12 +56,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 21
+        hash: 23
         segments:
         - 1
         - 2
-        - 5
-        version: 1.2.5
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency
@@ -72,12 +72,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 23
+        hash: 27
         segments:
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 4
+        version: 0.3.4
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency
@@ -88,12 +88,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 23
+        hash: 29
         segments:
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 2
+        - 1
+        version: 1.2.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency
@@ -136,13 +136,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 103
+        hash: 29
         segments:
         - 0
-        - 6
-        - 6
-        - 0
-        version: 0.6.6.0
+        - 7
+        - 15
+        version: 0.7.15
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency
@@ -153,13 +152,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 97
+        hash: 31
         segments:
         - 1
         - 6
-        - 3
-        - 1
-        version: 1.6.3.1
+        - 8
+        version: 1.6.8
   type: :runtime
   version_requirements: *id009
 description: A sinatra based app for rendering CSVs hosted on google docs or locally in custom HTML
@@ -257,6 +255,7 @@ files:
 - spec/table-setter_spec.rb
 - table_setter.gemspec
 - template/config.ru
+- template/lib/formatters.rb
 - template/public/favicon.ico
 - template/public/images/th_arrow_asc.gif
 - template/public/images/th_arrow_desc.gif