prosperity 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 740ec9800cffd9ee38910edd8cedebac1f49645c
-  data.tar.gz: a80cf6f9d7abadcc4f76753e68b21037415bb003
+  metadata.gz: 2a2b4fadf928d57f33383ad55b6a989b2dfd8d22
+  data.tar.gz: 01781f83c18c0da2e1ea23b94c220d480f523f1c
 SHA512:
-  metadata.gz: 3eb35a4e4da0e5c1861d40e50b25a379e6b87e3185a03002acf190a9da328a28f0a03091ad42dcd364420b37556a1fb3a34b00d59ff8e3769100eab5006c8289
-  data.tar.gz: 503524d35703953d01aab8b262e51f08a7797de5f7f6865eaa4c09cd5ad43c6199702179d3872c3d3b451ea01c61db958ba2371331faf4705d7dcb60dc78e803
+  metadata.gz: 78b242530b5999fbdde7a9a1bba6b444a95d6073a143cd9f47d80be04498badcad408b5bbe64fe79d871f09be4588d007f3e7107034a7d4713336781e6a9c214
+  data.tar.gz: 8d0875abb61818781caa6445711a0bbb92330838185d920d89937609f26e4f1c2fd0d82ccac8dc33cbad67301dae8878d9ad8d14ca54d4c64b1e09342737ab75

data/app/assets/javascripts/prosperity/application.js.coffee

@@ -12,7 +12,8 @@
 #
 #= require jquery
 #= require jquery_ujs
-#= require highcharts
+#= require morris.min-0.5
+#= require raphael-min-2.1.2
 #= require_tree .
 
 $ ->

data/app/assets/javascripts/prosperity/graph.js.coffee

@@ -1,67 +1,82 @@
+class SubGraph
+  constructor: (options = {}) ->
+    @el = $('<div>', class: 'sub-graph')
+    if options.showTitle
+      @el.append("<div class='title'>Loading...</div>")
 
-class Graph
-  constructor: (option) ->
-    @url = option.url
-    @el = option.el
-    @$el = $(option.el)
-
-  render: ->
-    highchartsOptions = 
-      chart:
-        type: 'line'
-        renderTo: @el
-      tooltip:
-        crosshairs: [true, true]
+    @el.find('.title').html(options.label)
+
+    chartEl = $('<div>', class: 'sub-graph-chart')
+    @el.append(chartEl)
+
+    @data = []
+    @chartOptions =
+      element: chartEl
       series: []
-      xAxis: 
-        type: 'datetime'
-        dateTimeLabelFormats:
-          day: '%e of %b'
-      yAxis: [{}, {}, {}]
-      title: 
-        text: "Loading..."
-
-    chart = new Highcharts.Chart(highchartsOptions)
-
-    getSeries = (url, axisIndex) =>
-      $.get url, (json) =>
-        axisIndex = Math.min(axisIndex, chart.yAxis.length - 1)
-        serie = 
-          data: json.data
-          name: json.label
-          yAxis: axisIndex
-          pointStart: Date.parse(json.start_time)
-          pointInterval: json.period_milliseconds
-
-        axisSettings = 
-          title: {text: json.key}
-          min: Math.min.apply(Math, json.data)
-          max: Math.max.apply(Math, json.data)
-      
-
-        if json.key == 'change'
-          axisSettings = $.extend axisSettings, {
-            min: 0,
-            max: Math.max.apply(Math, json.data),
-            labels: {formatter: -> this.value + '%' },
-            opposite: true
-          }
-
-          serie = $.extend serie, {
-            tooltip: {valueDecimals: 2, valueSuffix: '%'}
-          }
-
-        chart.yAxis[axisIndex].update(axisSettings)
-        chart.addSeries(serie)
-
-    $.getJSON @url, (json) ->
-      chart.setTitle {text: json.title}
+      xkey: "x"
+      ykeys: []
+      labels: []
+      smooth: false
+      data: @data
+
+    @chartOptions.postUnits = '%' if options.key == 'change'
+
+  addSeries: (json) ->
+    data = @data
+
+    start_time = Date.parse(json.start_time)
+    for point, i in json.data
+      time = start_time + i * json.period_milliseconds
+      data[i] ||= {
+        x: time
+      }
+      data[i][json.uid] = point
+
+    @chartOptions.ykeys.push(json.uid)
+    @chartOptions.labels.push(json.uid)
+
+    @el
 
+  draw: ->
+    # Because of a bug in Morris (https://github.com/morrisjs/morris.js/issues/388) 
+    # it's not possible to add data on a hidden element. We just redraw the
+    # entire thing in the meantime.
+    @chart = new Morris.Line(@chartOptions)
+
+class Graph
+  constructor: (options) ->
+    @url = options.url
+    @el = options.el
+    @$el = $(options.el)
+    console.log(@$el)
+
+  render: =>
+    $.getJSON @url, (json) =>
       for extractor, index in json.extractors
