stapfen 1.0.0 → 1.0.1

data/Gemfile

@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in stapfen.gemspec
 gemspec
 
-
 group :development do
   gem 'rake'
   gem 'rspec', '~> 2.11'
   gem 'guard-rspec'
+  gem 'yard'
 end

data/lib/stapfen/worker.rb

@@ -1,4 +1,5 @@
-require 'stomp'
+require 'thread'
+require 'onstomp'
 
 module Stapfen
   class Worker
@@ -28,20 +29,15 @@ module Stapfen
     attr_accessor :client
 
     def initialize
-      @pool = []
-      @workqueue = Queue.new
       handle_signals!
     end
 
-    def main_thread(&block)
-      @workqueue << block
-    end
 
     def run
-      @client = Stomp::Client.new(self.class.configuration)
+      @client = OnStomp::Client.new(generate_uri)
+      @client.connect
 
       self.class.consumers.each do |name, headers, block|
-
         # We're taking each block and turning it into a method so that we can
         # use the instance scope instead of the blocks originally bound scope
         # which would be at a class level
@@ -49,9 +45,8 @@ module Stapfen
         self.class.send(:define_method, method_name, &block)
 
         client.subscribe(name, headers) do |message|
-          @pool << Thread.new do
-            self.send(method_name, message)
-          end
+          puts "invoking #{method_name} for #{message.inspect}"
+          self.send(method_name, message)
         end
       end
 
@@ -59,19 +54,8 @@ module Stapfen
         # Performing this join/open loop to make sure that we don't
         # experience potential deadlocks between signal handlers who might
         # close the connection, and an infinite Client#join call
-        while client.open? do
-          client.join(1)
-
-          until @workqueue.empty?
-            block = @workqueue.pop
-            begin
-              block.call
-            rescue => e
-              puts "Exception! #{e}"
-            end
-          end
-
-          @pool = @pool.select { |t| t.alive? }
+        while client.connected? do
+          sleep(0.2)
         end
       rescue Interrupt
         exit_cleanly
@@ -89,15 +73,25 @@ module Stapfen
     end
 
     def exit_cleanly
-      unless @pool.empty?
-        puts "Giving #{@pool.size} threads 10s each to finish up"
-        @pool.each do |t|
-          t.join(10)
-        end
+      if client.connected?
+        client.disconnect
       end
-      unless client.closed?
-        client.close
+    end
+
+    # Convert Stapfen configuration into an OnStomp URL
+    #
+    # @return [String]
+    def generate_uri
+      config = self.class.configuration
+      raise Stapfen::ConfigurationError if config.nil? || config.empty?
+
+      user_info = nil
+
+      if config[:login] && config[:passcode]
+        user_info = "#{config[:login]}:#{config[:passcode]}@"
       end
+
+      "stomp://#{user_info}#{config[:host]}:#{config[:port]}"
     end
   end
 end

data/spec/worker_spec.rb

@@ -2,11 +2,10 @@ require 'spec_helper'
 
 
 describe Stapfen::Worker do
-  let(:worker) { subject }
+  subject(:worker) { described_class.new }
 
   context 'class methods' do
-    subject { described_class }
-    let(:worker) { described_class }
+    subject(:worker) { described_class }
 
     it { should respond_to :run! }
     it { should respond_to :configure }
@@ -53,4 +52,39 @@ describe Stapfen::Worker do
       end
     end
   end
+
+  context 'instance methods' do
+    describe '#generate_uri' do
+      subject(:uri) { worker.generate_uri }
+      let(:conf) { {} }
+
+      before :each do
+        worker.class.stub(:configuration).and_return(conf)
+      end
+
+      context 'with a blank configuration' do
+        it 'should raise an error' do
+          expect { worker.generate_uri }.to raise_error(Stapfen::ConfigurationError)
+        end
+      end
+
+      context 'with an unauthenticated non-ssl host' do
+        let(:conf) { {:host => 'localhost', :port => 61613} }
+
+        it { should eql('stomp://localhost:61613') }
+      end
+
+      context 'with an authentication ssl host' do
+        let(:conf) do
+          {:host => 'localhost',
+           :port => 61613,
+           :login => 'admin',
+           :passcode => 'admin'}
+        end
+
+        it { should eql('stomp://admin:admin@localhost:61613') }
+      end
+    end
+
+  end
 end

data/stapfen.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
 
-  gem.add_dependency('stomp', '>= 1.2.8')
+  gem.add_dependency('onstomp', '>= 1.0.7')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stapfen
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: stomp
+  name: onstomp
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.0.7
 description: A simple gem for writing good basic STOMP workers
 email:
 - rtyler.croy@lookout.com
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2006440266819501787
+      hash: -4282538672362447376
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2006440266819501787
+      hash: -4282538672362447376
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -80,3 +80,4 @@ summary: A simple gem for writing good basic STOMP workers
 test_files:
 - spec/spec_helper.rb
 - spec/worker_spec.rb
+has_rdoc: