graffable 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68f6c232ecbb7293cc71a1abc7435e98b6e3b0f
-  data.tar.gz: d2059c65cfa780aec4164843ecc664d046cd9c69
+  metadata.gz: 46adff9ed7f91eaf984f65e4dea871ce51de43df
+  data.tar.gz: 18c69537813f8d22bcceec67793f6377b1937f1f
 SHA512:
-  metadata.gz: 54b73fd518fe5249903dd32b7dcd6c5ed47b645d3ad9a45b0b9002e12ffd964667a3e88e17b750a7c789fe4ed4a3e52cc0ff707ce5e249c3401cc57e31d28777
-  data.tar.gz: 9d1c0e3058e8c2d35e62b4b882f6ea06004557d88bb39682281b326b84a3721018d250bff26036678e85330947f13f727e64cbcf1915dd7cdca9a680192cf8d8
+  metadata.gz: 29fd8acb103da34e6674e26d2c0e6f43087de388d46a5dd7d5dac7c99e0eb574ceee77f7bdc6996d1a781b62dcff8be2ba22170a3af1d14018c0e75cde9f2eae
+  data.tar.gz: c690f97cb951290a6380a8a1ae30613617891172c9f6fee5b2828df41bd8658d1f704c183c883a1eedc372bd7e916ba1c7e721b842e0b5e7a41d9dd410689bcc

data/CHANGES.md

@@ -2,6 +2,13 @@
 Graffable Changes
 =================
 
+2014-02-06 Graffable v0.0.2
+---------------------------
+* `Graffable::Database.connect()` now connects to `ENV['DATABASE_URL']` (was `ENV['GRAFFABLE_DATABASE_URL']`)
+* Fix bug `Graffable::App#return_csv` when `max` is set
+* Fix bug `Graffable::App#return_json` when `max` is set
+
+
 2014-01-29 Graffable v0.0.1
 ---------------------------
 First release of Sinatra-based data charting application.

data/lib/graffable/app.rb

@@ -21,10 +21,11 @@ module Graffable
 
 
     before do
-      @db     = Graffable::Database.connect # Sequel.connect settings.database_url
+      @db     = Graffable::Database.connect
       @groups = @db[:groups].order(:name)
     end
 
+
     # /:group/:report/:year/:month.json
     get %r{/(.+)/(.+)/(\d{4})/(\d{2}).(csv|json)} do |group_name, report_name, year, month, extension|
       group  = assert_group  group_name
@@ -182,17 +183,24 @@ module Graffable
         defaults = { max: -1 }
         opts     = defaults.merge params
 
-        data = [ %w( date label value ).to_csv ]
+        data   = [ %w( date label value ).to_csv ]
+        values = {}
         dataset.each do |row|
-          date  = %i( year month day hour ).collect { |k| row[k] }.compact.join('-')
-          label = row[:label] || ''
-          value = row[:value].to_i
-          data << [ date, label, value ].to_csv
+          date   = %i( year month day hour ).collect { |k| row[k] }.compact.join('-')
+          label  = row[:label] || ''
+          value  = row[:value].to_i
+
+          values[date]        ||= {}
+          values[date][label]   = value
         end
 
-        if opts[:max] > -1
-          headers = data.shift
-          data = [ headers, data.reverse.slice( 0 .. ( opts[:max] - 1 ) ).reverse ].flatten
+        values = values.sort.reverse.slice( 0 .. opts[:max] - 1 ).reverse if opts[:max] > - 1
+        values.each do |tuple|
+          date  = tuple.first
+          pairs = tuple.last
+          pairs.each_pair do |label, value|
+            data << [ date, label, value ].to_csv
+          end
         end
 
         content_type :text
@@ -203,22 +211,30 @@ module Graffable
         defaults = { max: -1 }
         opts     = defaults.merge params
 
-        data = {}
+        data         = {}
+        date_mapping = {}
+        values       = {}
         dataset.each do |row|
-          date  = opts[:date_formatter].call row[:year], row[:month], row[:day], row[:hour]
+          date  = %i( year month day hour ).collect { |k| row[k] }.compact.join('-')
           label = row[:label] || ''
           value = row[:value].to_i
+        
+          date_mapping[date] = opts[:date_formatter].call row[:year], row[:month], row[:day], row[:hour] unless date_mapping.key?(date)
 
-          unless data.key?(label)
-            data[label]         = { data: [] }
-            data[label][:label] = label unless label.empty?
-          end
-          data[label][:data].push [ date, value ]
+          values[date]        ||= {}
+          values[date][label]   = value
         end
 
