prosperity 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a2b4fadf928d57f33383ad55b6a989b2dfd8d22
-  data.tar.gz: 01781f83c18c0da2e1ea23b94c220d480f523f1c
+  metadata.gz: a5c67a59270ef33317323ebdc699936e5e89ac5f
+  data.tar.gz: 21df5064d10dc796a58e8d7510ac7c0a0e26e5a6
 SHA512:
-  metadata.gz: 78b242530b5999fbdde7a9a1bba6b444a95d6073a143cd9f47d80be04498badcad408b5bbe64fe79d871f09be4588d007f3e7107034a7d4713336781e6a9c214
-  data.tar.gz: 8d0875abb61818781caa6445711a0bbb92330838185d920d89937609f26e4f1c2fd0d82ccac8dc33cbad67301dae8878d9ad8d14ca54d4c64b1e09342737ab75
+  metadata.gz: faf49f6e8fe66d517f58b6f53bd95280f1ebff3cb5673288d9db7da7f879fb072374d97e4d30eefb37a278840d657f15bbe59837eaa8191cc681e13b1b3c4680
+  data.tar.gz: bfb5e793939e5d190935b0dde676a4ef7fdf07632e041245e111650519a0a47d141daff898f54edbf3f4c5ca18a7f237e0b70a33eef8dc040aa6a8bcab317b2e

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

@@ -1,6 +1,8 @@
 class SubGraph
   constructor: (options = {}) ->
     @el = $('<div>', class: 'sub-graph')
+    @graphType = options.graphType
+
     if options.showTitle
       @el.append("<div class='title'>Loading...</div>")
 
@@ -37,11 +39,17 @@ class SubGraph
 
     @el
 
+  class: =>
+    if @graphType == 'area'
+      Morris.Area
+    else
+      Morris.Line
+
   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)
+    @chart = new @class()(@chartOptions)
 
 class Graph
   constructor: (options) ->
@@ -54,7 +62,11 @@ class Graph
     $.getJSON @url, (json) =>
       for extractor, index in json.extractors
         $.get extractor.url, (line_json) =>
-          subgraph = @getSubgraph(label: line_json.label, key: line_json.key)
+          subgraph = @getSubgraph
+            label: line_json.label
+            key: line_json.key
+            graphType: json.graph_type
+
           subgraph.addSeries(line_json)
 
           if @$el.hasClass('dashboard')
@@ -100,5 +112,4 @@ $(document).on "change", ".edit_graph .metric-title-select select", (e) ->
 $ ->
   $(".edit_graph .metric-title-select select").each (i, el) ->
     updateMetricOptions el
-  
 

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

@@ -3,10 +3,8 @@
   They will automatically be included in application.css.
 */
 
