klomp 1.0.0 → 1.0.1

data/ChangeLog.md

@@ -1,6 +1,12 @@
 Klomp Changes
 --------------------------------------------------------------------------------
 
+1.0.1 (2012/10/5)
+================================================================================
+
+- Make publish, subscribe, and unsubscribe methods behave like Klomp 0.0.x where
+  the return value is the frame object(s) that was created by the operation.
+
 1.0.0 (2012/10/3)
 ================================================================================
 

data/klomp.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "klomp"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nick Sieger"]

data/lib/klomp.rb

@@ -1,5 +1,5 @@
 class Klomp
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   class Error < StandardError; end
 
@@ -24,11 +24,17 @@ class Klomp
   end
 
   def subscribe(queue, subscriber = nil, &block)
-    connections.each {|conn| conn.subscribe(queue, subscriber, &block) }
+    connections.map {|conn| conn.subscribe(queue, subscriber, &block) }
   end
 
   def unsubscribe(queue)
-    connections.each {|conn| conn.unsubscribe(queue) rescue nil }
+    if Array === queue
+      raise ArgumentError,
+        "wrong size array for #{connections.size} (#{queue.size})" unless connections.size == queue.size
+      connections.zip(queue).map {|conn,arg| conn.unsubscribe arg rescue nil }
+    else
+      connections.map {|conn| conn.unsubscribe(queue) rescue nil }
+    end
   end
 
   def connected?
@@ -36,8 +42,9 @@ class Klomp
   end
 
   def disconnect
-    connections.each {|conn| conn.disconnect }
-    @connections = []
+    connections.map {|conn| conn.disconnect }.tap do
+      @connections = []
+    end
   end
 end
 

data/lib/klomp/connection.rb

@@ -40,12 +40,18 @@ class Klomp
       raise Klomp::Error, "subscriber does not respond to #call" if subscriber && !subscriber.respond_to?(:call)
       previous = subscriptions[queue]
       subscriptions[queue] = subscriber || block
-      write Frames::Subscribe.new(queue) unless previous
+      frame = Frames::Subscribe.new(queue)
+      if previous
+        frame.previous_subscriber = previous
+      else
+        write frame
+      end
       start_subscriber_thread
-      previous
+      frame
     end
 
     def unsubscribe(queue)
+      queue = queue.headers['destination'] if Frames::Subscribe === queue
       write Frames::Unsubscribe.new(queue) if subscriptions.delete queue
     end
 
@@ -55,9 +61,11 @@ class Klomp
     def disconnect
       close!
       stop_subscriber_thread
-      write Frames::Disconnect.new rescue nil
+      frame = Frames::Disconnect.new
+      write frame rescue nil
       @socket.close rescue nil
       @socket = nil
+      frame
     end
 
     def reconnect
@@ -88,6 +96,7 @@ class Klomp
 
       @socket.write frame.to_s
       log_frame frame if logger
+      frame
     rescue Error
       raise
     rescue

data/lib/klomp/frames.rb

@@ -89,6 +89,7 @@ class Klomp
     end
 
     class Subscribe < Frame
+      attr_accessor :previous_subscriber
       def initialize(queue)
         headers['id'] = queue
         headers['destination'] = queue

data/spec/klomp/connection_spec.rb

@@ -69,10 +69,12 @@ describe Klomp::Connection do
 
     Given(:connection) { Klomp::Connection.new server, options }
 
-    When { connection.publish "/queue/greeting", "hello" }
+    When(:result) { connection.publish "/queue/greeting", "hello" }
 
     Then { socket.should have_received(:write).with(frame(:greeting)) }
 
+    Then { result.should be_instance_of(Klomp::Frames::Send) }
+
     context "logs when logger level is debug" do
 
       Given(:logger) { double("Logger").as_null_object.tap {|l| l.stub!(debug?: true) } }
@@ -89,10 +91,12 @@ describe Klomp::Connection do
 
     context "writes the subscribe message" do
 
-      When { connection.subscribe "/queue/greeting", subscriber }
+      When(:result) { connection.subscribe "/queue/greeting", subscriber }
 
       Then { socket.should have_received(:write).with(frame(:subscribe)) }
 
+      Then { result.should be_instance_of(Klomp::Frames::Subscribe) }
+
       context "and logs when logger level is debug" do
 
         Given(:logger) { double("Logger").as_null_object.tap {|l| l.stub!(debug?: true) } }
@@ -201,26 +205,38 @@ describe Klomp::Connection do
   context "unsubscribe" do
 
     Given(:connection) { Klomp::Connection.new server, options }
+    Given(:arg) { "/queue/greeting" }
 
     Given { connection.subscriptions["/queue/greeting"] = double "subscribers" }
 
-    When { connection.unsubscribe "/queue/greeting" }
+    When(:result) { connection.unsubscribe arg }
 
     Then { socket.should have_received(:write).with(frame(:unsubscribe)) }
 
+    Then { result.should be_instance_of(Klomp::Frames::Unsubscribe) }
+
+    context "can accept Subscribe frame" do
+
+      Given(:arg) { Klomp::Frames::Subscribe.new "/queue/greeting" }
+
+      Then { socket.should have_received(:write).with(frame(:unsubscribe)) }
+
+    end
   end
 
   context "disconnect" do
 
     Given!(:connection) { Klomp::Connection.new server, options }
 
