klomp 1.0.4 → 1.0.5

data/.simplecov

@@ -3,6 +3,6 @@
 SimpleCov.start do
   add_filter '/vendor/'
 
-  add_group "Loldance", "lib"
+  add_group "Klomp", "lib"
   add_group "Specs", "spec"
 end

data/ChangeLog.md

@@ -1,6 +1,16 @@
 Klomp Changes
 --------------------------------------------------------------------------------
 
+1.0.5 (2012/10/17)
+================================================================================
+
+- Ensure subscriptions don't get lost if re-subscribe calls fail
+- Add a test of the reconnect logic using em-proxy
+- Rescue all errors while parsing server frames and treat them like foreign
+  (server/IO/socket) errors
+- Bump up default select timeout to avoid niggling read errors on connect
+- Don't log exceptions if we're already offline or closing
+
 1.0.4 (2012/10/10)
 ================================================================================
 

data/Gemfile

@@ -13,6 +13,8 @@ gem "rspec", "~>2.11.0", :group => [:development, :test]
 gem "ZenTest", "~>4.8.0", :group => [:development, :test]
 gem "rspec-given", "~>1.0", :group => [:development, :test]
 gem "simplecov", "~>0.6.0", :group => [:development, :test]
+gem "em-proxy", "~>0.1.0", :group => [:development, :test]
+gem "ci_reporter", "~>1.7.0", :group => [:development, :test]
 gem "hoe", "~>3.0", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Gemfile.lock

@@ -2,7 +2,13 @@ GEM
   remote: http://rubygems.org/
   specs:
     ZenTest (4.8.0)
+    builder (3.1.4)
+    ci_reporter (1.7.3)
+      builder (>= 2.1.2)
     diff-lcs (1.1.3)
+    em-proxy (0.1.7)
+      eventmachine
+    eventmachine (1.0.0)
     hoe (3.0.3)
       rake (~> 0.8)
     hoe-bundler (1.1.0)
@@ -36,6 +42,8 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest (~> 4.8.0)
+  ci_reporter (~> 1.7.0)
+  em-proxy (~> 0.1.0)
   hoe (~> 3.0)
   hoe-bundler (~> 1.1.0)
   hoe-gemspec (~> 1.0.0)

data/Manifest.txt

@@ -12,6 +12,7 @@ lib/klomp/connection.rb
 lib/klomp/frames.rb
 lib/klomp/sentinel.rb
 spec/acceptance/acceptance_spec.rb
+spec/acceptance/reconnect_spec.rb
 spec/frames/auth_error.txt
 spec/frames/connect.txt
 spec/frames/connect_vhost.txt
@@ -29,3 +30,4 @@ spec/klomp/sentinel_spec.rb
 spec/klomp_spec.rb
 spec/spec_helper.rb
 spec/support/have_received.rb
+spec/support/shared_contexts.rb

data/Rakefile

@@ -10,6 +10,8 @@ Hoe.spec 'klomp' do
   self.history_file = 'CHANGELOG.md'
   self.readme_file  = 'README.md'
 
+  self.clean_globs << 'spec/reports'
+
   ### dependencies!
   self.extra_dev_deps << [ 'hoe-bundler',  '~> 1.1.0'  ]
   self.extra_dev_deps << [ 'hoe-gemspec',  '~> 1.0.0'  ]
@@ -18,4 +20,8 @@ Hoe.spec 'klomp' do
   self.extra_dev_deps << [ 'ZenTest',      '~> 4.8.0'  ]
   self.extra_dev_deps << [ 'rspec-given',  '~> 1.0'    ]
   self.extra_dev_deps << [ 'simplecov',    '~> 0.6.0'  ]
+  self.extra_dev_deps << [ 'em-proxy',     '~> 0.1.0'  ]
+  self.extra_dev_deps << [ 'ci_reporter',  '~> 1.7.0'  ]
 end
+
+require 'ci/reporter/rake/rspec'

data/klomp.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "klomp"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Sieger"]
-  s.date = "2012-10-10"
+  s.date = "2012-10-17"
   s.description = "Klomp is a simple [Stomp] messaging client that keeps your sanity intact.\n\nThe purpose of Klomp is to be the simplest possible Stomp client. No in-memory\nbuffering of outgoing messages, no fanout subscriptions in-process, no\ntransactions, no complicated messaging patterns. Code simple enough so that when\nsomething goes wrong, the problem is obvious.\n\n[Stomp]: http://stomp.github.com/"
   s.email = ["nick.sieger@livingsocial.com"]
   s.extra_rdoc_files = ["Manifest.txt"]
@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<ZenTest>, ["~> 4.8.0"])
       s.add_development_dependency(%q<rspec-given>, ["~> 1.0"])
       s.add_development_dependency(%q<simplecov>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<em-proxy>, ["~> 0.1.0"])
+      s.add_development_dependency(%q<ci_reporter>, ["~> 1.7.0"])
       s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
@@ -40,6 +42,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ZenTest>, ["~> 4.8.0"])
       s.add_dependency(%q<rspec-given>, ["~> 1.0"])
       s.add_dependency(%q<simplecov>, ["~> 0.6.0"])
+      s.add_dependency(%q<em-proxy>, ["~> 0.1.0"])
+      s.add_dependency(%q<ci_reporter>, ["~> 1.7.0"])
       s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
@@ -51,6 +55,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ZenTest>, ["~> 4.8.0"])
     s.add_dependency(%q<rspec-given>, ["~> 1.0"])
     s.add_dependency(%q<simplecov>, ["~> 0.6.0"])
+    s.add_dependency(%q<em-proxy>, ["~> 0.1.0"])
+    s.add_dependency(%q<ci_reporter>, ["~> 1.7.0"])
     s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

data/lib/klomp.rb

@@ -1,5 +1,5 @@
 class Klomp
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 
   class Error < StandardError; end
 

data/lib/klomp/connection.rb

@@ -28,7 +28,7 @@ class Klomp
       @options['host']   ||= host
       @subscriptions = {}
       @logger = options['logger']
-      @select_timeout = options['select_timeout'] || 0.1
+      @select_timeout = options['select_timeout'] || 0.5
       connect
     end
 
@@ -77,6 +77,8 @@ class Klomp
       subscriptions.clear
       subs.each {|queue, subscriber| subscribe(queue, subscriber) }
       @sentinel = nil
+    ensure
+      @subscriptions = subs if subs && subs.size != @subscriptions.size
     end
 
     private
@@ -134,8 +136,8 @@ class Klomp
     end
 
     def go_offline(ex)
+      return if @closing || (@sentinel && @sentinel.alive?)
       log_exception(ex, :warn, "offline server=#{options['server'].join(':')} ") if logger
-      return if @sentinel && @sentinel.alive?
       @socket.close rescue nil
       @socket = nil
       @sentinel = Sentinel.new(self)
@@ -156,7 +158,7 @@ class Klomp
           rescue INTERRUPT
             break
           rescue => e
-            log_exception(e, :warn) if logger
+            log_exception(e, :warn) if logger && !@closing
           end
           break if @closing
         end

data/lib/klomp/frames.rb

@@ -1,5 +1,5 @@
 class Klomp
-  class FrameError < Error; end
+  class FrameError < ::StandardError; end
 
   module Frames
     class Frame
@@ -36,6 +36,10 @@ class Klomp
       def parse(data)
         headers, body = data.split("\n\n")
         [parse_headers(headers), body.chomp(FRAME_SEP)]
+      rescue FrameError
+        raise
+      rescue
+        raise FrameError, "malformed frame from server"
       end
 
       def parse_headers(data)
@@ -47,7 +51,7 @@ class Klomp
               frame = line.chomp
               @error = frame == "ERROR"
               if !@error && frame != name
-                raise Klomp::FrameError,
+                raise FrameError,
                   "unexpected frame #{frame} (expected #{name}):\n#{data}"
               end
               next

data/spec/acceptance/acceptance_spec.rb

@@ -4,11 +4,7 @@ require 'open-uri'
 
 describe "Klomp acceptance", :acceptance => true do
 
-  Given(:server) { "127.0.0.1:61613" }
-  Given(:credentials) { %w(admin password) }
-  Given(:options) { Hash[*%w(login passcode).zip(credentials).flatten] }
-  Given(:clients) { [] }
-  Given(:klomp) { Klomp.new(server, options).tap {|l| clients << l } }
+  include_context :acceptance_client
 
   context "connect" do
 
@@ -51,7 +47,6 @@ describe "Klomp acceptance", :acceptance => true do
       subscriber.message.body.should == "hello subscriber!"
     end
 
-
     context "and unsubscribe" do
 
       When do
@@ -135,8 +130,6 @@ describe "Klomp acceptance", :acceptance => true do
     end
   end
 
