stapfen 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,7 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWZmOWJmNmUzNmU2MDA1MmUzZDJhOGM5ZmRlMDMwOGZjMmU5YWM4MA==
-  data.tar.gz: !binary |-
-    NGM4ODgxMTUwMjFhZTQyYTE3ZjgxODgzOThlMDYzYjcxN2JjMGUyMg==
-SHA512:
-  metadata.gz: !binary |-
-    ZTU4OTgyZmFkY2EyZTAwYmEyNDQxMWI3NjhkOTNiNTA0MGIwOWM2ZDM5NzY3
-    NTQ4ZDVlYTAxYWM1YWJjOTQxYzIwNWI1Zjk4OGFjN2ZlN2QwMTAxZGEzYzMz
-    M2YwNDdiMWQwODkzMmEyOWMwM2M3OTQyMDVkNzEyNDY1NDZjOWE=
-  data.tar.gz: !binary |-
-    NjNhOTRiNjcwMWY4YjRkNThhOWJkYzM4ZTZmZDAzNTA5NjQ4YmQzOGEzYjJl
-    YmJiMGE4MDZmMGJjMmQ1MDYyNDVlODA2ZDQxZWIwMzVmOWE1YTA4ZTMxYmY4
-    NDg0OTc0ZjlmZmU2ZGM5MjAwNjhlYzFhYTM1NTk1ZmNiZDM2YzU=
+--- 
+SHA1: 
+  metadata.gz: 19bdf4344cf49d95cee8597de1902b9a814a1b90
+  data.tar.gz: 06ad77a4f72ea1cce8269e92a19ce2cf6872474b
+SHA512: 
+  metadata.gz: 09b0dfd450a6e4387250b0d0c4b49734891ea5f07db900b7cdb33412b731352b5cd0a192663b898e383030c2938710f29238716b0b793d181adbed35157155aa
+  data.tar.gz: 79104895c26a380204fe1cddbe0304e255e87d522ada0c1c38fe7dad16457b10d9bec4bdb82cd44b55f21bd21ecc09cba1ec8b8abc2287cf2a23663f23ed10b3

data/examples/simple.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 require 'stapfen'
+require ENV['activemq_jar'] if ENV['USE_JMS']
 
 
 class Worker < Stapfen::Worker
@@ -13,19 +14,31 @@ class Worker < Stapfen::Worker
         :passcode => 'guest',
         :ssl => false
       }
-    ]}
+    ],
+    :factory => 'org.apache.activemq.ActiveMQConnectionFactory'}
   end
 
-  consume 'jms.queue.test' do |message|
-    puts "received: #{message}"
-  end
+  use_jms! if ENV['USE_JMS']
+
+  if ENV['USE_JMS']
+    consume '/queue/jms.queue.test',
+            :max_redeliveries => 3,
+            :dead_letter_queue => '/queue/jms.queue.test/dlq' do |message|
+      puts "received: #{message}"
 
-  consume 'jms.topic.foo', {:ack => 'client'} do |message|
-    main_thread do
-      client.acknowledge(message)
+      # False here forces an unreceive
+      return false
+    end
+  else # use stomp
+    consume '/queue/test',
+            :max_redeliveries => 3,
+            :dead_letter_queue => '/queue/test/dlq' do |message|
+      puts "received: #{message}"
+
+      # False here forces an unreceive
+      return false
     end
   end
 end
 
-
 Worker.run!

data/lib/stapfen/client/jms.rb

@@ -103,20 +103,14 @@ module Stapfen
       def unreceive(message, unreceive_headers)
         return if unreceive_headers[:max_redeliveries].nil? && unreceive_headers[:max_redeliveries].nil?
 
-        headers = message.headers
-        retry_count = headers.delete('retry_count').to_i || 0
-        retry_count += 1
-        headers['retry_count'] = retry_count
-
-        destination = headers.delete('destination')
+        destination = message.destination.to_s.sub('queue://','/queue/').sub('topic://','/topic')
+        retry_count = message.getStringProperty('retry_count').to_i || 0
+        retry_count +=1
 
         if unreceive_headers[:max_redeliveries] && (retry_count <= unreceive_headers[:max_redeliveries])
-          self.publish(destination, message.body, headers)
+          self.publish(destination, message.data, {'retry_count' => retry_count.to_s})
         elsif unreceive_headers[:dead_letter_queue] # Done retrying, send to DLQ
-          headers['original_destination'] = destination
-          headers.delete('retry_count')
-
-          self.publish(unreceive_headers[:dead_letter_queue], message.body, headers)
+          self.publish(unreceive_headers[:dead_letter_queue], message.data, {:original_destination => destination})
         end
       end
     end

data/lib/stapfen/version.rb

@@ -1,3 +1,3 @@
 module Stapfen
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/client/jms_spec.rb

@@ -17,7 +17,7 @@ if RUBY_PLATFORM == 'java'
 
     describe '#unreceive' do
       let(:body) { 'Some body in string form' }
-      let(:message) { double('Message', :headers => msg_headers.merge('destination' => orig_destination), :body => body) }
+      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
@@ -25,16 +25,9 @@ if RUBY_PLATFORM == 'java'
       end
       let(:orig_destination) { '/queue/some_queue' }
 
-      # Just to make sure we preserve any headers we don't explicitly get rid of
-      let(:orig_headers) do
-        { 'key1' => 'value1' }
-      end
-
-
       subject(:unreceive!) { client.unreceive(message, unreceive_headers) }
 
       context 'with no unreceive[:max_redeliveries] or unreceive[:dead_letter_queue]' do
-        let(:msg_headers) { orig_headers }
         let(:unreceive_headers) { Hash.new }
 
         it 'should not resend the message' do
@@ -45,13 +38,15 @@ if RUBY_PLATFORM == 'java'
       end
 
       context 'On a message with no retry_count in the headers' do
-        let(:msg_headers) { orig_headers }
+        before :each do
+          message.stub(:getStringProperty).with('retry_count').and_return(nil)
+        end
 
         it 'should publish it to the same destination with a retry_count of 1' 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 msg_headers.merge({'retry_count' => 1})
+            expect(the_headers).to eql({'retry_count' => '1'})
           end
 
           unreceive!
@@ -59,7 +54,10 @@ if RUBY_PLATFORM == 'java'
       end
 
       context 'On a message with a retry_count in the headers' do
-        let(:msg_headers) { orig_headers.merge('retry_count' => retry_count) }
+        before :each do
+          message.stub(:getStringProperty).with('retry_count').and_return(retry_count)
+        end
+
 
         context 'that is less than max_redeliveries' do
          let(:retry_count) { max_redeliveries - 1 }
@@ -70,7 +68,7 @@ if RUBY_PLATFORM == 'java'
               expect(the_body).to eql body
 
 
-              expect(the_headers).to eql msg_headers.merge({'retry_count' => retry_count + 1})
+              expect(the_headers).to eql({'retry_count' => (retry_count + 1).to_s})
             end
 
             unreceive!
@@ -86,11 +84,7 @@ if RUBY_PLATFORM == 'java'
               expect(the_body).to eql body
               expect(dest).to eql dlq
 
-              # Headers should eql msg_headers except for retry count,
-              # and original_destination
-              msg_headers.delete('retry_count')
-              msg_headers['original_destination'] = orig_destination
-              expect(the_headers).to eql msg_headers
+              expect(the_headers).to eql({:original_destination => orig_destination})
             end
 
             unreceive!
@@ -105,11 +99,7 @@ if RUBY_PLATFORM == 'java'
               expect(the_body).to eql body
               expect(dest).to eql dlq
 
-              # Headers should eql msg_headers except for retry count,
-              # and original_destination
-              msg_headers.delete('retry_count')
-              msg_headers['original_destination'] = orig_destination
-              expect(the_headers).to eql msg_headers
+              expect(the_headers).to eql({:original_destination => orig_destination})
             end
 
             unreceive!

metadata

@@ -1,22 +1,27 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: stapfen
-version: !ruby/object:Gem::Version
-  version: 2.1.0
+version: !ruby/object:Gem::Version 
+  version: 2.1.1
 platform: ruby
-authors:
+authors: 
 - R. Tyler Croy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+
+date: 2014-01-28 00:00:00 Z
 dependencies: []
+
 description: A simple gem for writing good basic STOMP workers
-email:
+email: 
 - rtyler.croy@lookout.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - CHANGES.md
 - Gemfile
@@ -42,30 +47,33 @@ files:
 - spec/spec_helper.rb
 - spec/worker_spec.rb
 - stapfen.gemspec
-homepage: ''
+homepage: ""
 licenses: []
+
 metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - &id001 
+    - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - *id001
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A simple gem for writing good basic STOMP workers
-test_files:
+test_files: 
 - spec/client/jms_spec.rb
 - spec/client/stomp_spec.rb
 - spec/client_spec.rb