RubyGems - table_setter - Versions diffs - 0.2.1 → 0.2.2 - Mend

table_setter 0.2.1 → 0.2.2

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 (7) hide show

data/VERSION.yml +1 -1
data/documentation/index.html.erb +3 -1
data/index.html +4 -2
data/lib/table_setter/command.rb +27 -28
data/table_setter.gemspec +1 -1
data/template/views/index.erb +1 -1
metadata +3 -3

data/VERSION.yml CHANGED Viewed

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

data/documentation/index.html.erb CHANGED Viewed

@@ -225,10 +225,12 @@ script/generate table-setter</pre>
     <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.2</strong>
+    <p>Fixing long standing bug with empty prefixes in the <strong>build</strong> command.</p>
     <strong>0.2.1</strong>
     <p>Table Urls have an optional trailing slash. Fixes a bug in <strong>0.2.0</strong></p>
     <strong>0.2.0</strong>
-    <p><del><b>Backwards incompatible change:</b> Table urls no longer end in a  trailing slash. Please the <strong>url_for</strong> calls in your templates to reflect the change.</del></p>
+    <p>It's recommended not to use this version. <del><b>Backwards incompatible change:</b> Table urls no longer end in a  trailing slash. Please modify the <strong>url_for</strong> calls in your templates to reflect the change.</del></p>
     <strong>0.1.11</strong>
     <p>Javascript Fixes. <b>Note:</b> You'll need to delete the javascript's folder in the config directory and run <strong>table-setter install</strong> to grab the changes.</p>
     <strong>0.1.10</strong>

data/index.html CHANGED Viewed

@@ -8,7 +8,7 @@
   </head>
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableSetter <small>&ndash; Version: 0.2.0</small></h1>
+    <h1>TableSetter <small>&ndash; Version: 0.2.2</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>
@@ -222,10 +222,12 @@ script/generate table-setter</pre>
     <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.2</strong>
+    <p>Fixing long standing bug with empty prefixes in the <strong>build</strong> command.</p>
     <strong>0.2.1</strong>
     <p>Table Urls have an optional trailing slash. Fixes a bug in <strong>0.2.0</strong></p>
     <strong>0.2.0</strong>
-    <p><del><b>Backwards incompatible change:</b> Table urls no longer end in a  trailing slash. Please the <strong>url_for</strong> calls in your templates to reflect the change.</del></p>
+    <p>It's recommended not to use this version. <del><b>Backwards incompatible change:</b> Table urls no longer end in a  trailing slash. Please modify the <strong>url_for</strong> calls in your templates to reflect the change.</del></p>
     <strong>0.1.11</strong>
     <p>Javascript Fixes. <b>Note:</b> You'll need to delete the javascript's folder in the config directory and run <strong>table-setter install</strong> to grab the changes.</p>
     <strong>0.1.10</strong>

data/lib/table_setter/command.rb CHANGED Viewed

@@ -11,19 +11,20 @@ table-setter is a Sinatra application for rendering and processing CSVs from goo
 Usage:
   table-setter COMMAND path/to/table-setter/assets OPTIONS
 commands:
   start    run the development server, for deployment use config.ru
   install  copy the table-setter assets into the the directory
   build    statically build tables in the ./out/ directory
 options:
     EOB
     def initialize
       @prefix = ""
       parse_options
+      @prefix = "/#{@prefix}/".gsub(/^\/\//, "/")
       command = ARGV.shift
       @directory = ARGV.shift || '.'
       TableSetter.configure @directory
@@ -34,12 +35,12 @@ options:
       else puts BANNER
       end
     end
     def start_server
       app = build_rack
       Rack::Handler::Thin.run app, :Port => "3000"
     end
     def install_assets
       FileUtils.mkdir_p @directory unless File.exists? @directory
       puts "\nInstalling TableSetter files...\n\n"
@@ -47,19 +48,17 @@ options:
         copy_file path, File.join(TableSetter.config_path, path.gsub(ROOT + "/template/", "/"))
       end
     end
     def build_out
       @out_dir = File.join(TableSetter.config_path, 'out', @prefix)
       puts "\nBuilding your TableSetter files...\n\n"
       app = build_rack
-      request = Rack::MockRequest.new(app)
-      build_index request
+      @request = Rack::MockRequest.new(app)
+      build_index
       build_assets
-      build_tables request
+      build_tables
     end
     private
     # Option parsing
     def parse_options
@@ -72,11 +71,11 @@ options:
       @option_parser.banner = BANNER
       @option_parser.parse! ARGV
     end
     def build_rack
       prefix = @prefix
       Rack::Builder.app do
-        map "/#{prefix}" do
+        map prefix do
           use Rack::CommonLogger, STDERR
           use Rack::ShowExceptions
           use Rack::Lint
@@ -84,57 +83,57 @@ options:
         end
       end
     end
-    def build_index(request)
-      install_file(request.request("GET", "/#{@prefix}/").body,
+    def build_index
+      install_file(@request.request("GET", "#{@prefix}").body,
                       File.join(@out_dir, "index.html"))
     end
     def build_assets
       Dir[TableSetter.config_path + "/public/**/*"].each do |path|
         copy_file path, File.join(path.gsub(TableSetter.config_path + "/public/", "#{@out_dir}/"))
       end
     end
-    def build_tables(request)
+    def build_tables
       TableSetter::Table.all.each do |table|
         return if !table.live
         puts "Building #{table.slug}"
-        install_file(request.request("GET", "/#{@prefix}/#{table.slug}/").body,
+        install_file(@request.request("GET", "#{@prefix}#{table.slug}/").body,
                     File.join(@out_dir, 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,
+            install_file(@request.request("GET", "#{@prefix}#{table.slug}/#{page}/").body,
                 File.join(@out_dir, table.slug, page.to_s, "index.html"))
           end
         end
       end
     end
     def base_files
       Dir[ROOT + "/template/**/*"]
     end
     def copy_file(source, dest)
       ensure_directory dest
       exists = File.exists? dest
       FileUtils.cp_r(source, dest) unless exists
       puts "#{exists ? "exists" : "created"}\t#{dest}"
     end
     def ensure_directory(dest)
       expanded_path = File.dirname dest
       FileUtils.mkdir_p(expanded_path) unless File.exists?(expanded_path)
     end
     def install_file(body, dest)
       ensure_directory dest
       File.open(dest, "w") do |file|
         file.write(body)
       end
     end
   end
-end
+end

data/table_setter.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{table_setter}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Larson"]

data/template/views/index.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <ul>
 <% for table in tables %>
   <li>
-    <a href="<%= url_for "/#{table.slug/}" %>"><%= table.title %></a>
+    <a href="<%= url_for "/#{table.slug}/" %>"><%= table.title %></a>
   </li>
 <% end %>
 </ul>

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: table_setter
 version: !ruby/object:Gem::Version
-  hash: 21
+  hash: 19
   prerelease: false
   segments:
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeff Larson