klomp 0.0.2 → 0.0.3

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create 1.9.3@klomp

data/ChangeLog.md

@@ -1,6 +1,12 @@
 Changes
 --------------------------------------------------------------------------------
 
+0.0.3 (2012/6/21)
+================================================================================
+
+- Upgraded to work with onstomp 1.0.7
+- Fix unsubscribe to accept array of frames that subscribe returns
+
 0.0.2 (2012/06/15)
 ================================================================================
 

data/Gemfile

@@ -1,5 +1,7 @@
 source "http://rubygems.org"
+
 gem "onstomp"
+# gem 'onstomp', :path => '../onstomp'
 gem "json"
 
 group :development do

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     foreman (0.46.0)
       thor (>= 0.13.6)
     json (1.7.1)
-    onstomp (1.0.6)
+    onstomp (1.0.7)
     rake (0.9.2.2)
     thor (0.15.2)
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 

data/lib/klomp.rb

@@ -1,5 +1,5 @@
 require 'klomp/client'
 
 module Klomp
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/klomp/client.rb

@@ -7,6 +7,7 @@ module Klomp
 
   class Client
     attr_reader :read_conn, :write_conn
+    attr_accessor :last_connect_exception
 
     def initialize(uri, options={})
       @translate_json = options.fetch(:translate_json, true)
@@ -28,6 +29,23 @@ module Klomp
       configure_connections
     end
 
+    def connect
+      @all_conn.each do |conn|
+        begin
+          attempts = conn.retry_attempts
+          conn.retry_attempts = 1
+          conn.connect
+        rescue OnStomp::Failover::MaximumRetriesExceededError
+          location = conn.active_client.uri.dup.tap {|u| u.password = 'REDACTED' }.to_s
+          msg = ": #{last_connect_exception.message}" if last_connect_exception
+          raise OnStomp::ConnectFailedError, "initial connection failed for #{location}#{msg}"
+        ensure
+          conn.retry_attempts = attempts
+        end
+      end
+      self
+    end
+
     def send(*args, &block)
       if @translate_json && args[1].respond_to?(:to_json)
         args[1] = args[1].to_json
@@ -39,7 +57,6 @@ module Klomp
       log.info("[Sending] Destination=#{args[0]} Body=#{args[1]} Headers=#{args[2]}") if log
       @write_conn.send(*args, &block)
     end
-    alias puts send
     alias publish send
 
     def subscribe(*args, &block)
@@ -67,6 +84,18 @@ module Klomp
       frames
     end
 
+    def unsubscribe(frames, headers={})
+      if !frames.respond_to?(:length) || frames.length != @read_conn.length
+        raise ArgumentError,
+          "frames is not an array or its length does not match number of connections"
+      end
+      frames.each_with_index.map {|f,i| @read_conn[i].unsubscribe f, headers }
+    end
+
+    def subscriptions
+      @read_conn.map {|c| c.active_client.subscriptions }
+    end
+
     def log
       @logger
     end
@@ -80,18 +109,14 @@ module Klomp
     READ_ONLY_METHODS = [
       :ack,
       :nack,
-      :unsubscribe,
     ]
 
     def method_missing(method, *args, &block)
       case method
       when *WRITE_ONLY_METHODS
-        @write_conn.send(method, *args, &block)
+        @write_conn.__send__(method, *args, &block)
       when *READ_ONLY_METHODS
         @read_conn.map {|c| c.__send__(method, *args, &block) }
-      when :connect
-        @all_conn.each {|c| c.connect}
-        self
       else
         @all_conn.map {|c| c.__send__(method, *args) }
       end
@@ -99,9 +124,10 @@ module Klomp
 
     private
     def configure_connections
+      klomp_client = self
       @all_conn.each do |c|
         c.on_failover_connect_failure do
-          raise if OnStomp::FatalConnectionError === $!
+          klomp_client.last_connect_exception = $!
         end
       end
     end

data/test/test_client.rb

@@ -2,9 +2,12 @@ require 'minitest/autorun'
 require 'minitest/pride'
 
 require 'klomp'
+require File.expand_path('../test_helper', __FILE__)
 
 describe Klomp::Client do
 
+  include KlompTestHelpers
+
   before do
     @uris = [
       'stomp://admin:password@localhost:61613',
@@ -71,7 +74,7 @@ describe Klomp::Client do
       got_message = true if msg.body == body
       client.ack(msg)
     end
-    sleep 1
+    let_background_processor_run
     assert got_message
 
     client.disconnect
@@ -88,7 +91,7 @@ describe Klomp::Client do
       got_message = true if msg.body == reply_to_body
       reply_to_body
     end
-    sleep 1
+    let_background_processor_run
     assert got_message
 
     client.disconnect
@@ -98,7 +101,11 @@ describe Klomp::Client do
     client = Klomp::Client.new(@uris).connect
 
     subscribe_frames = client.subscribe(@destination) { |msg| }
-    client.unsubscribe(subscribe_frames)
+    unsub_frames = client.unsubscribe(subscribe_frames)
+    assert_equal subscribe_frames.length, unsub_frames.length
+    let_background_processor_run
+
+    assert client.subscriptions.flatten.empty?, "expected connection to have no subscriptions"
 
     client.disconnect
   end

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+trap("QUIT") do
+  $stderr.puts "\n\nThread dump:\n"
+  Thread.list.each do |t|
+    $stderr.puts t.inspect
+    $stderr.puts *t.backtrace
+    $stderr.puts
+  end
+end
+
+module KlompTestHelpers
+  def let_background_processor_run
+    sleep 1
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klomp
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: onstomp
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rvmrc
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
@@ -62,6 +63,7 @@ files:
 - lib/klomp/client.rb
 - tasks/test_failover.rake
 - test/test_client.rb
+- test/test_helper.rb
 homepage: https://github.com/livingsocial/klomp
 licenses: []
 post_install_message: 
@@ -74,6 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1591973809162906904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -88,3 +93,4 @@ specification_version: 3
 summary: A simple wrapper around the OnStomp library with additional features
 test_files:
 - test/test_client.rb
+- test/test_helper.rb