-        getSeries(extractor.url, index)
-        
+        $.get extractor.url, (line_json) =>
+          subgraph = @getSubgraph(label: line_json.label, key: line_json.key)
+          subgraph.addSeries(line_json)
+
+          if @$el.hasClass('dashboard')
+            if subgraph.chartOptions.ykeys.length == json.extractors.length
+              subgraph.draw()
+          else
+            subgraph.draw()
+
     @
-  
+
+  getSubgraph: (options) =>
+    create = (options) => 
+      subgraph = new SubGraph(options)
+      @$el.append(subgraph.el)
+      subgraph
+
+    # Render 1 subgraph if it's a dashboard graph, mulltiple otherwise.
+    if @$el.hasClass('dashboard')
+      @subGraph ||= create(options)
+    else
+      create($.extend(options, showTitle: true))
+
 @Prosperity ||= {}
 @Prosperity.Graph = Graph
 

data/app/assets/stylesheets/prosperity/application.css.scss

@@ -10,10 +10,11 @@
  *
  *= require bootstrap.min
  *= require bootstrap-theme.min
+ *= require morris
  *= require_self
  *= require_tree .
  */
 
 .main {
   padding: 40px  15px;
-}
+}

data/app/assets/stylesheets/prosperity/{graph.css → graph.css.scss}

@@ -2,3 +2,11 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+.sub-graph {
+  .title {
+    text-align: center;
+    font-size: 14px;
+    font-weight: bold;
+  }
+}

data/app/controllers/prosperity/dashboards_controller.rb

@@ -11,11 +11,11 @@ module Prosperity
     end
 
     def show
-      @dashboard = Dashboard.find(params[:id])
+      dashboard
     end
 
     def edit
-      @dashboard = Dashboard.find(params[:id])
+      dashboard
     end
 
     def create
@@ -23,11 +23,22 @@ module Prosperity
       @dashboard.title = params.fetch(:dashboard, {})[:title]
       @dashboard.default = false
       if @dashboard.save
-        redirect_to action: :index
+        redirect_to edit_dashboard_path(@dashboard)
       else
         flash[:error] = @dashboard.errors.full_messages.to_sentence
         render action: :new
       end
     end
+
+    def destroy
+      dashboard.destroy
+      redirect_to action: 'index'
+    end
+
+    private
+
+    def dashboard
+      @dashboard ||= Dashboard.find(params[:id])
+    end
   end
 end

data/app/controllers/prosperity/metrics_controller.rb

@@ -36,7 +36,11 @@ module Prosperity
     end
 
     def data
-      ext_klass = Metric.extractors[params.fetch(:extractor, "interval")]
+      ext_name = params.fetch(:extractor, "interval")
+      ext_klass = Metric.extractors.fetch(ext_name) do
+        render_json_error "Could not find extractor #{ext_name} for #{@metric}. Possible values are #{Metric.extractors.keys.join(", ")}.", 404
+        return
+      end
 
       p = Prosperity::Periods::ALL.fetch(period)
       ext = ext_klass.new(@metric, option, start_time, end_time, p)
