beanstalkd_view 1.0.0 → 1.0.1

data/README.md

@@ -23,6 +23,8 @@ Use the following environment variable to specify the location of the beanstalk
 ENV['BEANSTALK_URL'] = 'beanstalk://localhost/'
 ```
 
+(This can be a comma separated list.)
+
 Embedding in a Rails app
 ------------------------
 
@@ -37,6 +39,17 @@ mount BeanstalkdView::Server, :at => "/beanstalkd"
 You can then browse to your application path to view information about your beanstalkd tubes, i.e.
 http://127.0.0.1:3000/beanstalkd
 
+If you wish to authenticate the mounted app with Devise, it would look something like:
+
+``` ruby
+devise_for :admin_users, ActiveAdmin::Devise.config
+
+match('/beanstalkd/admin/login' => redirect('/admin/login'))
+authenticate :admin_user do
+  mount BeanstalkdView::Server, at: "/beanstalkd"
+end
+```
+
 Running from the command line
 ------------------------
 

data/lib/beanstalkd_view/server.rb

@@ -36,17 +36,26 @@ module BeanstalkdView
 
   class Server < Sinatra::Base
     include BeanstalkdView::BeanstalkdUtils
-    enable :sessions
+    helpers Sinatra::Cookies
     
+    root = File.dirname(File.expand_path(__FILE__))
+    set :root, root
+    set :views,  "#{root}/views"
+    if respond_to? :public_folder
+          set :public_folder, "#{root}/resources"
+        else
+          set :public, "#{root}/resources"
+        end
+    set :static, true
+      
     get "/" do
       begin
         @tubes = beanstalk.list_tubes
         @stats = beanstalk.stats
-        chart_data = get_chart_data_hash(@tubes)
+        @tube_set = tube_set(@tubes)
+        chart_data = get_chart_data_hash(@tube_set)
         @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
       rescue Beanstalk::NotConnected => @error
         erb :error
@@ -61,10 +70,10 @@ module BeanstalkdView
           response = conn.put([ params[:tube], body ].to_json, params[:priority].to_i, params[:delay].to_i, params[:ttr].to_i)
         end
         if response
-          session[:message] = "Added job #{response.inspect}"
+          cookies[:beanstalkd_view_notice] = "Added job #{response.inspect}"
           redirect url("/")
         else
-          session[:message] = "Error adding job"
+          cookies[:beanstalkd_view_notice] = "Error adding job"
           redirect url("/")
         end
       rescue Beanstalk::NotConnected => @error
@@ -76,8 +85,6 @@ module BeanstalkdView
       begin
         @tube = params[:tube]
         @stats = beanstalk.stats_tube(@tube)
-        @message = session[:message]
-        session[:message] = nil
         erb :tube_stats
       rescue Beanstalk::NotConnected => @error
         erb :error
@@ -116,10 +123,10 @@ module BeanstalkdView
             response = conn.delete(params[:job_id].to_i)
           end
           if response
-            session[:message] = "Deleted Job #{params[:job_id]}"
+            cookies[:beanstalkd_view_notice] = "Deleted Job #{params[:job_id]}"
             redirect url("/tube/#{params[:tube]}")
           else
-            session[:message] = "Error deleting Job #{params[:job_id]}"
+            cookies[:beanstalkd_view_notice] = "Error deleting Job #{params[:job_id]}"
             redirect url("/tube/#{params[:tube]}")
           end
         rescue Beanstalk::NotConnected => @error
@@ -131,14 +138,14 @@ module BeanstalkdView
       begin
         response = beanstalk.pause_tube(params[:tube], params[:delay].to_i)
         if response
-          session[:message] = "Paused #{params[:tube]}. No jobs will be reserved for #{params[:delay].to_i} seconds."
+          cookies[:beanstalkd_view_notice] = "Paused #{params[:tube]}. No jobs will be reserved for #{params[:delay].to_i} seconds."
           redirect url("/tube/#{params[:tube]}")
         else
-          session[:message] = "Error pausing #{params[:tube]}."
+          cookies[:beanstalkd_view_notice] = "Error pausing #{params[:tube]}."
           redirect url("/tube/#{params[:tube]}")
         end
       rescue NameError => @error
-        session[:message] = "The pause_tube method is currently not implemented by this version of beanstalk-client."
+        cookies[:beanstalkd_view_notice] = "The pause_tube method is currently not implemented by this version of beanstalk-client."
         redirect url("/tube/#{params[:tube]}")
       rescue Beanstalk::NotConnected => @error
         erb :error
@@ -152,10 +159,10 @@ module BeanstalkdView
           response = conn.kick(params[:bound].to_i)
         end
         if response
-          session[:message] = "Kicked #{params[:tube]} for #{response} jobs."
+          cookies[:beanstalkd_view_notice] = "Kicked #{params[:tube]} for #{response} jobs."
           redirect url("/tube/#{params[:tube]}")
         else
-          session[:message] = "Error kicking #{params[:tube]}."
+          cookies[:beanstalkd_view_notice] = "Error kicking #{params[:tube]}."
           redirect url("/tube/#{params[:tube]}")
         end
       rescue Beanstalk::NotConnected => @error
@@ -163,21 +170,31 @@ module BeanstalkdView
       end
     end
     
-    get "/resources/*" do |path|
-      file = File.expand_path(File.join('resources', path), File.dirname(__FILE__))
-      send_file file
+    def url_path(*path_parts)
+      [ path_prefix, path_parts ].join("/").squeeze('/')
     end
-    
+    alias_method :u, :url_path
+
+    def path_prefix
+      request.env['SCRIPT_NAME']
+    end
+
+    def notice_message
+      message = cookies[:beanstalkd_view_notice]
+      cookies[:beanstalkd_view_notice] = ''
+      message
+    end
+
     private
-    
+        
     # Return the stats data in a format for the Bluff JS UI Charts
-    def get_chart_data_hash(tubes)
+    def get_chart_data_hash(tube_set)
       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 
-      tube_set(tubes).each do |tube|
+      tube_set.each do |tube|
         begin
           stats = beanstalk.stats_tube(tube)
           #total_jobs

data/lib/beanstalkd_view/version.rb

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

data/lib/beanstalkd_view/views/index.erb

@@ -12,10 +12,10 @@
         <tbody>
 		  <% @tubes.keys.each do |key| %>
         	<% @tubes[key].each do |tube| %>
-		  <tr>
-            <td><%= key %></td>
-			<td><a href="<%= url("/tube/#{tube}") %>"><%= tube %></a></td>
-			</tr>
+		    <tr>
+              <td><%= key %></td>
+			  <td><a href="<%= u("/tube/#{tube}") %>"><%= tube %></a></td>
+		    </tr>
 			<% end %>
 		  <% end %>
 		</tbody>
@@ -269,8 +269,8 @@
 	<div class="span6">
 		  <div class="span6">
             <h3>Add Job</h3>
-			<form id="add_job_form" class="well" name="add_job_form" action="<%= url('/add_job') %>" method="POST">
-			  <input id="form_tube_name" type="text" class="span3" placeholder="Tube name" name="tube">
+			<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_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">
@@ -335,6 +335,13 @@ $(document).ready(function(){
 	  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 = [];
+	<% @tube_set.each do |tube| %>
+	  tubeNames.push('<%=tube%>');
+	<% end %>
+	$('#form_tube_name').typeahead({source: tubeNames});
 });
 </script>
 

data/lib/beanstalkd_view/views/layout.erb

@@ -3,16 +3,16 @@
 <html>
   <head>
     <title>Beanstalkd View - <%= BeanstalkdView::VERSION %></title>
-    <link rel="stylesheet" type="text/css" href="<%= url('/resources/bootstrap/css/bootstrap.min.css') %>"/>
-    <link rel="stylesheet" type="text/css" href="<%= url('/resources/bootstrap/css/overrides.css') %>"/>
+    <link rel="stylesheet" type="text/css" href="<%= u('/bootstrap/css/bootstrap.min.css') %>"/>
+    <link rel="stylesheet" type="text/css" href="<%= u('/bootstrap/css/overrides.css') %>"/>
     <meta http-equiv="content-type" content="text/html;charset=utf-8" />
-    <script type="text/javascript" src="<%= url('/resources/js/jquery-1.7.1.min.js') %>"></script>
-    <script type="text/javascript" src="<%= url('/resources/bootstrap/js/bootstrap.min.js') %>"></script>
-    <script type="text/javascript" src="<%= url('/resources/js/json2.js') %>"></script>
-    <script type="text/javascript" src="<%= url('/resources/js/peek_jobs.js') %>"></script>
-	<script language="javascript" src="<%= url('/resources/js/bluff/js-class.js') %>"></script>
-	<script language="javascript" src="<%= url('/resources/js/bluff/bluff-min.js') %>"></script>
-	<!--[if IE]><script language="javascript" src="<%= url('/resources/js/bluff/excanvas.js') %>"></script><![endif]-->
+    <script type="text/javascript" src="<%= u('/js/jquery-1.7.1.min.js') %>"></script>
+    <script type="text/javascript" src="<%= u('/bootstrap/js/bootstrap.min.js') %>"></script>
+    <script type="text/javascript" src="<%= u('/js/json2.js') %>"></script>
+    <script type="text/javascript" src="<%= u('/js/peek_jobs.js') %>"></script>
+	<script language="javascript" src="<%= u('/js/bluff/js-class.js') %>"></script>
+	<script language="javascript" src="<%= u('/js/bluff/bluff-min.js') %>"></script>
+	<!--[if IE]><script language="javascript" src="<%= u('/js/bluff/excanvas.js') %>"></script><![endif]-->
 	<script type="text/javascript">
 		<!-- Enable Tooltips -->
 		$(document).ready(function() {
@@ -25,20 +25,21 @@
 	<div class="navbar">
 	  <div class="navbar-inner">
 	    <div class="container">
-			<a class="brand" href="<%= url('/') %>">Beanstalkd View - <%= BeanstalkdView::VERSION %></a>
+			<a class="brand" href="<%= u("/") %>">Beanstalkd View - <%= BeanstalkdView::VERSION %></a>
 		</div>
 	  </div>
 	</div>
 	
 	<div class="container">
 		
-		<% if @message %>
+		<% message = notice_message %>
+		<% if message and not message.empty? %>
 			<div id='flash' class='notice'>
 				<div class="row">
 					<div class="span12">
 						<div class="alert alert-success">
 						 <h4 class="alert-heading">Notice:</h4>
-						  <%= @message %>
+						  <%= message %>
 						</div>
 					</div>
 				</div>		

data/lib/beanstalkd_view/views/tube_stats.erb

@@ -87,15 +87,15 @@
 
   <div class="span6">
     <h3>Pause Tube</h3>
-	<form class="well form-inline" name="pause_form" action="<%= url('/pause') %>" method="POST">
+	<form class="well form-inline" name="pause_form" action="<%= u("/pause") %>" method="POST">
 	  <input id="form_tube_name" type="hidden" name="tube" value="<%= @tube %>">
-      <input id="form_url_base" type="hidden" name="url_base" value="<%= url('/') %>">
+      <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>
 
     <h3>Kick Tube</h3>
-	<form class="well form-inline" name="kick_form" action="<%= url('/kick') %>" method="POST">
+	<form class="well form-inline" name="kick_form" action="<%= u("/kick") %>" method="POST">
 	  <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>

data/lib/beanstalkd_view.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'sinatra/base'
+require 'sinatra/cookies'
 require 'erb'
 require "beanstalk-client"
 require "json"

data/spec/lib/beanstalkd_view/server_spec.rb

@@ -62,7 +62,7 @@ describe BeanstalkdView::Server, :type => :request do
     
     it "show be able to peek_ready a tube", :js => true do
       visit '/tube/test.tube'
-      click_button "peek_ready_btn"
+      click_link('peek_ready_btn')
       body.should have_content "Job id:"
     end
   end

data/spec/spec_helper.rb

@@ -15,5 +15,5 @@ end
   
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run_excluding :requires_beanstalkd
+  config.filter_run_excluding :requires_beanstalkd, :requires_two_beanstalkd
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkd_view
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152680400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152680400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &2152679160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +53,15 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152679160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &2152677540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +69,15 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152677540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152677140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152677140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152676540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152676540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152675740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152675740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152674980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152674980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2152674400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152674400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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
@@ -149,15 +205,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2542161363701454031
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2542161363701454031
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Sinatra app to view/manage beanstalkd queues that can be embedded in a