beanstalkd_view 1.1.3 → 1.2.0

data/lib/beanstalkd_view/views/index.erb

@@ -24,15 +24,17 @@
           </tr>
         </thead>
         <tbody>
+        <% tube_names = [] %>
 		    <% @tubes.each do |tube| %>
-		    <tr>
-			    <td><a href="<%= u("/tube/#{CGI::escape(tube.name)}") %>"><%= tube.name %></a></td>
-		    </tr>
+          <% tube_names << tube.name.strip %>
+  		    <tr>
+  			    <td><a href="<%= u("/tube/#{CGI::escape(tube.name)}") %>"><%= tube.name %></a></td>
+  		    </tr>
 		    <% end %>
 		    </tbody>
       </table>
 
-	<table class="table">
+    	<table class="table">
         <thead>
           <tr>
             <th colspan="2">Current Jobs</th>
@@ -41,11 +43,11 @@
         <tbody>
           <tr rel="tooltip" title="The number of ready jobs with priority < 1024.">
             <td>Urgent</td>
-			<% if @stats[:current_jobs_urgent] > 0 %>
-              <td class="data_cell"><span class="badge badge-warning"><%= @stats[:current_jobs_urgent] %></span></td>
-			<% else %>
-              <td class="data_cell"><%= @stats[:current_jobs_urgent] %></td>
-			<% end %>
+      			<% if @stats[:current_jobs_urgent] > 0 %>
+                    <td class="data_cell"><span class="badge badge-warning"><%= @stats[:current_jobs_urgent] %></span></td>
+      			<% else %>
+                    <td class="data_cell"><%= @stats[:current_jobs_urgent] %></td>
+      			<% end %>
           </tr>
           <tr rel="tooltip" title="The number of jobs in the ready queue.">
             <td>Ready</td>
@@ -61,9 +63,9 @@
           </tr>
           <tr rel="tooltip" title="he number of buried jobs.">
             <td>Buried</td>
-			<% if @stats[:current_jobs_buried] > 0 %>
-              <td class="data_cell"><span class="badge badge-error"><%= @stats[:current_jobs_buried] %></span></td>
-			<% else %>
+      			<% if @stats[:current_jobs_buried] > 0 %>
+                    <td class="data_cell"><span class="badge badge-error"><%= @stats[:current_jobs_buried] %></span></td>
+      			<% else %>
               <td class="data_cell"><%= @stats[:current_jobs_buried] %></td>
             <% end %>
           </tr>
@@ -79,26 +81,26 @@
 	      <tbody>
 	        <tr rel="tooltip" title="The rate of job bury calls to reserve calls.">
 	          <td>Bury Rate</td>
-			  <% bury_reserve_rate = (@stats[:cmd_bury].to_f / @stats[:cmd_reserve].to_f) %>
-			  <% bury_reserve_rate = 0 if bury_reserve_rate.nan? %>
-			  <% if bury_reserve_rate > 0.01 %>
+    			  <% bury_reserve_rate = (@stats[:cmd_bury].to_f / @stats[:cmd_reserve].to_f) %>
+    			  <% bury_reserve_rate = 0 if bury_reserve_rate.nan? %>
+    			  <% if bury_reserve_rate > 0.01 %>
 	          	<td class="data_cell"><span class="badge badge-error"><%= bury_reserve_rate %></span></td>
 	          <% else %>
 	            <td class="data_cell"><%= bury_reserve_rate %></td>
 	          <% end %>
 	        </tr>
-			<tr rel="tooltip" title="The rate of job timeouts to reserve calls.">
+			    <tr rel="tooltip" title="The rate of job timeouts to reserve calls.">
 	          <td>Timeout Rate</td>
 	          <% timeout_reserve_rate = (@stats[:job_timeouts].to_f / @stats[:cmd_reserve].to_f) %>
 	          <% timeout_reserve_rate = 0 if timeout_reserve_rate.nan? %>
