prosperity 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5c67a59270ef33317323ebdc699936e5e89ac5f
-  data.tar.gz: 21df5064d10dc796a58e8d7510ac7c0a0e26e5a6
+  metadata.gz: 4f2eef9c17ac3662933cc06b450f81f8d750daa7
+  data.tar.gz: e0f0f2ffd626b476d0d39ff2323fa08dcb51cbfd
 SHA512:
-  metadata.gz: faf49f6e8fe66d517f58b6f53bd95280f1ebff3cb5673288d9db7da7f879fb072374d97e4d30eefb37a278840d657f15bbe59837eaa8191cc681e13b1b3c4680
-  data.tar.gz: bfb5e793939e5d190935b0dde676a4ef7fdf07632e041245e111650519a0a47d141daff898f54edbf3f4c5ca18a7f237e0b70a33eef8dc040aa6a8bcab317b2e
+  metadata.gz: 2f5ed319d26cbfa9b49021f258d2b70c5628cd25e72d92bd0c0c675001c2350693e6ef15316a3ca060133d0c5187d29fd6667d862a0ec3157bbc469b16c58fa7
+  data.tar.gz: 1170f782cc52ecc0dfb604d9e7d6b717ff93f296946caaf3c5b19e233432c3d543fe334bea019b4c1f0cba21b2eae5f549c051cd47ec44e9567c9a55fcd5d342

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

@@ -16,5 +16,5 @@
  */
 
 .main {
-  padding: 40px  15px;
+  padding: 60px  15px;
 }

data/app/controllers/prosperity/dashboard_graphs_controller.rb

@@ -4,8 +4,12 @@ module Prosperity
   class DashboardGraphsController < ApplicationController
     before_action :get_objs
     def create
-      DashboardGraph.create!(graph: @graph, dashboard: @dashboard)
-      redirect_to edit_dashboard_path(@dashboard)  
+      dashboard_graph = DashboardGraph.new(graph: @graph, dashboard: @dashboard)
+
+      unless dashboard_graph.save
+        set_error(dashboard_graph)
+      end
+      redirect_to edit_dashboard_path(@dashboard)
     end
 
     def destroy

data/app/controllers/prosperity/graphs_controller.rb

@@ -2,7 +2,7 @@ require_dependency "prosperity/application_controller"
 
 module Prosperity
   class GraphsController < ApplicationController
-    before_action :get_graph, only: [:edit, :update, :show]
+    before_action :get_graph, only: [:edit, :update]
     def new
       @graph = Graph.new
     end
@@ -19,6 +19,7 @@ module Prosperity
     def show
       respond_to do |format|
         format.json do
+          get_graph
           render json: {
             title: @graph.title,
             graph_type: @graph.graph_type,
@@ -37,6 +38,13 @@ module Prosperity
         end
 
         format.html {
+          begin
+            get_graph
+          rescue ActiveRecord::RecordNotFound
+            @graph = nil
+            render layout: 'prosperity/embedabble', status: :not_found
+            return
+          end
           render layout: 'prosperity/embedabble'
         }
       end

data/app/models/prosperity/dashboard_graph.rb

@@ -2,5 +2,7 @@ module Prosperity
   class DashboardGraph < ActiveRecord::Base
     belongs_to :dashboard
     belongs_to :graph
+
+    validates :dashboard, uniqueness: {scope: :graph, message: "already contains this graph"}
   end
 end

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

@@ -37,8 +37,7 @@
       <div class="main">
         <% flash.each do |name, msg| %>
           <% if msg.is_a?(String) %>
-            <div class="alert alert-<%= name == :notice ? "success" : "error" %>">
-              <a class="close" data-dismiss="alert">&#215;</a>
+            <div class="alert alert-<%= name == :notice ? "success" : "danger" %>">
               <%= content_tag :div, msg, :id => "flash_#{name}" %>
             </div>
           <% end %>

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

@@ -16,3 +16,7 @@
     <div class="metric dashboard" data-url="<%= graph_path(graph, start_time: start_time) %>"></div>
   </div>
 <% end %>
+
+<p>
+  <%= link_to "Edit this dashboard", edit_dashboard_path(@dashboard) %>
+</p>

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

@@ -0,0 +1,14 @@
+<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>
+
+<div class="form-group">
+  <%= f.label :period %>
+  <%= f.select :period, Prosperity::Periods::ALL.keys %>
+</div>

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

@@ -3,15 +3,8 @@
 <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>
+
+      <%= render partial: 'common_fields', locals: {f: f} %>
 
       <h4>Lines</h4>
       <%= f.fields_for :graph_lines do |l| %>

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

@@ -1,15 +1,7 @@
 <h1>New Graph</h1>
 
 <%= form_for @graph, html: {role: 'form'} do |f| %>
-  <div class="form-group">
-    <%= f.label :title %>
-    <%= f.text_field :title %>
-  </div>
-
-  <div class="form-group">
-    <%= f.label :period %>
-    <%= f.select :period, Prosperity::Periods::ALL.keys %>
-  </div>
+  <%= render partial: 'common_fields', locals: {f: f} %>
 
   <%= f.submit "Save", class: 'btn btn-success' %>
 <% end %>

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

@@ -1,3 +1,6 @@
-<div class='metric-title'><%= @graph.title %></div>
-<div class="metric dashboard" data-url="<%= graph_path(@graph) %>"></div>
-
+<% if @graph %>
+  <div class='metric-title'><%= @graph.title %></div>
+  <div class="metric dashboard" data-url="<%= graph_path(@graph) %>"></div>
+<% else %>
+  <p>No such graph</p>
+<% end %>

data/lib/prosperity/version.rb

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

data/spec/controllers/prosperity/dashboard_graphs_controller_spec.rb

@@ -25,6 +25,13 @@ module Prosperity
         dg.graph.should == graph
         dg.dashboard.should == dashboard
       end
+
+      it "errors if you try to add the same graph twice" do
+        post :create, dashboard_id: dashboard.id, graph_id: graph.id
+        post :create, dashboard_id: dashboard.id, graph_id: graph.id
+        response.should redirect_to(edit_dashboard_path(dashboard))
+        flash[:error].should be_present
+      end
     end
 
     describe "DELETE 'destroy'" do

data/spec/controllers/prosperity/graphs_controller_spec.rb

@@ -81,6 +81,12 @@ module Prosperity
         it "should render the embedabble layout" do
           response.body.should_not include('navbar')
         end
+
+        it "404 with custom page when graph is not found" do
+          get :show, id: :unknown_id, format: 'html'
+          response.status.should == 404
+          response.body.should include("No such graph")
+        end
       end
     end