-        if opts[:max] > -1
-          data.each_pair do |label, values|
-            data[label][:data] = data[label][:data].reverse.slice( 0 .. ( opts[:max] - 1 ) ).reverse
+        values = values.sort.reverse.slice( 0 .. opts[:max] - 1 ).reverse if opts[:max] > - 1
+        values.each do |tuple|
+          date = date_mapping[ tuple.first ]
+          pairs = tuple.last
+          pairs.each_pair do |label, value|
+            unless data.key?(label)
+              data[label]         = { data: [] }
+              data[label][:label] = label unless label.empty?
+            end
+            data[label][:data].push [ date, value ]
           end
         end
 

data/lib/graffable/database.rb

@@ -4,7 +4,7 @@ module Graffable
 
   class Database
     def self.connect
-      key = 'GRAFFABLE_DATABASE_URL'
+      key = 'DATABASE_URL'
       raise "ERROR: #{key} not defined" unless ENV.key?(key)
       Sequel.connect ENV[key]
     end

data/lib/graffable/migration_task.rb

@@ -8,18 +8,19 @@ module Graffable
     def initialize
 
       Sequel.extension :migration
-      db         = Graffable::Database.connect
       namespace  = 'graffable:migrate'
       migrations = File.join( File.dirname(__FILE__), '../../db/migrations' )
 
       desc 'Perform migration down (erase all data)'
       task "#{namespace}:down" do
+        db = Graffable::Database.connect
         Sequel::Migrator.run db, migrations, target: 0
         puts "<= #{namespace}:down executed"
       end
 
       desc 'Perform migration reset (full erase and migration up)'
       task "#{namespace}:reset" do
+        db = Graffable::Database.connect
         Sequel::Migrator.run db, migrations, target: 0
         Sequel::Migrator.run db, migrations
         puts "<= #{namespace}:reset executed"
@@ -27,6 +28,7 @@ module Graffable
 
       desc 'Perform migration down (erase all data)'
       task "#{namespace}:down" do
+        db = Graffable::Database.connect
         Sequel::Migrator.run db, migrations, target: 0
         puts "<= #{namespace}:down executed"
       end
@@ -35,12 +37,15 @@ module Graffable
       task "#{namespace}:to" do
         version = ENV['VERSION'].to_i
         raise 'No VERSION was provided' if version.nil?
+
+        db = Graffable::Database.connect
         Sequel::Migrator.run db, migrations, target: version
         puts "<= #{namespace}:to version=[#{version}] executed"
       end
 
       desc 'Perform migration to latest migration available'
       task "#{namespace}:up" do
+        db = Graffable::Database.connect
         Sequel::Migrator.run db, migrations
         puts "<= #{namespace}:up executed"
       end

data/lib/graffable/seed_task.rb

@@ -7,12 +7,12 @@ module Graffable
 
     def initialize
 
-      db         = Graffable::Database.connect
-      namespace  = 'graffable'
+      namespace = 'graffable'
 
-      desc 'Load Graffable seed data from GRAFFABLE_SEED_FILE'
+      desc 'Load Graffable seed data from SEED_FILE'
       task "#{namespace}:seed" do
-        key  = 'GRAFFABLE_SEED_FILE'
+        db   = Graffable::Database.connect
+        key  = 'SEED_FILE'
         seed = ENV[key]
         raise "No #{key} was provided" if seed.nil?
         load seed

data/lib/graffable/version.rb

@@ -1,4 +1,4 @@
 module Graffable
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end
 

data/lib/graffable/views/report.haml

@@ -8,6 +8,10 @@
       %a{ href: url(@next) }
         %span.glyphicon.glyphicon-chevron-right
 
+  #content{ style: 'align: center; margin: auto; padding: 1em; width: 95%;' }
+    #placeholder{ style: 'align: center; height: 75%; margin: auto; padding: 1em; width: 95%;' }
+  #legend{ style: 'padding-bottom: 1em;' }
+ 
   :javascript
     data_url = "#{ url(@data_url) }";
 
@@ -20,6 +24,9 @@
         grid: {
           hoverable: true
         },
+        legend: {
+          container: $('#legend')
+        },
         points: {
           show: true
         },
@@ -57,7 +64,4 @@
 
     });
 
-  -# FIXME
-  #content{ style: 'align: center; margin: auto; padding: 1em; width: 95%;' }
-    #placeholder{ style: 'align: center; height: 75%; margin: auto; padding: 1em; width: 95%;' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graffable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - blair christensen.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml