beanstalkd_view 0.1.8 → 0.1.9

data/README.md

@@ -51,8 +51,9 @@ bundle exec beanstalkd_view
 
 (This will use the vegas gem to launch the Sinatra app on an available port.)
 
-
-![Screenshot](http://s9.postimage.org/tpfksm5kv/beanstalkd_view.png)
+Screenshot
+------------------------
+![Screenshot](http://s15.postimage.org/burvb1tjv/i_OS_Simulator_Screen_shot_Apr_5_2012_3_31_51_PM.png)
 
 License
 ------------------------

data/lib/beanstalkd_view/resources/js/peek_jobs.js

@@ -1,22 +1,26 @@
 <!-- Enable Peek Job Button Handlers
 $(document).ready(function() {
 	if ($("#peek_ready_btn").length > 0) {
-		$("#peek_ready_btn").click(function() {
+		$("#peek_ready_btn").click(function(event) {
+		  event.preventDefault();
       peek('ready');
     });
 	}
 	if ($("#peek_delayed_btn").length > 0) {
-		$("#peek_delayed_btn").click(function() {
+		$("#peek_delayed_btn").click(function(event) {
+		  event.preventDefault();
       peek('delayed');
     });
 	}
 	if ($("#peek_buried_btn").length > 0) {
-		$("#peek_buried_btn").click(function() {
+		$("#peek_buried_btn").click(function(event) {
+		  event.preventDefault();
       peek('buried');
     });
 	}
 	if ($("#add_job_btn").length > 0) {
-		$("#add_job_btn").click(function() {
+		$("#add_job_btn").click(function(event) {
+		  event.preventDefault();
       add_job();
     });
 	}

data/lib/beanstalkd_view/server.rb

@@ -8,7 +8,9 @@ module BeanstalkdView
       begin
         @tubes = beanstalk.list_tubes
         @stats = beanstalk.stats
-        @total_jobs_data = get_total_jobs_data(@tubes)
+        chart_data = get_chart_data_hash(@tubes)
+        @total_jobs_data = chart_data["total_jobs_data"]
+        @buried_jobs_data = chart_data["buried_jobs_data"] if chart_data["buried_jobs_data"]["items"].size > 0
         @message = session[:message]
         session[:message] = nil
         erb :index
@@ -135,21 +137,34 @@ module BeanstalkdView
       send_file file
     end
     
-    def get_total_jobs_data(tubes)
-      total_jobs_data = Hash.new
-      items = Array.new
+    def get_chart_data_hash(tubes)
+      chart_data = Hash.new
+      chart_data["total_jobs_data"] = Hash.new
+      chart_data["buried_jobs_data"] = Hash.new
+      chart_data["total_jobs_data"]["items"] = Array.new
+      chart_data["buried_jobs_data"]["items"] = Array.new
       tubes.keys.each do |key|
         tubes[key].each do |tube|
           stats = beanstalk.stats_tube(tube)
+          #total_jobs
           total_jobs = stats['total-jobs']
-          datum = Hash.new
-          datum["label"] = tube
-          datum["data"] = total_jobs
-          items << datum
+          if total_jobs > 0
+            total_datum = Hash.new
+            total_datum["label"] = tube
+            total_datum["data"] = total_jobs
+            chart_data["total_jobs_data"]["items"] << total_datum
+          end
+          #buried_jobs
+          buried_jobs = stats['current-jobs-buried']
+          if buried_jobs > 0
+            buried_datum = Hash.new
+            buried_datum["label"] = tube
+            buried_datum["data"] = buried_jobs
+            chart_data["buried_jobs_data"]["items"] << buried_datum
+          end
         end
       end
-      total_jobs_data["items"] = items
-      total_jobs_data
+      chart_data
     end
   
   end  

data/lib/beanstalkd_view/version.rb

@@ -1,3 +1,3 @@
 module BeanstalkdView
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/beanstalkd_view/views/index.erb

@@ -69,6 +69,7 @@
 	        <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 %>
 	          	<td class="data_cell"><span class="badge badge-error"><%= bury_reserve_rate %></span></td>
 	          <% else %>
@@ -78,6 +79,7 @@
 			<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 %>
 	          	<td class="data_cell"><span class="badge badge-error"><%= timeout_reserve_rate %></span></td>
 	          <% else %>
@@ -275,39 +277,64 @@
 			  <label class="control-label" for="textarea">Job Body JSON Hash, e.g. {} or {"id": 1, "name": "Bob"}</label>
 			  <textarea id="form_job_body" class="input-xlarge" name="body" rows="3"></textarea>
 			  <br/>
-			  <a id="add_job_btn" href="javascript:false" class="btn">Add Job</a>
+			  <a id="add_job_btn" href="#" class="btn">Add Job</a>
 			</form>
 		  </div>
 		
 		<div class="span6">
-			<h3>Total Jobs</h3>
-            <canvas id="total_jobs_chart"></canvas>
-		  </div>
+			<div id="total_jobs_container">
+				<h3>Total Jobs</h3>
+	            <canvas id="total_jobs_chart"></canvas>
+			</div>
+			<div id="buried_jobs_container" style="visibility:hidden">
+				<br/>
+				<h3>Current Jobs Buried</h3>
+	            <canvas id="buried_jobs_chart"></canvas>
+			</div>
+		</div>
     </div>
 </div>
 
 <script type="text/javascript">
 $(document).ready(function(){
-	var data = <%= @total_jobs_data.to_json.html_safe %>
-	  //Create pie chart
-	  var bluffGraph = new Bluff.Pie('total_jobs_chart', 570);
-      //Setup theme
-      var colors = ['#6886B4', '#FDD84E', '#72AE6E', '#D1695E', '#8A6EAF', '#EFAA43', 'white'];  
-  	  bluffGraph.set_theme({
-	    colors: colors,
-	    marker_color: 'white',
-	    font_color: 'white',
-	    background_colors: ['#008000', '#008000']
-	  });
-	  bluffGraph.tooltips = true;
+	
+	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();
+	}
 
-	  for (i in data.items) {
-	    var item = data.items[i];
-	    //Add each data item to pie
-	    bluffGraph.data(item.label, item.data);
-	  }
-	  //Finally draw the chart
-	  bluffGraph.draw();
+	<% if @total_jobs_data %>
+		var total_jobs_data = <%= @total_jobs_data.to_json.html_safe %>
+		draw_pie_chart('total_jobs_chart', total_jobs_data);
+	<% end %>
+	<% if @buried_jobs_data %>
+	  var buried_jobs_data = <%= @buried_jobs_data.to_json.html_safe %>	
+	  draw_pie_chart('buried_jobs_chart', buried_jobs_data);
+	  $("#buried_jobs_container").css('visibility', 'visible');
+	<% end %>
 });
 </script>
 

data/lib/beanstalkd_view/views/tube_stats.erb

@@ -103,9 +103,9 @@
 
     <h3>Peek Jobs</h3>	
 	<form class="well" name="peek_jobs">
-  	  <a id="peek_ready_btn" href="javascript:false" class="btn">Peek Ready</a>
-	  <a id="peek_delayed_btn" href="javascript:false" class="btn">Peek Delayed</a>
-	  <a id="peek_buried_btn" href="javascript:false" class="btn">Peek Buried</a>
+  	  <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>
 
   </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkd_view
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156750980 !ruby/object:Gem::Requirement
+  requirement: &2156722560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156750980
+  version_requirements: *2156722560
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &2156750420 !ruby/object:Gem::Requirement
+  requirement: &2156722060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156750420
+  version_requirements: *2156722060
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2156749960 !ruby/object:Gem::Requirement
+  requirement: &2156721580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156749960
+  version_requirements: *2156721580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156749520 !ruby/object:Gem::Requirement
+  requirement: &2156721180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156749520
+  version_requirements: *2156721180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156748940 !ruby/object:Gem::Requirement
+  requirement: &2156720600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156748940
+  version_requirements: *2156720600
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156748520 !ruby/object:Gem::Requirement
+  requirement: &2156720060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156748520
+  version_requirements: *2156720060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156748080 !ruby/object:Gem::Requirement
+  requirement: &2156719460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156748080
+  version_requirements: *2156719460
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156747660 !ruby/object:Gem::Requirement
+  requirement: &2156718720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156747660
+  version_requirements: *2156718720
 description: A Sinatra app to view/manage beanstalkd queues that can be embedded in
   a Rails app similar to what's available in Resque
 email: dennis.kuczynski@gmail.com