beanstalk-client 1.1.0 → 1.1.1

data/.gitignore

@@ -1,4 +1,3 @@
 .DS_Store
 pkg
 doc
-*.gemspec

data/README.md

@@ -0,0 +1,18 @@
+Beanstalk Ruby Client
+=====================
+
+Beanstalk is a simple, fast work queue. Its interface is generic, but was
+originally designed for reducing the latency of page views in high-volume web
+applications by running time-consuming tasks asynchronously.
+
+For more information, see:
+
+ - <http://kr.github.com/beanstalkd/>
+ - <http://github.com/kr/beanstalkd/raw/master/doc/protocol.txt>
+
+## Contributors
+
+ - Isaac Feliu
+ - Peter Kieltyka
+ - Martyn Loughran
+ - Dustin Sallings

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/beanstalk-client/connection.rb

@@ -27,6 +27,7 @@ module Beanstalk
 
     def initialize(addr, default_tube=nil)
       @mutex = Mutex.new
+      @tube_mutex = Mutex.new
       @waiting = false
       @addr = addr
       connect
@@ -53,8 +54,8 @@ module Beanstalk
       pri = pri.to_i
       delay = delay.to_i
       ttr = ttr.to_i
-      body = body.to_s # Make sure that body.size gives a useful number
-      interact("put #{pri} #{delay} #{ttr} #{body.size}\r\n#{body}\r\n",
+      body = "#{body}" # Make sure that body.bytesize gives a useful number
+      interact("put #{pri} #{delay} #{ttr} #{body.bytesize}\r\n#{body}\r\n",
                %w(INSERTED BURIED))[0].to_i
     end
 
@@ -78,6 +79,14 @@ module Beanstalk
       interact("peek-buried\r\n", :job)
     end
 
+    def on_tube(tube, &block)
+      @tube_mutex.lock
+      use tube
+      yield self
+    ensure
+      @tube_mutex.unlock
+    end
+
     def reserve(timeout=nil)
       raise WaitingForJobError if @waiting
       @mutex.lock
@@ -289,6 +298,10 @@ module Beanstalk
       send_to_rand_conn(:yput, obj, pri, delay, ttr)
     end
 
+    def on_tube(tube, &block)
+      send_to_rand_conn(:on_tube, tube, &block)
+    end
+
     # Reserve a job from the queue.
     #
     # == Parameters
@@ -376,9 +389,9 @@ module Beanstalk
 
     private
 
-    def call_wrap(c, *args)
+    def call_wrap(c, *args, &block)
       self.last_conn = c
-      c.send(*args)
+      c.send(*args, &block)
     rescue UnexpectedResponse => ex
       raise ex
     rescue EOFError, Errno::ECONNRESET, Errno::EPIPE => ex
@@ -401,9 +414,9 @@ module Beanstalk
       retry_wrap{open_connections.inject(nil) {|r,c| r or call_wrap(c, *args)}}
     end
 
-    def send_to_rand_conn(*args)
+    def send_to_rand_conn(*args, &block)
       connect()
-      retry_wrap{call_wrap(pick_connection, *args)}
+      retry_wrap{call_wrap(pick_connection, *args, &block)}
     end
 
     def send_to_all_conns(*args)

data/test/test_beanstalk-client.rb

@@ -4,4 +4,84 @@ class TestBeanstalkClient < Test::Unit::TestCase
   def test_truth
     assert true
   end
+
+  def setup
+    @beanstalk = Beanstalk::Pool.new(['127.0.0.1:11300'])
+    @tubes = ['one', 'two']
+
+    # Put something on each tube so they exist
+    @beanstalk.use('one')
+    @beanstalk.put('one')
+
+    @beanstalk.use('two')
+    @beanstalk.put('two')
+  end
+
+  def test_not_thread_safe
+    # Create threads that will execute
+    # A: use one
+    # B: use one
+    # B: put two
+    # A: put one
+    a = Thread.new do
+      @beanstalk.use('one')
+      sleep 4
+      @beanstalk.put('one')
+    end
+
+    b = Thread.new do
+      sleep 1
+      @beanstalk.use('two')
+      @beanstalk.put('two')
+    end
+
+    a.join
+    b.join
+
+    one = @beanstalk.stats_tube 'one'
+    two = @beanstalk.stats_tube 'two'
+
+    assert_equal one['current-jobs-ready'], 1
+    assert_equal two['current-jobs-ready'], 3
+  end
+
+  def test_thread_safe
+    a = Thread.new do
+      @beanstalk.on_tube('one') do |conn|
+        sleep 4
+        conn.put('one')
+      end
+    end
+
+    b = Thread.new do
+      @beanstalk.on_tube('two') do |conn|
+        sleep 1
+        conn.put('two')
+      end
+    end
+
+    a.join
+    b.join
+
+    one = @beanstalk.stats_tube 'one'
+    two = @beanstalk.stats_tube 'two'
+
+    assert_equal one['current-jobs-ready'], 2
+    assert_equal two['current-jobs-ready'], 2
+  end
+
+  def teardown
+    # Clear the tubes
+    @tubes.each do |tube|
+      stats = @beanstalk.stats_tube tube
+      num_jobs = stats['current-jobs-ready']
+      @beanstalk.watch tube
+      num_jobs.times do
+        job = @beanstalk.reserve
+        job.delete
+      end
+      @beanstalk.ignore tube
+    end
+  end
+
 end

metadata

@@ -1,37 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: beanstalk-client
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.1.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Keith Rarick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-20 00:00:00 -07:00
-default_executable: 
+date: 2010-08-20 00:00:00.000000000Z
 dependencies: []
-
 description: Ruby client for beanstalkd
 email: kr@xph.us
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
-- README.rdoc
-files: 
+- README.md
+files:
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - lib/beanstalk-client.rb
@@ -45,40 +35,31 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
-has_rdoc: true
 homepage: http://github.com/kr/beanstalk-client-ruby
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby client for beanstalkd
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_beanstalk-client.rb

data/README.rdoc

@@ -1,20 +0,0 @@
-= Beanstalk Ruby Client
-By: Keith Rarick
-
-Beanstalk is a simple, fast workqueue service. Its interface is generic, but was originally designed for reducing the latency of page views in high-volume web applications by running time-consuming tasks asynchronously.
-
-For more information see:
-- http://kr.github.com/beanstalkd/
-- http://github.com/kr/beanstalkd/blob/master/doc/protocol.txt?raw=true
-
-= Notes
-
-== Multiple Threads
-
-If you want to use this library from multiple concurrent threads, you should synchronize access to the connection. This library does no internal synchronization.
-
-= Contributors
-- Isaac Feliu
-- Peter Kieltyka
-- Martyn Loughran
-- Dustin Sallings