beaneater 0.3.0 → 1.1.0

data/test/errors_test.rb

@@ -1,4 +1,4 @@
-# test/connection_test.rb
+# test/errors_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
@@ -23,4 +23,11 @@ describe "Beaneater::Errors" do
     assert_equal 'reserve 0', @klazz.cmd
     assert_equal 'DEADLINE_SOON', @klazz.status
   end
-end
+
+  it 'should raise proper exception for invalid status EXPECTED_CRLF' do
+    @klazz = Beaneater::UnexpectedResponse.from_status("EXPECTED_CRLF", "reserve 0")
+    assert_kind_of(Beaneater::ExpectedCrlfError, @klazz)
+    assert_equal 'reserve 0', @klazz.cmd
+    assert_equal 'EXPECTED_CRLF', @klazz.status
+  end
+end

data/test/job_test.rb

@@ -1,11 +1,11 @@
-# test/connection_test.rb
+# test/job_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
 describe Beaneater::Job do
   before do
-    @pool  = Beaneater::Pool.new(['localhost'])
-    @tube  = @pool.tubes.find 'tube'
+    @beanstalk  = Beaneater.new('localhost')
+    @tube  = @beanstalk.tubes.find 'tube'
   end
 
   describe "for #bury" do
@@ -139,7 +139,7 @@ describe Beaneater::Job do
       assert_equal 'foo touch', job.body
       job.bury
       assert_equal 1, @tube.stats.current_jobs_buried
-      if @pool.stats.version > 1.7
+      if @beanstalk.stats.version.to_f > 1.7
         job.kick
         assert_equal 0, @tube.stats.current_jobs_buried
         assert_equal 1, @tube.stats.current_jobs_ready
@@ -218,7 +218,7 @@ describe Beaneater::Job do
       assert_equal 1, job.pri
       job.release
     end
-  end # tube
+  end # pri
 
 
   describe "for #ttr" do
@@ -232,7 +232,7 @@ describe Beaneater::Job do
       assert_equal 5, job.ttr
       job.release
     end
-  end # tube
+  end # ttr
 
   describe "for #delay" do
     before do
@@ -243,9 +243,5 @@ describe Beaneater::Job do
     it("should return delay") do
       assert_equal 5, @job.delay
     end
-  end # tube
-
-  after do
-    cleanup_tubes!(['tube'])
-  end
-end # Beaneater::Tubes
+  end # delay
+end # Beaneater::Job

data/test/jobs_test.rb

@@ -1,12 +1,12 @@
-# test/connection_test.rb
+# test/jobs_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
 describe Beaneater::Jobs do
   before do
-    @pool = Beaneater::Pool.new(['localhost'])
-    @jobs = Beaneater::Jobs.new(@pool)
-    @tube = @pool.tubes.find('baz')
+    @beanstalk = Beaneater.new('localhost')
+    @jobs = Beaneater::Jobs.new(@beanstalk)
+    @tube = @beanstalk.tubes.find('baz')
   end
 
   describe "for #find" do
@@ -33,30 +33,6 @@ describe Beaneater::Jobs do
     end
   end # find
 
-  describe "for #find_all" do
-    before do
-      @time = Time.now.to_i
-      @tube.put("foo find #{@time}")
-      @job = @tube.peek(:ready)
-    end
-
-      it "should return job from id" do
-        assert_equal "foo find #{@time}", @jobs.find_all(@job.id).first.body
-      end
-
-      it "should return job using peek" do
-        assert_equal "foo find #{@time}", @jobs.find_all(@job.id).first.body
-      end
-
-      it "should return job using hash syntax" do
-        assert_equal "foo find #{@time}", @jobs.find_all(@job.id).first.body
-      end
-
-      it "should return nil for invalid id" do
-        assert_equal [], @jobs.find_all(-1)
-      end
-  end # find_all
-
   describe "for #register!" do
     before do
       $foo = 0
@@ -98,10 +74,10 @@ describe Beaneater::Jobs do
 
       cleanup_tubes!(['tube_success', 'tube_release', 'tube_buried'])
 
-      @pool.tubes.find('tube_success').put("success abort", :pri => 2**31 + 1)
-      @pool.tubes.find('tube_success').put("success 2", :pri => 1)
-      @pool.tubes.find('tube_release').put("released")
-      @pool.tubes.find('tube_buried').put("buried")
+      @beanstalk.tubes.find('tube_success').put("success abort", :pri => 2**31 + 1)
+      @beanstalk.tubes.find('tube_success').put("success 2", :pri => 1)
+      @beanstalk.tubes.find('tube_release').put("released")
+      @beanstalk.tubes.find('tube_buried').put("buried")
 
       @jobs.process!(:release_delay => 0)
     end
