nebulous_stomp 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50d86922e77fc4e61bf8a69424f252d3c91ce41
-  data.tar.gz: 62790af2e03505a506da7f73ff7e772c17d09b16
+  metadata.gz: 210d0ff5d3c99590ab6356e5456e2fa67e9ab0ae
+  data.tar.gz: ac6782c4ef1969f7f0854de505a393927487cd00
 SHA512:
-  metadata.gz: 78f6c7775d04afca9ef387767ad4e7bf3e0f54d37b276cd653ebbccd3297f76f969b376616554855fd90497c30372e1b3716cf44afae53fa07107b6f686684c0
-  data.tar.gz: a085cc52937b783362bc4669797f589aac716a1af5a27fd1a34c674d3d20020fc053a6a89706fef075f0966cfa477f05e93981f09cf167ed9aeffc01642684b6
+  metadata.gz: e12b2880dff2e61135575fcb2f694315621fcd8a69f29156e01eec0d1248b8f679241d1907bf75da452ec3bb6cf69152009e364ed9aeaa218b2735c929a7daf2
+  data.tar.gz: 2e5a0161b8c527dd8633562d1f359b781e105554a4c4d396c2dcba265f78750c0697051d0049cc9f26e6ef060b68cc97358d358e64a6caa1d0a64d3065922f92

data/.hgtags

@@ -15,3 +15,4 @@ cff04defabb0895ff2f032087b97ea9616bee6a9 1.14
 8ad003b30ff2d61d481343ba8d822ff2ffafaabb 1.1.4
 6ddf180c9a2fc1cef55f5d128faa4d5df28d1353 1.1.5
 6da65ce15fab9722deb05d8c0ed2d0c8e2cfe2ff 2.0.0
+9c4ec9af8f6b8a848082bf118be037696ff357c7 2.0.1

data/lib/nebulous_stomp/stomp_handler.rb

@@ -2,12 +2,15 @@ require 'stomp'
 require 'json'
 require 'time'
 
-
 module NebulousStomp
 
 
   ##
-  # A Class to deal with talking to STOMP via the Stomp gem
+  # A Class to deal with talking to STOMP via the Stomp gem.
+  #
+  # You will need to instantiate this yourself if you only want to listen for messages. But if you
+  # want to send a request and receive a response, you should never need this -- a NebRequest
+  # returns a Message.
   #
   class StompHandler
 
@@ -123,7 +126,7 @@ module NebulousStomp
       return self unless nebulous_on?
       NebulousStomp.logger.info(__FILE__) {"Connecting to STOMP"} 
 
-      @client = @test_client || Stomp::Client.new( @stomp_hash.dup )
+      @client = @test_client || Stomp::Client.new( @stomp_hash )
       raise ConnectionError, "Stomp Connection failed" unless connected?
 
       conn = @client.connection_frame()
@@ -208,9 +211,6 @@ module NebulousStomp
     # Ideally I'd like to DRY this and listen() up, but with this
     # yield-within-a-thread stuff going on, I'm actually not sure how to do
     # that safely.
-    #
-    # Actually i'm not even sure how to stop once I've read one message. The
-    # Stomp gem behaves very strangely.
     #++
     #
     def listen_with_timeout(queue, timeout)
@@ -230,21 +230,24 @@ module NebulousStomp
         @client.subscribe( queue, {ack: "client-individual"} ) do |msg|
 
           begin
-            if msg.body == 'boo'
-              @client.ack(msg)
-            elsif done == false
+            unless msg.body == "boo"
               yield Message.from_stomp(msg) 
               done = true
             end
+            @client.ack(msg)
           rescue =>e
             NebulousStomp.logger.error(__FILE__) {"Error during polling: #{e}" }
           end
 
-        end # of Stomp client subscribe block
+          if done
+            # Not that this seems to do any good when the Stomp gem is in play
+            resource.signal 
+            break
+          end
 
-        # Not that this seems to do any good when the Stomp gem is in play, but.
-        resource.signal if done
+        end # of Stomp client subscribe block
 
+        resource.signal if done #or here. either, but.
       end # of with_timeout
 
       raise NebulousTimeout unless done
@@ -261,7 +264,10 @@ module NebulousStomp
             && mess.respond_to?(:headers_for_stomp)
 
       stomp_connect unless @client
-      @client.publish(queue, mess.body_for_stomp, mess.headers_for_stomp)
+
+      headers = mess.headers_for_stomp.reject{|k,v| v.nil? || v == "" }
+      @client.publish(queue, mess.body_for_stomp, headers)
+
       mess
     end
 

data/lib/nebulous_stomp/version.rb

@@ -1,5 +1,5 @@
 module NebulousStomp
 
   # Nebulous version number
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/nebulous.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.requirements << 'Redis server (optional)'
 
   spec.post_install_message = <<~MESSAGE
-    Nebulous has been installed ...sort of...  ::waves arms noncomittedly::
+    Nebulous has been installed ...sort of... ::waves arms noncomittedly::
   MESSAGE
 
   spec.add_development_dependency "bundler", "~> 1.11"
@@ -39,8 +39,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-doc"
   spec.add_development_dependency "ripper-tags"
 
-  spec.add_runtime_dependency 'stomp',   '>=1.3'
-  spec.add_runtime_dependency 'redis',   '>=3.1'
+  spec.add_runtime_dependency 'stomp',   '~>1.4'
+  spec.add_runtime_dependency 'redis',   '~>3.1'
   spec.add_runtime_dependency 'devnull', '~>0.1'
  
 end

data/spec/through_test_spec.rb

@@ -0,0 +1,79 @@
+require 'nebulous_stomp'
+
+
+##
+# This is a through test against the JH development stomp server.
+# It's really only here to double check that the Stomp gem hasn't moved the 
+# goalposts (again).
+#
+# In order for it to work, the JH RabbitMQ server has to be where we left it. 
+# So this test won't work for you out of the box, unless you are me.
+#
+describe 'through test' do
+
+  def connect_hash
+    host = { login:    'guest',
+             passcode: 'guest',
+             host:     '10.0.0.150',
+             port:     61613,
+             ssl:      false        }
+
+    {hosts: [host], reliable: false}
+  end
+
+  def target_hash
+    { sendQueue:    "/queue/nebulous.test",
+      receiveQueue: "/queue/nebulous.test.response" }
+
+  end
+
+  def init_stomp
+    NebulousStomp.init(stompConnectHash: connect_hash, messageTimeout: 5)
+    NebulousStomp.add_target(:target, target_hash)
+  end
+
+  ##
+  # a little method to receive a message and send one back, for testinng 
+  # sending one.
+  #
+  def qna
+    Thread.new do
+
+      begin
+        sh = NebulousStomp::StompHandler.new(connect_hash)
+        sh.listen_with_timeout( target_hash[:sendQueue], 10 ) do |m| 
+          sh.send_message( *m.respond_success )
+        end
+      ensure
+        sh.stomp_disconnect if sh
+      end
+
+    end
+
+  rescue
+    nil
+  end
+
+
+  let(:request) { NebulousStomp::NebRequest.new(:target, "ping") }
+
+  before do
+    init_stomp
+  end
+
+
+  it "sends a request" do
+    expect{ request.send_no_cache }.to raise_exception NebulousStomp::NebulousTimeout
+  end
+
+
+  it "receives a response" do
+    r = NebulousStomp::NebRequest.new(:target, "ping")
+    qna; response = r.send_no_cache
+
+    expect( response ).to be_a_kind_of NebulousStomp::Message
+    expect( response.verb ).to eq 'success'
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nebulous_stomp
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Andy Jones
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,28 +112,28 @@ dependencies:
   name: stomp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
@@ -199,12 +199,13 @@ files:
 - spec/spec_helper.rb
 - spec/stomp_handler_null_spec.rb
 - spec/stomp_handler_spec.rb
+- spec/through_test_spec.rb
 - tags
 homepage: https://bitbucket.org/andy-twosticks/nebulous_stomp
 licenses:
 - MIT
 metadata: {}
-post_install_message: 'Nebulous has been installed ...sort of...  ::waves arms noncomittedly::
+post_install_message: 'Nebulous has been installed ...sort of... ::waves arms noncomittedly::
 
 '
 rdoc_options: []
@@ -241,4 +242,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/stomp_handler_null_spec.rb
 - spec/stomp_handler_spec.rb
+- spec/through_test_spec.rb
 has_rdoc: