stalk_climber 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,5 @@
 # StalkClimber
+[![Gem Version](https://badge.fury.io/rb/stalk_climber.png)](http://badge.fury.io/rb/stalk_climber)
 [![Build Status](https://secure.travis-ci.org/freewrite/stalk_climber.png)](http://travis-ci.org/freewrite/stalk_climber)
 [![Dependency Status](https://gemnasium.com/freewrite/stalk_climber.png)](https://gemnasium.com/freewrite/stalk_climber)
 [![Coverage Status](https://coveralls.io/repos/freewrite/stalk_climber/badge.png?branch=master)](https://coveralls.io/r/freewrite/stalk_climber)

data/lib/stalk_climber/climber.rb

@@ -1,6 +1,6 @@
 module StalkClimber
   class Climber
-    include LazyEnumerable
+    include RUBY_VERSION >= '2.0.0' ? LazyEnumerable : Enumerable
 
     attr_accessor :beanstalk_addresses, :test_tube
     attr_reader :cache
@@ -11,7 +11,7 @@ module StalkClimber
       if self.beanstalk_addresses.nil?
         raise RuntimeError, 'beanstalk_addresses must be set in order to establish a connection'
       end
-      @connection_pool = ConnectionPool.new(self.beanstalk_addresses)
+      @connection_pool = ConnectionPool.new(self.beanstalk_addresses, self.test_tube)
     end
 
 
@@ -30,7 +30,9 @@ module StalkClimber
 
     # Creates a new Climber instance, optionally yielding the instance
     # if a block is given
-    def initialize
+    def initialize(beanstalk_addresses = nil, test_tube = nil)
+      self.beanstalk_addresses = beanstalk_addresses
+      self.test_tube = test_tube
       yield(self) if block_given?
     end
 

data/lib/stalk_climber/connection.rb

@@ -5,8 +5,7 @@ module StalkClimber
     DEFAULT_TUBE = 'stalk_climber'
     PROBE_TRANSMISSION = "put 4294967295 0 300 2\r\n{}"
 
-    attr_accessor :test_tube
-    attr_reader :max_climbed_job_id, :min_climbed_job_id
+    attr_reader :max_climbed_job_id, :min_climbed_job_id, :test_tube
 
 
     # Returns or creates a Hash used for caching jobs by ID
@@ -40,18 +39,12 @@ module StalkClimber
     # all transmissions.
     # Optionally yields the instance if a block is given. The instance is yielded
     # prior to test_tube configuration to allow the test_tube to be configured.
-    def initialize(address)
-      super
-      self.test_tube = DEFAULT_TUBE
+    def initialize(address, test_tube = DEFAULT_TUBE)
+      super(address)
+      @test_tube = test_tube || DEFAULT_TUBE
       clear_cache
       yield(self) if block_given?
-      [
-        "use #{self.test_tube}",
-        "watch #{self.test_tube}",
-        'ignore default',
-      ].each do |transmission|
-        transmit(transmission)
-      end
+      use_test_tube
     end
 
 
@@ -68,6 +61,13 @@ module StalkClimber
     end
 
 
+    # Set and use the provided +test_tube+
+    def test_tube=(test_tube)
+      @test_tube = test_tube
+      use_test_tube
+    end
+
+
     # Safe form of with_job!, yields a Job instance to +block+ for the specified +job_id+.
     # If the job does not exist, the error is caught and nil is passed to +block+ instead.
     def with_job(job_id, &block)
@@ -139,5 +139,18 @@ module StalkClimber
       end
     end
 
+
+    # Dispatch transmissions notifying Beanstalk to use the configured test_tube for all
+    # commands from this connection and to ignore the default tube
+    def use_test_tube
+      [
+        "use #{self.test_tube}",
+        "watch #{self.test_tube}",
+        'ignore default',
+      ].each do |transmission|
+        transmit(transmission)
+      end
+    end
+
   end
 end

data/lib/stalk_climber/connection_pool.rb

@@ -3,13 +3,14 @@ module StalkClimber
 
     class InvalidURIScheme < RuntimeError; end
 
-    attr_reader :addresses
+    attr_reader :addresses, :test_tube
 
     # Constructs a Beaneater::Pool from a less strict URL
     # +url+ can be a string i.e 'localhost:11300' or an array of addresses.
-    def initialize(addresses = nil)
+    def initialize(addresses = nil, test_tube = nil)
       @addresses = Array(parse_addresses(addresses) || host_from_env || Beaneater.configuration.beanstalkd_url)
-      @connections = @addresses.map { |address| Connection.new(address) }
+      @test_tube = test_tube
+      @connections = @addresses.map { |address| Connection.new(address, test_tube) }
     end
 
 

data/lib/stalk_climber/job.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module StalkClimber
   class Job
 
@@ -13,7 +15,7 @@ module StalkClimber
 
     # Returns or fetches the body of the job obtained via the peek command
     def body
-      return @body ||= connection.transmit("peek #{id}")[:body]
+      return @body ||= JSON.parse(connection.transmit("peek #{id}")[:body])
     end
 
 
@@ -74,7 +76,7 @@ module StalkClimber
         @body = @stats = nil
       when 'FOUND' # peek
         @id = job_data[:id].to_i
-        @body = job_data[:body]
+        @body = JSON.parse(job_data[:body])
         @stats = nil
       when 'OK' # stats-job
         @body = nil

data/lib/stalk_climber/version.rb

@@ -1,3 +1,3 @@
 module StalkClimber
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/unit/climber_test.rb

@@ -3,9 +3,7 @@ require 'test_helper'
 class ClimberTest < Test::Unit::TestCase
 
   def test_climb_caches_jobs_for_later_use
-    climber = StalkClimber::Climber.new do |c|
-      c.beanstalk_addresses = BEANSTALK_ADDRESSES
-    end
+    climber = StalkClimber::Climber.new(BEANSTALK_ADDRESSES)
 
     test_jobs = {}
     climber.connection_pool.connections.each do |connection|
@@ -33,9 +31,7 @@ class ClimberTest < Test::Unit::TestCase
 
 
   def test_connection_pool_creates_a_connection_pool
-    climber = StalkClimber::Climber.new do |c|
-      c.beanstalk_addresses = 'beanstalk://localhost'
-    end
+    climber = StalkClimber::Climber.new('beanstalk://localhost')
     assert_kind_of StalkClimber::ConnectionPool, climber.connection_pool
   end
 
@@ -56,4 +52,11 @@ class ClimberTest < Test::Unit::TestCase
     )
   end
 
+
+  def test_with_a_test_tube
+    climber = StalkClimber::Climber.new(BEANSTALK_ADDRESSES, 'test_tube')
+    assert_equal 'test_tube', climber.test_tube
+    assert_equal 'test_tube', climber.connection_pool.test_tube
+  end
+
 end

data/test/unit/connection_pool_test.rb

@@ -13,37 +13,44 @@ class ConnectionPoolTest < Test::Unit::TestCase
 
 
   def test_for_delegated_methods_it_should_delegate_methods_to_beanstalk_connection
-    connection = StalkClimber::ConnectionPool.new('beanstalk://localhost')
-    assert_equal 'localhost', connection.connections.first.host
+    connection_pool = StalkClimber::ConnectionPool.new('beanstalk://localhost')
+    assert_equal 'localhost', connection_pool.connections.first.host
   end
 
 
   def test_with_multiple_urls_it_should_support_array_of_connections
-    connection = StalkClimber::ConnectionPool.new(['beanstalk://localhost:11300','beanstalk://localhost'])
-    connections = connection.connections
-    assert_equal 2, connection.connections.size
+    connection_pool = StalkClimber::ConnectionPool.new(['beanstalk://localhost:11300','beanstalk://localhost'])
+    connections = connection_pool.connections
+    assert_equal 2, connection_pool.connections.size
     assert_equal ['localhost:11300','localhost:11300'], connections.map(&:address)
   end
 
 
   def test_with_multiple_urls_it_should_support_single_string_with_commas
-    connection = StalkClimber::ConnectionPool.new('beanstalk://localhost:11300,beanstalk://localhost')
-    connections = connection.connections
+    connection_pool = StalkClimber::ConnectionPool.new('beanstalk://localhost:11300,beanstalk://localhost')
+    connections = connection_pool.connections
     assert_equal 2, connections.size
     assert_equal ['localhost:11300','localhost:11300'], connections.map(&:address)
   end
 
 
   def test_with_single_url_it_should_set_up_connection_pool
-    connection = StalkClimber::ConnectionPool.new('beanstalk://localhost')
-    assert_kind_of StalkClimber::ConnectionPool, connection
-    assert_kind_of Beaneater::Pool, connection
+    connection_pool = StalkClimber::ConnectionPool.new('beanstalk://localhost')
+    assert_kind_of StalkClimber::ConnectionPool, connection_pool
+    assert_kind_of Beaneater::Pool, connection_pool
   end
 
 
   def test_with_a_single_url_it_should_convert_url_to_address_array
-    connection = StalkClimber::ConnectionPool.new('beanstalk://localhost')
-    assert_equal ['localhost:11300'], connection.addresses
+    connection_pool = StalkClimber::ConnectionPool.new('beanstalk://localhost')
+    assert_equal ['localhost:11300'], connection_pool.addresses
+  end
+
+
+  def test_with_a_test_tube
+    connection_pool = StalkClimber::ConnectionPool.new('beanstalk://localhost', 'test_tube')
+    assert_equal 'test_tube', connection_pool.test_tube
+    assert connection_pool.connections.all? { |connection| connection.test_tube == 'test_tube' }
   end
 
 end

data/test/unit/connection_test.rb

@@ -157,6 +157,13 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
 
+  def test_initialize_with_a_test_tube
+    StalkClimber::Connection.any_instance.expects(:use_test_tube)
+    connection = StalkClimber::Connection.new('localhost:11300', 'test_tube')
+    assert_equal 'test_tube', connection.test_tube
+  end
+
+
   def test_test_tube_is_initialized_but_configurable
     assert_equal StalkClimber::Connection::DEFAULT_TUBE, @connection.test_tube
     tube_name = 'test_tube'
@@ -165,6 +172,15 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
 
+  def test_setting_test_tube_uses_test_tube
+    @connection.expects(:transmit).with('use test_tube')
+    @connection.expects(:transmit).with('watch test_tube')
+    @connection.expects(:transmit).with('ignore default')
+    @connection.test_tube = 'test_tube'
+    assert_equal 'test_tube', @connection.test_tube
+  end
+
+
   def test_with_job_yields_nil_or_the_requested_job_if_it_exists
     assert_nothing_raised do
       @connection.with_job(@connection.max_job_id) do |job|

data/test/unit/job_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'json'
 
 class Job < Test::Unit::TestCase
 
@@ -8,11 +9,11 @@ class Job < Test::Unit::TestCase
   end
 
 
-  def test_body_retrives_performs_peek
-    body = {:test => true}
+  def test_body_retrives_performs_peek_and_parses_json
+    body = {'test' => true}
 
     @job.connection.expects(:transmit).returns({
-      :body => body,
+      :body => body.to_json,
     })
     assert_equal body, @job.body
 
@@ -52,7 +53,7 @@ class Job < Test::Unit::TestCase
     assert_equal @connection, job.connection
     assert_equal @job.id, job.id
     assert_equal 'FOUND', job.instance_variable_get(:@status)
-    assert_equal '{}', job.body
+    assert_equal({}, job.body)
     refute job.instance_variable_get(:@stats)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stalk_climber
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler