beanstalkd_view 1.0.2 → 1.1.0

data/spec/spec_helper.rb

@@ -18,5 +18,16 @@ 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.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
 end
 
+
+

data/spec/support/integration_test_shared_examples.rb

@@ -10,7 +10,7 @@ shared_examples 'integration_test' do
 
     it "should show error at site root" do
       visit site_root
-      page.should have_content "Beanstalk::NotConnected"
+      page.should have_content "Could not connect"
     end
   end
   
@@ -43,7 +43,7 @@ shared_examples 'integration_test' do
       form.click_link('Add Job')
       body.should have_content "Add new job?"
       click_link "confirm_add_job_btn"
-      body.should have_content "Added job "
+      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
@@ -60,9 +60,7 @@ shared_examples 'integration_test' do
       click_button 'Peek'
       body.should have_content "Peek Range"
     end
-    
-=begin
-    # Current beanstalk-client lib doesn't support pause_tube action
+
     it "show be able to pause a tube", :js => true do
       visit "#{site_root}/tube/test.tube"
       form = find('#pause_form')
@@ -70,7 +68,6 @@ shared_examples 'integration_test' do
       click_button "Pause"
       body.should have_content "Paused test.tube"
     end
-=end
 
     it "show be able to kick a tube", :js => true do
       visit "#{site_root}tube/test.tube"
@@ -110,11 +107,15 @@ shared_examples 'integration_test' do
       form.click_link('Add Job')
       body.should have_content "Add new job?"
       click_link "confirm_add_job_btn"
-      body.should have_content "Added job "
+      body.should have_content "Added job:"
       
       visit site_root
       click_link('test.tube')
       body.should have_content "test.tube"
+
+      visit "#{site_root}tube/test.tube"
+      click_link('peek_ready_btn')
+      body.should have_content "Job id:"
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beanstalkd_view
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -60,21 +60,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.11
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: beaneater
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
@@ -201,9 +201,6 @@ files:
 - Rakefile
 - MIT-LICENSE.txt
 - lib/beanstalkd_view/beanstalkd_utils.rb
-- lib/beanstalkd_view/extensions/beanstalk-pool.rb
-- lib/beanstalkd_view/Gemfile
-- lib/beanstalkd_view/Rakefile
 - lib/beanstalkd_view/resources/css/app.css
 - lib/beanstalkd_view/resources/css/vendor/bootstrap.min.css
 - lib/beanstalkd_view/resources/js/app.js
@@ -246,7 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 508936170925941146
+      hash: 1970467942070673531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -255,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 508936170925941146
+      hash: 1970467942070673531
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/beanstalkd_view/Gemfile

@@ -1,4 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in beanstalkd_view.gemspec
-gemspec

data/lib/beanstalkd_view/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"

data/lib/beanstalkd_view/extensions/beanstalk-pool.rb

@@ -1,39 +0,0 @@
-# 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
-    
-    # Overide the default behavior which uses send_to_all_conn, which returns Hash values for stats combining
-    def peek_job(id)
-      send_to_each_conn_first_res(:peek_job, id)
-    end
-    
-  end
-end