asir_beanstalk 1.2.5 → 1.2.6

data/Changelog

@@ -1,3 +1,8 @@
+2012-03-13  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.2.6: New Version: Added #status, #stats, #stats_job, #stats_tube.
+	* Improved tests.
+
 2012-03-12  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.2.5: New Version: Test fixes.

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.2.3"
+  gem.add_dependency "asir", "~> 1.2.6"
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
   gem.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/asir/transport/beanstalk.rb

@@ -1,4 +1,5 @@
 require 'asir/transport/tcp_socket'
+require 'yaml'
 
 module ASIR
   class Transport
@@ -130,6 +131,51 @@ module ASIR
       # !SLIDE
       # Beanstalk protocol support
 
+      def status
+        {
+          :beanstalkd => {
+            :stats => stats,
+            :stats_tube => tube && stats_tube,
+          }
+        }
+      end
+
+      def stats
+        _beanstalk_stats_yaml! "stats\r\n"
+      end
+
+      def stats_job job_id
+        _beanstalk_stats_yaml! "stats-job #{job_id}\r\n"
+      end
+
+      def stats_tube tube = nil
+        tube ||= self.tube
+        _beanstalk_stats_yaml! "stats-tube #{tube}\r\n"
+      end
+
+      def _beanstalk_stats_yaml! message, expect = nil
+        expect ||= /\AOK (\d+)\r\n\Z/
+        x = _beanstalk_return_data message, expect
+        x && ::YAML.load(x)
+      rescue ASIR::Transport::PayloadIO::UnexpectedResponse => exc
+        return :NOT_FOUND if exc.received == NOT_FOUND
+        raise exc
+      end
+      NOT_FOUND = "NOT_FOUND\r\n".freeze
+
+      def _beanstalk_return_data message, expect, data_size_field = nil, payload = nil
+        (@server || stream).with_stream! do | stream |
+          if match = _beanstalk(stream, message, expect, payload)
+            size = match[data_size_field ||= 1].to_i
+            data = stream.read(size)
+            _read_line_and_expect! stream, /\A\r\n\Z/
+            data
+          else
+            raise "unexpected result"
+          end
+        end
+      end
+
       # Send "something ...\r\n".
       # Expect /\ASOMETHING (\d+)...\r\n".
       def _beanstalk stream, message, expect, payload = nil

data/lib/asir_beanstalk/version.rb

@@ -1,3 +1,3 @@
 module AsirBeanstalk
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/spec/beanstalk_spec.rb

@@ -1,7 +1,26 @@
 require 'spec_helper'
+require 'asir/coder/marshal'
+require 'timeout'
+#require 'pp'
 
 describe "ASIR::Transport::Beanstalk" do
-  attr_accessor :t
+  let :t do
+      t =
+        ASIR::Transport::Beanstalk.new({
+                                         :encoder => ASIR::Coder::Marshal.new,
+                                         :uri => "beanstalk://localhost:31033/spec",
+                                         :conduit_options => {
+                                           :pid_file => "/tmp/asir-beanstalk-test.pid",
+                                         },
+                                         :verbose => 9,
+                                         :_logger => $stderr,
+                                       })
+  end
+
+  context "for uninitialized instance" do
+    let :t do
+      ASIR::Transport::Beanstalk.new
+    end
 
   it "should default to localhost:11300" do
     t.host.should == '127.0.0.1'
@@ -29,8 +48,103 @@ describe "ASIR::Transport::Beanstalk" do
     t.tube = 'tube'
     t.uri.should == "beanstalk://host:12345/tube"
   end
+  end
+
+  context "with started beanstalk server" do
+    before :all do
+      $transport ||= t
+      t.start_conduit!
+      sleep 1
+    end
+    after :all do
+      $transport.stop_conduit!
+    end
+
+    context "with connected transport" do
+      let :connected_transport do
+        t.stream
+        # pp t
+        t
+      end
+
+      it "should be able to get stats" do
+        s = t.stats
+        s['pid'].should_not == nil
+        s['version'].should_not == nil
+      end
+
+      it "should be able to get stats_tube" do
+        s = t.stats_tube
+        t.tube.should == 'spec'
+        s['name'].should == t.tube
+        s['current-using'].should_not == nil
+      end
+
+      it "should not get stats_tube on an unknown tube" do
+        s = t.stats_tube "UNKNOWN"
+        s.should == :NOT_FOUND
+      end
+
+      it "should be able to get status" do
+        s = t.status
+        s = s[:beanstalkd]
+        s.should_not == nil
+        s[:stats].class.should == Hash
+        s[:stats_tube].class.should == Hash
+      end
+
+      context "with a sent message" do
+        let :m do
+          ASIR::Message.new(ASIR, :name, [ ], nil, nil)
+        end
+
+        let :sent_message do
+          t.send_message(m)
+          # pp m
+          m
+        end
+
+        it "should have at least one job in its tube" do
+          s = t.stats_tube
+          # pp [ __LINE__, s ]
+          # PENDING
+        end
+
+        it "should be able to get status on job" do
+          job_id = sent_message[:beanstalk_job_id]
+          s = t.stats_job job_id
+          # pp [ __LINE__, job_id, s ]
+          s["id"].should == job_id
+          s["tube"].should == 'spec'
+          s["state"].should == 'ready'
+        end
+
+        context "with received message" do
+          let :state do
+            state = nil
+            Timeout.timeout(5) do
+              stream, stream = t._server_accept_connection! nil
+              state =
+                ASIR::Message::State.new(:in_stream => stream, :out_stream => stream)
+              # pp t
+              t.receive_message(state)
+              state.message.class.should == ASIR::Message
+              state.message.receiver.should == ASIR
+              state.message.selector.should == :name
+              state.message.arguments.should == [ ]
+            end
+            state
+          end
 
-  before :each do
-    @t = ASIR::Transport::Beanstalk.new
+          it "should have consumed job" do
+            t._after_invoke_message state
+            job_id = sent_message[:beanstalk_job_id]
+            s = t.stats_job job_id
+            # pp [ __LINE__, job_id, s ]
+            s.should == :NOT_FOUND
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir_beanstalk
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2965738020681731259
+      hash: -1356083774943575431
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2965738020681731259
+      hash: -1356083774943575431
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25