stapfen 3.0.2.21 → 3.0.2.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGRlODBmYzg5OWFlNmMwYTdjYTc4MDkwY2ZiNzMyYTVhODY2YjgxNA==
+    Y2FlNzUwYjlhZDkyODRiMDNmOGJiMWVkMWRkOWZkMDc1MjMxMmU4NA==
   data.tar.gz: !binary |-
-    NDQ0YTIwZjRlNjdiMzg4NTE3YThiZDZjOGJhOGFjZWI4OWM1ODg3Mw==
+    YjhjZWJjNDc2NDlmNDc1NjRkZWJmYTI4NThhOTgxMzlkZGI0MmRkYQ==
 SHA512:
   metadata.gz: !binary |-
-    MzI4ZDUwNTg4OTA1ZGFkNWY5ZjVjMzU0N2E3NTFkOGI5ZTliYWI0NTliYzkz
-    N2RhNGFjZDg2YjM4NmQ5YTllYjNmMDBiMGQ1MDAwOWFmYzM5NjVmNDk4ZWI3
-    YTBjODk1N2RhMmUyMTMyZmE5MjNiZmI5ODAxZTA4ZDA1YjNjZjM=
+    MTFkMDg2ODZmMDcyMDBkMTFhOTgzYjM5YjA0NGVjMWVkYTlkMzhkMzk4NmY1
+    Yjc4OWZkMDRmYmQ4OTMwOWNkMDg2MDkxY2ZkYTRkYzVkYWI3YzIxYTY5NTAx
+    ODUwODk5ZWFjN2E5YzU2ZTcyZjhkNzE1YTU2OGU1ZDg4ZWMyMmE=
   data.tar.gz: !binary |-
-    MTA3MTg2MTU4NWVhY2Y2YTlkY2QzOGJjOWMwNTVhNDFmNTk4ZTFkMTM3ZTM3
-    OTBkNzk0ODdmNjBjODlkOTM3NzkzMjQwZDRkMzE4OTI0YWJlYTQ3MTEyMDA2
-    ZTFjOWI4YjY5MzE3ZGUzNzgzOWFmMzM2MTlkNGEyMTQwY2Y5YTY=
+    MDkwNGMyNmM3ZjA2MjI0NzU2N2ExYWJmNDRhNmNlMmEzNjM0ZTUxOGYwZmM1
+    NDdhN2VkOTQ3NWUxOWFkZmVmZGY0MDhlNGJmOTA2YmZlMmU3ODdmYTIzMzFi
+    YmIxM2JmOTY1NzRmZjcwZTUxYWZlYzE2ZjhiMTVkOTMzYjllNTc=

data/lib/stapfen/client/jms.rb

@@ -101,9 +101,9 @@ module Stapfen
       # @option unreceive_headers [String] :dead_letter_queue After giving up on
       #   redelivering, send the message here.
       def unreceive(message, unreceive_headers)
-        return if unreceive_headers[:max_redeliveries].nil? && unreceive_headers[:max_redeliveries].nil?
+        return if unreceive_headers[:max_redeliveries].nil? && unreceive_headers[:dead_letter_queue].nil?
 
-        destination = message.destination.to_s.sub('queue://','/queue/').sub('topic://','/topic')
+        destination = message.destination.to_s.sub('queue://','/queue/').sub('topic://','/topic/')
         retry_count = message.getStringProperty('retry_count').to_i || 0
         retry_count +=1
 

data/spec/client/jms_spec.rb

@@ -20,23 +20,49 @@ if RUBY_PLATFORM == 'java'
       let(:message) { double('Message', :destination => orig_destination, :data => body, :getStringProperty => nil) }
       let(:max_redeliveries) { 2 }
       let(:dlq) { '/queue/some_queue/dlq' }
-      let(:unreceive_headers) do
-        { :dead_letter_queue => dlq, :max_redeliveries => max_redeliveries }
-      end
+
       let(:orig_destination) { '/queue/some_queue' }
 
       subject(:unreceive!) { client.unreceive(message, unreceive_headers) }
 
-      context 'with no unreceive[:max_redeliveries] or unreceive[:dead_letter_queue]' do
+      context 'with no unreceive[:dead_letter_queue] and no unreceive[:max_redeliveries]' do
         let(:unreceive_headers) { Hash.new }
-
         it 'should not resend the message' do
           client.should_not_receive(:publish)
+          unreceive!
+        end
+      end
+
+      context 'with no unreceive[:max_redeliveries]' do
+        let(:unreceive_headers) do
+          { dead_letter_queue: '/queue/some_queue/dlq' }
+        end
 
+        it 'should resend the message' do
+          client.should_receive(:publish) do |dest, the_body, the_headers|
+            expect(dest).to eql '/queue/some_queue/dlq'
+          end
           unreceive!
         end
       end
 
+      context 'with no unreceive[:dead_letter_queue]' do
+        let(:unreceive_headers) { { max_redeliveries: 2 } }
+
+        it 'should resend the message' do
+          client.should_receive(:publish) do |dest, the_body, the_headers|
+            expect(dest).to eql orig_destination
+            expect(the_body).to eql body
+          end
+
+          unreceive!
+        end
+      end
+
+      let(:unreceive_headers) do
+        { :dead_letter_queue => dlq, :max_redeliveries => max_redeliveries }
+      end
+
       context 'On a message with no retry_count in the headers' do
         before :each do
           message.stub(:getStringProperty).with('retry_count').and_return(nil)
@@ -61,13 +87,10 @@ if RUBY_PLATFORM == 'java'
 
         context 'that is less than max_redeliveries' do
          let(:retry_count) { max_redeliveries - 1 }
-
           it 'should publish it to the same destination with a retry_count increased by one' do
             client.should_receive(:publish) do |dest, the_body, the_headers|
               expect(dest).to eql orig_destination
               expect(the_body).to eql body
-
-
               expect(the_headers).to eql({'retry_count' => (retry_count + 1).to_s})
             end
 
@@ -83,7 +106,6 @@ if RUBY_PLATFORM == 'java'
             client.should_receive(:publish) do |dest, the_body, the_headers|
               expect(the_body).to eql body
               expect(dest).to eql dlq
-
               expect(the_headers).to eql({:original_destination => orig_destination})
             end
 
@@ -105,6 +127,32 @@ if RUBY_PLATFORM == 'java'
             unreceive!
           end
         end
+
+        context 'with a topic url destination' do
+          let(:retry_count) { max_redeliveries + 1 }
+          let(:orig_destination) { 'topic://some_queue' }
+          it 'should succeed' do
+            client.should_receive(:publish) do |dest, the_body, the_headers|
+              expect(the_body).to eql body
+              expect(dest).to eql dlq
+              expect(the_headers).to eql({:original_destination => '/topic/some_queue'})
+            end
+            unreceive!
+          end
+        end
+
+        context 'with a queue url destination' do
+          let(:retry_count) { max_redeliveries + 1 }
+          let(:orig_destination) { 'queue://some_queue' }
+          it 'should succeed' do
+            client.should_receive(:publish) do |dest, the_body, the_headers|
+              expect(the_body).to eql body
+              expect(dest).to eql dlq
+              expect(the_headers).to eql({:original_destination => '/queue/some_queue'})
+            end
+            unreceive!
+          end
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 3.0.2.21
+  version: 3.0.2.23
 platform: ruby
 authors:
 - R. Tyler Croy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe