Merge 87ab66f into cd3fc53

Gemfile

@@ -23,6 +23,7 @@ group :test do
   gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'pry'
+  gem 'timecop'
   gem 'vcr'
   gem 'webmock'
   gem 'cucumber-api-steps', require: false

Gemfile.lock

@@ -21,7 +21,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    autoprefixer-rails (6.2.2)
+    autoprefixer-rails (6.2.3)
       execjs
       json
     bootstrap-sass (3.3.6)
@@ -107,9 +107,10 @@ GEM
       rb-inotify (>= 0.9)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.9)
+    lumberjack (1.0.10)
     method_source (0.8.2)
     mime-types (2.99)
+    mime-types-data (3.2015.1120)
     mini_portile2 (2.0.0)
     minitest (5.8.3)
     multi_json (1.11.2)
@@ -144,7 +145,7 @@ GEM
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rake (10.4.2)
-    rb-fsevent (0.9.6)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redis (3.2.2)
@@ -188,6 +189,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
+    timecop (0.8.0)
     tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -228,6 +230,7 @@ DEPENDENCIES
   sinatra
   sinatra-assetpack
   tilt (~> 1)
+  timecop
   vcr
   webmock
 

TODO.md

@@ -3,3 +3,4 @@
 * Individual URLs per dataset, maybe iframe the dashboards ala Sir Handel
 * Front page with high-priority things?
 * Github URLs back to the datas
+* License the data

lib/dashboard/fetcher.rb

@@ -1,6 +1,10 @@
 module Dashboard
   class Fetcher
-    @@redis = Redis.new
+    REDIS = Redis.new
+
+    def self.redis
+      REDIS
+    end
 
     def self.headers
       {
@@ -16,15 +20,15 @@ def self.query
       }
     end
 
-    def self.get url
-      if @@redis.get url
-        return Marshal.load(@@redis.get url)
+    def self.get url, ttl = 3600
+      begin
+        Marshal.load(self.redis.get url)
+      rescue TypeError
+        h = HTTParty.get url, headers: headers, query: query
+        self.redis.set url, Marshal.dump(h.body)
+        self.redis.expire url, ttl
+        Marshal.load(self.redis.get url)
       end
-
-      h = HTTParty.get url, headers: headers, query: query
-      @@redis.set url, Marshal.dump(h.body)
-      @@redis.expire url, 3600
-      return Marshal.load(@@redis.get url)
     end
 
     def self.extract_repo url

lib/views/grid.erb

@@ -31,7 +31,7 @@
     ]
 
     var layout = {
-      title: json['title'],
+      title: json['title'] + ' (' + githubLink(json) + ')',
       xaxis: {
         tickformat: "%b %Y"
       },
@@ -69,11 +69,16 @@
     }
     content += '<h2>' + fixedDate + '</h2>'
     content += '<h3>(' + age + ')</h3>'
+    content += githubLink(json)
     content += '<hr />'
 
     return cellContent(json['id'], content)
   }
 
+  function githubLink(json) {
+    return '<a href="' + json['url'] + '">Source</a>'
+  }
+
   function cellContent(id, content) {
     return "<div class='col-md-4' id='#" + id + "'>" + content + "</div>"
   }

spec/caching_spec.rb

@@ -0,0 +1,37 @@
+module Dashboard
+  describe Fetcher do
+    before :each do
+      Redis.new.flushall
+    end
+
+    after :all do
+      Redis.new.flushall
+    end
+
+    it 'stores a value in Redis', :vcr do
+      url = 'https://raw.githubusercontent.com/pikesley/snake-data/master/length.csv'
+      described_class.get(url)
+      expect(Marshal.load(Redis.new.get(url))).to eq(
+"""\
+Date,Length in m
+2014-09-30,0.45
+2014-10-09,0.50
+2014-10-18,0.50
+2014-12-12,0.55
+2015-01-11,0.60
+2015-01-28,0.65
+2015-08-27,0.95
+"""
+      )
+    end
+
+    it 'expires a value after the timeout', :vcr do
+      url = 'https://api.github.com/repos/pikesley/catface/contents/flea-treatment.csv?ref=master'
+      described_class.get(url, 1)
+      expect(Redis.new.get url).to_not be nil
+      expect(Redis.new.ttl url).to eq 1
+      sleep 1
+      expect(Redis.new.get url).to be nil
+    end
+  end
+end

spec/javascripts/dashboardSpec.js

@@ -1,5 +0,0 @@
-describe('ago', function() {
-  it('knows a thing was a month ago', function() {
-    Timecop.install()
-  })
-})

spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'coveralls'
 Coveralls.wear_merged!
+require 'timecop'
 
 require 'dashboard'
 require_relative 'support/vcr_setup'