beanstalkd_view 0.1.9 → 1.0.0

data/README.md

@@ -53,7 +53,7 @@ bundle exec beanstalkd_view
 
 Screenshot
 ------------------------
-![Screenshot](http://s15.postimage.org/burvb1tjv/i_OS_Simulator_Screen_shot_Apr_5_2012_3_31_51_PM.png)
+![Screenshot](http://s16.postimage.org/4mdum0x79/i_OS_Simulator_Screen_shot_Apr_24_2012_10_29_33.png)
 
 License
 ------------------------

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

@@ -102,7 +102,7 @@ $(document).ready(function() {
 
   function create_new_job_buttons() {
     var job_info_buttons = "";
-    job_info_buttons += "<a id=\"confirm_add_job_btn\" href=\"javascript:false\" class=\"btn\">Add Job</a>";
+    job_info_buttons += "<a id=\"confirm_add_job_btn\" href=\"#\" class=\"btn\">Add Job</a>";
     return job_info_buttons;
   }
   

data/lib/beanstalkd_view/server.rb

@@ -1,9 +1,43 @@
+# Overiding the standard beanstalk-client Pool to ignore NotFoundErrors.
+# In this application, those errors should only occur when using multiple beanstalkd instances,
+#  when one instance does not have a tube, and others do.
+module Beanstalk
+  class Pool
+    def call_wrap(c, *args, &block)
+      self.last_conn = c
+      c.send(*args, &block)
+    rescue NotFoundError => ex
+      puts "Ignoring NotFoundError: #{ex.class}: #{ex}"
+      nil
+    rescue UnexpectedResponse => ex
+      raise ex
+    rescue EOFError, Errno::ECONNRESET, Errno::EPIPE => ex
+      self.remove(c)
+      raise ex
+    end
+    
+    def on_tube(tube, &block)
+      response = nil
+      connection_size = open_connections.size
+      # Retry if the desired tube is not found
+      # Randomly picking over double the connection size, should eventually find it...
+      #  but a better algorithm would be nicer at some point...
+      # Note, that with just 1 beanstalkd instance, this code should always return on the first send
+      for i in 1..(connection_size*2)
+        response = send_to_rand_conn(:on_tube, tube, &block)
+        break if not response.nil?
+      end
+      response
+    end
+  end
+end
+
 module BeanstalkdView
 
   class Server < Sinatra::Base
     include BeanstalkdView::BeanstalkdUtils
     enable :sessions
-      
+    
     get "/" do
       begin
         @tubes = beanstalk.list_tubes
@@ -40,7 +74,8 @@ module BeanstalkdView
     
     get "/tube/:tube" do
       begin
-        @stats = beanstalk.stats_tube(params[:tube])
+        @tube = params[:tube]
+        @stats = beanstalk.stats_tube(@tube)
         @message = session[:message]
         session[:message] = nil
         erb :tube_stats
@@ -54,15 +89,11 @@ module BeanstalkdView
       begin
         response = nil
         beanstalk.on_tube(params[:tube]) do |conn|
-          puts "On Tube #{conn.inspect} #{params[:type]}"
           if (params[:type]) == "ready"
-            puts "Peaking Ready"
             response = conn.peek_ready()
           elsif (params[:type]) == "delayed"
-            puts "Peaking Delayed"
             response = conn.peek_delayed()
           else
-            puts "Peeking Buried"
             response = conn.peek_buried()
           end
         end
@@ -137,18 +168,21 @@ module BeanstalkdView
       send_file file
     end
     
+    private
+    
+    # Return the stats data in a format for the Bluff JS UI Charts
     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|
+      chart_data["buried_jobs_data"]["items"] = Array.new 
+      tube_set(tubes).each do |tube|
+        begin
           stats = beanstalk.stats_tube(tube)
           #total_jobs
           total_jobs = stats['total-jobs']
-          if total_jobs > 0
+            if total_jobs > 0
             total_datum = Hash.new
             total_datum["label"] = tube
             total_datum["data"] = total_jobs
@@ -162,10 +196,23 @@ module BeanstalkdView
             buried_datum["data"] = buried_jobs
             chart_data["buried_jobs_data"]["items"] << buried_datum
           end
+        rescue Beanstalk::NotFoundError
+          puts "Ignoring Beanstalk::NotFoundError for #{tube}"
         end
       end
       chart_data
     end
-  
+    
+    # Return a Set of tube names
+    def tube_set(tubes)
+      tube_set = Set.new
+      tubes.keys.each do |key|
+        tubes[key].each do |tube|
+          tube_set.add(tube)
+        end
+      end
+      tube_set
+    end
+
   end  
 end

data/lib/beanstalkd_view/version.rb

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

data/lib/beanstalkd_view/views/index.erb

@@ -327,11 +327,11 @@ $(document).ready(function(){
 	}
 
 	<% if @total_jobs_data %>
-		var total_jobs_data = <%= @total_jobs_data.to_json.html_safe %>
+		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.html_safe %>	
+	  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 %>

data/lib/beanstalkd_view/views/tube_stats.erb

@@ -1,6 +1,6 @@
 <div class="row">
 	<div class="span6">
-		<h1><%= @stats["name"] %></h1>
+		<h1><%= @tube %></h1>
 
 	    <table class="table">
 	      <thead>
@@ -88,7 +88,7 @@
   <div class="span6">
     <h3>Pause Tube</h3>
 	<form class="well form-inline" name="pause_form" action="<%= url('/pause') %>" method="POST">
-	  <input id="form_tube_name" type="hidden" name="tube" value="<%= @stats["name"] %>">
+	  <input id="form_tube_name" type="hidden" name="tube" value="<%= @tube %>">
       <input id="form_url_base" type="hidden" name="url_base" value="<%= url('/') %>">
 	  <input type="text" class="span3" placeholder="Number of seconds to wait" name="delay">
 	  <button type="submit" class="btn">Pause</button>
@@ -96,7 +96,7 @@
 
     <h3>Kick Tube</h3>
 	<form class="well form-inline" name="kick_form" action="<%= url('/kick') %>" method="POST">
-	  <input type="hidden" name="tube" value="<%= @stats["name"] %>">
+	  <input type="hidden" name="tube" value="<%= @tube %>">
 	  <input type="text" class="span3" placeholder="Number of jobs" name="bound">
 	  <button type="submit" class="btn">Kick</button>
 	</form>

data/spec/lib/beanstalkd_view/server_spec.rb

@@ -2,13 +2,11 @@ require 'spec_helper'
 
 describe BeanstalkdView::Server, :type => :request do
   
-  before :all do
-    ENV['BEANSTALK_URL'] = 'beanstalk://localhost/'
-    Capybara.app = BeanstalkdView::Server.new
-  end
-
   describe "with beanstalkd daemon running", :requires_beanstalkd => true do
     before :all do
+      ENV['BEANSTALK_URL'] = 'beanstalk://localhost/'
+      Capybara.app = BeanstalkdView::Server.new
+
       # Make sure beanstalkd is running
       if `pgrep beanstalkd` == ""
         raise "PRECONDITION NOT MET: beanstalkd not running"
@@ -27,10 +25,87 @@ describe BeanstalkdView::Server, :type => :request do
       body.should have_content "Beanstalkd View"
       body.should have_content "Statistics"
     end
+    
+    it "show be able to add a job on the overview page", :js => true do
+      visit '/'
+      form = find('#add_job_form')
+      form.fill_in 'form_tube_name', :with => 'test.tube'
+      form.fill_in 'form_job_body', :with => '{"id": 1, "name": "Bob"}'
+      form.click_link('Add Job')
+      body.should have_content "Add new job?"
+      click_link "confirm_add_job_btn"
+      body.should have_content "Added job "
+    end
+    
+    it "show be able to click on the test.tube link (created by the last test)", :js => true do
+      visit '/'
+      click_link('test.tube')
+      body.should have_content "test.tube"
+    end
+    
+=begin
+    # Current beanstalk-client lib doesn't support pause_tube action
+    it "show be able to pause a tube", :js => true do
+      visit '/tube/test.tube'
+      fill_in 'delay', :with => 1
+      click_button "Pause"
+      body.should have_content "Paused test.tube"
+    end
+=end
+
+    it "show be able to kick a tube", :js => true do
+      visit '/tube/test.tube'
+      fill_in 'bound', :with => 1
+      click_button "Kick"
+      body.should have_content "Kicked test.tube"
+    end
+    
+    it "show be able to peek_ready a tube", :js => true do
+      visit '/tube/test.tube'
+      click_button "peek_ready_btn"
+      body.should have_content "Job id:"
+    end
+  end
+  
+  describe "with two beanstalkd daemons running", :requires_two_beanstalkd => true do
+    before :all do
+      ENV['BEANSTALK_URL'] = 'beanstalk://localhost:12300/,beanstalk://localhost:12400/'
+      Capybara.app = BeanstalkdView::Server.new
+
+      # Make sure beanstalkd is running
+      if `pgrep beanstalkd` == ""
+        raise "PRECONDITION NOT MET: beanstalkd not running"
+      end
+    end
+    
+    it "should show the overview at: /" do
+      visit '/'
+      body.should have_content "Beanstalkd View"
+      body.should have_content "Statistics"
+      body.should have_content "Tubes"
+    end
+    
+    it "show be able to add a job on the overview page, and view its stats", :js => true do
+      visit '/'
+      form = find('#add_job_form')
+      form.fill_in 'form_tube_name', :with => 'test.tube'
+      form.fill_in 'form_job_body', :with => '{"id": 1, "name": "Bob"}'
+      form.click_link('Add Job')
+      body.should have_content "Add new job?"
+      click_link "confirm_add_job_btn"
+      body.should have_content "Added job "
+      
+      visit '/'
+      click_link('test.tube')
+      body.should have_content "test.tube"
+    end
   end
   
   describe "with out beanstalkd daemon running" do
     before :all do
+      ENV['BEANSTALK_URL'] = 'beanstalk://localhost/'
+      Capybara.app = BeanstalkdView::Server.new
+      
       # Make sure beanstalkd is NOT running
       if `pgrep beanstalkd` != ""
         raise "PRECONDITION NOT MET: beanstalkd running"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkd_view
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2156722560 !ruby/object:Gem::Requirement
+  requirement: &2152680400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156722560
+  version_requirements: *2152680400
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &2156722060 !ruby/object:Gem::Requirement
+  requirement: &2152679160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156722060
+  version_requirements: *2152679160
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2156721580 !ruby/object:Gem::Requirement
+  requirement: &2152677540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156721580
+  version_requirements: *2152677540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156721180 !ruby/object:Gem::Requirement
+  requirement: &2152677140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156721180
+  version_requirements: *2152677140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156720600 !ruby/object:Gem::Requirement
+  requirement: &2152676540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156720600
+  version_requirements: *2152676540
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2156720060 !ruby/object:Gem::Requirement
+  requirement: &2152675740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156720060
+  version_requirements: *2152675740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156719460 !ruby/object:Gem::Requirement
+  requirement: &2152674980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156719460
+  version_requirements: *2152674980
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2156718720 !ruby/object:Gem::Requirement
+  requirement: &2152674400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156718720
+  version_requirements: *2152674400
 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