@@ -111,21 +87,17 @@ describe Beaneater::Jobs do
     end
 
     it "should clear successful_jobs" do
-      assert_equal 0, @pool.tubes.find('tube_success').stats.current_jobs_ready
-      assert_equal 1, @pool.tubes.find('tube_success').stats.current_jobs_buried
-      assert_equal 0, @pool.tubes.find('tube_success').stats.current_jobs_reserved
+      assert_equal 0, @beanstalk.tubes.find('tube_success').stats.current_jobs_ready
+      assert_equal 1, @beanstalk.tubes.find('tube_success').stats.current_jobs_buried
+      assert_equal 0, @beanstalk.tubes.find('tube_success').stats.current_jobs_reserved
     end
 
     it "should retry release jobs 2 times" do
-      assert_equal 2, @pool.tubes.find('tube_release').peek(:buried).stats.releases
+      assert_equal 2, @beanstalk.tubes.find('tube_release').peek(:buried).stats.releases
     end
 
     it "should bury unexpected exception" do
-      assert_equal 1, @pool.tubes.find('tube_buried').stats.current_jobs_buried
+      assert_equal 1, @beanstalk.tubes.find('tube_buried').stats.current_jobs_buried
     end
-  end
-
-  after do
-    cleanup_tubes!(['baz', 'tube_success', 'tube_release', 'tube_buried'])
-  end
-end
+  end # for_process!
+end # Beaneater::Jobs

data/test/prompt_regexp_test.rb

@@ -31,15 +31,27 @@ describe "Reading from socket client" do
         end
       end
     end
+
+    slept = 0
+    while @beanstalk.nil?
+      begin
+        @beanstalk = Beaneater.new("localhost:#{@fake_port}")
+      rescue Beaneater::NotConnected
+        raise 'Could not connect to fake beanstalkd server' if slept > 1
+        sleep 0.1
+        slept += 0.1
+      end
+    end
+
   end
 
   it 'should reserve job with full body' do
-    pool = Beaneater::Pool.new("localhost:#{@fake_port}")
-    job = pool.tubes[@tube_name].reserve
+    job = @beanstalk.tubes[@tube_name].reserve
     assert_equal '[first part][second part]', job.body
   end
 
   after do
+    @beanstalk.close
     @fake_server.kill
   end
 end

data/test/stat_struct_test.rb

@@ -1,4 +1,4 @@
-# test/connection_test.rb
+# test/stat_struct_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
@@ -38,4 +38,14 @@ describe Beaneater::StatStruct do
       assert_equal ['foo', 'bar', 'baz', 'under_score'].sort, @struct.keys.sort
     end
   end # keys
-end
+
+  describe "for #to_h" do
+    it "should return 4 keys / values" do
+      assert_equal 4, @struct.to_h.size
+    end
+
+    it "should return expect hash" do
+      assert_equal [['foo', 'bar'], ['bar', 'baz'], ['baz', 'foo'], ['under_score', 'demo']].sort, @struct.to_h.sort
+    end
+  end # to_h
+end # Beaneater::StatStruct

data/test/stats_test.rb

@@ -1,21 +1,21 @@
-# test/connection_test.rb
+# test/stats_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
 describe Beaneater::Stats do
   before do
-    @pool =  stub(:transmit_to_all => [{ :body => { 'uptime' => 1, 'cmd-use' => 2 }, :status => "OK"},
-      {:body => { 'uptime' => 3,'cmd-use' => 4 }, :status => "OK" }])
-    @stats = Beaneater::Stats.new(@pool)
+    connection = stub(:transmit => { :body => { 'uptime' => 1, 'cmd-use' => 2 }, :status => "OK"})
+    @beanstalk = stub(:connection => connection)
+    @stats = Beaneater::Stats.new(@beanstalk)
   end
 
   describe 'for #[]' do
     it "should return stats by key" do
-      assert_equal 4, @stats[:uptime]
+      assert_equal 1, @stats[:uptime]
     end
 
     it "should return stats by underscore key" do
-      assert_equal 6, @stats[:'cmd_use']
+      assert_equal 2, @stats[:'cmd_use']
     end
   end # []
 
@@ -29,15 +29,15 @@ describe Beaneater::Stats do
 
   describe 'for #method_missing' do
     it "should return stats by key" do
-      assert_equal 4, @stats.uptime
+      assert_equal 1, @stats.uptime
     end
 
     it "should return stats by underscore key" do