-  after { clients.each(&:disconnect) }
-
   def apollo_mgmt_url(path)
     "http://localhost:61680#{path}"
   end

data/spec/acceptance/reconnect_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'em-proxy'
+require 'logger'
+
+describe "Klomp reconnect logic", :acceptance => true do
+
+  include_context :acceptance_client
+  Given(:origin_server) { "127.0.0.1:61613" }
+  Given(:server) { "127.0.0.1:62623" }
+  Given(:options) { Hash[*%w(login passcode).zip(credentials).flatten] }
+
+  it "reconnects after a server goes down" do
+    # Publish and receive a message
+    klomp.publish "/queue/greeting", "hello"
+    incoming = []
+    klomp.subscribe "/queue/greeting" do |msg|
+      incoming << msg
+    end
+    sleep 2
+    incoming.should_not be_empty
+
+    # Server disappears
+    stop_proxy
+    expect { klomp.publish "/queue/greeting", "hello" }.to raise_error
+    klomp.should_not be_connected
+
+    # Server reappears
+    start_proxy
+    klomp.should be_connected
+
+    # Subscription is re-established
+    incoming = []
+    klomp.publish "/queue/greeting", "hello"
+    sleep 2
+    incoming.should_not be_empty
+
+    klomp.unsubscribe "/queue/greeting"
+  end
+
+  before { start_proxy }
+  after { stop_proxy }
+
+  def server_to_hash(s)
+    Hash[*[:host, :port].zip(s.split(':')).flatten]
+  end
+
+  def start_proxy
+    listen, forward = server_to_hash(server), server_to_hash(origin_server)
+    @pid = fork do
+      [STDIN, STDOUT, STDERR].each {|s| s.reopen "/dev/null" }
+      Proxy.start listen do |conn|
+        conn.server :origin, forward.merge(:relay_client => true, :relay_server => true)
+      end
+    end
+    sleep 2
+  end
+
+  def stop_proxy
+    if @pid
+      Process.kill "TERM", @pid
+      Process.waitpid @pid
+      @pid = nil
+    end
+  end
+
+end

data/spec/klomp/connection_spec.rb

@@ -161,8 +161,6 @@ describe Klomp::Connection do
 
       Then { subscriber.should_not have_received(:call) }
 
-      Then { logger.should have_received(:warn) }
-
     end
 
     context "fails if neither a subscriber nor a block is given" do
@@ -351,6 +349,28 @@ describe Klomp::Connection do
 
     end
 
+    context "ensures subscriptions don't get lost if re-subscribe calls fail" do
+
+      Given do
+        connection.subscribe "/queue/greeting", subscriber
+        connection.subscribe "/queue/hello", subscriber
+        thread.stub!(:raise)
+        connection.disconnect
+        socket.messages_received.clear
+        socket.stub!(:write).and_return do |data|
+          raise "some error" if data =~ /SUBSCRIBE/
+        end
+      end
+
+      When(:expect_reconnect) { expect { connection.reconnect } }
+
+      Then do
+        expect_reconnect.to raise_error
+        connection.subscriptions.size.should == 2
+      end
+
+    end
+
   end
 
 end

data/spec/support/shared_contexts.rb

@@ -0,0 +1,9 @@
+shared_context :acceptance_client do
+  Given(:server) { "127.0.0.1:61613" }
+  Given(:credentials) { %w(admin password) }
+  Given(:options) { Hash[*%w(login passcode).zip(credentials).flatten] }
+  Given(:clients) { [] }
+  Given(:klomp) { Klomp.new(server, options).tap {|l| clients << l } }
+
+  after { clients.each(&:disconnect) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klomp
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -139,6 +139,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: em-proxy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: ci_reporter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +222,7 @@ files:
 - lib/klomp/frames.rb
 - lib/klomp/sentinel.rb
 - spec/acceptance/acceptance_spec.rb
+- spec/acceptance/reconnect_spec.rb
 - spec/frames/auth_error.txt
 - spec/frames/connect.txt
 - spec/frames/connect_vhost.txt
@@ -207,6 +240,7 @@ files:
 - spec/klomp_spec.rb
 - spec/spec_helper.rb
 - spec/support/have_received.rb
+- spec/support/shared_contexts.rb
 - .gemtest
 homepage: http://github.com/livingsocial/klomp
 licenses: []
@@ -224,7 +258,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1370034990818288756
+      hash: -3900239592679067652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: