0.2.12

propublica · Feb 27, 2013 · 495cb7b · 495cb7b
1 parent c26aa4a
commit 495cb7b
Show file tree

Hide file tree

Showing 17 changed files with 265 additions and 451 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ template/out/
 
 ## PROJECT::SPECIFIC
 log
+
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in daybreak.gemspec
+gemspec
diff --git a/Rakefile b/Rakefile
@@ -1,58 +1,11 @@
-require 'rubygems'
-require 'rake'
+require 'bundler/gem_tasks'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "table_setter"
-    gem.summary = %Q{A sinatra based app for rendering CSVs in custom HTML}
-    gem.description = %Q{A sinatra based app for rendering CSVs hosted on google docs or locally in custom HTML}
-    gem.email = "thejefflarson@gmail.com"
-    gem.homepage = "http://propublica.github.com/table-setter/"
-    gem.authors = ["Jeff Larson"]
-    gem.rubyforge_project = "table-setter"
-    gem.add_development_dependency "rspec"
-    gem.add_dependency "rack", ">= 1.1.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", ">= 1.0.3"
-    gem.add_dependency "emk-sinatra-url-for", ">= 0.2.1"
-    gem.add_dependency "curb", ">= 0.7.15"
-    gem.add_dependency "rdiscount", ">= 1.6.8"
-    gem.executables << "table-setter"
+task :test do
+  Dir['./test/*_test.rb'].each do |file|
+    ruby file
   end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "table-setter #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
 end
+task :default => :test
 
 desc "render documentation for gh-pages"
 task :gh do
@@ -62,3 +15,8 @@ task :gh do
  end
  `open index.html`
 end
+
+desc "Publish the docs to gh-pages"
+task :publish do |t|
+  system('git push -f origin master:gh-pages')
+end
diff --git a/VERSION.yml b/VERSION.yml
diff --git a/documentation/index.html.erb b/documentation/index.html.erb
@@ -1,5 +1,5 @@
 <%
-require 'yaml'
+require './lib/table_setter/version.rb'
 %>
 <!DOCTYPE html>
 <html>
@@ -11,10 +11,7 @@ require 'yaml'
   </head>
   <body>
     <a href="http://www.propublica.org" class="propublica">&nbsp;</a>
-    <h1>TableSetter <small>&ndash; Version: <%=
-    config = YAML.load(File.read('VERSION.yml'))
-    "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-    %></small></h1>
+    <h1>TableSetter <small>&ndash; Version: <%= TableSetter::VERSION %></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>
@@ -239,6 +236,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.12</strong>
+    <p>General clean up and fix dependencies.</p>
     <strong>0.2.10</strong>
     <p>Switch to https for google key.</p>
     <strong>0.2.9</strong>
@@ -287,4 +286,4 @@ script/generate table-setter</pre>
     <pre><%= File.open("LICENSE").read %></pre>
 
   </body>
-</html>
+</html>
diff --git a/index.html b/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.11</small></h1>
+    <h1>TableSetter <small>&ndash; Version: 0.2.12</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>
@@ -302,4 +302,4 @@ <h2><a id="license" href="#toc">License</a></h2>
 </pre>
 
   </body>
-</html>
+</html>
diff --git a/lib/table_setter.rb b/lib/table_setter.rb
@@ -34,8 +34,7 @@ def configure(path)
     end
 
     def table_path
-      @config_path + "/tables/"
+      "#{@config_path}/tables/"
     end
-
   end
-end
+end
diff --git a/lib/table_setter/table.rb b/lib/table_setter/table.rb
@@ -25,7 +25,6 @@ def initialize(slug, opts={:defer => false})
     # It performs the requested data manipulations form the yml file after the data has been loaded.
     # 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

diff --git a/lib/table_setter/version.rb b/lib/table_setter/version.rb
@@ -0,0 +1,3 @@
+module TableSetter
+  VERSION = "0.2.12"
+end
diff --git a/spec/spec.opts b/spec/spec.opts
diff --git a/spec/table-setter-app_spec.rb b/spec/table-setter-app_spec.rb
diff --git a/spec/table-setter_spec.rb b/spec/table-setter_spec.rb