klomp 0.0.8 → 1.0.0

data/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+require 'simplecov'
+require 'klomp'
+require 'rspec'
+require 'rspec-given'
+
+Dir[File.expand_path('../support/', __FILE__) + '/*.rb'].each {|f| require f }
+
+module Frames
+  def frame(type)
+    File.read(File.expand_path("../frames/#{type}.txt", __FILE__))
+  end
+end
+
+def queue_available?
+  s = TCPSocket.new 'localhost', 61613
+  true
+rescue
+  false
+ensure
+  s && s.close
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  config.filter_run_excluding :acceptance  unless queue_available?
+  if ENV['PERF']
+    config.filter_run :performance
+  else
+    config.filter_run_excluding :performance
+  end
+
+  config.include Frames
+end

data/spec/support/have_received.rb

@@ -0,0 +1,101 @@
+# Like rspec-spies, but better.
+#
+# Leverages RSpec's builtin MessageExpectation class/DSL so that you can use arg
+# matchers, # of invocation matchers, etc.
+
+require 'rspec/mocks'
+
+class RSpec::Mocks::Proxy
+  attr_reader :messages_received, :error_generator
+
+  # This does the equivalent of rspec-spies monkey patch, but with less work
+  alias orig_message_received message_received
+  def message_received(*args, &block)
+    record_message_received(*args, &block)
+    orig_message_received(*args, &block)
+  end
+
+  # Be sure to reset the messages received between specs!
+  alias orig_reset reset
+  def reset
+    orig_reset.tap { messages_received.clear }
+  end
+end
+
+module RSpec::Mocks::Methods
+
+  def messages_received
+    __mock_proxy.messages_received
+  end
+
+  def error_generator
+    __mock_proxy.error_generator
+  end
+
+  def replay_on(other, &match_block)
+    messages_received.each do |msg, args, &block|
+      if !match_block || match_block.call(msg,args,&block)
+        other.send msg, *args, &block
+      end
+    end
+  end
+
+  def reset
+    __mock_proxy.reset
+  end
+end
+
+class RSpec::Mocks::MessageExpectation
+  public :error_generator=
+end
+
+module RSpec::Matchers::HaveReceived
+  class Matcher
+    def initialize(message, expected_from)
+      @message, @mock = message, RSpec::Mocks::Mock.new
+      @mock.stub!(message)
+      @expectation = @mock.should_receive(message, expected_from: expected_from)
+    end
+
+    def matches?(actual)
+      begin
+        @expectation.error_generator = actual.error_generator
+        actual.replay_on(@mock) {|msg,args,&block| @message == msg }
+        @mock.rspec_verify
+        true
+      rescue RSpec::Mocks::MockExpectationError => e
+        @exception = e
+        false
+      end
+    end
+
+    def description
+      "have received #{@message.inspect}"
+    end
+
+    def failure_message_for_should
+      @exception.message
+    end
+
+    def failure_message_for_should_not
+      begin
+        @expectation.generate_error
+      rescue RSpec::Mocks::MockExpectationError => e
+        e.message.sub(/expected.*/m, "unexpected match")
+      end
+    end
+
+    def method_missing(meth, *args, &block)
+      @expectation.send meth, *args, &block
+      self
+    end
+  end
+
+  def have_received(message)
+    Matcher.new(message, caller(1)[0])
+  end
+end
+
+RSpec.configure do |config|
+  config.include RSpec::Matchers::HaveReceived
+end

metadata

@@ -1,89 +1,219 @@
 --- !ruby/object:Gem::Specification
 name: klomp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
-- LivingSocial
+- Nick Sieger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: onstomp
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
-  type: :runtime
+        version: '3.10'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: hoe-gemspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: hoe-git
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
-  type: :runtime
+        version: 4.8.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
-description: A simple wrapper around the OnStomp library with additional features
+        version: 4.8.0
+- !ruby/object:Gem::Dependency
+  name: rspec-given
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'Klomp is a simple [Stomp] messaging client that keeps your sanity
+  intact.
+
+
+  The purpose of Klomp is to be the simplest possible Stomp client. No in-memory
+
+  buffering of outgoing messages, no fanout subscriptions in-process, no
+
+  transactions, no complicated messaging patterns. Code simple enough so that when
+
+  something goes wrong, the problem is obvious.
+
+
+  [Stomp]: http://stomp.github.com/'
 email:
-- dev.happiness@livingsocial.com
+- nick.sieger@livingsocial.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- Manifest.txt
 files:
-- .gitignore
-- .rvmrc
+- .rspec
+- .simplecov
 - ChangeLog.md
 - Gemfile
 - Gemfile.lock
-- Procfile
+- Manifest.txt
 - README.md
 - Rakefile
 - klomp.gemspec
 - lib/klomp.rb