-.sub-graph {
-  .title {
-    text-align: center;
-    font-size: 14px;
-    font-weight: bold;
-  }
+.sub-graph .title, .metric-title {
+  text-align: center;
+  font-size: 14px;
+  font-weight: bold;
 }

data/app/controllers/prosperity/graphs_controller.rb

@@ -17,20 +17,29 @@ module Prosperity
     end
 
     def show
-      render json: {
-        title: @graph.title,
-        extractors: @graph.graph_lines.map do |line|
-          {
-            key: line.extractor,
-            url: data_metric_path(id: line.metric, 
-                                  extractor: line.extractor, 
-                                  option: line.option, 
-                                  period: @graph.period, 
-                                  start_time: start_time, 
-                                  end_time: end_time),
+      respond_to do |format|
+        format.json do
+          render json: {
+            title: @graph.title,
+            graph_type: @graph.graph_type,
+            extractors: @graph.graph_lines.map do |line|
+              {
+                key: line.extractor,
+                url: data_metric_path(id: line.metric, 
+                                      extractor: line.extractor, 
+                                      option: line.option, 
+                                      period: @graph.period, 
+                                      start_time: start_time, 
+                                      end_time: end_time),
+              }
+            end
           }
         end
-      }
+
+        format.html {
+          render layout: 'prosperity/embedabble'
+        }
+      end
     end
 
     def update
@@ -42,7 +51,7 @@ module Prosperity
 
     def create
       @graph = Graph.new
-      [:title, :period].each do |attr|
+      [:title, :period, :graph_type].each do |attr|
         @graph.send("#{attr}=", graph_params[attr])
       end
 
@@ -53,7 +62,7 @@ module Prosperity
         render action: :new
       end
     end
-    
+
     private
 
     def get_graph
@@ -65,7 +74,7 @@ module Prosperity
         params.require(:graph).
           permit(Graph::ATTR_ACCESSIBLE + [:graph_lines_attributes => (GraphLine::ATTR_ACCESSIBLE + [:id])])
       else
-        params.fetch(:graph, {})     
+        params.fetch(:graph, {})
       end
     end
   end

data/app/models/prosperity/graph.rb

@@ -4,10 +4,13 @@ module Prosperity
     validates_presence_of :title, :period
     accepts_nested_attributes_for :graph_lines, reject_if: :not_filled?
 
-    ATTR_ACCESSIBLE = [:title, :period, :graph_lines].freeze
+    ATTR_ACCESSIBLE = [:title, :period, :graph_lines, :graph_type].freeze
 
     attr_accessible *ATTR_ACCESSIBLE unless defined?(ActionController::StrongParameters)
 
+    VALID_GRAPH_TYPES = %w(line area)
+    validates :graph_type, inclusion: {in: VALID_GRAPH_TYPES}
+
     private
     def not_filled?(line)
       if line[:id]

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>(lang="en")
+<html>
   <head>
     <title>
       <%= content_for?(:title) ? yield(:title) : app_name %>

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

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <%= csrf_meta_tags %>
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements
+    -->
+    <!--[if lt IE 9]
+      <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" %>
+    -->
+    <%= stylesheet_link_tag "prosperity/application", :media => "all" %>
+  </head>
+  <body>
+    <%= yield %>
+    <%= javascript_include_tag "prosperity/application" %>
+  </body>
+</html>

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

@@ -1,10 +1,18 @@
 <h1>Edit Graph</h1>
 
-<p>Title: <%= @graph.title%></p>
-
 <div class="row">
   <div class="span6">
     <%= form_for @graph, data: {metric_options: @options} do |f| %>
+      <div class="form-group">
+        <%= f.label :title %>
+        <%= f.text_field :title %>
+      </div>
+
+      <div class="form-group">
+        <%= f.label :graph_type %>
+        <%= f.select :graph_type, Prosperity::Graph::VALID_GRAPH_TYPES %>
+      </div>
+
       <h4>Lines</h4>
       <%= f.fields_for :graph_lines do |l| %>
         <% if l.object.new_record? %>
@@ -35,7 +43,16 @@
 
   <div class="span8">
     <div class="graph well"/>
-      <div class="metric" data-url="<%= graph_path(@graph) %>"></div>
+      <div class="metric dashboard" data-url="<%= graph_path(@graph) %>"></div>
+    </div>
+
+    <div>
+      <p>
+      You can embed this graph by embedding the following snippet in your web page.
+      </p>
+      <input disabled value='<iframe height="400px" src="<%= graph_url(@graph) %>" style="border: none;" width="512px"></iframe>' />
+      
+    </div>
   </div>
 </div>
 

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

@@ -0,0 +1,3 @@
+<div class='metric-title'><%= @graph.title %></div>
+<div class="metric dashboard" data-url="<%= graph_path(@graph) %>"></div>
+

data/db/migrate/20140516222642_add_graph_type_to_graphs.rb

@@ -0,0 +1,11 @@
+class AddGraphTypeToGraphs < ActiveRecord::Migration
+  def up
+    add_column :prosperity_graphs, :graph_type, :string
+    execute "UPDATE prosperity_graphs SET graph_type='line'"
+    change_column :prosperity_graphs, :graph_type, :string, null: false
+  end
+
+  def down
+    remove_column :prosperity_graphs, :graph_type, :string
+  end
+end

data/lib/prosperity/version.rb

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

data/spec/controllers/prosperity/dashboard_graphs_controller_spec.rb

@@ -5,7 +5,7 @@ module Prosperity
     routes { Prosperity::Engine.routes }
 
     let(:valid_graph_attributes) do
-      { title: "My Graph", period: "month" }
+      { title: "My Graph", period: "month", graph_type: 'line' }
     end
 
     let!(:valid_dashboard_attributes) do

data/spec/controllers/prosperity/graphs_controller_spec.rb

@@ -8,6 +8,7 @@ module Prosperity
       {
         title: "My Graph",
         period: "month",
+        graph_type: 'line',
       }
     end
 
@@ -48,20 +49,38 @@ module Prosperity
     end
 
     describe "GET 'show'" do
-      it "renders the JSON representation of the graph" do
-        get :show, id: graph.id
-        response.should be_success
-        json['title'].should == graph.title
-        json['extractors'].should == []
+      context "in JSON" do
+        it "renders the JSON representation of the graph" do
+          get :show, id: graph.id, format: 'json'
+          response.should be_success
+          json['title'].should == graph.title
+          json['extractors'].should == []
+        end
+
+        it "returns one extractor per graph line" do
+          get :show, id: graph_w_line, format: 'json'
+          response.should be_success
+          json['extractors'].count.should == 1
+          ext = json['extractors'].first
+          ext['key'].should == valid_line_attributes[:extractor]
+          ext['url'].should be_present
+        end
       end
 
-      it "returns one extractor per graph line" do
-        get :show, id: graph_w_line
-        response.should be_success
-        json['extractors'].count.should == 1
-        ext = json['extractors'].first
-        ext['key'].should == valid_line_attributes[:extractor]
-        ext['url'].should be_present
+      context "as embedabble HTML" do
+        before do
+          get :show, id: graph.id, format: 'html'
+          response.should be_success
+        end
+
+        it "renders html" do
+          response.content_type.should == 'text/html'
+          response.body.should include('metric dashboard')
+        end
+
+        it "should render the embedabble layout" do
+          response.body.should_not include('navbar')
+        end
       end
     end
 

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140217005117) do
+ActiveRecord::Schema.define(version: 20140516222642) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -49,6 +49,7 @@ ActiveRecord::Schema.define(version: 20140217005117) do
     t.string   "period",     null: false
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "graph_type", null: false
   end
 
   create_table "users", force: true do |t|