superbolt 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1ae682e276cb88e28fe0226a34506473ef92f0
-  data.tar.gz: 89c3df502b1f1a8de17d411686f40412fafdb670
+  metadata.gz: 9edf5a20e4fe7b10dc3d4a0ce51ba6db321733a3
+  data.tar.gz: 8d46eb9f8f272c78813dadd3555831e130d02276
 SHA512:
-  metadata.gz: 2846d21f6ffd39d49f7e93eab88c24c5baca3bd02fb7bede0e33d4d40e8eb413cb23ba973af0385fe3deb56d2314d258274f2d44da9789f7db3206fe7c513493
-  data.tar.gz: 47c71f8a760809c45d308bd973da1a72e154cb0ce36d4c58f368f258f84b74308de066b52817e093e6eea6f7671712e052775096e2e431fc499088d9cd18b436
+  metadata.gz: 77c29a55feed037520f3f456a1a309b7750493296640ea46f71c3b3174de13223122c0f0f1c116c4db58dd2976f0c686d552b69f15b5dee48c817526540229ff
+  data.tar.gz: 019a6f7fff3af4a3b1d4543af28658d7c3ed5d620e09c9c2c99739c9af4ee75178638e87e00c07931f870212474ba07ff55b23da9834dfecb12792969d5a264b

data/README.md

@@ -4,7 +4,7 @@
 
 Superbolt is an easy intra-app communication system for sending messages
 between applications. It is backed by RabbitMQ and under the covers it
-uses both the Bunny gem and the AMQP gem.
+uses the Bunny gem.
 
 #### Why not just use those gems?
 

data/lib/superbolt.rb

@@ -1,14 +1,13 @@
 require 'json'
 
 require 'bunny'
-require 'amqp'
 require 'active_support/core_ext/module/delegation'
+require 'eventmachine'
 
 require "superbolt/version"
 require "superbolt/config"
 require "superbolt/adapter/base"
 require "superbolt/adapter/bunny"
-require "superbolt/adapter/amqp"
 require "superbolt/connection/base"
 require "superbolt/connection/queue"
 require "superbolt/connection/app"
@@ -17,7 +16,6 @@ require "superbolt/incoming_message"
 require "superbolt/app"
 require "superbolt/processor"
 require "superbolt/facade"
-require "superbolt/message_ram"
 require "superbolt/messenger"
 require "superbolt/spec_helpers"
 

data/lib/superbolt/adapter/base.rb

@@ -5,6 +5,7 @@ module Superbolt
 
       def initialize(config=nil)
         @config = config || Superbolt.config
+        @channel = new_channel
       end
 
       delegate :closed?, :open, :open?,
@@ -16,13 +17,6 @@ module Superbolt
         @channel = nil
         response
       end
-
-      delegate :queues, :acknowledge, :reject, :queue,
-        to: :channel
-
-      def exchange
-        channel.default_exchange
-      end
     end
   end
 end

data/lib/superbolt/adapter/bunny.rb

@@ -8,8 +8,12 @@ module Superbolt
         @socket
       end
 
-      def channel
-        @channel ||= socket.create_channel
+      def new_channel
+        socket.create_channel
+      end
+
+      def channel=(new_channel)
+        @channel = new_channel
       end
     end
   end

data/lib/superbolt/app.rb

@@ -19,7 +19,7 @@ module Superbolt
     end
 
     delegate :close, :closing, :exclusive?, :durable?, :auto_delete?,
-      :writer, :channel, :q,
+      :channel, :q,
         to: :connection
 
     def queue

data/lib/superbolt/connection/app.rb

@@ -2,19 +2,19 @@ module Superbolt
   module Connection
     class App < Base
       def connection
-        @connection ||= Adapter::Bunny.new(config)
+        CONNECTION
       end
 
       def close(&block)
-        connection.close
-        @connection = nil
+        channel.close
+        @channel = nil
         @q = nil
         @qq = nil
         block.call
       end
 
       def qq
-        @qq ||= connection.queue("#{name}.quit", self.class.default_options)
+        @qq ||= channel.queue("#{name}.quit", self.class.default_options)
       end
     end
   end

data/lib/superbolt/connection/base.rb

@@ -17,16 +17,24 @@ module Superbolt
       end
 
       def q
-        @q ||= connection.queue(name, self.class.default_options)
+        @q ||= channel.queue(name, self.class.default_options)
       end
 
       delegate :exclusive?, :durable?, :auto_delete?,
         to: :q
 
       def channel
-        connection.channel
+        return @channel if @channel.try(:open?)
+        tries = 0
+        begin
+          @channel = connection.new_channel
+        rescue ::Bunny::CommandInvalid # only happens if a channel is already open
+          @channel.close
+          tries += 1
+          retry if tries < 2
+        end
       end
