superbolt 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6156fe224308697980844511e2ab5b8a10979683
-  data.tar.gz: 5bb9ddb432a7fb6184c21d2e8158c314be2a757e
+  metadata.gz: e553aac5d606b63183b802cb08a07c43e2a04e9d
+  data.tar.gz: 06a774880b8b0f9164defd612b5212d28655adaa
 SHA512:
-  metadata.gz: 451095576178948ed0caae0d240ff3c59e92709b1aea62509b7ffedc04d07f6c5bd84f8f5552803ee041d556bce1327ba2943835aac25c16b898d442d27e9638
-  data.tar.gz: c148e78686e11cd817dc929951995937c75719e8848d37a1876a455c9346e3e3aa50b546f6ecaa7a98ddb39b8c152430b3763acc3f88bff84bc1b950840204fd
+  metadata.gz: 7de9c9e6a98e5609d9157e23edc4c542d81c6bf533f6dc79d2b7cd54f2c7875c6650edd05344b682e7f3f7fa9d607010a1e1211da81004ff38dd355ff4b1d7d1
+  data.tar.gz: 1f8f67313fa1b123a73de0975e1f090467bd610f8dcf56f02b2c66d35efe45d2a5f6abc09fe50798b42618aadc4befbc3ed543f2d6c4b9b096976c4a739a3875

data/README.md

@@ -222,12 +222,6 @@ the Superbolt app. Errors will be logged and the notification will be sent
 to the error notifier (none by default, can be airbrake) with information
 about the exception raised.
 
-The app can be shutdown gracefully by sending a quit message to a
-special queue:
-
-    quit_queue = Superbolt::App.new('dorothy_inbox').quit_queue
-    quit_queue.push(message: 'for a deploy')
-
 ## Error reporting
 
   `Superbolt::App` can hook into Airbrake by your command:

data/lib/superbolt.rb

@@ -1,6 +1,5 @@
 require 'json'
 
-require 'file_marshal'
 require 'bunny'
 require 'amqp'
 require 'eventmachine'
@@ -36,9 +35,6 @@ require "superbolt/app"
 require "superbolt/processor"
 require "superbolt/facade"
 require "superbolt/messenger"
-require "superbolt/file_manager"
-require "superbolt/file_unpacker"
-require "superbolt/file_packer"
 
 require "superbolt/spec_helpers"
 

data/lib/superbolt/app.rb

@@ -16,11 +16,6 @@ module Superbolt
       env ? "#{@name}_#{env}" : @name
     end
 
-    # just in case you have a handle to the app and want to quit it
-    def quit_queue
-      Queue.new("#{connection.name}.quit", connection.config)
-    end
-
     def connection
       @connection ||= Connection::Queue.new(name, config)
     end
@@ -33,15 +28,8 @@ module Superbolt
       connection.q
     end
 
-    def quit_subscriber_queue
-      connection.qq
-    end
-
     def run(&block)
       runner_class.new(queue, error_notifier, logger, block).run
-      # quit_subscriber_queue.subscribe do |message|
-      #    (message)
-      # end
     end
 
     def runner_class

data/lib/superbolt/connection/app.rb

@@ -9,11 +9,6 @@ module Superbolt
         connection.close(&block)
         @connection = nil
         @q = nil
-        @qq = nil
-      end
-
-      def qq
-        @qq ||= connection.queue("#{name}.quit", self.class.default_options)
       end
     end
   end

data/lib/superbolt/connection/queue.rb

@@ -22,10 +22,6 @@ 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/incoming_message.rb

@@ -9,8 +9,7 @@ module Superbolt
     end
 
     def parse
-      hash = JSON.parse(payload)
-      unpack_files(hash)
+      JSON.parse(payload)
     rescue JSON::ParserError
       payload
     end
@@ -22,11 +21,5 @@ module Superbolt
     def ack
       channel.acknowledge(tag)
     end
-
-    def unpack_files(hash)
-      return hash unless hash.is_a?(Hash) && hash["arguments"].is_a?(Hash)
-      hash['arguments'] = FileUnpacker.new(hash["arguments"]).perform
-      hash
-    end
   end
 end

data/lib/superbolt/messenger.rb

@@ -47,18 +47,9 @@ module Superbolt
 
     def send!(args=nil)
       self.arguments = args if args
-      pack_files
       queue.push(message)
     end
 
-    def pack_files
-      return unless arguments.is_a?(Hash)
-      file_keys = arguments.keys.find_all { |key| key.to_s.match(Superbolt.file_matcher) }
-      file_keys.each do |key|
-        arguments[key] = FileMarshal::Dumper.new(arguments[key]).to_hash
-      end
-    end
-
     def queue
       unless name
         raise "no destination app name defined, please pass one in"

data/lib/superbolt/runner/pg.rb

@@ -2,12 +2,20 @@ module Superbolt
   module Runner
     class Pg < AckOne
       def on_error(message, error)
-        if error == PG::UnableToSend || error == PG::ConnectionBad
-          ActiveRecord::Base.connection.reset!
+        if reconnect_after_error?(error)
+          ActiveRecord::Base.connection.reconnect!
         end
 
         super
       end
+
+      private
+
+      def reconnect_after_error?(error)
+        error.is_a?(ActiveRecord::StatementInvalid) and
+          error.message.start_with?("PG::UnableToSend") or
+          error.message.start_with?("PG::ConnectionBad")
+      end
     end
   end
 end

data/lib/superbolt/version.rb

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

data/spec/app_spec.rb

@@ -13,33 +13,17 @@ describe Superbolt::App do
   let(:name)        { 'superbolt' }
   let(:logger)      { Logger.new('/dev/null') }
   let(:queue)       { Superbolt::Queue.new("#{name}_#{env}") }
-  let(:quit_queue)  { Superbolt::Queue.new("#{name}_#{env}.quit") }
-  let(:error_queue) { Superbolt::Queue.new("#{name}_#{env}.error") }
   let(:messages)    { [] }
 
   before do
     queue.clear
-    quit_queue.clear
-    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
-
-    #   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})
@@ -88,11 +72,10 @@ describe Superbolt::App do
 
       app.run do |message, logger|
         logger.info(message)
-        # quit_queue.push({message: 'stop!'})
         app.quit
       end
 
-      message_received.should be_true
+      message_received.should eq true
     end
 
     context 'notifying errors' do

data/spec/config_spec.rb

@@ -18,7 +18,7 @@ describe Superbolt::Config do
     }
 
     it "should make the app name available" do
-      config.app_name.should == 'my_great_app'
+      expect(config.app_name).to eq 'my_great_app'
     end
 
     it "should make the env available" do

data/spec/incoming_message_spec.rb

@@ -19,18 +19,6 @@ describe Superbolt::IncomingMessage do
       it "parses it to a hash" do
         message.parse.should == {'some' => 'message'}
       end
-
-      context 'payload has a file' do
-        let(:payload) { { 'arguments' => {'some_file' => {'file_hash' => 'yup'}} }.to_json } 
-        let(:packer) { double('packer', perform: {'some_file' => 'some_file'} ) }
-        
-        it "uses FilePacker to rewrite files into a hash" do
-          Superbolt::FileUnpacker.should_receive(:new)
-            .with({'some_file' => {'file_hash' => 'yup'}})
-            .and_return(packer)
-          message.parse.should == {'arguments' => packer.perform}
-        end
-      end
     end
   end
 

data/spec/lib/superbolt/runner/pg_spec.rb

@@ -2,52 +2,45 @@ require 'spec_helper'
 
 module ActiveRecord
   class Base
-  end
-end
-
-module PG
-  class UnableToSend
-    def self.message
-      'oh noes'
+    def self.connection
+      @@connection
     end
 
-    def self.backtrace
-      'trace me'
+    @@connection = Class.new do
+      def self.reset!
+      end
     end
   end
 
-  class ConnectionBad
-    def self.message
-      'oh noes'
-    end
-
-    def self.backtrace
-      'trace me'
-    end
+  class StatementInvalid < StandardError
   end
 end
 
+PG_UNABLE_TO_SEND_ERROR = ActiveRecord::StatementInvalid.new("PG::UnableToSend: server closed the connection unexpectedly\n\tThis probably means the server terminated abnormally\n\tbefore or while processing the request.\n: SELECT  \"data_sources\".* FROM \"data_sources\"  WHERE \"data_sources\".\"program_id\" = 1 AND \"data_sources\".\"identifier\" = 'qz.com/feed'  ORDER BY \"data_sources\".\"id\" ASC LIMIT 1")
+
+PG_CONNECTION_BAD_ERROR = ActiveRecord::StatementInvalid.new("PG::ConnectionBad: PQsocket() can't get socket descriptor: BEGIN")
+
 describe "Superbolt::Runner::Pg" do
-  let(:runner) { Superbolt::Runner::Pg.new('berkin', Superbolt::ErrorNotifier::None.new, 'whatever', 'some block') }
-  let(:connection) { double('connection', reset!: true) }
+  subject(:runner) { Superbolt::Runner::Pg.new('berkin', Superbolt::ErrorNotifier::None.new, 'whatever', 'some block') }
 
-  before do
-    ActiveRecord::Base.stub(:connection).and_return(connection)
-  end
+  describe "#on_error" do
+    it "reconnects ActiveRecord when it gets PG::UnableToSend" do
+      expect(ActiveRecord::Base.connection).to receive(:reconnect!)
+      report_error(PG_UNABLE_TO_SEND_ERROR)
+    end
 
-  describe "on_error" do
-    context "PG::UnableToSend" do
-      it "should handle it" do
-        connection.should_receive(:reset!).and_return(true)
-        runner.on_error({message: 'somethig has gone very wrong'}, PG::UnableToSend)
-      end
+    it "reconnects ActiveRecord when it gets PG::ConnectionBad" do
+      expect(ActiveRecord::Base.connection).to receive(:reconnect!)
+      report_error(PG_CONNECTION_BAD_ERROR)
     end
 
-    context "PG::ConnectionBad " do
-      it "should handle it" do
-        connection.should_receive(:reset!).and_return(true)
-        runner.on_error({message: 'somethig has gone very wrong'}, PG::ConnectionBad)
-      end
+    it "doesn't reconnect for AR::StatementInvalid with a different message" do
+      expect(ActiveRecord::Base.connection).to_not receive(:reconnect!)
+      report_error(ActiveRecord::StatementInvalid.new("some other message"))
     end
   end
+
+  def report_error(exception)
+    runner.on_error({"superbolt_message_payload" => "hello"}, exception)
+  end
 end

data/spec/messenger_spec.rb

@@ -51,17 +51,12 @@ describe Superbolt::Messenger do
         messenger.re('zap')
         message[:event].should == 'zap'
       end
-
-      it "passes data to the message" do
-        messenger.data({foo: 'bar'})
-        message[:arguments].should == {foo: 'bar'}
-      end
     end
 
     context 'reading' do
       it '#to returns the name' do
         messenger.to('transducer')
-        messenger.to.should == 'transducer'
+        expect(messenger.to).to eq 'transducer'
       end
 
       it '#from returns the origin' do
@@ -82,8 +77,6 @@ describe Superbolt::Messenger do
   end
 
   describe 'send!' do
-    let(:image_file) { File.open(File.dirname(__FILE__) + '/support/commodore.jpg')}
-    
     before do
       messenger
         .to(name)
@@ -99,14 +92,5 @@ describe Superbolt::Messenger do
         'arguments' => 'none'
       }
     end
-
-    it "converts any values that have key ending in '_file' with FileMarshal" do
-      messenger.send!({
-        image_file: image_file
-      })
-
-      message = queue.pop
-      message['arguments']['image_file'].should be_a(Tempfile)
-    end
   end
 end

data/spec/queue_spec.rb

@@ -15,9 +15,9 @@ describe 'Superbolt::Queue' do
   end
 
   it "is setup with the right defaults" do
-    queue.exclusive?.should be_false
-    queue.durable?.should be_true
-    queue.auto_delete?.should be_false
+    queue.exclusive?.should eq false
+    queue.durable?.should eq true
+    queue.auto_delete?.should eq false
   end
 
   describe 'queue/array operations' do

data/superbolt.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "amqp"
   spec.add_dependency "bunny"
   spec.add_dependency 'eventmachine'
-  spec.add_dependency 'file_marshal'
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,20 +66,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: file_marshal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -147,9 +133,6 @@ files:
 - lib/superbolt/error_notifier/airbrake.rb
 - lib/superbolt/error_notifier/none.rb
 - lib/superbolt/facade.rb
-- lib/superbolt/file_manager.rb
-- lib/superbolt/file_packer.rb
-- lib/superbolt/file_unpacker.rb
 - lib/superbolt/incoming_message.rb
 - lib/superbolt/message_handler.rb
 - lib/superbolt/messenger.rb
@@ -170,8 +153,6 @@ files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
-- spec/file_packer_spec.rb
-- spec/file_unpacker_spec.rb
 - spec/incoming_message_spec.rb
 - spec/lib/superbolt/error_notifier/airbrake_spec.rb
 - spec/lib/superbolt/error_notifier/none_spec.rb
@@ -181,7 +162,6 @@ files:
 - spec/router_spec.rb
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
-- spec/support/commodore.jpg
 - spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb
 - superbolt.gemspec
@@ -205,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Superbolt is a gem that makes SOA intra-app communication easy, via RabbitMQ
@@ -213,8 +193,6 @@ test_files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
-- spec/file_packer_spec.rb
-- spec/file_unpacker_spec.rb
 - spec/incoming_message_spec.rb
 - spec/lib/superbolt/error_notifier/airbrake_spec.rb
 - spec/lib/superbolt/error_notifier/none_spec.rb
@@ -224,6 +202,5 @@ test_files:
 - spec/router_spec.rb
 - spec/spec_helper.rb
 - spec/superbolt_spec.rb
-- spec/support/commodore.jpg
 - spec/support/em_mocking.rb
 - spec/support/queue_helpers.rb

data/lib/superbolt/file_manager.rb

@@ -1,24 +0,0 @@
-module Superbolt
-  class FileManager
-    attr_reader :hash
-
-    def initialize(hash)
-      @hash = hash
-    end
-
-    def perform
-      file_keys.each do |key|
-        hash[key] = process_file(hash[key])
-      end
-      hash
-    end
-
-    def file_keys
-      @file_keys ||= hash.keys.find_all { |key| key.to_s.match(Superbolt.file_matcher) }
-    end
-
-    def process_file(arg)
-      raise NotImplementedError
-    end
-  end
-end

data/lib/superbolt/file_packer.rb

@@ -1,7 +0,0 @@
-module Superbolt
-  class FilePacker < FileManager
-    def process_file(file)
-      FileMarshal::Dumper.new(file).to_hash
-    end
-  end
-end

data/lib/superbolt/file_unpacker.rb

@@ -1,7 +0,0 @@
-module Superbolt
-  class FileUnpacker < FileManager
-    def process_file(file_hash)
-      FileMarshal::Loader.new(file_hash).tempfile
-    end
-  end
-end

data/spec/file_packer_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe Superbolt::FilePacker do
-  let(:packer) { Superbolt::FilePacker.new(hash) }
-
-  let(:hash) { 
-    { 
-      my_file: file,
-      foo: 'bar'
-    }
-  }
-
-  let(:dumper) { double('dumper', to_hash: {}) }
-
-  let(:file) { double('file') }
-  
-  describe '#perform' do
-    it "makes matching keys into a file hash via FileMarshal" do
-      FileMarshal::Dumper.should_receive(:new).with(file).and_return(dumper)
-      dumper.should_receive(:to_hash)
-      packer.perform.should == {
-        foo: 'bar',
-        my_file: {}
-      }
-    end
-  end
-end

data/spec/file_unpacker_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Superbolt::FileUnpacker do
-  let(:unpacker){ Superbolt::FileUnpacker.new(hash) }
-  let(:file) { File.open(File.dirname(__FILE__) + '/support/commodore.jpg')}
-  let(:file_hash) {
-    # back and forth in JSON required due to Time.parse issues
-    JSON.parse(FileMarshal::Dumper.new(file).to_hash.to_json)
-  }
-  let(:hash) { 
-    { 
-      my_file: file_hash,
-      foo: 'bar'
-    }
-  }
-
-  describe "#perform" do 
-    it "makes the keys matching the Superbolt.file_matcher" do
-      unpacker.perform[:my_file].should be_a Tempfile
-    end
-
-    it "leaves everything else alone" do
-      unpacker.perform[:foo].should == "bar"
-    end
-  end
-end