-      assert_equal 6, @stats.cmd_use
+      assert_equal 2, @stats.cmd_use
     end
 
     it "should raise NoMethodError" do
       assert_raises(NoMethodError) { @stats.cmd }
     end
   end # method_missing
-end # Beaneater::Stats
+end # Beaneater::Stats

data/test/test_helper.rb

@@ -1,22 +1,46 @@
 ENV["TEST"] = 'true'
 require 'rubygems'
+require 'coveralls'
+Coveralls.wear!
 require 'minitest/autorun'
 $:.unshift File.expand_path("../../lib")
 require 'beaneater'
-require 'fakeweb'
-require 'mocha'
+require 'timeout'
+begin
+  require 'mocha/setup'
+rescue LoadError
+  require 'mocha'
+end
 require 'json'
 
-FakeWeb.allow_net_connect = false
-
 class MiniTest::Unit::TestCase
 
-  # Cleans up all jobs from tubes
-  # cleanup_tubes!(['foo'], @bp)
-  def cleanup_tubes!(tubes, bp=nil)
-    bp ||= @pool
+  # Cleans up all jobs from specific tubes
+  #
+  # @example
+  #   cleanup_tubes!(['foo'], @beanstalk)
+  #
+  def cleanup_tubes!(tubes, client=nil)
+    client ||= @beanstalk
     tubes.each do |name|
-      bp.tubes.find(name).clear
+      client.tubes.find(name).clear
+    end
+  end
+
+  # Cleans up all jobs from all tubes known to the connection
+  def flush_all(client=nil)
+    client ||= @beanstalk
+
+    # Do not continue if it is a mock or the connection has been closed
+    return if !client.is_a?(Beaneater) || !client.connection.connection
+
+    client.tubes.all.each do |tube|
+      tube.clear
     end
   end
-end
+
+  # Run clean up after each test to ensure clean state in all tests
+  def teardown
+    flush_all
+  end
+end

data/test/tube_test.rb

@@ -1,11 +1,11 @@
-# test/connection_test.rb
+# test/tube_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
 describe Beaneater::Tube do
   before do
-    @pool = Beaneater::Pool.new(['localhost'])
-    @tube = Beaneater::Tube.new(@pool, 'baz')
+    @beanstalk = Beaneater.new('localhost')
+    @tube = Beaneater::Tube.new(@beanstalk, 'baz')
   end
 
   describe "for #put" do
@@ -26,22 +26,15 @@ describe Beaneater::Tube do
       assert_equal "delayed put #{@time}", @tube.peek(:delayed).body
     end
 
-    it "should try to put 2 times before put successfully" do
-      Beaneater::Connection.any_instance.expects(:transmit).once.with(includes('use baz'), {})
-      Beaneater::Connection.any_instance.expects(:transmit).times(2).with(includes("bar put #{@time}"), {}).
-        raises(Beaneater::DrainingError.new(nil, nil)).then.returns('foo')
-      assert_equal 'foo', @tube.put("bar put #{@time}")
-    end
-
-    it "should try to put 3 times before to raise" do
-      Beaneater::Connection.any_instance.expects(:transmit).once.with(includes('use baz'), {})
-      Beaneater::Connection.any_instance.expects(:transmit).with(includes("bar put #{@time}"), {}).
-        times(3).raises(Beaneater::DrainingError.new(nil, nil))
-      assert_raises(Beaneater::DrainingError) { @tube.put "bar put #{@time}" }
+    it "should support custom serializer" do
+      Beaneater.configure.job_serializer = lambda { |b| JSON.dump(b) }
+      @tube.put({ foo: "bar"})
+      assert_equal '{"foo":"bar"}', @tube.peek(:ready).body
     end
 
     after do
       Beaneater::Connection.any_instance.unstub(:transmit)
+      Beaneater.configure.job_serializer = lambda { |b| b }
     end
   end # put
 
@@ -140,7 +133,7 @@ describe Beaneater::Tube do
   describe "for #pause" do
     before do
       @time = Time.now.to_i
-      @tube = Beaneater::Tube.new(@pool, 'bam')
+      @tube = Beaneater::Tube.new(@beanstalk, 'bam')
       @tube.put "foo pause #{@time}"
     end
 
@@ -164,7 +157,7 @@ describe Beaneater::Tube do
     end
 
     it "should raise error for empty tube" do
-      assert_raises(Beaneater::NotFoundError) { @pool.tubes.find('fake_tube').stats }
+      assert_raises(Beaneater::NotFoundError) { @beanstalk.tubes.find('fake_tube').stats }
     end
   end # stats
 