-			  <% if timeout_reserve_rate > 0.01 %>
+    			  <% if timeout_reserve_rate > 0.01 %>
 	          	<td class="data_cell"><span class="badge badge-error"><%= timeout_reserve_rate %></span></td>
 	          <% else %>
 	            <td class="data_cell"><%= timeout_reserve_rate %></td>
 	          <% end %>
 	        </tr>
-	 	</tbody>
-	  </table>
+	 	    </tbody>
+	    </table>
 
       <table class="table">
         <thead>
@@ -162,7 +164,7 @@
         </tbody>
       </table>
 
-	  <table class="table">
+	    <table class="table">
         <thead>
           <tr>
             <th colspan="2">Binlog</th>
@@ -278,10 +280,10 @@
 	</div>
 	
 	<div class="span6">
-		  <div class="span6">
-            <h3>Add Job</h3>
+		<div class="span6">
+      <h3>Add Job</h3>
 			<form id="add_job_form" class="well" name="add_job_form" action="<%= u("/add_job") %>" method="POST">
-			  <input id="form_tube_name" type="text" class="span3" placeholder="Tube name" name="tube" data-provide="typeahead" autocomplete="off">
+			  <input id="form_tube_name" type="text" class="span3" placeholder="Tube name" name="tube" data-provide="typeahead" autocomplete="off" data-tubes='<%= "#{tube_names.to_json.to_s}" %>'>
 			  <input id="form_job_priority" type="text" class="span3" placeholder="Priority, e.g. 65536" name="priority">
 			  <input id="form_job_delay" type="text" class="span3" placeholder="Delay, e.g. 0" name="delay">
 			  <input id="form_job_ttr" type="text" class="span3" placeholder="TTR, e.g. 120" name="ttr">
@@ -290,7 +292,7 @@
 			  <br/>
 			  <a id="add_job_btn" href="#" class="btn">Add Job</a>
 			</form>
-		  </div>
+		</div>
 		
 		<div class="span6">
 			<h3>Peek Range</h3>
@@ -304,65 +306,15 @@
 		<div class="span6">
 			<div id="total_jobs_container">
 				<h3>Total Jobs</h3>
-	            <canvas id="total_jobs_chart"></canvas>
+	      <canvas id="total_jobs_chart" data-set='<%= "#{@total_jobs_data.to_json.to_s}" %>'></canvas>
 			</div>
 			<div id="buried_jobs_container" style="visibility:hidden">
 				<br/>
 				<h3>Current Jobs Buried</h3>
-	            <canvas id="buried_jobs_chart"></canvas>
+	      <canvas id="buried_jobs_chart" data-set='<%= "#{@buried_jobs_data.to_json.to_s}" %>'></canvas>
 			</div>
 		</div>
-    </div>
+  </div>
 </div>
 
-<script type="text/javascript">
-$(document).ready(function(){
-	
-	function draw_pie_chart(div, data) {
-		//Create pie charts
-		var chart = new Bluff.Bar(div, 460);
-	    //Setup theme
-	    var colors = ['#6886B4', '#FDD84E', '#72AE6E', '#D1695E', '#8A6EAF', '#EFAA43', 'white'];  
-	  	chart.set_theme({
-		  colors: colors,
-		  marker_color: 'white',
-		  font_color: 'white',
-		  background_colors: ['#008000', '#008000']
-		});
-		chart.tooltips = true;
-		chart.hide_line_markers = false;
-		chart.minimum_value = 0;
-		var max_value = 0;
-		//Add each data item to chart
-		for (i in data.items) {
-		  var item = data.items[i];
-		  chart.data(item.label, item.data);
-		  if (item.data > max_value) {
-			max_value = item.data;
-		  }
-		}
-		chart.maximum_value = max_value;
-		//Finally draw the chart
-		chart.draw();
-	}
-
-	<% if @total_jobs_data %>
-		var total_jobs_data = <%= @total_jobs_data.to_json %>
-		draw_pie_chart('total_jobs_chart', total_jobs_data);
-	<% end %>
-	<% if @buried_jobs_data %>
-	  var buried_jobs_data = <%= @buried_jobs_data.to_json %>	
-	  draw_pie_chart('buried_jobs_chart', buried_jobs_data);
-	  $("#buried_jobs_container").css('visibility', 'visible');
-	<% end %>
-	
-	//Setup Typeahead For Tube Names on Add Job Form
-	var tubeNames = [];
-	<% @tubes.each do |tube| %>
-	  tubeNames.push('<%=tube.name%>');
-	<% end %>
-	$('#form_tube_name').typeahead({source: tubeNames});
-});
-</script>
-
-<%= erb :job_info_popup %>
+<%= erb :job_info_popup %>

