asir_beanstalk 1.1.4 → 1.1.5

data/Changelog

@@ -1,3 +1,8 @@
+2012-12-11  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.5: New version.
+	* Beanstalk: Properly handle uri, host, port, tube.
+
 2012-12-07  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.4: New version.

data/asir_beanstalk.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "asir", "~> 1.1.6"
+  gem.add_dependency "asir", "~> 1.1.7"
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
   gem.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/asir/transport/beanstalk.rb

@@ -5,26 +5,40 @@ module ASIR
     # !SLIDE
     # Beanstalk Transport
     class Beanstalk < TcpSocket
-      LINE_TERMINATOR = "\r\n".freeze
-
-      attr_accessor :tube, :priority, :delay, :ttr
+      attr_accessor :tube, :tube_default
+      attr_accessor :priority, :delay, :ttr
 
       def initialize *args
-        self.port_default ||= 11300
-        @tube ||= 'asir'
+        self.scheme_default ||= 'beanstalk'
+        self.host_default   ||= '127.0.0.1'
+        self.port_default   ||= 11300
+        self.tube_default   ||= 'asir'
         @priority ||= 0
         @delay ||= 0
         @ttr ||= 600
         super
       end
 
+      def tube
+        @tube ||=
+          @uri && (
+            p = _uri.path.sub(%r{\A/}, '')
+            p = nil if p.empty?
+            p
+          ) || tube_default
+      end
+
+      def path_default
+        "/#{tube}"
+      end
+
       # !SLIDE
       # Sends the encoded Message payload String.
       def _send_message message, message_payload
         stream.with_stream! do | s |
           begin
-            match = 
-              _beanstalk(s, 
+            match =
+              _beanstalk(s,
                          "put #{message[:beanstalk_priority] || @priority} #{message[:beanstalk_delay] || @delay} #{message[:beanstalk_ttr] || @ttr} #{message_payload.size}\r\n",
                          /\AINSERTED (\d+)\r\n\Z/,
                          message_payload)
@@ -45,12 +59,12 @@ module ASIR
       def _receive_message channel, additional_data
         channel.with_stream! do | stream |
           begin
-            match = 
+            match =
               _beanstalk(stream,
                          RESERVE,
                          /\ARESERVED (\d+) (\d+)\r\n\Z/)
             additional_data[:beanstalk_job_id] = match[1].to_i
-            additional_data[:beanstalk_message_size] = 
+            additional_data[:beanstalk_message_size] =
               size = match[2].to_i
             message_payload = stream.read(size)
             _read_line_and_expect! stream, /\A\r\n\Z/
@@ -72,7 +86,7 @@ module ASIR
         # There is a possibility here the following could happen:
         #
         #   _receive_message
-        #     channel == #<Channel:1>   
+        #     channel == #<Channel:1>
         #     channel.stream == #<TCPSocket:1234>
         #   end
         #   ...
@@ -80,7 +94,7 @@ module ASIR
         #      channel.stream.close
         #      channel.stream = nil
         #   ...
-        #   _send_result 
+        #   _send_result
         #     channel == #<Channel:1>
         #     channel.stream == #<TCPSocket:5678> # NEW CONNECTION
         #     stream.write "delete #{job_id}"
@@ -131,6 +145,8 @@ module ASIR
         match
       end
 
+      LINE_TERMINATOR = "\r\n".freeze
+
       def _after_connect! stream
         if @tube
           _beanstalk(stream,
@@ -148,7 +164,7 @@ module ASIR
                            :try_sleep_increment => 0.1,
                            :try_sleep_max => 10) do | stream |
           if @tube
-            _beanstalk(stream, 
+            _beanstalk(stream,
                        "watch #{@tube}\r\n",
                        /\AWATCHING (\d+)\r\n\Z/)
           end
@@ -173,8 +189,8 @@ module ASIR
       end
 
       def _start_conduit!
-        addr = address ? "-l #{address} " : ""
-        cmd = "beanstalkd #{addr}-p #{port}"
+        opt = host ? "-l #{host} " : ""
+        cmd = "beanstalkd #{opt}-p #{port}"
         $stderr.puts "  #{cmd}" if @conduit_options[:verbose]
         exec(cmd)
       end

data/lib/asir_beanstalk/version.rb

@@ -1,3 +1,3 @@
 module AsirBeanstalk
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/beanstalk_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe "ASIR::Transport::Beanstalk" do
+  attr_accessor :t
+
+  it "should default to localhost:11300" do
+    t.host.should == '127.0.0.1'
+    t.host_default.should == '127.0.0.1'
+    t.port.should == 11300
+    t.port_default.should == 11300
+    t.tube.should == 'asir'
+    t.tube_default.should == 'asir'
+    t.path.should == '/asir'
+    t.uri.should == 'beanstalk://127.0.0.1:11300/asir'
+  end
+
+  it "should return a #host, #port, #tube based on #uri" do
+    t.uri = "beanstalk://host:12345/tube"
+    t.scheme.should == 'beanstalk'
+    t.host.should == 'host'
+    t.port.should == 12345
+    t.tube.should == 'tube'
+    t.path.should == '/tube'
+  end
+
+  it "should return a #uri based on #host, #port, #tube" do
+    t.host = 'host'
+    t.port = 12345
+    t.tube = 'tube'
+    t.uri.should == "beanstalk://host:12345/tube"
+  end
+
+  before :each do
+    @t = ASIR::Transport::Beanstalk.new
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
 require 'rubygems'
 $:.unshift File.expand_path('../../lib', __FILE__)
 
-gem 'asir'
+if p = ENV['ASIR_LIB_PATH']
+  $:.unshift File.expand_path(p)
+else
+  gem 'asir'
+end
 require 'asir'
+require 'asir/transport/beanstalk'
 
 module ASIR
   module Test

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +102,7 @@ files:
 - lib/asir/transport/beanstalk.rb
 - lib/asir_beanstalk.rb
 - lib/asir_beanstalk/version.rb
+- spec/beanstalk_spec.rb
 - spec/example_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
@@ -118,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4008377011960426377
+      hash: 1666542740013907559
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -127,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4008377011960426377
+      hash: 1666542740013907559
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -135,5 +136,6 @@ signing_key:
 specification_version: 3
 summary: Beanstalkd transport for ASIR
 test_files:
+- spec/beanstalk_spec.rb
 - spec/example_spec.rb
 - spec/spec_helper.rb