@@ -44,6 +48,7 @@ module Prosperity
       json = {
         data: ext.to_a,
         key: ext.key,
+        uid: ext.uid,
         label: ext.label,
         start_time: p.actual_start_time(start_time).iso8601,
         end_time: p.actual_end_time(end_time).iso8601,

data/app/helpers/prosperity/application_helper.rb

@@ -7,5 +7,17 @@ module Prosperity
     def link_to_metric(metric)
       link_to metric.new.title, metric_path(id: metric.name)
     end
+
+    def navbar_item(name, url, *controllers)
+      classes = []
+
+      if controllers.any?{ |c| controller.is_a?(c) }
+        classes << 'active'
+      end
+
+      content_tag(:li, class: classes) do
+        link_to name, url
+      end
+    end
   end
 end

data/app/views/layouts/prosperity/application.html.erb

@@ -27,12 +27,8 @@
         </div>
         <div class="collapse navbar-collapse">
           <ul class="nav navbar-nav">
-            <li class="active">
-              <a href="<%= dashboards_path %>">Dashboards</a>
-            </li>
-            <li>
-              <a href="<%= metrics_path %>">All Metrics</a>
-            </li>
+            <%= navbar_item 'Dashboards', dashboards_path, Prosperity::DashboardsController, Prosperity::GraphsController %>
+            <%= navbar_item 'Browse Metrics', metrics_path, Prosperity::MetricsController %>
           </ul>
         </div>
       </div>

data/app/views/prosperity/dashboards/edit.html.erb

@@ -22,3 +22,8 @@
 <% end %>
 
 <%= link_to "Add New Graph", new_graph_path, class: 'btn btn-primary' %>
+
+<p>
+  <%= link_to "View Dashboard", @dashboard, class: 'btn' %>
+</p>
+

data/app/views/prosperity/dashboards/index.html.erb

@@ -1,15 +1,29 @@
 <h1>Dashboards</h1>
 
 <p>
-  <ul>
-    <% for dashboard in @dashboards %>
-      <li>
-        <%= link_to dashboard.title, dashboard_path(dashboard) %>
-        -
-        <%= link_to 'edit', edit_dashboard_path(dashboard) %>
-      </li>  
-    <% end %>
-  </ul>
+  <% if @dashboards.present? %>
+    <table class="table">
+      <thead>
+        <tr>
+          <th>Dashboard</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% for dashboard in @dashboards %>
+          <tr>
+            <td> <%= link_to dashboard.title, dashboard_path(dashboard) %> </td>
+            <td> 
+              <%= link_to 'Edit', edit_dashboard_path(dashboard), class: 'btn btn-primary' %>
+              <%= link_to 'Delete', dashboard_path(dashboard), method: 'delete', class: 'btn btn-danger' %>
+            </td>
+          </tr>  
+        <% end %>
+      </body>
+    </table>
+  <% else %>
+    You currently don't have any dashboard. Click the button bellow to create your first!
+  <% end %>
 </p>
 
 <a href="<%= new_dashboard_path %>" class="btn btn-primary">New Dashboard</a>

data/app/views/prosperity/dashboards/show.html.erb

@@ -5,10 +5,14 @@
   <%= submit_tag "Update", class: 'btn btn-primary' %>
 <% end %>
 
+<% if @dashboard.graphs.empty? %>
+  <p>No Graphs</p>
+<% end %>
+
 <% @dashboard.graphs.each do |graph| %>
-  <div class="graph">
+  <div class="graph dashboard-graph">
     <h2><%= graph.title %></h2>
 
-    <div class="metric" data-url="<%= graph_path(graph, start_time: start_time) %>"></div>
+    <div class="metric dashboard" data-url="<%= graph_path(graph, start_time: start_time) %>"></div>
   </div>
 <% end %>

data/lib/prosperity/extractors/base.rb

@@ -1,5 +1,5 @@
 module Prosperity
-  class Extractors::Base 
+  class Extractors::Base
     attr_reader :metric, :start_time, :end_time, :period, :option
 
     def initialize(metric, option, start_time, end_time, period)
@@ -15,6 +15,10 @@ module Prosperity
       self.class.key
     end
 
+    def uid
+      "#{@metric.to_s.underscore}_#{@option}_#{key}"
+    end
+
     def label
       "#{metric.title} by #{key} with option #{option}"
     end

data/lib/prosperity/metric.rb

@@ -112,6 +112,10 @@ module Prosperity
       self.class.name
     end
 
+    def to_s
+      id
+    end
+
     def sql?
       self.class.sql?
     end

data/lib/prosperity/metrics/option.rb

@@ -6,6 +6,10 @@ module Prosperity
       @name = name
       @block = block
     end
+
+    def to_s
+      name
+    end
   end
 end
 

data/lib/prosperity/version.rb

@@ -1,3 +1,3 @@
 module Prosperity
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/controllers/prosperity/dashboards_controller_spec.rb

@@ -41,7 +41,9 @@ module Prosperity
         expect do
           post 'create', dashboard: {title: 'test'}
         end.to change(Dashboard, :count).by(1)
-        response.should redirect_to(action: :index)
+        dashboard = assigns(:dashboard)
+        dashboard.should be_a(Dashboard)
+        response.should redirect_to(edit_dashboard_path(dashboard))
       end
 
       it "should handle validation error" do
@@ -50,5 +52,14 @@ module Prosperity
         flash[:error].should be_present
       end
     end
+
+    describe "DELETE 'destroy'" do
+      it "deleted the dashboard" do
+        delete 'destroy', id: dashboard.id
+        response.should redirect_to(dashboards_path)
+
+        Dashboard.find_by(id: dashboard.id).should be_nil
+      end
+    end
   end
 end

data/spec/controllers/prosperity/metrics_controller_spec.rb

@@ -95,6 +95,12 @@ module Prosperity
         response.code.to_i.should == 404
         json['error'].should be_present
       end
+
+      it "returns 404 for a known metric, but unknowd extractor" do
+        get :data, id: metric.id, extractor: 'does-not-exist', format: 'json'
+        response.code.to_i.should == 404
+        json['error'].should be_present
+      end
     end
   end
 end