-    When { connection.disconnect }
+    When(:result) { connection.disconnect }
 
     Then do
       socket.should have_received(:write).with(frame(:disconnect))
       socket.should have_received(:close)
     end
 
+    Then { result.should be_instance_of(Klomp::Frames::Disconnect) }
+
     context "makes connection useless (raises error)" do
 
       Then { expect { connection.publish "/queue/greeting", "hello" }.to raise_error(Klomp::Error) }

data/spec/klomp_spec.rb

@@ -43,22 +43,26 @@ describe Klomp do
 
   context "publish" do
 
+    Given(:frame) { double "send frame" }
+
     context "calls publish on one of the connections" do
 
       Given do
         connections.values.each do |conn|
           conn.stub!(:connected? => false)
-          conn.stub!(:publish).and_return { conn.stub!(:connected? => true) }
+          conn.stub!(:publish).and_return { conn.stub!(:connected? => true); frame }
         end
       end
 
-      When { klomp.publish "/queue/greeting", "hello" }
+      When(:result) { klomp.publish "/queue/greeting", "hello" }
 
       Then { connections.values.select {|conn| conn.connected? }.length.should == 1 }
 
       Then { connections.values.detect {|conn| conn.connected? }.
         should have_received(:publish).with("/queue/greeting", "hello", {}) }
 
+      Then { result.should == frame }
+
     end
 
     context "calls publish on another connection if the first one fails" do
@@ -70,6 +74,7 @@ describe Klomp do
           conn.stub!(:publish).and_return do
             if first_exception
               conn.stub!(:connected? => true)
+              frame
             else
               first_exception = true
               raise Klomp::Error.new
@@ -78,13 +83,15 @@ describe Klomp do
         end
       end
 
-      When { klomp.publish "/queue/greeting", "hello" }
+      When(:result) { klomp.publish "/queue/greeting", "hello" }
 
       Then { connections.values.select {|conn| conn.connected? }.length.should == 1 }
 
       Then { connections.values.detect {|conn| conn.connected? }.
         should have_received(:publish).with("/queue/greeting", "hello", {}) }
 
+      Then { result.should == frame }
+
     end
 
     context "raises an exception if all connections failed" do
@@ -106,12 +113,18 @@ describe Klomp do
 
     context "calls subscribe on all of the servers" do
 
-      Given { connections.values.each {|conn| conn.stub!(:subscribe) } }
+      Given { connections.values.each {|conn| conn.stub!(subscribe: 42) } }
 
-      When { klomp.subscribe("/queue/greeting") { true } }
+      When(:result) { klomp.subscribe("/queue/greeting") { true } }
 
       Then { connections.values.each {|conn| conn.should have_received(:subscribe).with("/queue/greeting", nil) } }
 
+      context "and returns the results of all Connection#subscribe as an array" do
+
+        Then { result.should == Array.new(connections.size, 42) }
+
+      end
+
     end
 
     context "fails if any subscribe calls fail" do
@@ -130,12 +143,18 @@ describe Klomp do
 
     context "calls unsubscribe on all the servers" do
 
-      Given { connections.values.each {|conn| conn.stub!(:unsubscribe) } }
+      Given { connections.values.each {|conn| conn.stub!(unsubscribe: 42) } }
 
-      When { klomp.unsubscribe("/queue/greeting") }
+      When(:result) { klomp.unsubscribe("/queue/greeting") }
 
       Then { connections.values.each {|conn| conn.should have_received(:unsubscribe).with("/queue/greeting") } }
 
+      context "and returns the results of all Connection#unsubscribe as an array" do
+
+        Then { result.should == Array.new(connections.size, 42) }
+
+      end
+
     end
 
     context "calls unsubscribe on all the servers even if the unsubscribe errs" do
@@ -148,18 +167,48 @@ describe Klomp do
 
     end
 
+    context "with an array" do
+
+      context "of length matching the number of connections" do
+
+        Given(:arg) { Array.new(connections.size, 42) }
+
+        Given { connections.values.each {|conn| conn.stub!(:unsubscribe) } }
+
+        When { klomp.unsubscribe arg }
+
+        Then { connections.values.each {|conn| conn.should have_received(:unsubscribe).with(42) } }
+
+      end
+
+      context "of mismatched length" do
+
+        When(:expect_unsubscribe) { expect { klomp.unsubscribe([]) } }
+
+        Then { expect_unsubscribe.to raise_error(ArgumentError) }
+
+      end
+
+    end
+
   end
 
   context "disconnect" do
 
     context "disconnects all the servers" do
 
-      Given { connections.values.each {|conn| conn.stub!(:disconnect) } }
+      Given { connections.values.each {|conn| conn.stub!(disconnect: 42) } }
 
-      When { klomp.disconnect }
+      When(:result) { klomp.disconnect }
 
       Then { connections.values.each {|conn| conn.should have_received(:disconnect) } }
 
+      context "and returns the results of all Connection#disconnect as an array" do
+
+        Then { result.should == Array.new(connections.size, 42) }
+
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klomp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -224,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1626497956462206890
+      hash: -2110109472818919447
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: