stapfen 3.0.0-java → 3.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15bccf07520be4677e0bc9522dc5ba3b89d1d4c
-  data.tar.gz: 0250d8554c15615b054ca7fa0e7cdba6a33ca298
+  metadata.gz: 0ecd2146309c4a8507d81bb459f7bee767d41d33
+  data.tar.gz: 60d7060c0d9fd30a33ca4190d15f5f82568b2f60
 SHA512:
-  metadata.gz: 79d452fea3dff4f7e1334b9ee833de9170e05e37718e6e22f8fe9db5b0a849be8d0ac2bdab31c06831b74566ee76297d4855af02a57d9b1fd177e6ed2613c80f
-  data.tar.gz: 609308d82ee199756efce1a9f7dc675ed8f8875101ee2c33b2f5297eb3d3cc615669b516f7a853d679d28b3ee2aebf82d6918941e2cbebfb5868dcdfcecdd35c
+  metadata.gz: 8a937d878a0e1a2f1c35d8c7d8570573ca6b7ac423ddc3e6a4a6606f95889f9bc1bacd6034ee7ccb4ae9803751e0e1550a09c9467001bf1b763cf9ee616f46dc
+  data.tar.gz: 3404d490697c47372068d3013b964704f5f7217e81fa57fc1b16a21f185f64c4ca97b664cadf7ded55f88c5e56f120637ef6ccbb6c2a4eaad3699734f15104e5

data/Gemfile

@@ -10,7 +10,4 @@ group :development do
   gem 'rake'
   gem 'rspec'
   gem 'rspec-its'
-  gem 'pry'
-  gem 'debugger', :platform => :mri
-  gem 'debugger-pry', :platform => :mri
 end

data/lib/stapfen/client/kafka.rb

@@ -71,8 +71,7 @@ module Stapfen
       #
       # @params [block] block to yield consumed messages
       def subscribe(destination, headers={}, &block)
-        destination = Stapfen::Destination.from_string(destination)
-        connection.consume(destination.as_kafka, &block)
+        connection.consume(destination, &block)
       end
 
       def runloop

data/lib/stapfen/version.rb

@@ -1,3 +1,3 @@
 module Stapfen
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/stapfen/worker.rb

@@ -35,7 +35,7 @@ module Stapfen
         unless block_given?
           raise Stapfen::ConsumeError, "Method `consume` requires a block"
         end
-        @consumers ||= []
+        @consumers ||= ThreadSafe::Array.new
         @consumers << [config_overrides, consume_block]
       end
 
@@ -96,7 +96,7 @@ module Stapfen
       # functionality if needed. Useful for testing (see worker_spec.rb).
       def set_class_variable_defaults
         @@signals_handled = false
-        @@workers = []
+        @@workers = ThreadSafe::Array.new
       end
 
     end
@@ -139,7 +139,7 @@ module Stapfen
     end
 
     def stomp?
-      @protocol.nil? || @protocol == STOMP
+      @protocol == STOMP
     end
 
     # Force the worker to use JMS as the messaging protocol.
@@ -194,16 +194,23 @@ module Stapfen
       @protocol == KAFKA
     end
 
+    def protocol
+      @protocol ||= KAFKA
+    end
+
     def run
-      if stomp?
+      case protocol
+      when STOMP
         require 'stapfen/client/stomp'
         stapfen_client = Stapfen::Client::Stomp.new(client_options)
-      elsif jms?
+      when JMS
         require 'stapfen/client/jms'
         stapfen_client = Stapfen::Client::JMS.new(client_options)
-      elsif kafka?
+      when KAFKA
         require 'stapfen/client/kafka'
         stapfen_client = Stapfen::Client::Kafka.new(client_options)
+      else
+        raise 'No client specified'
       end
 
       logger.info("Running with #{stapfen_client} inside of Thread:#{Thread.current.inspect}")

data/lib/stapfen.rb

@@ -1,3 +1,5 @@
+require 'thread_safe'
+
 begin
   require 'stomp'
 rescue LoadError

data/spec/client/kafka_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hermann/consumer'
 require 'stapfen/client/kafka'
 
 
@@ -84,15 +83,12 @@ describe Stapfen::Client::Kafka, :java => true do
 
   describe '#subscribe' do
     let(:topic) { 'topic' }
-    let(:destination) { double('Destination') }
     let(:msg) { 'foo' }
     it 'yields to the block and passes in consumed message' do
-      allow(destination).to receive(:as_kafka) { topic }
-      allow(Stapfen::Destination).to receive(:from_string) { destination }
       allow(consumer).to receive(:consume).with(topic).and_yield(msg)
 
       expect{ |b|
-        client.subscribe(destination, nil, &b)
+        client.subscribe(topic, nil, &b)
       }.to yield_with_args(msg)
     end
   end

data/spec/spec_helper.rb

@@ -6,12 +6,10 @@ require 'rspec/its'
 
 is_java = (RUBY_PLATFORM == 'java')
 
-unless is_java
-  require 'debugger'
-  require 'debugger/pry'
+if is_java
+  require 'hermann/consumer'
 end
 
-
 RSpec.configure do |c|
   c.color = true
   c.order = "random"

data/spec/worker_spec.rb

@@ -4,6 +4,19 @@ require 'stapfen/client/stomp'
 class ExampleWorker < Stapfen::Worker
 end
 
+# `exit` is private in 1.9.3 so this is a little hack to add the
+# namespace for java and make that `exit` method public. Since we use
+# it in our tests below.
+module Java
+  module JavaLang
+    class System
+      class << self
+        public :exit
+      end
+    end
+  end
+end
+
 describe Stapfen::Worker do
 
   after(:each) do
@@ -79,6 +92,7 @@ describe Stapfen::Worker do
     end
 
     it 'cleanly exits the worker and java environment' do
+      described_class.const_set(:RUBY_PLATFORM, 'java')
       described_class.workers << example_worker
       expect(Java::JavaLang::System).to receive(:exit).with(0)
       expect(example_worker).to receive(:exit_cleanly)
@@ -94,6 +108,7 @@ describe Stapfen::Worker do
     end
 
     it 'is false if an exception is raised' do
+      described_class.const_set(:RUBY_PLATFORM, 'java')
       expect(Java::JavaLang::System).to receive(:exit).with(0)
       described_class.workers << example_worker
       expect(example_worker).to receive(:exit_cleanly).and_raise(StandardError)
@@ -357,61 +372,69 @@ describe Stapfen::Worker do
         described_class.class_variable_set(:@@workers, [])
       end
 
-      context 'with just a queue name' do
-        context 'on a failed message' do
-          it 'should not unreceive' do
-            stapfen_client.should_receive(:unreceive).never
-
-            described_class.consume(client_options) {|msg| false }
-            described_class.new.run
+      context 'using stomp' do
+        before do
+          described_class.configure do |w|
+            w.use_stomp!
           end
         end
-        context 'on a successful message' do
-          it 'should not unreceive' do
-            stapfen_client.should_receive(:unreceive).never
 
-            described_class.consume(client_options) {|msg| true }
-            described_class.new.run
-          end
-        end
-      end
-
-      context 'with a queue name and headers for a dead_letter_queue and max_redeliveries' do
-        let(:unrec_headers) do
-          { :dead_letter_queue => '/queue/foo',
-          :max_redeliveries => 3 }
-        end
+        context 'with just a queue name' do
+          context 'on a failed message' do
+            it 'should not unreceive' do
+              stapfen_client.should_receive(:unreceive).never
 
-        let(:raw_headers) { unrec_headers.merge(:other_header => 'foo!') }
-        let(:client_options) { {:topic => name}.merge(raw_headers) }
-        let(:config_overrides) { client_options.merge(unrec_headers) }
-        context 'on a failed message' do
-          it 'should unreceive' do
-            stapfen_client.should_receive(:unreceive).once
+              described_class.consume(client_options) {|msg| false }
+              described_class.new.run
+            end
+          end
+          context 'on a successful message' do
+            it 'should not unreceive' do
+              stapfen_client.should_receive(:unreceive).never
 
-            described_class.consume(config_overrides) {|msg| false }
-            described_class.new.run
+              described_class.consume(client_options) {|msg| true }
+              described_class.new.run
+            end
           end
-          it 'should pass :unreceive_headers through to the unreceive call' do
-            stapfen_client.should_receive(:unreceive).with(message, config_overrides).once
+        end
 
-            described_class.consume(config_overrides) {|msg| false }
-            described_class.new.run
+        context 'with a queue name and headers for a dead_letter_queue and max_redeliveries' do
+          let(:unrec_headers) do
+            { :dead_letter_queue => '/queue/foo',
+            :max_redeliveries => 3 }
           end
-          it 'should not remove the unreceive headers from the consumer' do
-            described_class.consume(config_overrides) {|msg| false}
-            described_class.new.run
 
-            expect(described_class.consumers.last[0][:dead_letter_queue]).to eql unrec_headers[:dead_letter_queue]
-            expect(described_class.consumers.last[0][:max_redeliveries]).to eql unrec_headers[:max_redeliveries]
+          let(:raw_headers) { unrec_headers.merge(:other_header => 'foo!') }
+          let(:client_options) { {:topic => name}.merge(raw_headers) }
+          let(:config_overrides) { client_options.merge(unrec_headers) }
+          context 'on a failed message' do
+            it 'should unreceive' do
+              stapfen_client.should_receive(:unreceive).once
+
+              described_class.consume(config_overrides) {|msg| false }
+              described_class.new.run
+            end
+            it 'should pass :unreceive_headers through to the unreceive call' do
+              stapfen_client.should_receive(:unreceive).with(message, config_overrides).once
+
+              described_class.consume(config_overrides) {|msg| false }
+              described_class.new.run
+            end
+            it 'should not remove the unreceive headers from the consumer' do
+              described_class.consume(config_overrides) {|msg| false}
+              described_class.new.run
+
+              expect(described_class.consumers.last[0][:dead_letter_queue]).to eql unrec_headers[:dead_letter_queue]
+              expect(described_class.consumers.last[0][:max_redeliveries]).to eql unrec_headers[:max_redeliveries]
+            end
           end
-        end
-        context 'on a successfully handled message' do
-          it 'should not unreceive' do
-            stapfen_client.should_receive(:unreceive).never
+          context 'on a successfully handled message' do
+            it 'should not unreceive' do
+              stapfen_client.should_receive(:unreceive).never
 
-            described_class.consume(config_overrides) {|msg| true }
-            described_class.new.run
+              described_class.consume(config_overrides) {|msg| true }
+              described_class.new.run
+            end
           end
         end
       end

data/stapfen.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
+  s.add_dependency 'thread_safe'
+
   if RUBY_PLATFORM == "java"
     s.add_dependency 'hermann', "~> 0.20.0"
     s.platform = 'java'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: java
 authors:
 - R. Tyler Croy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: thread_safe
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -38,6 +52,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- activemq-all-5.8.0.jar
 - examples/simple.rb
 - lib/stapfen.rb
 - lib/stapfen/client.rb