blackbeard 0.0.5.0 → 0.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e955101ffdd9c1bfe155e1916ebfc0a9911f4d
-  data.tar.gz: eaab8a527217bc44eaadf13665a230cd46e8ae65
+  metadata.gz: fa44763d398c47b3063551c73926ec687539f3c7
+  data.tar.gz: e79c73df961507fc06858312fe91ed5c3a1caa1e
 SHA512:
-  metadata.gz: d16393da029f3e584a1b632332582b20645dd1857b7b845012546bd0b939a99251969c6ec5e658fb425e61cb5cdf4ad2588461883a5128541f0a18ea66ca54d8
-  data.tar.gz: 5f5154181ac58db415657199eddb3f6e19ff236e999bf21bd74fc597903ab63350f783face5647bd534b5dd1b6c8580ffbe439616a5b812fc77320af3325e838
+  metadata.gz: 56daa5b7823b2b5c3ca4ef2380d0c9e9fea8221f40aa03e274f7a43bd640488938e57f3d012fcb45b319cbbaa720a7e5675b0b6b33ddaf8b95a341f84617c3ef
+  data.tar.gz: 552061f079c0f531a850f8f9b62e4f9675d9df8867f3ffe4f2ef0d84bfa3cbaf69c1c12d2b77378e796e1200387dc4d4480d884284d99cbc07b37b16f12b96aa

data/dashboard/routes/metrics.rb

@@ -42,7 +42,13 @@ module Blackbeard
       end
 
       def ensure_charts
-        @charts = []
+        @charts = [chartable.recent_hours_chart, chartable.recent_days_chart]
+      end
+
+      def chartable
+        return GroupMetric.new(@group, @metric) if @group
+        return CohortMetric.new(@cohort, @metric) if @cohort
+        return @metric
       end
 
     end

data/dashboard/views/cohorts/show.erb

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1><span id="editable-name"><%= @cohort.name %></span> <small>Group</small></h1>
+  <h1><span id="editable-name"><%= @cohort.name %></span> <small>Cohort</small></h1>
   <p id="editable-description"><%= @cohort.description %></p>
 </div>
 

data/lib/blackbeard/chartable.rb

@@ -29,7 +29,7 @@ module Blackbeard
         :dom_id => 'recent_hour_chart',
         :title => title,
         :columns => ['Hour']+chartable_segments,
-        :rows => data.map{ |metric_hour| metric_hour.result_rows(chartable_segments) }
+        :rows => data.reverse.map{ |metric_hour| metric_hour.result_rows(chartable_segments) }
       )
     end
 
@@ -39,7 +39,7 @@ module Blackbeard
         :dom_id => 'recent_days_chart',
         :title => "Last #{count} Days",
         :columns => ['Day']+chartable_segments,
-        :rows => data.map{ |metric_date| metric_date.result_rows(chartable_segments) }
+        :rows => data.reverse.map{ |metric_date| metric_date.result_rows(chartable_segments) }
       )
     end
 

data/lib/blackbeard/cohort_metric.rb

@@ -1,5 +1,6 @@
 module Blackbeard
   class CohortMetric
+    include ConfigurationMethods
     include Chartable
 
     attr_reader :cohort, :metric
@@ -24,7 +25,7 @@ module Blackbeard
     end
 
     def chartable_segments
-      metric_data.map{|s| "avg #{s}" }
+      metric_data.segments.map{|s| "avg #{s}" }
     end
 
     def chartable_result_for_hour(hour)

data/lib/blackbeard/group_metric.rb

@@ -1,5 +1,6 @@
 module Blackbeard
   class GroupMetric
+    include ConfigurationMethods
     include Chartable
 
     attr_reader :group, :metric

data/lib/blackbeard/metric_date.rb

@@ -13,7 +13,7 @@ module Blackbeard
     end
 
     def result_rows(segments)
-      [@date] + results_for(segments)
+      [@date.to_s] + results_for(segments)
     end
 
 

data/lib/blackbeard/metric_hour.rb

@@ -12,7 +12,7 @@ module Blackbeard
     end
 
     def result_rows(segments)
-      [@hours] + results_for(segments)
+      [@hour.strftime("%l%P")] + results_for(segments)
     end
 
   private

data/lib/blackbeard/version.rb

@@ -1,3 +1,3 @@
 module Blackbeard
-  VERSION = "0.0.5.0"
+  VERSION = "0.0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blackbeard
 version: !ruby/object:Gem::Version
-  version: 0.0.5.0
+  version: 0.0.5.1
 platform: ruby
 authors:
 - Robert Graff