charted 0.0.5 → 0.0.6

data/README.md

@@ -38,14 +38,10 @@ Then initialize the database:
 
     $ charted --migrate
 
-The app should be mounted to `/charted` path on your domain.  Then in your app,
-include the script right before the closing `</body>` tag:
+The app should be mounted to `/charted` path on your domain
 
-    <script src="/charted/script.js" async></script>
-
-If you concatenate your JavaScript, you can generate the `script.js` file and
-add it to your project.  The downside being when you update the charted gem,
-you'll also have to remember to update the JavaScript:
+In your app, generate a `charted.js` file.  This can be safely concatenated with
+you other JavaScript assets.
 
     $ charted --js > /path/to/my/project/public/charted.js
 
@@ -54,7 +50,7 @@ Updating
 
     $ gem install charted
     
-If you concatenated the JavaScript, you may need to do it again:
+You may need to generate a `charted.js` file again:
 
     $ charted --js > /path/to/my/project/public/charted.js
 
@@ -135,10 +131,7 @@ TODO
 ====
 
 * don't catch-all load error, makes debugging config.ru difficult
-* fix sorting
-* fix search terms
-* consider removing colored titles
-* shorten lists (too many single entries) on dashboard, add --full?
+* add --full or --single
 * browser version (IE6, IE7, IE8...) ?
 * handle 255 string length limit
 

data/lib/charted.rb

@@ -13,14 +13,13 @@ require 'geoip'
 require 'pony'
 require 'useragent'
 require 'search_terms'
-require 'colorize'
 require 'dashes'
 
 DataMapper::Model.raise_on_save_failure = true
 DataMapper::Property::String.length(255)
 
 module Charted
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
   GEOIP = GeoIP.new("#{File.dirname(__FILE__)}/../geoip.dat")
   JS_FILE = "#{File.dirname(__FILE__)}/../public/charted/script.js"
 
@@ -338,17 +337,15 @@ module Charted
       max_width = [`tput cols`.to_i / 2, 60].min
       chart = Dashes::Chart.new.
         max_width(max_width).
-        title("Total Visits".colorize(:light_green))
+        title("Total Visits")
       chart2 = Dashes::Chart.new.
         max_width(max_width).
-        title("Unique Visits".colorize(:light_green))
+        title("Unique Visits")
       table = Dashes::Table.new.
         max_width(max_width).
         spacing(:min, :min, :max).
         align(:right, :right, :left).
-        row('Total'.colorize(:light_blue),
-          'Unique'.colorize(:light_blue),
-          'Visits'.colorize(:light_green)).
+        row('Total', 'Unique', 'Visits').
         separator
       (0..11).each do |delta|
         date = Charted.prev_month(Date.today, delta)
@@ -374,9 +371,7 @@ module Charted
           max_width(max_width).
           spacing(:min, :min, :max).
           align(:right, :right, :left).
-          row('Total'.colorize(:light_blue),
-            '%'.colorize(:light_blue),
-            column.colorize(:light_green)).separator
+          row('Total', '%', column).separator
         rows = []
         total = @site.send(type).count(field.not => nil)
         @site.send(type).aggregate(field, :all.count).each do |label, count|
@@ -385,52 +380,49 @@ module Charted
           label = "#{label[0..37]}..." if label.length > 40
           rows << [format(count), "#{((count / total.to_f) * 100).round}%", label]
         end
-        rows.sort_by { |r| r[1] }.reverse.each { |row| table.row(*row) }
+        add_truncated(table, rows)
         nodes << table
       end
       table = Dashes::Table.new.
         max_width(max_width).
         spacing(:min, :min, :max).
         align(:right, :right, :left).
-        row('Total'.colorize(:light_blue),
-          'Unique'.colorize(:light_blue), 
-          'Events'.colorize(:light_green)).separator
+        row('Total', 'Unique', 'Events').
+        separator
       rows = []
       @site.events.aggregate(:label, :all.count).each do |label, count|
         unique = @site.visitors.count(:events => {label: label})
         rows << [format(count), format(unique), label]
       end
-      rows.sort_by { |r| r[1] }.reverse.each { |row| table.row(*row) }
+      add_truncated(table, rows)
       nodes << table
 
       table = Dashes::Table.new.
         max_width(max_width).
         spacing(:min, :min, :max).
         align(:right, :right, :left).
-        row('Start'.colorize(:light_blue),
-          'End'.colorize(:light_blue), 
-          'Conversions'.colorize(:light_green)).separator
+        row('Start', 'End', 'Conversions').
+        separator
       rows = []
       @site.conversions.aggregate(:label, :all.count).each do |label, count|
         ended = @site.conversions.count(label: label, :ended_at.not => nil)
         rows << [format(count), format(ended), label]
       end
-      rows.sort_by { |r| r[1] }.reverse.each { |row| table.row(*row) }
+      add_truncated(table, rows)
       nodes << table
 
       table = Dashes::Table.new.
         max_width(max_width).
         spacing(:min, :min, :max).
         align(:right, :right, :left).
-        row('Start'.colorize(:light_blue),
-          'End'.colorize(:light_blue), 
-          'Experiments'.colorize(:light_green)).separator
+        row('Start', 'End', 'Experiments').
+        separator
       rows = []
       @site.experiments.aggregate(:label, :bucket, :all.count).each do |label, bucket, count|
         ended = @site.experiments.count(label: label, bucket: bucket, :ended_at.not => nil)
         rows << [format(count), format(ended), "#{label}: #{bucket}"]
       end
-      rows.sort_by { |r| r[1] }.reverse.each { |row| table.row(*row) }
+      add_truncated(table, rows)
       nodes << table
 
       nodes.reject! do |node|
@@ -498,6 +490,15 @@ module Charted
     def format(num)
       num.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse
     end
+
+    def add_truncated(table, rows)
+      rows = rows.sort_by { |r| r[1].to_i }.reverse
+      if rows.length > 12 
+        rows = rows[0..11]
+        rows << ['...', '...', '...']
+      end
+      rows.each { |row| table.row(*row) }
+    end
   end
 
   class ExitError < RuntimeError; end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: charted
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dashes
   requirement: !ruby/object:Gem::Requirement