@@ -198,12 +191,8 @@ describe Beaneater::Tube do
       tube_counts = lambda { %w(ready buried delayed).map { |s| @tube.stats["current_jobs_#{s}"] } }
       assert_equal [2, 2, 2], tube_counts.call
       @tube.clear
-      stats = @tube.stats
+      @tube.stats
       assert_equal [0, 0, 0], tube_counts.call
     end
   end # clear
-
-  after do
-    cleanup_tubes!(['baz'])
-  end
-end # Beaneater::Tubes
+end # Beaneater::Tube

data/test/tubes_test.rb

@@ -1,12 +1,12 @@
-# test/connection_test.rb
+# test/tubes_test.rb
 
 require File.expand_path('../test_helper', __FILE__)
 
 describe Beaneater::Tubes do
   describe "for #find" do
     before do
-      @pool  = stub
-      @tubes = Beaneater::Tubes.new(@pool)
+      @beanstalk  = stub
+      @tubes = Beaneater::Tubes.new(@beanstalk)
     end
 
     it("should return Tube obj") { assert_kind_of Beaneater::Tube, @tubes.find(:foo) }
@@ -16,143 +16,148 @@ describe Beaneater::Tubes do
 
   describe "for #use" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
+      @beanstalk = Beaneater.new('localhost')
     end
 
     it "should switch to used tube for valid name" do
-      tube = Beaneater::Tube.new(@pool, 'some_name')
-      @pool.tubes.use('some_name')
-      assert_equal 'some_name', @pool.tubes.used.name
+      Beaneater::Tube.new(@beanstalk, 'some_name')
+      @beanstalk.tubes.use('some_name')
+      assert_equal 'some_name', @beanstalk.tubes.used.name
     end
 
     it "should raise for invalid tube name" do
-      assert_raises(Beaneater::InvalidTubeName) { @pool.tubes.use('; ') }
+      assert_raises(Beaneater::InvalidTubeName) { @beanstalk.tubes.use('; ') }
     end
   end # use
 
   describe "for #watch & #watched" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
+      @beanstalk = Beaneater.new('localhost')
     end
 
     it 'should watch specified tubes' do
-      @pool.tubes.watch('foo')
-      @pool.tubes.watch('bar')
-      assert_equal ['default', 'foo', 'bar'].sort, @pool.tubes.watched.map(&:name).sort
+      @beanstalk.tubes.watch('foo')
+      @beanstalk.tubes.watch('bar')
+      assert_equal ['default', 'foo', 'bar'].sort, @beanstalk.tubes.watched.map(&:name).sort
     end
 
     it 'should raise invalid name for bad tube' do
-      assert_raises(Beaneater::InvalidTubeName) { @pool.tubes.watch('; ') }
+      assert_raises(Beaneater::InvalidTubeName) { @beanstalk.tubes.watch('; ') }
     end
   end # watch! & watched
 
   describe "for #all" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
-      @pool.tubes.find('foo').put 'bar'
-      @pool.tubes.find('bar').put 'foo'
+      @beanstalk = Beaneater.new('localhost')
+      @beanstalk.tubes.find('foo').put 'bar'
+      @beanstalk.tubes.find('bar').put 'foo'
     end
 
     it 'should retrieve all tubes' do
       ['default', 'foo', 'bar'].each do |t|
-        assert @pool.tubes.all.map(&:name).include?(t)
+        assert @beanstalk.tubes.all.map(&:name).include?(t)
       end
     end
   end # all
 
+  describe "for Enumerable" do
+    before do
+      @beanstalk = Beaneater.new('localhost')
+      @beanstalk.tubes.find('foo').put 'bar'
+      @beanstalk.tubes.find('bar').put 'foo'
+    end
+
+    it 'should map tubes' do
+      ['default', 'foo', 'bar'].each do |t|
+        assert @beanstalk.tubes.map(&:name).include?(t)
+      end
+    end
+  end
+
   describe "for #used" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
-      @pool.tubes.find('foo').put 'bar'
-      @pool.tubes.find('bar').put 'foo'
+      @beanstalk = Beaneater.new('localhost')
+      @beanstalk.tubes.find('foo').put 'bar'
+      @beanstalk.tubes.find('bar').put 'foo'
     end
 
     it 'should retrieve used tube' do
-      assert_equal 'bar', @pool.tubes.used.name
+      assert_equal 'bar', @beanstalk.tubes.used.name
     end
 
     it 'should support dashed tubes' do
-      @pool.tubes.find('der-bam').put 'foo'
-      assert_equal 'der-bam', @pool.tubes.used.name
+      @beanstalk.tubes.find('der-bam').put 'foo'
+      assert_equal 'der-bam', @beanstalk.tubes.used.name
     end
   end # used
 
   describe "for #watch!" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
+      @beanstalk = Beaneater.new('localhost')
     end
 
     it 'should watch specified tubes' do
-      @pool.tubes.watch!(:foo)
-      @pool.tubes.watch!('bar')
-      assert_equal ['bar'].sort, @pool.tubes.watched.map(&:name).sort
+      @beanstalk.tubes.watch!(:foo)
+      @beanstalk.tubes.watch!('bar')
+      assert_equal ['bar'].sort, @beanstalk.tubes.watched.map(&:name).sort
     end
   end # watch!
 
   describe "for #ignore" do
     before do
-      @pool = Beaneater::Pool.new(['localhost'])
+      @beanstalk = Beaneater.new('localhost')
     end
 
     it 'should ignore specified tubes' do
-      @pool.tubes.watch('foo')
-      @pool.tubes.watch('bar')
-      @pool.tubes.ignore('foo')
-      assert_equal ['default', 'bar'].sort, @pool.tubes.watched.map(&:name).sort
+      @beanstalk.tubes.watch('foo')
+      @beanstalk.tubes.watch('bar')
+      @beanstalk.tubes.ignore('foo')
+      assert_equal ['default', 'bar'].sort, @beanstalk.tubes.watched.map(&:name).sort
     end
   end # ignore
 
   describe "for #reserve" do
     before do
-      @pool  = Beaneater::Pool.new(['localhost'])
-      @tube  = @pool.tubes.find 'tube'
+      @beanstalk  = Beaneater.new('localhost')
+      @tube  = @beanstalk.tubes.find 'tube'
       @time = Time.now.to_i
       @tube.put "foo reserve #{@time}"
     end
 
     it("should reserve job") do
-      @pool.tubes.watch 'tube'
-      job = @pool.tubes.reserve
+      @beanstalk.tubes.watch 'tube'
+      job = @beanstalk.tubes.reserve
       assert_equal "foo reserve #{@time}", job.body
       job.delete
     end
 
     it("should reserve job with block") do
-      @pool.tubes.watch 'tube'
+      @beanstalk.tubes.watch 'tube'
       job = nil
-      @pool.tubes.reserve { |j| job = j; job.delete }
+      @beanstalk.tubes.reserve { |j| job = j; job.delete }
       assert_equal "foo reserve #{@time}", job.body
     end
 
     it("should reserve job with block and timeout") do
-      @pool.tubes.watch 'tube'
+      @beanstalk.tubes.watch 'tube'
       job = nil
-      res = @pool.tubes.reserve(0)  { |j| job = j; job.delete }
+      @beanstalk.tubes.reserve(0)  { |j| job = j; job.delete }
       assert_equal "foo reserve #{@time}", job.body
     end
 
     it "should raise TimedOutError with timeout" do
-      @pool.tubes.watch 'tube'
-      @pool.tubes.reserve(0)  { |j| job = j; job.delete }
-      assert_raises(Beaneater::TimedOutError) { @pool.tubes.reserve(0) }
-    end
-
-    it "should raise TimedOutError no delete, with timeout" do
-      @pool.tubes.watch 'tube'
-      @pool.tubes.reserve(0)  { |j| job = j; job.delete }
-      assert_raises(Beaneater::TimedOutError) { @pool.tubes.reserve(0) }
+      @beanstalk.tubes.watch 'tube'
+      @beanstalk.tubes.reserve(0)  { |j| job = j; job.delete }
+      assert_raises(Beaneater::TimedOutError) { @beanstalk.tubes.reserve(0) }
     end
 
     it "should raise DeadlineSoonError with ttr 1" do
       @tube.reserve.delete
       @tube.put "foo reserve #{@time}", :ttr => 1
-      @pool.tubes.watch 'tube'
-      @pool.tubes.reserve
-      assert_raises(Beaneater::DeadlineSoonError) { @pool.tubes.reserve(0) }
+      @beanstalk.tubes.watch 'tube'
+      @beanstalk.tubes.reserve
+      assert_raises(Beaneater::DeadlineSoonError) { @beanstalk.tubes.reserve(0) }
     end
 
-    after do
-      cleanup_tubes!(['foo', 'tube'])
-    end
   end # reserve
-end # Beaneater::Tubes
+end # Beaneater::Tubes