-
+            
       def self.default_options
         {
           :auto_delete => false,

data/lib/superbolt/connection/queue.rb

@@ -2,12 +2,12 @@ module Superbolt
   module Connection
     class Queue < Base
       def connection
-        @connection ||= Adapter::Bunny.new(config)
+        CONNECTION
       end
 
       def close
-        connection.close
-        @connection = nil
+        channel.close
+        @channel = nil
         @q = nil
       end
 
@@ -16,11 +16,6 @@ module Superbolt
         close
         response
       end
-
-      def writer
-        q # to make sure it is connected
-        connection.exchange
-      end
     end
   end
 end

data/lib/superbolt/facade.rb

@@ -1,4 +1,5 @@
 module Superbolt
+  
   def self.config=(options)
     @config = Config.new(options)
   end
@@ -23,4 +24,5 @@ module Superbolt
   def self.message(args={})
     Superbolt::Messenger.new(args)
   end
+  CONNECTION = Adapter::Bunny.new(config)
 end

data/lib/superbolt/incoming_message.rb

@@ -4,7 +4,7 @@ module Superbolt
 
     def initialize(delivery_info, payload, channel)
       @payload = payload
-      @tag = delivery_info.delivery_tag
+      @tag = delivery_info.delivery_tag if delivery_info
       @channel = channel
     end
 
@@ -14,8 +14,8 @@ module Superbolt
       payload
     end
 
-    def reject
-      channel.reject(tag)
+    def reject(requeue=true)
+      channel.reject(tag, requeue)
     end
 
     def ack

data/lib/superbolt/messenger.rb

@@ -1,6 +1,6 @@
 module Superbolt
   class Messenger
-    attr_accessor :origin, :name, :event, :arguments, :env, :retry_time, :timeout
+    attr_accessor :origin, :name, :event, :arguments, :env, :retry_time, :timeout, :live_queue
 
     def initialize(options={})
       @name = options.delete(:to)
@@ -57,18 +57,15 @@ module Superbolt
 
     def send!(args=nil)
       self.arguments = args if args
-      MessageRam.new(self, 'push_to_queue').besiege
-    end
-
-    def push_to_queue
       queue.push(message)
     end
 
+
     def queue
       unless name
         raise "no destination app name defined, please pass one in"
       end
-      Queue.new(destination_name)
+      @live_queue = Queue.new(destination_name)
     end
 
     def destination_name

data/lib/superbolt/queue.rb

@@ -12,36 +12,36 @@ module Superbolt
     end
 
     delegate :close, :closing, :exclusive?, :durable?, :auto_delete?,
-      :writer, :channel, :q,
-        to: :connection
+    :channel, :q,
+    to: :connection
 
     def push(message)
       closing do
-        writer.publish(message.to_json, routing_key: name)
+        q.publish(message.to_json)
       end
     end
 
     def size
-      closing do
-        q.message_count
-      end
+      q.message_count
     end
 
     def clear
-      closing do
-        q.purge
-      end
+      q.purge
     end
 
     # TODO: roll up some of these subscribe methods
 
     def read
+      current_size = size
       messages = []
       closing do
         q.subscribe(:ack => true) do |delivery_info, metadata, payload|
           message = IncomingMessage.new(delivery_info, payload, channel)
           messages << message
         end
+        while messages.length < current_size
+          true  
+        end
       end
       messages
     end
@@ -51,20 +51,22 @@ module Superbolt
     end
 
     def peek
-      all.first
+      message = pop
+      push(message)
+      message
     end
 
     def pop
       closing do
-        q.pop do |delivery_info, metadata, message|
-          message = IncomingMessage.new(delivery_info, message, channel)
+        q.pop(ack: false) do |delivery_info, metadata, payload|
+          message = IncomingMessage.new(delivery_info, payload, channel) if payload
           message && message.parse
         end
       end
     end
 
     delegate :slice, :[],
-      to: :all
+    to: :all
 
     def delete
       messages = []
@@ -77,11 +79,11 @@ module Superbolt
             message.ack
           end
         end
-
         # channel is closed by block before message ack can complete
         # therefore we must sleep :(
         sleep 0.02
       end
+
       messages
     end
   end

data/lib/superbolt/version.rb

@@ -1,3 +1,3 @@
 module Superbolt
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/spec/connection_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Superbolt::Adapter::Bunny do
   let(:connection) { Superbolt::Adapter::Bunny.new }
+  let(:channel) { connection.new_channel }
 
   it "has an underlying open connection via Bunny" do
     connection.socket.should be_a Bunny::Session
@@ -9,13 +10,15 @@ describe Superbolt::Adapter::Bunny do
     connection.should be_open
   end
 
-  it "has a channel" do
-    connection.channel.should be_a Bunny::Channel
+  describe 'new_channel' do
+    it "creates a channel" do
+      connection.new_channel.should be_a Bunny::Channel
+    end
   end
 
   it "delegates queue creation to the channel" do
-    queue = connection.queue('changelica')
+    queue = channel.queue('changelica')
     queue.should be_a Bunny::Queue
-    connection.queues.keys.should include('changelica')
+    channel.queues.keys.should include('changelica')
   end
 end

data/spec/queue_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 describe 'Superbolt::Queue' do
   let(:name) { 'superbolt_test' }
-  let(:connection) { Superbolt::Connection.new }
   let(:queue) { Superbolt::Queue.new(name) }
   let(:messages) { [] }
 
@@ -60,19 +59,15 @@ describe 'Superbolt::Queue' do
     end
 
     describe '#all' do
-      before do
+      before do 
         queue.push(message)
         queue.push(message)
         queue.push(message)
       end
 
-      it "returns all the messages on the queue" do
-        messages = queue.all
-        messages.size.should == 3
-        messages.uniq.should == [decoded]
-      end
-
-      it "does not consume the messages" do
+      it "returns all the messages on the queue and doesnt consume them" do
+        Superbolt::IncomingMessage.should_receive(:new).exactly(3).times.and_return(double('whatever', parse:true))
+        queue.all
         queue.size.should == 3
       end
     end
@@ -117,8 +112,8 @@ describe 'Superbolt::Queue' do
       end
 
       it "returns all messages where the block is true" do
-        messages = queue.delete{|json| json['i'] > 2 && json['i'] != 6 && json['i'] < 8 }
-        messages.map{|json| json['i']}.should == [3,4,5,7]
+        messages = queue.delete{|json| json['i'] % 2 != 0 }
+        messages.map{|json| json['i']}.should == [1,3,5,7,9]
       end
 
       it "removes those messages from the queue" do

data/superbolt.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "amqp"
-  spec.add_dependency "bunny", "~> 0.9.0.rc1"
+  spec.add_dependency "bunny", "~> 1.0.5"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "eventmachine"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: superbolt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,34 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: amqp
-  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: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc1
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.0.rc1
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Superbolt is comprised of a standalone app, and a queue-like queue for
   sending messages between services and applications.
 email:
@@ -108,7 +108,6 @@ files:
 - README.md
 - Rakefile
 - lib/superbolt.rb
-- lib/superbolt/adapter/amqp.rb
 - lib/superbolt/adapter/base.rb
 - lib/superbolt/adapter/bunny.rb
 - lib/superbolt/app.rb
@@ -118,7 +117,6 @@ files:
 - lib/superbolt/connection/queue.rb
 - lib/superbolt/facade.rb
 - lib/superbolt/incoming_message.rb
-- lib/superbolt/message_ram.rb
 - lib/superbolt/messenger.rb
 - lib/superbolt/processor.rb
 - lib/superbolt/queue.rb
@@ -127,7 +125,6 @@ files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
-- spec/message_ram_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/spec_helper.rb
@@ -154,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Superbolt is a gem that makes SOA intra-app communication easy, via RabbitMQ
@@ -162,7 +159,6 @@ test_files:
 - spec/app_spec.rb
 - spec/config_spec.rb
 - spec/connection_spec.rb
-- spec/message_ram_spec.rb
 - spec/messenger_spec.rb
 - spec/queue_spec.rb
 - spec/spec_helper.rb

data/lib/superbolt/adapter/amqp.rb

@@ -1,18 +0,0 @@
-module Superbolt
-  module Adapter
-    class AMQP < Base
-      def socket
-        @socket ||= ::AMQP.connect(config.connection_params)
-      end
-
-      def channel
-        @channel ||= ::AMQP::Channel.new(socket)
-      end
-
-      def close(&block)
-        socket.close(&block)
-      end
-    end
-  end
-end
-

data/lib/superbolt/message_ram.rb

@@ -1,31 +0,0 @@
-module Superbolt
-  class MessageRam
-    attr_reader :messenger, :method_name
-    attr_accessor :run_time
-    def initialize(messenger, method_name)
-      @messenger = messenger
-      @method_name = method_name
-      @run_time = 0
-    end
-
-    def besiege
-      messenger.send(method_name)
-    rescue => e
-      puts "Something went wrong: #{e}"
-      puts "=========================="
-      puts "Continuing the siege in #{messenger.retry_time} seconds...\n"
-      sleep(messenger.retry_time)
-      retreat(e) if retreat?
-      besiege
-    end
-
-    def retreat?
-      @run_time += messenger.retry_time
-      run_time >= messenger.timeout
-    end
-
-    def retreat(error)
-      raise error
-    end
-  end
-end

data/spec/message_ram_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-
-describe Superbolt::MessageRam do
-  let(:error_class) { Exception }
-  let(:messenger) { double(
-    retry_time: 1,
-    timeout: 5
-  )}
-  let(:ram) { Superbolt::MessageRam.new(messenger, :some_method ) }
-
-  before do
-    messenger.should_receive(:some_method).ordered.and_raise('Some Error')
-  end
-
-  context "failed to open connection" do
-    before do
-      expect(messenger)
-      .to receive(:some_method).ordered
-          .and_return(true)
-    end
-
-    it 'should raise no errors' do
-      expect {
-        ram.besiege
-      }.to_not raise_error
-    end
-
-    it "retries on a configured interval" do
-      ram.besiege.should == true
-    end
-  end
-
-  context 'it runs out of time' do
-    before do
-      ram.run_time = 6
-    end
-    it 'should raise error' do
-      expect {
-        ram.besiege
-      }.to raise_error(Exception)
-    end
-  end
-end