stuff

bin/harvester-new

@@ -15,7 +15,7 @@ source = File.expand_path File.dirname(__FILE__) + '/..'
 FileUtils.mkdir_p new
 FileUtils.cp_r  source + '/data/templates', new + '/templates'
 FileUtils.cp    source + '/collections.yaml', new + '/collections.yaml'
-FileUtils.cp    source + '/README', new + '/README'
+FileUtils.cp    source + '/README.rdoc', new + '/README'
 
 # edit default options
 c = YAML::load_file source + '/config.yaml'

data/sql/mysql/chart.sql

@@ -0,0 +1 @@
+select date(items.date) as date,sources.collection from items left join sources on sources.rss=items.rss where date > now() - interval '14 days' and date < now() + interval '1 day' order by date

data/sql/postgresql/chart.sql

@@ -0,0 +1 @@
+select date(items.date) as date,sources.collection from items left join sources on sources.rss=items.rss where date > now() - interval '14 days' and date < now() + interval '1 day' order by date

data/sql/sqlite3/chart.sql

@@ -0,0 +1 @@
+select date(items.date) as date,sources.collection from items left join sources on sources.rss=items.rss where date > time('now', '-14 days') and date < time('now', '+1 day') order by date

lib/harvester/chart.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require_relative '../harvester'
+require_relative '../harvester/db'
 require 'gruff'
 
 class Harvester
@@ -11,7 +12,7 @@ def chart!
     info "CHART"
     task "generate chart" do
       c = Chart::StatsPerCollection.new
-      @dbi.execute("select date(items.date) as date,sources.collection from items left join sources on sources.rss=items.rss where date > now() - interval '14 days' and date < now() + interval '1 day' order by date").each{ |date,collection|
+      @dbi.execute( File.read( sql_query(:chart) ) ).each{ |date,collection|
         c.add_one(collection, Date.parse(date).day)
       }
       Chart.new(c).write File.join( @config['settings']['output'], '/chart.jpg' )

lib/harvester/db.rb

@@ -116,4 +116,8 @@ def update(rss_url, new_source, collection, response, rss_url_nice = rss_url)
   def sql_queries(task)
     Dir[ File.dirname(__FILE__) + "/../../data/sql/#{ @config['db']['driver'].downcase }/#{ task }*.sql" ].each
   end
+
+  def sql_query(task)
+    File.dirname(__FILE__) + "/../../data/sql/#{ @config['db']['driver'].downcase }/#{ task }.sql"
+  end
 end

lib/harvester/fetch.rb

@@ -75,7 +75,7 @@ def self.run(dbi, collections, settings, logger)
             if http.response_header.status != 200
               logger.warn rss_url_nice + "HTTP not OK, but: #{ http.response_header.status }"
             elsif http.response.size > settings['size limit'].to_i
-              logger.warn rss_url_nice + "Got too big repsonse: #{response.size} bytes"
+              logger.warn rss_url_nice + "Got too big repsonse: #{ response.size } bytes"
             else
               yield rss_url, new_source, collection, http.response, rss_url_nice
             end
@@ -91,6 +91,6 @@ def self.run(dbi, collections, settings, logger)
         EM.stop
       }
     end
-    logger.info '[done]  fetch using Eventmachine'
+    logger.info '[done ] fetch using Eventmachine'
   end
 end