-- lib/klomp/client.rb
-- tasks/test_failover.rake
-- test/test_client.rb
-- test/test_helper.rb
-homepage: https://github.com/livingsocial/klomp
+- lib/klomp/connection.rb
+- lib/klomp/frames.rb
+- lib/klomp/sentinel.rb
+- spec/acceptance/acceptance_spec.rb
+- spec/frames/auth_error.txt
+- spec/frames/connect.txt
+- spec/frames/connect_vhost.txt
+- spec/frames/connected.txt
+- spec/frames/disconnect.txt
+- spec/frames/error.txt
+- spec/frames/greeting.txt
+- spec/frames/message.txt
+- spec/frames/receipt.txt
+- spec/frames/subscribe.txt
+- spec/frames/unsubscribe.txt
+- spec/klomp/connection_spec.rb
+- spec/klomp/frames_spec.rb
+- spec/klomp/sentinel_spec.rb
+- spec/klomp_spec.rb
+- spec/spec_helper.rb
+- spec/support/have_received.rb
+- .gemtest
+homepage: http://github.com/livingsocial/klomp
 licenses: []
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --main
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -94,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4086948349046815425
+      hash: -1626497956462206890
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,11 +232,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project: klomp
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A simple wrapper around the OnStomp library with additional features
-test_files:
-- test/test_client.rb
-- test/test_helper.rb
+summary: Klomp is a simple [Stomp] messaging client that keeps your sanity intact
+test_files: []

data/.gitignore

@@ -1 +0,0 @@
-pkg/

data/.rvmrc

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

data/Procfile

@@ -1,2 +0,0 @@
-apollo_primary: /usr/local/var/apollo-primary/bin/apollo-broker run
-apollo_secondary: /usr/local/var/apollo-secondary/bin/apollo-broker run

data/lib/klomp/client.rb

@@ -1,163 +0,0 @@
-require 'onstomp'
-require 'onstomp/failover'
-require 'json'
-require 'uuid'
-require 'logger'
-
-class OnStomp::Failover::Client
-  # Save previous N, N-1 delays for fibonacci backoff
-  attr_accessor :prev_retry_delay
-end
-
-module Klomp
-
-  class Client
-    attr_reader :read_conn, :write_conn, :all_conn, :vhost
-    attr_accessor :last_connect_exception
-
-    def initialize(uri, options={})
-      @translate_json = options.fetch(:translate_json, true)
-      @auto_reply_to  = options.fetch(:auto_reply_to, true)
-      @logger         = options.fetch(:logger, nil)
-      @uuid           = options.fetch(:uuid) { UUID.new }
-      @vhost          = options.fetch(:vhost, nil)
-
-      @fib_retry_backoff = !options.has_key?(:retry_attempts) && !options.has_key?(:retry_delay)
-
-      # defaults for retry delay and attempts
-      options[:retry_delay]    ||= 1
-      options[:retry_attempts] ||= -1
-
-      if uri.is_a?(Array)
-        @write_conn = OnStomp::Failover::Client.new(uri, options)
-        @read_conn = uri.map {|obj| OnStomp::Failover::Client.new([obj], options) }
-      else
-        @write_conn = OnStomp::Failover::Client.new([uri], options)
-        @read_conn = [@write_conn]
-      end
-      @all_conn = ([@write_conn] + @read_conn).uniq
-      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(dest, body, headers={}, &cb)
-      if @translate_json && body.respond_to?(:to_json)
-        body = body.to_json
-        headers[:'content-type'] = 'application/json'
-      else
-        body = body.to_s
-      end
-      uuid = headers[:id] = @uuid.generate if @uuid
-      log.debug("[Sending] ID=#{uuid} Destination=#{dest} Body=#{body.inspect} Headers=#{headers.inspect}") if log
-      @write_conn.send(dest, body, headers, &cb)
-    end
-    alias publish send
-
-    def subscribe(*args, &block)
-      frames = []
-      @read_conn.each do |c|
-        frames << c.subscribe(*args) do |msg|
-          log.debug("[Received] ID=#{msg[:id]} Body=#{msg.body.inspect} Headers=#{msg.headers.to_hash.inspect}") if log
-          if @translate_json
-            msg.body = begin
-              JSON.parse(msg.body)
-            rescue JSON::ParserError
-              msg.body
-            end
-          end
-          reply_args = yield msg
-          if @auto_reply_to && !msg.headers[:'reply-to'].nil?
-            if reply_args.is_a?(Array)
-              send(msg.headers[:'reply-to'], *reply_args)
-            else
-              send(msg.headers[:'reply-to'], reply_args)
-            end
-          end
-        end
-      end
-      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
-
-    WRITE_ONLY_METHODS = [
-      :abort,
-      :begin,
-      :commit,
-    ]
-
-    READ_ONLY_METHODS = [
-      :ack,
-      :nack,
-    ]
-
-    def method_missing(method, *args, &block)
-      case method
-      when *WRITE_ONLY_METHODS
-        @write_conn.__send__(method, *args, &block)
-      when *READ_ONLY_METHODS
-        @read_conn.map {|c| c.__send__(method, *args, &block) }
-      else
-        @all_conn.map {|c| c.__send__(method, *args) }
-      end
-    end
-
-    private
-    def configure_connections
-      klomp_client = self
-      @all_conn.each do |c|
-
-        if @vhost
-          c.client_pool.each do |client|
-            client.host = @vhost
-          end
-        end
-
-        if @fib_retry_backoff
-          c.before_failover_retry do |conn, attempt|
-            if attempt == 1
-              conn.prev_retry_delay, conn.retry_delay = 0, 1
-            else
-              conn.prev_retry_delay, conn.retry_delay = conn.retry_delay, conn.prev_retry_delay + conn.retry_delay
-            end
-          end
-        end
-
-        c.on_failover_connect_failure do
-          klomp_client.last_connect_exception = $!
-        end
-      end
-    end
-  end
-
-end