superbolt 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234d0975ce1b95e327ebefdd7f023a3ae9e36864
-  data.tar.gz: 86187f0b44f54b22365dfab163d5384036e1a670
+  metadata.gz: 415111f64ddbfb854cc45718278e4d04dcc9629d
+  data.tar.gz: 1c5b6f516d6b51a2b217d9288f64281ed40098d2
 SHA512:
-  metadata.gz: f9d41cf6285e5b4853813eed6befe9c150cf83efbab3c882cd2c162a6edf7ab99ffa52611a75d38b898fc69ff76db3d27427bb6de8ff106ce9f09d45a2a053c3
-  data.tar.gz: 66f8359c9a4b88ab9997c2c1ea66d1281fd51f9a857777b102e63fc9f1b3d3a6e078e726441ffdb01bd628d8b21f873e58491c8064442e404b414cb8afd98b64
+  metadata.gz: b007c47e99e43af1d766eb72ae36c64c9dd0a95d85b3702551151253e1f7ac3c50f1a2fd7d0c39e4ed61e999fd2106ce3585e24ee0e410a764bda42f257b2c19
+  data.tar.gz: 5de3ea41e8724daf828d2038137ab7840c73ccaf3235da65c91d06560f4167a477714929935b61f35eb15c16249863e5c4521de5e72dac18b0d9446fac84f840

data/Rakefile

@@ -1 +1,23 @@
 require "bundler/gem_tasks"
+require "superbolt/tasks"
+
+
+# This one is for locally testing your crazy ideas
+task :environment do
+  class MySleeperCell < Superbolt::MessageHandler
+    def perform
+      sleep(rand(10))
+    end
+  end
+
+  Superbolt.config = {
+    connection_params: {
+      host: '127.0.0.1',
+      heartbeat: 1,
+    }
+  }
+  Superbolt.app_name = 'food'
+  Superbolt::Router.routes = {
+    'do-it' => 'MySleeperCell'
+  }
+end

data/lib/superbolt/app.rb

@@ -7,8 +7,8 @@ module Superbolt
       @name = name
       @env =            options[:env] || Superbolt.env
       @logger =         options[:logger] || Logger.new($stdout)
-      @runner_type =    options[:runner] || :default
       @config =         options[:config] || Superbolt.config
+      @runner_type =    options[:runner] || :default
     end
 
     def name
@@ -25,7 +25,7 @@ module Superbolt
     end
 
     def connection
-      @connection ||= Connection::App.new(name, config)
+      @connection ||= Connection::Queue.new(name, config)
     end
 
     delegate :close, :closing, :exclusive?, :durable?, :auto_delete?,
@@ -42,15 +42,6 @@ module Superbolt
 
     def run(&block)
       EventMachine.run do
-        queue.channel.auto_recovery = true
-
-        # LShift came up with this solution, which helps reconnect when 
-        # a process runs longer than the heartbeat (and therefore disconnects)
-        queue.channel.connection.on_tcp_connection_loss do |conn, settings|
-          puts 'Lost TCP connection, reconnecting'
-          conn.reconnect(false, 2)
-        end
-
         runner_class.new(queue, error_queue, logger, block).run
 
         quit_subscriber_queue.subscribe do |message|

data/lib/superbolt/connection/queue.rb

@@ -5,8 +5,9 @@ module Superbolt
         @connection ||= Adapter::Bunny.new(config)
       end
 
-      def close
+      def close(&block)
         connection.close
+        block.call if block
         @connection = nil
         @q = nil
       end
@@ -21,6 +22,10 @@ module Superbolt
         q # to make sure it is connected
         connection.exchange
       end
+
+      def qq
+        @qq ||= connection.queue("#{name}.quit", self.class.default_options)
+      end
     end
   end
 end

data/lib/superbolt/router.rb

@@ -21,7 +21,7 @@ module Superbolt
 
     def perform
       if handler_class
-        handler_class.new(arguments, logger).perform 
+        handler_class.new(arguments, logger).perform
       else
         logger.warn "No Superbolt route for event: '#{event}'"
       end

data/lib/superbolt/runner/default.rb

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

data/lib/superbolt/runner/pop.rb

@@ -2,17 +2,17 @@ module Superbolt
   module Runner
     class Pop < Base
       attr_reader :message
-    
+
       def run
         EventMachine.add_periodic_timer(0.01) do
-          next if message
+          next unless queue.message_count > 0
 
-          queue.pop do |metadata, payload|
-            @message = IncomingMessage.new(metadata, payload, channel)
-            processor = Processor.new(message, logger, &block)
 
+          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)
+              on_error(message.parse, processor.exception) if message.parse
             end
             @message = nil
           end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/lib/tasks/superbolt.rake

@@ -1,7 +1,7 @@
 # assumes an environment task that sets up your app environment
 desc "worker that reads the queue and sends messages through the router as configured"
 task :superbolt => :environment do
-  Superbolt::App.new(Superbolt.app_name).run do |message, logger|
+  Superbolt::App.new(Superbolt.app_name, {}).run do |message, logger|
     Superbolt::Router.new(message, logger).perform
   end
 end

data/spec/app_spec.rb

@@ -5,7 +5,7 @@ describe Superbolt::App do
     Superbolt::App.new(name, {
       env: env,
       logger: logger,
-      runner: runner_type
+      config: double('config', runner_type: runner_type, connection_params: true)
     })
   }
 
@@ -23,6 +23,7 @@ describe Superbolt::App do
     error_queue.clear
   end
 
+
   shared_examples 'app' do
     it "shuts down with any message to the quit queue" do
       queue.push({please: 'stop'})
@@ -63,7 +64,6 @@ describe Superbolt::App do
       queue.size.should == 0
     end
 
-
     it "passes a logger to the block" do
       mock_logger = double
       app.logger = mock_logger

data/spec/support/em_mocking.rb

@@ -0,0 +1,9 @@
+module EM
+  def self.defer(&block)
+    block.call
+  end
+
+  def self.next_tick(&block)
+    block.call
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -176,6 +176,7 @@ files:
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
 - spec/support/commodore.jpg
+- spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb
 - superbolt.gemspec
 homepage: ''
@@ -198,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Superbolt is a gem that makes SOA intra-app communication easy, via RabbitMQ
@@ -215,5 +216,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
 - spec/support/commodore.jpg
+- spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb
-has_rdoc: