superbolt 0.5.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee5f785becf5300b3f3aa76a6309e345b33e6f89
-  data.tar.gz: f91c93f3f9814d5a8e969ade48f06a76506276b8
+  metadata.gz: 2c78aea5b8060d528b43b74ac5c6939e137bad63
+  data.tar.gz: 9a660f7536bd590f3f2aad70f1bcf16b10a67b2c
 SHA512:
-  metadata.gz: 26a593552635172c7e548c781b84846c63210536e57c2444e7b369e9518383bbd3b21856a644f1af8ff23395363dc725b4fa55cc4bf379605aa230c04a93899e
-  data.tar.gz: 6a96bb6ed931e49acf07a8e0dfe3415565c63dfcf97f4bfcb4a456e8ad6ed13616e608f664f6fc6f5f6d6b57b61e40cbf529d6c5b4a41639982056d8cb37d5da
+  metadata.gz: 3c06a247acb6b856c9c72078ffab1da9869df256de2eef70ce65b48b981dfd19b80b84d015cc51207b733984f99c7deed41cc8d2f3fb5c1d2c6368aa41f88cfe
+  data.tar.gz: e33cbf5336606dec0cb52e420b49a00c0d278721ed348e55abefc1ea6b2f08be918122bcac7adaed28cf10bebf1c77eed764b2bf2cb33a057415c806a4502deb

data/lib/superbolt/app.rb

@@ -41,13 +41,10 @@ module Superbolt
     end
 
     def run(&block)
-      EventMachine.run do
-        runner_class.new(queue, error_queue, logger, block).run
-
-        quit_subscriber_queue.subscribe do |message|
-          quit(message)
-        end
-      end
+      @consumer = runner_class.new(queue, error_queue, logger, block).run
+      # quit_subscriber_queue.subscribe do |message|
+      #    (message)
+      # end
     end
 
     def runner_class
@@ -70,9 +67,9 @@ module Superbolt
 
     def quit(message='no message given')
       logger.info "EXITING Superbolt App listening on queue #{name}: #{message}"
-      close {
-        EventMachine.stop
-      }
+      q.channel.consumers.first[0]
+      q.channel.basic_cancel q.channel.consumers.first[0]
+      close
     end
   end
 end

data/lib/superbolt/runner/default.rb

@@ -11,13 +11,13 @@ module Superbolt
       end
 
       def subscribe
-        queue.subscribe(ack: ack) do |delivery_info, metadata, payload|
-
+        queue.subscribe(ack: ack, block: true) do |delivery_info, metadata, payload|
           message = Superbolt::IncomingMessage.new(delivery_info, payload, channel)
           processor = processor_class.new(message, logger, &block)
-          unless processor.perform
-            on_error(message.parse, processor.exception)
-          end
+          processor.perform
+          # unless processor.perform
+          #   on_error(message.parse, processor.exception)
+          # end
 
           message.ack if ack
         end
@@ -34,4 +34,4 @@ module Superbolt
       end
     end
   end
-end
+end

data/lib/superbolt/runner/pop.rb

@@ -4,20 +4,15 @@ module Superbolt
       attr_reader :message
 
       def run
-        EventMachine.add_periodic_timer(0.01) do
-          next unless queue.message_count > 0
-
-
-          queue.pop do |delivery_info, metadata, payload|
-            @message = IncomingMessage.new(delivery_info, payload, channel)
-            processor = Processor.new(message, logger, &block)
-            unless processor.perform
-              on_error(message.parse, processor.exception) if message.parse
-            end
-            @message = nil
+        queue.subscribe(ack: false, block: true) do |delivery_info, metadata, payload|
+          @message = IncomingMessage.new(delivery_info, payload, channel)
+          processor = Processor.new(message, logger, &block)
+          unless processor.perform
+            on_error(message.parse, processor.exception) if message.parse
           end
+          @message = nil
         end
       end
     end
   end
-end
+end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.5.9" #possibly broken for file transfer :(
+  VERSION = "0.6.0" #possibly broken for file transfer :(
 end

data/spec/app_spec.rb

@@ -23,26 +23,33 @@ describe Superbolt::App do
     error_queue.clear
   end
 
+  after do
+    queue.clear
+    quit_queue.clear
+    error_queue.clear
+  end
 
   shared_examples 'app' do
-    it "shuts down with any message to the quit queue" do
-      queue.push({please: 'stop'})
-
-      app.run do |arguments|
-        quit_queue.push({message: 'just because'})
-      end
+    # it "shuts down with any message to the quit queue" do
+    #   queue.push({please: 'stop'})
+    #   app.run do |arguments|
+    #     quit_queue.push({message: 'just because'})
+    #   end
 
-      queue.size.should == 0
-      quit_queue.size.should == 0
-    end
+    #   queue.size.should == 0
+    #   quit_queue.size.should == 0
+    # end
 
     it 'passes messages to the block for processing' do
       queue.push({first: 1})
       queue.push({last: 2})
+      messages = []
 
       app.run do |message, logger|
         messages << message
-        quit_queue.push({message: 'quit'}) if message['last']
+        if messages.length > 1
+          app.quit
+        end
       end
 
       messages.size.should == 2
@@ -58,9 +65,10 @@ describe Superbolt::App do
 
       app.run do |message, logger|
         messages << message
-        quit_queue.push({message: 'quit'}) if message['last']
+        if messages.length > 1
+          app.quit
+        end
       end
-
       queue.size.should == 0
     end
 
@@ -79,44 +87,45 @@ describe Superbolt::App do
 
       app.run do |message, logger|
         logger.info(message)
-        quit_queue.push({message: 'stop!'})
+        # quit_queue.push({message: 'stop!'})
+        app.quit
       end
 
       message_received.should be_true
     end
 
     it "moves the message to an error queue if an exception is raised" do
+      pending "we will probably delete this test in favor of airbrake"
       queue.push({oh: 'noes'})
 
       app.run do |message|
-        quit_queue.push({message: 'halt thyself'})
+        # quit_queue.push({message: 'halt thyself'})
         raise "something went wrong"
       end
-
       queue.size.should == 0
       error_queue.size.should == 1
     end
   end
 
-  context 'when runner acknowledges one' do
+  context 'ACKONE: when runner acknowledges one' do
     let(:runner) { :ack_one }
 
     it_should_behave_like "app"
   end
 
-  context 'when runner acknowledges without a prefetch limit' do
+  context 'ACK: when runner acknowledges without a prefetch limit' do
     let(:runner) { :ack }
 
     it_should_behave_like 'app'
   end
 
-  context 'when runner does not acknowledge and has no limits' do
+  context 'GREEDY: when runner does not acknowledge and has no limits' do
     let(:runner) { :greedy }
 
     it_should_behave_like 'app'
   end
 
-  context 'when the runner pops without acknowledgment' do
+  context 'POP: when the runner pops without acknowledgment' do
     let(:runner) { :pop }
 
     it_should_behave_like "app"

data/spec/queue_spec.rb

@@ -40,7 +40,7 @@ describe 'Superbolt::Queue' do
       it "returns the message but leaves it in the queue" do
         queue.push(message)
         queue.peek.should == decoded
-        queue.size.should == 1 
+        queue.size.should == 1
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport