RubyGems - table_setter - Versions diffs - 0.2.3 → 0.2.4 - Mend

table_setter 0.2.3 → 0.2.4

Files changed (16) hide show

data/Rakefile +1 -1
data/VERSION.yml +1 -1
data/bin/table-setter +2 -2
data/documentation/index.html.erb +6 -1
data/index.html +7 -2
data/lib/table_setter.rb +9 -1
data/lib/table_setter/command.rb +1 -0
data/lib/table_setter/table.rb +1 -1
data/spec/table-setter-app_spec.rb +2 -2
data/table_setter.gemspec +5 -5
data/template/tables/example.yml +3 -4
data/template/tables/example_faceted.yml +3 -3
data/template/tables/example_local.yml +4 -4
data/template/views/layout.erb +3 -2
data/template/views/table.erb +2 -0
metadata +7 -7

data/Rakefile CHANGED

@@ -14,7 +14,7 @@ begin
     gem.add_development_dependency "rspec", "~> 1.2.9"
     gem.add_dependency "rack", ">= 1.1.0"
     gem.add_dependency "thin", ">= 1.2.5"
-    gem.add_dependency "table_fu", ">= 0.2.1"
+    gem.add_dependency "table_fu", ">= 0.3.2"
     gem.add_dependency "sinatra", ">= 1.0.0"
     gem.add_dependency "sinatra-static-assets", ">= 0.5.0"
     gem.add_dependency "emk-sinatra-url-for", ">= 0.2.1"

data/VERSION.yml CHANGED

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

data/bin/table-setter CHANGED

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby -rrubygems
-require File.dirname(__FILE__ ) + "/../lib/table_setter"
+require "#{File.expand_path(File.dirname(__FILE__ ))}/../lib/table_setter.rb"
 TableSetter::Command.new

data/documentation/index.html.erb CHANGED

@@ -219,12 +219,17 @@ script/generate table-setter</pre>
       <li>
         <a href="http://media.apps.chicagotribune.com/tables/speed.html">In the Wild: Chicago Tribune</a><br>
         A table showing leniency rates of Chicago area judges in speeding cases.
+      </li>
+      <li>
+        <a href="https://github.com/newsapps/tostones">In the Wild: Tostones, easy TableSetter testing and deployment</a><br>
+        A set of fabric deploy scripts for deploying TableSetter to s3.
       </li>
     </ul>
     <h2><a id="credits" href="#toc">Credits</a></h2>
     <p><a href="http://github.com/thejefflarson">Jeff Larson</a> (Maintainer), <a href="http://github.com/brianboyer/">Brian Boyer</a>, <a href="http://github.com/kleinmatic">Scott Klein</a>, <a href="http://github.com/markpercival">Mark Percival</a>, <a href="http://github.com/seebq">Charles Brian Quinn</a>, <a href="http://github.com/bouvard">Christopher Groskopf</a>, and <a href="http://github.com/ryanmark">Ryan Mark</a>.</p>
     <h2><a id="changes" href="#toc">Change Log</a></h2>
+    <strong>0.2.4</strong>
+    <p>Fixes encodings issues and the FasterCSV name change for ruby 1.9.</p>
     <strong>0.2.3</strong>
     <p>JavaScript fix for table-sorter.</p>
     <strong>0.2.2</strong>

data/index.html CHANGED

@@ -8,7 +8,7 @@
   </head>
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableSetter <small>&ndash; Version: 0.2.2</small></h1>
+    <h1>TableSetter <small>&ndash; Version: 0.2.4</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>
@@ -216,12 +216,17 @@ script/generate table-setter</pre>
       <li>
         <a href="http://media.apps.chicagotribune.com/tables/speed.html">In the Wild: Chicago Tribune</a><br>
         A table showing leniency rates of Chicago area judges in speeding cases.
+      </li>
+      <li>
+        <a href="http://blog.apps.chicagotribune.com/2010/11/19/tostones-easy-tablesetter-testing-and-deployment/">In the Wild: Tostones, easy TableSetter testing and deployment</a><br>
+        A set of fabric deploy scripts for deploying TableSetter to s3.
       </li>
     </ul>
     <h2><a id="credits" href="#toc">Credits</a></h2>
     <p><a href="http://github.com/thejefflarson">Jeff Larson</a> (Maintainer), <a href="http://github.com/brianboyer/">Brian Boyer</a>, <a href="http://github.com/kleinmatic">Scott Klein</a>, <a href="http://github.com/markpercival">Mark Percival</a>, <a href="http://github.com/seebq">Charles Brian Quinn</a>, <a href="http://github.com/bouvard">Christopher Groskopf</a>, and <a href="http://github.com/ryanmark">Ryan Mark</a>.</p>
     <h2><a id="changes" href="#toc">Change Log</a></h2>
+    <strong>0.2.4</strong>
+    <p>Fixes encodings issues and the FasterCSV name change for ruby 1.9.</p>
     <strong>0.2.3</strong>
     <p>JavaScript fix for table-sorter.</p>
     <strong>0.2.2</strong>

data/lib/table_setter.rb CHANGED

@@ -3,10 +3,18 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 require 'table_fu'
 require 'yaml'
+if RUBY_VERSION > "1.9"
+  require 'csv'
+  Encoding.default_external = Encoding::UTF_8
+  Encoding.default_internal = Encoding::UTF_8
+  ::FasterCSV = CSV unless defined? ::FasterCSV
+else
+  require 'fastercsv'
+end
 autoload :Sinatra,   'sinatra/base'
 autoload :Thin,      'thin'
 autoload :ERB,       'erb'
-autoload :FasterCSV, 'FasterCSV'
 autoload :Curb,      'curb'
 autoload :RDiscount, 'rdiscount'

data/lib/table_setter/command.rb CHANGED

@@ -130,6 +130,7 @@ options:
     def install_file(body, dest)
       ensure_directory dest
+      body.force_encoding("UTF-8") if RUBY_VERSION > "1.9"
       File.open(dest, "w") do |file|
         file.write(body)
       end

data/lib/table_setter/table.rb CHANGED

@@ -1,5 +1,5 @@
+# encoding: utf-8
 require 'curb'
-require 'fastercsv'
 require 'table_fu'
 require 'net/http'

data/spec/table-setter-app_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 describe TableSetter::App, "in the application" do
@@ -16,7 +16,7 @@ describe TableSetter::App, "in the application" do
   it "should render a table" do
-    get '/example'
+    get '/example/'
     last_response.ok?.should be_true
     last_response.body.include?("Failed Banks List").should be_true
   end

data/table_setter.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{table_setter}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Larson"]
-  s.date = %q{2010-11-12}
+  s.date = %q{2010-11-19}
   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"]
@@ -144,7 +144,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
       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.2.1"])
+      s.add_runtime_dependency(%q<table_fu>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
       s.add_runtime_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])
@@ -154,7 +154,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 1.2.9"])
       s.add_dependency(%q<rack>, [">= 1.1.0"])
       s.add_dependency(%q<thin>, [">= 1.2.5"])
-      s.add_dependency(%q<table_fu>, [">= 0.2.1"])
+      s.add_dependency(%q<table_fu>, [">= 0.3.2"])
       s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
       s.add_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])
@@ -165,7 +165,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 1.2.9"])
     s.add_dependency(%q<rack>, [">= 1.1.0"])
     s.add_dependency(%q<thin>, [">= 1.2.5"])
-    s.add_dependency(%q<table_fu>, [">= 0.2.1"])
+    s.add_dependency(%q<table_fu>, [">= 0.3.2"])
     s.add_dependency(%q<sinatra>, [">= 1.0.0"])
     s.add_dependency(%q<sinatra-static-assets>, [">= 0.5.0"])
     s.add_dependency(%q<emk-sinatra-url-for>, [">= 0.2.1"])

data/template/tables/example.yml CHANGED

@@ -9,13 +9,12 @@ table:
     columns:
     -  Bank
     -  State
-    -  Closing Date
-    -  Our Coverage
+    -  Closing Date
+    -  Our Coverage
     -  Federal Regulators
     -  Public Enforcement Documents
     style:
       Bank: 'text-align:left;'
-    sorted_by:
+    sorted_by:
       Closing Date: 'ascending'
   live: true

data/template/tables/example_faceted.yml CHANGED

@@ -6,7 +6,7 @@ table:
   footer:
     <p>This chart and other stories are part of <a href="http://www.propublica.org/ion/stimulus/">Eye on the Stimulus</a>, our blog dedicated to tracking the stimulus from bill to building.</p>
   column_options:
-    columns:
+    columns:
       - State
       - Cong. District
       - Representative
@@ -21,7 +21,7 @@ table:
     total: ['Total Appropriation', 'Projects']
     sorted_by:
       Cong. District: descending
-  faceting:
+  faceting:
     facet_by: State
   live: false

data/template/tables/example_local.yml CHANGED

@@ -4,7 +4,7 @@ table:
   deck:
     <p>Road and bridge projects are expected to make up one of the biggest chunks of the jobs created in the stimulus package. Below, you’ll find a chart of more than 5,800 projects that have been approved by the U.S. Department of Transportation. Once given the green light, states can put the projects out to bid, contract them and begin construction work. So far, about 2,300 projects are under way.</p>
     <p>Help us find out how much progress has been made on these projects by participating in our <a href="http://projects.propublica.org/spotcheck/">Stimulus Spot Check</a>.</p>
     <p>For more on the stimulus, check out our <a href="http://www.propublica.org/ion/stimulus">blog and resource page</a>.</p>
   footer:
     <p>Source:&nbsp;<a href="http://www.fdic.gov/bank/individual/failed/banklist.html">FDIC</a></p>
@@ -14,14 +14,14 @@ table:
       - Urban Area
       - Project Description
       - Improvement Type
-      - ARRA Funds Obligated
+      - ARRA Funds Obligated
     style:
       State: 'text-align:left;'
-      Project Description: 'text-align:right;'
+      Project Description: 'text-align:right;'
     sorted_by:
       State: ascending
     formatting:
       ARRA Funds Obligated: currency
   hard_paginate: true
   per_page: 250
-  live: false
+  live: false

data/template/views/layout.erb CHANGED

@@ -1,3 +1,4 @@
+<%# encoding: UTF-8 %>
 <% table ||= nil %>
 <!DOCTYPE html>
 <html>
@@ -14,7 +15,7 @@
     <%= javascript_script_tag "/javascripts/jquery.tablesorter.multipagefilter.js" %>
     <%= javascript_script_tag "/javascripts/application.js" %>
     <%= stylesheet_link_tag "/stylesheets/stylesheet.css", :media=>"screen" %>
     <script>
       <% if !table.nil? %>
         var sortPlease = <%= table.sortable? %>;
@@ -24,7 +25,7 @@
         var sortPlease = false;
       <% end %>
     </script>
   </head>
   <body>
     <div id="table_fu">

data/template/views/table.erb CHANGED

@@ -1,3 +1,5 @@
+<%# encoding: UTF-8 %>
 <div id="table_title"><%= table.title %></div>
 <div id="deck"><%= table.deck %></div>
 <div id="controls">

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_setter
 version: !ruby/object:Gem::Version
-  hash: 17
+  hash: 31
   prerelease: false
   segments:
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors:
 - Jeff Larson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-11-12 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -74,12 +74,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 21
+        hash: 23
         segments:
         - 0
+        - 3
         - 2
-        - 1
-        version: 0.2.1
+        version: 0.3.2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency