RubyGems - beanstalkd_view - Versions diffs - 1.0.1 → 1.0.2 - Mend

beanstalkd_view 1.0.1 → 1.0.2

Files changed (35) hide show

data/lib/beanstalkd_view/views/layout.erb CHANGED Viewed

@@ -3,22 +3,14 @@
 <html>
   <head>
     <title>Beanstalkd View - <%= BeanstalkdView::VERSION %></title>
-    <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="<%= 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() {
-	    	$("[rel=tooltip]").tooltip();
-		});
-	</script>
+    <% 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 %>
   </head>
   <body>
 	<!-- Header -->

data/lib/beanstalkd_view/views/peek_range.erb ADDED Viewed

@@ -0,0 +1,51 @@
+<div class="row">
+	<div class="span12">
+		<h3>Peek Range</h3>
+		<div class="alert alert-success">
+		  <strong>NOTE:</strong> Setting min and max to 0 will attempt to guess an appropriate range value based on the current ready queue.
+		</div>
+		<form class="well form-inline" name="peek_range_form" action="<%= u("/peek-range") %>" method="GET">
+		  <input type="text" class="span2" name="min" value="<%= @min %>">
+		  <input type="text" class="span2" name="max" value="<%= @max %>">
+		  <select id="peek_range_tube_select" class="span2" name="tube">
+			<option></option>
+			<% @tube_set.each do |tube| %>
+			<option <% if @tube == tube%>selected="true"<% end %>><%=tube%></option>
+			<% end %>
+		  </select>
+		  <button type="submit" class="btn">Refresh</button>
+		</form>
+		<table id="peek_range_table" class="table table-bordered">
+			<tr>
+				<th>ID</th>
+				<th>Priority</th>
+				<th>Age</th>
+				<th>Delay</th>
+				<th>TTR</th>
+				<th>Time Left</th>
+				<th>Reserves</th>
+				<th>Timeouts</th>
+				<th>Releases</th>
+				<th>Buries</th>
+				<th>Kicks</th>
+				<th>Body</th>
+			</tr>
+			<% @jobs.each do |job| %>
+			<tr data-tube="<%=job['tube']%>" <% if job['pri'] < 1024 %>class="urgent"<%end%>>
+				<td><%=job['id']%></td>
+				<td><%=job['pri']%></td>
+				<td><%=job['age']%></td>
+				<td><%=job['delay']%></td>
+				<td><%=job['ttr']%></td>
+				<td><%=job['time-left']%></td>
+				<td><%=job['reserves']%></td>
+				<td><%=job['timeouts']%></td>
+				<td><%=job['releases']%></td>
+				<td><%=job['buries']%></td>
+				<td><%=job['kicks']%></td>
+				<td><p class="peek_range_job_body"><%=job['body'].inspect%><p></td>
+			</tr>
+			<% end %>
+		</table>
+	</div>
+</div>

data/lib/beanstalkd_view/views/tube_stats.erb CHANGED Viewed

@@ -95,7 +95,7 @@
 	</form>
     <h3>Kick Tube</h3>
-	<form class="well form-inline" name="kick_form" action="<%= u("/kick") %>" method="POST">
+	<form id="kick_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>
@@ -107,6 +107,14 @@
 	  <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 %>">
+	  <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>

data/lib/beanstalkd_view.rb CHANGED Viewed

@@ -1,10 +1,12 @@
 require 'rubygems'
 require 'sinatra/base'
 require 'sinatra/cookies'
+require 'sinatra/assetpack'
 require 'erb'
 require "beanstalk-client"
 require "json"
 require "beanstalkd_view/version"
+require "beanstalkd_view/extensions/beanstalk-pool"
 require "beanstalkd_view/beanstalkd_utils"
 require 'beanstalkd_view/server'

data/spec/integration/rails_integration_spec.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe "RailsIntegration", :type => :request do
+  before(:all) do
+    # Configure Capybara for Rails
+    require "capybara/rails"
+  end
+  it_behaves_like "integration_test" do
+    let(:site_root) { '/beanstalkd/' }
+  end
+end

data/spec/integration/sinatra_integration_spec.rb ADDED Viewed

@@ -0,0 +1,13 @@
+require 'spec_helper'
+describe "SinatraIntegration", :type => :request do
+  before :all do
+    ENV['BEANSTALK_URL'] = 'beanstalk://localhost/'
+    Capybara.app = BeanstalkdView::Server.new
+  end
+  it_behaves_like "integration_test" do
+    let(:site_root) { '/' }
+  end
+end

data/spec/lib/beanstalkd_view/beanstalkd_util_spec.rb CHANGED Viewed

@@ -26,7 +26,7 @@ describe BeanstalkdView::BeanstalkdUtils do
       utils = Object.new.extend BeanstalkdView::BeanstalkdUtils
       @stats = utils.beanstalk.stats
       @stats.keys.should include('current-jobs-ready')
-      @stats['current-jobs-ready'].should eq(0)
+      @stats['current-jobs-ready'].should > 0
     end
   end

data/spec/rails_app/config/routes.rb ADDED Viewed

@@ -0,0 +1,3 @@
+BeanstalkdView::RailsApp.routes.draw do
+  mount BeanstalkdView::Server, :at => "/beanstalkd"
+end