depend on beaneater 1.0.0

denniskuczynski · Apr 29, 2015 · 192a753 · 192a753
1 parent 6818bc4
commit 192a753
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 52 deletions.
diff --git a/README.md b/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
 ------------------------

diff --git a/beanstalkd_view.gemspec b/beanstalkd_view.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "sinatra",         ">= 1.3.0"
   s.add_dependency "sinatra-contrib", ">= 1.3.0"
-  s.add_dependency "beaneater",         "~> 0.3.0"
+  s.add_dependency "beaneater",       "~> 1.0.0"
   s.add_dependency "vegas",           "~> 0.1.2"
   s.add_dependency "json"
 

diff --git a/lib/beanstalkd_view/beanstalkd_utils.rb b/lib/beanstalkd_view/beanstalkd_utils.rb
@@ -7,17 +7,17 @@ module BeanstalkdUtils
     class BadURL < RuntimeError; end
 
     def beanstalk
-      @@beanstalk ||= Beaneater::Pool.new(beanstalk_addresses)
+      @@beanstalk ||= Beaneater.new(beanstalk_address)
     end
 
     def beanstalk_url
       return @@url if defined?(@@url) and @@url
       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)

diff --git a/lib/beanstalkd_view/server.rb b/lib/beanstalkd_view/server.rb
@@ -16,7 +16,7 @@ class Server < Sinatra::Base
 
     get "/" do
       begin
-        @connections = beanstalk.connections
+        @connection = beanstalk.connection
         @tubes = beanstalk.tubes.all
         @tubes = @tubes.sort_by{|obj| obj.name }
         @stats = beanstalk.stats

diff --git a/lib/beanstalkd_view/views/index.erb b/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>
 

diff --git a/spec/lib/beanstalkd_view/beanstalkd_util_spec.rb b/spec/lib/beanstalkd_view/beanstalkd_util_spec.rb
@@ -6,17 +6,17 @@
     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
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -17,17 +17,9 @@
 
 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
-
-
-
diff --git a/spec/support/integration_test_shared_examples.rb b/spec/support/integration_test_shared_examples.rb
@@ -32,25 +32,4 @@
 
   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