data/lib/beanstalkd_view/views/job_info_popup.erb

@@ -2,9 +2,70 @@
 	<div class="modal-header">
     	<a class="close" data-dismiss="modal">×</a>
     	<h3 id="job_info_popup_title"></h3>
-  	</div>
-	<div class="modal-body" id="job_info_popup_body">
-  	</div>
-  	<div class="modal-footer" id="job_info_popup_footer">
-  	</div>
-</div>
+  </div>
+	<div class="modal-body" id="job_info_popup_body"></div>
+  <div class="modal-footer" id="job_info_popup_footer"></div>
+</div>
+
+<script id="job_modal_template" type="text/template">
+  <table class="table">
+    <tbody>
+      <tr rel="tooltip" data-original-title="The tube to which the job will be added.">
+        <td>tube</td>
+        <td>{{= data.tube }}</td>
+      </tr>
+      <tr rel="tooltip" data-original-title="The priority value set by the put, release, or bury commands.">
+        <td>pri</td>
+        <td>{{= data.pri }}</td>
+      </tr>
+      {{ if (data.age !== undefined) { }}
+        <tr rel="tooltip" data-original-title="The time in seconds since the put command that created this job.">
+          <td>age</td>
+          <td>{{= data.age }}</td>
+        </tr>
+      {{ } }}
+      <tr rel="tooltip" data-original-title="The delay value in seconds">
+        <td>delay</td>
+        <td>{{= data.delay }}</td>
+      </tr>
+      <tr rel="tooltip" data-original-title="The number of seconds to allow a worker to run this job. This time is counted from the moment a worker reserves this job. If the worker does not delete, release, or bury the job within ttr seconds, the job will time out and the server will release the job.">
+        <td>ttr</td>
+        <td>{{= data.ttr }}</td>
+      </tr>
+      {{ if (data.reserves !== undefined) { }}
+        <tr rel="tooltip" data-original-title="The number of times this job has been reserved">
+          <td>reserves</td>
+          <td>{{= data.reserves }}</td>
+        </tr>
+      {{ } }}
+      {{ if (data.timeouts !== undefined) { }}
+        <tr rel="tooltip" data-original-title="The number of times this job has timed out during a reservation.">
+          <td>timeouts</td>
+          <td>{{= data.timeouts }}</td>
+        </tr>
+      {{ } }}
+      {{ if (data.releases !== undefined) { }}
+        <tr rel="tooltip" data-original-title="The number of times a client has released this job from a reservation.">
+          <td>releases</td>
+          <td>{{= data.releases }}</td>
+        </tr>
+      {{ } }}
+      {{ if (data.buries !== undefined) { }}
+        <tr rel="tooltip" data-original-title=" The number of times this job has been buried.">
+          <td>buries</td>
+          <td>{{= data.buries }}</td>
+        </tr>
+      {{ } }}
+      {{ if (data.kicks !== undefined) { }}
+        <tr rel="tooltip" data-original-title="The number of times this job has been kicked.">
+          <td>kicks</td>
+          <td>{{= data.kicks }}</td>
+        </tr>
+      {{ } }}
+      <tr rel="tooltip" data-original-title="The jobs body content.">
+        <td>body</td>
+        <td>{{= data.body }}</td>
+      </tr>
+    </tbody>
+  </table>
+</script>

