beanstalkd_view 1.2.12 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5281430061bd31788ede7550710f9ac84ecd6b60
-  data.tar.gz: 3e5ece7278263e6affcaa487dd14952ac6d061f4
+  metadata.gz: 2f7b8257b1b1d3eae86c69e325ff9f7c09a91aa2
+  data.tar.gz: 22aaa2ce1d663bd594e22e2a89b2e118dca66893
 SHA512:
-  metadata.gz: ffb637cbbb7fd9ac0faf68b8551da612557c080b1790dce9ea5eb31a36aad352cf99c282c767b141b7721e249a2d20c79908af8a219aacce655bd01101fc9883
-  data.tar.gz: a9e208e7118526ad748513ae3982630f226dc5eddbbeb0aac2438185c354b21c5bda2b6105283b6f7be0e578f0e5eebaa7dc1e4bc252ccf625b06f81193a5e49
+  metadata.gz: c4ef8838a25c10198e85badc7d505e95fc7d0acb22bb59c7eef19842f3dae9c9989243548d3dd37a557fee8efa32d54efffc405109a42059ee0becbf8c0795c4
+  data.tar.gz: d9a8565b26177a357a867553bda7785116d9fb93281720387a510ef0c455806323e3052ca9d290f413a6f1e55fdffe16699a28f93e840253cdb36c7d230106c2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+2.0.0
+-----------
+
+- Depend on beaneater 1.0.0 via @ryanjohns 
+
 1.2.12
 -----------
 

data/README.md