data/lib/beanstalkd_view/views/layout.erb

@@ -4,13 +4,8 @@
   <head>
     <title>Beanstalkd View - <%= BeanstalkdView::VERSION %></title>
     <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <% css_imports = css :application, :media => 'screen' %>
-	<% js_imports =  js  :application %> 
-	<%# Must modify sinatra-assetpack output to use the Mount prefix when embedding through Rails %>
-    <% if path_prefix %>
-	  <%= css_imports.gsub(/href='/, "href='#{path_prefix}") %>
-      <%= js_imports.gsub(/src='/, "src='#{path_prefix}") %>
-    <% end %>
+    <link rel="stylesheet" type="text/css" href="<%= "#{path_prefix}/css/beanstalkd_view.css" %>">
+    <script type="text/javascript" src="<%= "#{path_prefix}/js/beanstalkd_view.min.js" %>"></script>
   </head>
   <body>
 	<!-- Header -->

data/lib/beanstalkd_view/views/peek_range.erb

@@ -50,4 +50,4 @@
 			<% end %>
 		</table>
 	</div>
-</div>
+</div>

data/lib/beanstalkd_view/views/tube_stats.erb

@@ -11,7 +11,7 @@
 	      <tbody>
 	        <tr rel="tooltip" title="The number of ready jobs with priority < 1024 in this tube.">
 	          <td>Urgent</td>
-			  <% if @stats[:current_jobs_urgent] > 0 %>
+			        <% if @stats[:current_jobs_urgent] > 0 %>
                 <td class="data_cell"><span class="badge badge-warning"><%= @stats[:current_jobs_urgent] %></span></td>
               <% else %>
 	            <td class="data_cell"><%= @stats[:current_jobs_urgent] %></td>
@@ -31,7 +31,7 @@
 	        </tr>
 	        <tr rel="tooltip" title="The number of buried jobs in this tube.">
 	          <td>Buried</td>
-			  <% if @stats[:current_jobs_buried] > 0 %>
+			        <% if @stats[:current_jobs_buried] > 0 %>
                 <td class="data_cell"><span class="badge badge-error"><%= @stats[:current_jobs_buried] %></span></td>
               <% else %>
 	            <td class="data_cell"><%= @stats[:current_jobs_buried] %></td>
@@ -70,7 +70,7 @@
 	      </tbody>
 	    </table>
 
-		<table class="table">
+		  <table class="table">
 	      <thead>
 	        <tr>
 	          <th colspan="2">API Call Histogram</th>
@@ -87,49 +87,48 @@
 
   <div class="span6">
     <h3>Pause Tube</h3>
-	<form id="pause_form" class="well form-inline" name="pause_form" action="<%= u("/pause") %>" method="POST">
-	  <input id="form_tube_name" type="hidden" name="tube" value="<%= @tube.name %>">
+	  <form id="pause_form" class="well form-inline" name="pause_form" action="<%= u("/pause") %>" method="POST">
+	    <input id="form_tube_name" type="hidden" name="tube" value="<%= @tube.name %>">
       <input id="form_url_base" type="hidden" name="url_base" value="<%= u("/") %>">
-	  <input type="text" class="span3" placeholder="Number of seconds to wait" name="delay">
-	  <button type="submit" class="btn">Pause</button>
-	</form>
+	    <input type="text" class="span3" placeholder="Number of seconds to wait" name="delay">
+	    <button type="submit" class="btn">Pause</button>
+	  </form>
 
     <h3>Clear Tube</h3>
-	<form id="clear_form" class="well form-inline" name="clear_form" action="<%= u("/clear") %>" method="POST">
-	  <input type="hidden" name="tube" value="<%= @tube.name %>">
+	  <form id="clear_form" class="well form-inline" name="clear_form" action="<%= u("/clear") %>" method="POST">
+	    <input type="hidden" name="tube" value="<%= @tube.name %>">
       <input type="hidden" name="url_base" value="<%= u("/") %>">
       <select name="state" class="span3">
-	    <option value="buried">Buried</option>
-	    <option value="ready">Ready</option>
-	    <option value="delayed">Delayed</option>
-	  </select>
-	  <button type="submit" class="btn">Clear</button>
-	</form>
+	      <option value="buried">Buried</option>
+	      <option value="ready">Ready</option>
+	      <option value="delayed">Delayed</option>
+	    </select>
+	    <button type="submit" class="btn">Clear</button>
+	  </form>
 
     <h3>Kick Tube</h3>
-	<form id="kick_form" class="well form-inline" name="kick_form" action="<%= u("/kick") %>" method="POST">
-	  <input type="hidden" name="tube" value="<%= @tube.name %>">
-	  <input type="text" class="span3" placeholder="Number of jobs" name="bound">
-	  <button type="submit" class="btn">Kick</button>
-	</form>
+	  <form id="kick_form" class="well form-inline" name="kick_form" action="<%= u("/kick") %>" method="POST">
+	    <input type="hidden" name="tube" value="<%= @tube.name %>">
+	    <input type="text" class="span3" placeholder="Number of jobs" name="bound">
+	    <button type="submit" class="btn">Kick</button>
+	  </form>
 
     <h3>Peek Jobs</h3>
-	<form class="well" name="peek_jobs">
+	  <form class="well" name="peek_jobs">
   	  <a id="peek_ready_btn" href="#" class="btn">Peek Ready</a>
-	  <a id="peek_delayed_btn" href="#" class="btn">Peek Delayed</a>
-	  <a id="peek_buried_btn" href="#" class="btn">Peek Buried</a>
-	</form>
-
-	<h3>Peek Range</h3>
-	<form id="peek_range_form" class="well form-inline" name="peek_range_form" action="<%= u("/peek-range") %>" method="GET">
-	  <input type="hidden" name="tube" value="<%= @tube.name %>">
-	  <input type="text" class="span2" placeholder="0" name="min">
-	  <input type="text" class="span2" placeholder="0" name="max">
-	  <button type="submit" class="btn">Peek</button>
-	</form>
+	    <a id="peek_delayed_btn" href="#" class="btn">Peek Delayed</a>
+	    <a id="peek_buried_btn" href="#" class="btn">Peek Buried</a>
+	  </form>
 
+	  <h3>Peek Range</h3>
+	  <form id="peek_range_form" class="well form-inline" name="peek_range_form" action="<%= u("/peek-range") %>" method="GET">
+	    <input type="hidden" name="tube" value="<%= @tube.name %>">
+	    <input type="text" class="span2" placeholder="0" name="min">
+	    <input type="text" class="span2" placeholder="0" name="max">
+	    <button type="submit" class="btn">Peek</button>
+	  </form>
   </div>
 
-<%= erb :job_info_popup %>
+  <%= erb :job_info_popup %>
 
-</div>
+</div>

data/lib/beanstalkd_view.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'sinatra/base'
 require 'sinatra/cookies'
-require 'sinatra/assetpack'
 require 'erb'
 require "beaneater"
 require "json"

data/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "beanstalkd_view",
+  "version": "1.2.0",
+  "devDependencies": {
+    "grunt": "~0.4.1",
+    "grunt-contrib-jshint": "~0.3.0",
+    "grunt-contrib-concat": "~0.1.3",
+    "grunt-contrib-uglify": "~0.2.0"
+  }
+}

data/spec/{integration → features}/rails_integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "RailsIntegration", :type => :request do
+describe "RailsIntegration", :type => :feature do
   
   before(:all) do
     # Configure Capybara for Rails

data/spec/{integration → features}/sinatra_integration_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "SinatraIntegration", :type => :request do
+describe "SinatraIntegration", :type => :feature do
   
   before :all do
     Capybara.app = BeanstalkdView::Server.new