@@ -52,6 +52,12 @@ authenticate :admin_user do
 end
 ```
 
+Breaking changes since 2.0.0!
+------------------------
+
+As of version 2.0.0, beanstalkd_view no longer supports connection to multiple beanstalkd
+servers due to a decision to drop connection pool support in the beaneater gem.
+
 Troubleshooting
 ------------------------
 1. CSS/JS assets not being served in Rails when running behind Apache or Nginx
@@ -130,10 +136,9 @@ from the command line after modifying any javascript or css files.  The output f
 
 Running the tests
 ------------------------
-There are 3 variants of RSpec tests.
+There are 2 variants of RSpec tests.
 * Without beanstalkd running, just execute: rspec spec
-* With 1 instance of beanstalkd running (default port), execute: rspec spec --tag requires_beanstalkd
-* With 2 instances of beanstalkd running (ports 11300 and 11400), execute: rspec spec --tag requires_two_beanstalkd
+* With beanstalkd running (default port), execute: rspec spec --tag requires_beanstalkd
 
 Customization
 ------------------------

data/Rakefile

@@ -19,7 +19,7 @@ namespace :beanstalkd_view do
   task :enqueue_test do
     host = "localhost"
     port = 11300
-    beanstalk = Beaneater::Pool.new([ "#{host}:#{port}" ])
+    beanstalk = Beaneater.new("#{host}:#{port}")
 
     # Loop flooding the queues with jobs
     while true
@@ -37,7 +37,7 @@ namespace :beanstalkd_view do
   task :pull_test do
     host = "localhost"
     port = 11300
-    beanstalk = Beaneater::Pool.new([ "#{host}:#{port}" ])
+    beanstalk = Beaneater.new("#{host}:#{port}")
 
     while true
       tube_name = TEST_QUEUES.sample

data/lib/beanstalkd_view/beanstalkd_utils.rb

@@ -7,7 +7,7 @@ module BeanstalkdView
     class BadURL < RuntimeError; end
     
     def beanstalk
-      @@beanstalk ||= Beaneater::Pool.new(beanstalk_addresses)
+      @@beanstalk ||= Beaneater.new(beanstalk_address)
     end
 
     def beanstalk_url
@@ -15,9 +15,9 @@ module BeanstalkdView
       ENV['BEANSTALK_URL'] || 'beanstalk://127.0.0.1/'
     end
 
-    def beanstalk_addresses
+    def beanstalk_address
       uris = beanstalk_url.split(/[\s,]+/)
-      uris.map {|uri| beanstalk_host_and_port(uri)}
+      beanstalk_host_and_port(uris.first)
     end
 
     def beanstalk_host_and_port(uri_string)
@@ -82,7 +82,7 @@ module BeanstalkdView
       (min+GUESS_PEEK_RANGE)-1
     end
 
-    def close_connections
+    def close_connection
       begin
         beanstalk.close
       rescue Beaneater::NotConnected

data/lib/beanstalkd_view/server.rb

@@ -16,7 +16,7 @@ module BeanstalkdView
 
     get "/" do
       begin
-        @connections = beanstalk.connections
+        @connection = beanstalk.connection
         @tubes = beanstalk.tubes.all
         @tubes = @tubes.sort_by{|obj| obj.name }
         @stats = beanstalk.stats
@@ -27,7 +27,7 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
@@ -48,29 +48,32 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
 
-    get "/tube/:tube" do
+    get "/tube/*" do
       begin
-        @tube = beanstalk.tubes[params[:tube]]
+        @tube = beanstalk.tubes[params[:splat].first]
         @stats = @tube.stats
         erb :tube_stats
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
 
-    get "/peek/:tube/:type" do
+    get "/peek/*" do
       content_type :json
+      parts = params[:splat].first.split('/')
+      tube = parts[0...-1].join('/')
+      type = parts.last
       begin
-        tube = beanstalk.tubes[params[:tube]]
-        response = tube.peek(params[:type])
+        tube = beanstalk.tubes[tube]
+        response = tube.peek(type)
         if response
           job_to_hash(response).to_json
         else
@@ -79,7 +82,7 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         { :error => @error.to_s }.to_json
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         { :error => @error.to_s }.to_json
       end
     end
@@ -105,43 +108,38 @@ module BeanstalkdView
 
         @jobs = []
         for i in min..max
-          begin
-            jobs = beanstalk.jobs.find_all(i)
-            jobs.each do |job|
-              @jobs << job_to_hash(job)
-            end
-          rescue Beaneater::NotFoundError
-            # Since we're looping over potentially non-existant jobs, ignore
-          end
+          job = beanstalk.jobs.find(i)
+          @jobs << job_to_hash(job) if job
         end
         erb :peek_range
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
 
-    get "/delete/:tube/:job_id" do
+    get "/delete/*" do
+      parts = params[:splat].first.split('/')
+      tube = parts[0...-1].join('/')
+      job_id = parts.last
       begin
           response = nil
-          jobs = beanstalk.jobs.find_all(params[:job_id].to_i)
-          raise Beaneater::NotFoundError.new("Job not found with specified id", 'find') if jobs.size == 0
-          raise Beaneater::NotFoundError.new("Multiple jobs found with specified id", 'find') if jobs.size > 1
-          job = jobs[0]
-          response = job.delete if job
+          job = beanstalk.jobs.find(job_id.to_i)
+          raise Beaneater::NotFoundError.new("Job not found with specified id", 'find') if job.nil?
+          response = job.delete
           if response
-            cookies[:beanstalkd_view_notice] = "Deleted Job #{params[:job_id]}"
-            redirect url("/tube/#{escaped_tube_param}")
+            cookies[:beanstalkd_view_notice] = "Deleted Job #{job_id}"
+            redirect url("/tube/#{escaped_tube_param(tube)}")
           else
-            cookies[:beanstalkd_view_notice] = "Error deleting Job #{params[:job_id]}"
-            redirect url("/tube/#{escaped_tube_param}")
+            cookies[:beanstalkd_view_notice] = "Error deleting Job #{job_id}"
+            redirect url("/tube/#{escaped_tube_param(tube)}")
           end
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
@@ -160,7 +158,7 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
@@ -181,7 +179,7 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
@@ -201,7 +199,7 @@ module BeanstalkdView
       rescue Beaneater::NotFoundError => @error
         erb :error
       rescue Beaneater::NotConnected => @error
-        close_connections
+        close_connection
         erb :error
       end
     end
@@ -213,8 +211,8 @@ module BeanstalkdView
 
     private
 
-    def escaped_tube_param
-      CGI::escape(params[:tube])
+    def escaped_tube_param(tube = nil)
+      CGI::escape(tube || params[:tube])
     end
 
     def path_prefix

data/lib/beanstalkd_view/version.rb

@@ -1,3 +1,3 @@
 module BeanstalkdView
-  VERSION = "1.2.12"
+  VERSION = "2.0.0"
 end

data/lib/beanstalkd_view/views/index.erb

@@ -5,15 +5,13 @@
       <table class="table">
         <thead>
           <tr>
-            <th>Connections</th>
+            <th>Connection</th>
           </tr>
         </thead>
         <tbody>
-        <% @connections.each do |connection| %>
-        <tr>
-          <td><%= connection.address %></td>
-        </tr>
-        <% end %>
+          <tr>
+            <td><%= @connection.address %></td>
+          </tr>
         </tbody>
       </table>
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beanstalkd_view",
-  "version": "1.2.12",
+  "version": "2.0.0",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-jshint": "~0.3.0",

data/spec/lib/beanstalkd_view/beanstalkd_util_spec.rb

@@ -6,17 +6,17 @@ describe BeanstalkdView::BeanstalkdUtils do
     utils = Object.new.extend BeanstalkdView::BeanstalkdUtils
     
     ENV['BEANSTALK_URL'] = "beanstalk://localhost:12300"
-    utils.beanstalk_addresses.should eq(["localhost:12300"])
+    utils.beanstalk_address.should eq("localhost:12300")
     
     ENV['BEANSTALK_URL'] = "beanstalk://localhost:12300/, beanstalk://localhost:12301/"
-    utils.beanstalk_addresses.should eq(["localhost:12300","localhost:12301"])
+    utils.beanstalk_address.should eq("localhost:12300")
     
     ENV['BEANSTALK_URL'] = "beanstalk://localhost:12300   beanstalk://localhost:12301"
-    utils.beanstalk_addresses.should eq(["localhost:12300","localhost:12301"])
+    utils.beanstalk_address.should eq("localhost:12300")
     
     expect {
-      ENV['BEANSTALK_URL'] = "beanstalk://localhost:12300, http://localhost:12301"
-      utils.beanstalk_addresses 
+      ENV['BEANSTALK_URL'] = "http://localhost:12301"
+      utils.beanstalk_address
     }.should raise_error(BeanstalkdView::BeanstalkdUtils::BadURL)
   end
 

data/spec/rails_app/log/test.log

@@ -689,3 +689,224 @@ Started GET "/beanstalkd/" for 127.0.0.1 at 2015-02-10 08:43:30 -0500
 
 
 Started GET "/beanstalkd/tube/default" for 127.0.0.1 at 2015-02-10 08:43:30 -0500
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:53:34 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:56:13 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:56:30 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:07 -0400
+
+
+Started GET "/beanstalkd/tube/default" for 127.0.0.1 at 2015-05-10 10:59:08 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:11 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:11 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:11 -0400
+
+
+Started GET "/favicon.ico" for 127.0.0.1 at 2015-05-10 10:59:11 -0400
+
+ActionController::RoutingError (No route matches [GET] "/favicon.ico"):
+  actionpack (3.2.6) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/show_exceptions.rb:56:in `call'
+  railties (3.2.6) lib/rails/rack/logger.rb:26:in `call_app'
+  railties (3.2.6) lib/rails/rack/logger.rb:16:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/request_id.rb:22:in `call'
+  rack (1.4.5) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.4.5) lib/rack/runtime.rb:17:in `call'
+  activesupport (3.2.6) lib/active_support/cache/strategy/local_cache.rb:72:in `call'
+  rack (1.4.5) lib/rack/lock.rb:15:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/static.rb:62:in `call'
+  railties (3.2.6) lib/rails/engine.rb:479:in `call'
+  railties (3.2.6) lib/rails/application.rb:220:in `call'
+  rack (1.4.5) lib/rack/builder.rb:134:in `call'
+  rack (1.4.5) lib/rack/urlmap.rb:64:in `block in call'
+  rack (1.4.5) lib/rack/urlmap.rb:49:in `each'
+  rack (1.4.5) lib/rack/urlmap.rb:49:in `call'
+  capybara (2.0.2) lib/capybara/server.rb:19:in `call'
+  rack (1.4.5) lib/rack/handler/webrick.rb:59:in `service'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:138:in `service'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:94:in `run'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/server.rb:294:in `block in start_thread'
+
+
+
+
+Started GET "/favicon.ico" for 127.0.0.1 at 2015-05-10 10:59:11 -0400
+
+ActionController::RoutingError (No route matches [GET] "/favicon.ico"):
+  actionpack (3.2.6) lib/action_dispatch/middleware/debug_exceptions.rb:21:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/show_exceptions.rb:56:in `call'
+  railties (3.2.6) lib/rails/rack/logger.rb:26:in `call_app'
+  railties (3.2.6) lib/rails/rack/logger.rb:16:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/request_id.rb:22:in `call'
+  rack (1.4.5) lib/rack/methodoverride.rb:21:in `call'
+  rack (1.4.5) lib/rack/runtime.rb:17:in `call'
+  activesupport (3.2.6) lib/active_support/cache/strategy/local_cache.rb:72:in `call'
+  rack (1.4.5) lib/rack/lock.rb:15:in `call'
+  actionpack (3.2.6) lib/action_dispatch/middleware/static.rb:62:in `call'
+  railties (3.2.6) lib/rails/engine.rb:479:in `call'
+  railties (3.2.6) lib/rails/application.rb:220:in `call'
+  rack (1.4.5) lib/rack/builder.rb:134:in `call'
+  rack (1.4.5) lib/rack/urlmap.rb:64:in `block in call'
+  rack (1.4.5) lib/rack/urlmap.rb:49:in `each'
+  rack (1.4.5) lib/rack/urlmap.rb:49:in `call'
+  capybara (2.0.2) lib/capybara/server.rb:19:in `call'
+  rack (1.4.5) lib/rack/handler/webrick.rb:59:in `service'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:138:in `service'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/httpserver.rb:94:in `run'
+  /Users/denniskuczynski/.rvm/rubies/ruby-2.2.2/lib/ruby/2.2.0/webrick/server.rb:294:in `block in start_thread'
+
+
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:14 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:15 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:15 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:17 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:17 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:17 -0400
+
+
+Started GET "/beanstalkd/peek-range?min=0&max=0" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/tube/test.tube" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:18 -0400
+
+
+Started GET "/beanstalkd/tube/test.tube" for 127.0.0.1 at 2015-05-10 10:59:20 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:20 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:20 -0400
+
+
+Started GET "/beanstalkd/tube/test.tube" for 127.0.0.1 at 2015-05-10 10:59:23 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:23 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:23 -0400
+
+
+Started GET "/beanstalkd/tube/test.tube" for 127.0.0.1 at 2015-05-10 10:59:25 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:25 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:25 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:27 -0400
+
+
+Started GET "/beanstalkd/tube/default" for 127.0.0.1 at 2015-05-10 10:59:27 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:27 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:27 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:27 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:31 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:31 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:31 -0400
+
+
+Started GET "/beanstalkd/" for 127.0.0.1 at 2015-05-10 10:59:33 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:33 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:33 -0400
+
+
+Started GET "/beanstalkd/peek-range?min=0&max=0" for 127.0.0.1 at 2015-05-10 10:59:34 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:34 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:34 -0400
+
+
+Started GET "/beanstalkd/tube/test%2Ftube" for 127.0.0.1 at 2015-05-10 10:59:35 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:35 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:35 -0400
+
+
+Started GET "/beanstalkd/tube/test%2Ftube" for 127.0.0.1 at 2015-05-10 10:59:37 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:37 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:37 -0400
+
+
+Started GET "/beanstalkd/tube/test%2Ftube" for 127.0.0.1 at 2015-05-10 10:59:39 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:39 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:39 -0400
+
+
+Started GET "/beanstalkd/tube/test%2Ftube" for 127.0.0.1 at 2015-05-10 10:59:41 -0400
+
+
+Started GET "/beanstalkd/css/beanstalkd_view.min.css" for 127.0.0.1 at 2015-05-10 10:59:41 -0400
+
+
+Started GET "/beanstalkd/js/beanstalkd_view.min.js" for 127.0.0.1 at 2015-05-10 10:59:41 -0400

data/spec/spec_helper.rb

@@ -17,17 +17,9 @@ end
   
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.filter_run_excluding :requires_beanstalkd, :requires_two_beanstalkd
+  config.filter_run_excluding :requires_beanstalkd
 
-  config.before(:each) do      
-      requires_two_beanstalkd = example.options[:requires_two_beanstalkd]
-      if requires_two_beanstalkd
-        ENV['BEANSTALK_URL'] = 'beanstalk://localhost:11300,beanstalk://localhost:11400'
-      else
-        ENV['BEANSTALK_URL'] = 'beanstalk://localhost:11300'
-      end
-    end
+  config.before(:each) do
+    ENV['BEANSTALK_URL'] = 'beanstalk://localhost:11300'
+  end
 end
-
-
-

data/spec/support/integration_test_shared_examples.rb

@@ -10,7 +10,7 @@ shared_examples 'integration_test' do
 
     it "should should error at site root" do
       visit site_root
-      page.should have_content "Could not connect"
+      page.should have_content "Connection to beanstalk 'localhost:11300' is closed!"
     end
   end
 
@@ -32,25 +32,4 @@ shared_examples 'integration_test' do
 
   end
 
-  describe "with two beanstalkd daemons running", :requires_two_beanstalkd => true do
-    before :all do
-      # Make sure beanstalkd is running
-      if `pgrep beanstalkd` == ""
-        raise "PRECONDITION NOT MET: beanstalkd not running"
-      end
-    end
-
-    it "should show the overview at: /", :requires_two_beanstalkd => true do
-      visit site_root
-      page.should have_content "Beanstalkd View"
-      page.should have_content "Statistics"
-      page.should have_content "Tubes"
-    end
-
-    it_behaves_like "queue_browser", :requires_two_beanstalkd => true do
-      let(:tube_name) { 'test.two' }
-    end
-
-  end
-
 end

data/spec/support/queue_browser_shared_examples.rb

@@ -40,7 +40,7 @@ shared_examples 'queue_browser' do
   end
 
   it "should be able to pause a tube", :js => true do
-    visit "#{site_root}/tube/#{CGI::escape(tube_name)}"
+    visit "#{site_root}tube/#{CGI::escape(tube_name)}"
     form = find('#pause_form')
     form.fill_in 'delay', :with => 1
     click_button "Pause"
@@ -62,7 +62,7 @@ shared_examples 'queue_browser' do
   end
 
   it "should be able to clear a tube", :js => true do
-    visit "#{site_root}/tube/#{CGI::escape(tube_name)}"
+    visit "#{site_root}tube/#{CGI::escape(tube_name)}"
     form = find('#clear_form')
     form.select 'Buried', :from => 'state'
     click_button "Clear"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkd_view
 version: !ruby/object:Gem::Version
-  version: 1.2.12
+  version: 2.0.0
 platform: ruby
 authors:
 - Dennis Kuczynski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Sinatra app to view/manage beanstalkd queues that can be embedded in a