superbolt 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9edf5a20e4fe7b10dc3d4a0ce51ba6db321733a3
-  data.tar.gz: 8d46eb9f8f272c78813dadd3555831e130d02276
+  metadata.gz: 1f5e8511ce0d7491cf249678f90c650bdcbd78c0
+  data.tar.gz: 9e57a9143eb61aa617f2ae021a952f6ab5cf0143
 SHA512:
-  metadata.gz: 77c29a55feed037520f3f456a1a309b7750493296640ea46f71c3b3174de13223122c0f0f1c116c4db58dd2976f0c686d552b69f15b5dee48c817526540229ff
-  data.tar.gz: 019a6f7fff3af4a3b1d4543af28658d7c3ed5d620e09c9c2c99739c9af4ee75178638e87e00c07931f870212474ba07ff55b23da9834dfecb12792969d5a264b
+  metadata.gz: b03bdffeee9f4f2894b21486369990a2b8c919b5a4d75e319eb5d90b52baace03e1fc9bdc283b0615d5023a186e180e1ef41375226907675049024883aaa7a50
+  data.tar.gz: 27494bd318f971156714870eb6aca2213ecc3166440a5e47ce542de63740f30c543f632075e68a402a527e8199a75f98d239042340644f7990ed7532233b05b7

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 the Bunny gem.
+uses both the Bunny gem and the AMQP gem.
 
 #### Why not just use those gems?
 

data/lib/superbolt.rb

@@ -1,13 +1,15 @@
 require 'json'
 
 require 'bunny'
-require 'active_support/core_ext/module/delegation'
+require 'amqp'
 require 'eventmachine'
+require 'active_support/core_ext/module/delegation'
 
 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"

data/lib/superbolt/adapter/amqp.rb

@@ -0,0 +1,18 @@
+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/adapter/base.rb

@@ -5,7 +5,6 @@ module Superbolt
 
       def initialize(config=nil)
         @config = config || Superbolt.config
-        @channel = new_channel
       end
 
       delegate :closed?, :open, :open?,
@@ -17,6 +16,13 @@ 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,12 +8,8 @@ module Superbolt
         @socket
       end
 
-      def new_channel
-        socket.create_channel
-      end
-
-      def channel=(new_channel)
-        @channel = new_channel
+      def channel
+        @channel ||= socket.create_channel
       end
     end
   end

data/lib/superbolt/app.rb

@@ -19,7 +19,7 @@ module Superbolt
     end
 
     delegate :close, :closing, :exclusive?, :durable?, :auto_delete?,
-      :channel, :q,
+      :writer, :channel, :q,
         to: :connection
 
     def queue
@@ -40,7 +40,7 @@ module Superbolt
 
     def run(&block)
       EventMachine.run do
-        queue.subscribe(ack: false) do |metadata, properties,  payload|
+        queue.subscribe(ack: false) do |metadata, payload|
           message = IncomingMessage.new(metadata, payload, channel)
           processor = Processor.new(message, logger, &block)
           unless processor.perform
@@ -48,9 +48,8 @@ module Superbolt
           end
         end
 
-        quit_subscriber_queue.subscribe do |metadata, properties, payload|
-          parsed_payload = JSON.parse(payload)
-          quit(parsed_payload['message'])
+        quit_subscriber_queue.subscribe do |message|
+          quit(message)
         end
       end
     end

data/lib/superbolt/config.rb

@@ -1,11 +1,20 @@
 module Superbolt
   class Config
     attr_reader :options
+    attr_writer :app_name, :env
 
     def initialize(options={})
       @options = options
     end
 
+    def app_name
+      @app_name ||= options[:app_name]
+    end
+
+    def env
+      @env ||= options[:env]
+    end
+
     def connection_params
       env_params || default
     end

data/lib/superbolt/connection/app.rb

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

data/lib/superbolt/connection/base.rb

@@ -17,24 +17,16 @@ module Superbolt
       end
 
       def q
-        @q ||= channel.queue(name, self.class.default_options)
+        @q ||= connection.queue(name, self.class.default_options)
       end
 
       delegate :exclusive?, :durable?, :auto_delete?,
         to: :q
 
       def 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
+        connection.channel
       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
+        @connection ||= Adapter::Bunny.new(config)
       end
 
       def close
-        channel.close
-        @channel = nil
+        connection.close
+        @connection = nil
         @q = nil
       end
 
@@ -16,6 +16,11 @@ 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,7 +1,10 @@
 module Superbolt
   
   def self.config=(options)
-    @config = Config.new(options)
+    @config = Config.new({
+      env: env,
+      app_name: app_name
+    }.merge(options))
   end
 
   def self.config
@@ -24,5 +27,4 @@ module Superbolt
   def self.message(args={})
     Superbolt::Messenger.new(args)
   end
-  CONNECTION = Adapter::Bunny.new(config)
 end

data/lib/superbolt/messenger.rb

@@ -1,6 +1,6 @@
 module Superbolt
   class Messenger
-    attr_accessor :origin, :name, :event, :arguments, :env, :retry_time, :timeout, :live_queue
+    attr_accessor :origin, :name, :event, :arguments, :env
 
     def initialize(options={})
       @name = options.delete(:to)
@@ -8,8 +8,6 @@ module Superbolt
       @event = options.delete(:event) || self.class.defaultevent
       @env = Superbolt.env
       @arguments = options
-      @retry_time = Superbolt.config.options[:retry_time] || 10
-      @timeout = Superbolt.config.options[:timeout] || 60
     end
 
     def message
@@ -38,14 +36,6 @@ module Superbolt
       attr_chainer(:arguments, val)
     end
 
-    def retry_after(val=nil)
-      attr_chainer(:retry_time, val)
-    end
-
-    def timeout_after(val=nil)
-      attr_chainer(:timeout, val)
-    end
-
     def attr_chainer(attr, val)
       return send(attr) unless val
       self.send("#{attr}=", val)
@@ -60,12 +50,11 @@ module Superbolt
       queue.push(message)
     end
 
-
     def queue
       unless name
         raise "no destination app name defined, please pass one in"
       end
-      @live_queue = Queue.new(destination_name)
+      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?,
-    :channel, :q,
-    to: :connection
+      :writer, :channel, :q,
+        to: :connection
 
     def push(message)
       closing do
-        q.publish(message.to_json)
+        writer.publish(message.to_json, routing_key: name)
       end
     end
 
     def size
-      q.message_count
+      closing do
+        q.message_count
+      end
     end
 
     def clear
-      q.purge
+      closing do
+        q.purge
+      end
     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
@@ -58,15 +58,15 @@ module Superbolt
 
     def pop
       closing do
-        q.pop(ack: false) do |delivery_info, metadata, payload|
-          message = IncomingMessage.new(delivery_info, payload, channel) if payload
+        q.pop do |delivery_info, metadata, message|
+          message = IncomingMessage.new(delivery_info, message, channel)
           message && message.parse
         end
       end
     end
 
     delegate :slice, :[],
-    to: :all
+      to: :all
 
     def delete
       messages = []
@@ -79,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.3"
+  VERSION = "0.3.0"
 end

data/spec/app_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Superbolt::App do
   let(:env)         { 'test' }
   let(:name)        { 'superbolt' }
-  let(:logger)      { Logger.new("/dev/null") }
+  let(:logger)      { Logger.new('/dev/null') }
   let(:app)         {
                        Superbolt::App.new(name, {
                          env: env,
@@ -24,6 +24,7 @@ describe Superbolt::App do
   describe '#run' 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

data/spec/config_spec.rb

@@ -9,6 +9,23 @@ describe Superbolt::Config do
     {}
   }
 
+  describe 'non connection configuration' do
+    let(:options) {
+      {
+        app_name: 'my_great_app',
+        env: 'staging'
+      }
+    }
+
+    it "should make the app name available" do
+      config.app_name.should == 'my_great_app'
+    end
+
+    it "should make the env available" do
+      config.env.should == 'staging'
+    end
+  end
+
   describe '#connection' do
     context "environmental variables" do
       context 'default behavior' do
@@ -33,7 +50,9 @@ describe Superbolt::Config do
         let(:old_value) { ENV['SOMEOTHERURL'] }
         let(:url) { 'http://someother-url.com' }
         let(:options) {
-          {connection_key: 'SOMEOTHERURL'}
+          {
+            connection_key: 'SOMEOTHERURL'
+          }
         }
 
         before do

data/spec/connection_spec.rb

@@ -2,7 +2,6 @@ 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
@@ -10,15 +9,13 @@ describe Superbolt::Adapter::Bunny do
     connection.should be_open
   end
 
-  describe 'new_channel' do
-    it "creates a channel" do
-      connection.new_channel.should be_a Bunny::Channel
-    end
+  it "has a channel" do
+    connection.channel.should be_a Bunny::Channel
   end
 
   it "delegates queue creation to the channel" do
-    queue = channel.queue('changelica')
+    queue = connection.queue('changelica')
     queue.should be_a Bunny::Queue
-    channel.queues.keys.should include('changelica')
+    connection.queues.keys.should include('changelica')
   end
 end

data/spec/messenger_spec.rb

@@ -78,64 +78,11 @@ describe Superbolt::Messenger do
         messenger.data({foo: 'bar'})
         messenger.data.should == {foo: 'bar'}
       end
-
-      describe '#retry_time' do
-        before do
-          Superbolt.config.options[:retry_time] = nil
-        end
-
-        context 'config contains retry_time' do
-          it 'returns config value' do
-            Superbolt.config.options[:retry_time] = 12
-            messenger.retry_after.should == 12
-          end
-        end
-
-        context 'config does not contain retry_time but we pass it in' do
-          it 'returns passed in value' do
-            messenger.retry_after(11)
-            messenger.retry_after.should == 11
-          end
-        end
-
-        context 'config does not contain retry_time and we dont pass it in' do
-          it 'returns default value' do
-            messenger.retry_after.should == 10
-          end
-        end
-      end
-
-      describe '#retry_time' do
-        before do
-          Superbolt.config.options[:timeout] = nil
-        end
-
-        context 'config contains retry_time' do
-          it 'returns config value' do
-            Superbolt.config.options[:timeout] = 120
-            messenger.timeout_after.should == 120
-          end
-        end
-
-        context 'config does not contain retry_time but we pass it in' do
-          it 'returns passed in value' do
-            messenger.timeout_after(90)
-            messenger.timeout_after.should == 90
-          end
-        end
-
-        context 'config does not contain retry_time and we dont pass it in' do
-          it 'returns default value' do
-            messenger.timeout_after.should == 60
-          end
-        end
-      end
     end
   end
 
   describe 'send!' do
     before do
-      Superbolt.config.options[:retry_time] = 0
       messenger
         .to(name)
         .from('me')

data/spec/queue_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe 'Superbolt::Queue' do
   let(:name) { 'superbolt_test' }
+  let(:connection) { Superbolt::Connection.new }
   let(:queue) { Superbolt::Queue.new(name) }
   let(:messages) { [] }
 
@@ -22,12 +23,13 @@ describe 'Superbolt::Queue' do
   describe 'queue/array operations' do
     let(:message) { {hello: 'insomniacs'} }
     let(:message_two) { {:hello => 'early birds'} }
+
     let(:decoded) { {'hello' => 'insomniacs'} }
     let(:decoded_two) { {'hello' => 'early birds'} }
 
     describe '#push' do
       let(:bunny_queue) {connection.queue(name, Superbolt::Queue.default_options)}
-
+      
       it "writes to the queue" do
         queue.push(message)
         queue.size.should == 1
@@ -38,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
 
@@ -59,15 +61,19 @@ 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 and doesnt consume them" do
-        Superbolt::IncomingMessage.should_receive(:new).exactly(3).times.and_return(double('whatever', parse:true))
-        queue.all
+      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
         queue.size.should == 3
       end
     end
@@ -112,8 +118,8 @@ describe 'Superbolt::Queue' do
       end
 
       it "returns all messages where the block is true" do
-        messages = queue.delete{|json| json['i'] % 2 != 0 }
-        messages.map{|json| json['i']}.should == [1,3,5,7,9]
+        messages = queue.delete{|json| json['i'] > 2 && json['i'] != 6 && json['i'] < 8 }
+        messages.map{|json| json['i']}.should == [3,4,5,7]
       end
 
       it "removes those messages from the queue" do
@@ -124,8 +130,7 @@ describe 'Superbolt::Queue' do
   end
 
   describe 'errors cases' do
-    let(:new_queue) { Superbolt::Queue.new("superbolt_test") }
-    #{rand(1_000_000)}
+    let(:new_queue) { Superbolt::Queue.new("random.name.#{rand(1_000_000)}") }
 
     after do
       new_queue.clear

data/spec/superbolt_spec.rb

@@ -1,15 +1,31 @@
 require 'spec_helper'
 
 describe Superbolt, 'the facade' do
-  describe '.config' do
-    after do
-      Superbolt.instance_eval do
-        @config = nil
-      end
+  before do
+    Superbolt.instance_eval do
+      @config = nil
+    end
+  end
+    
+  describe 'total configuration' do
+    before do
+      Superbolt.app_name = 'bossanova'
+      Superbolt.env = 'production'
+      Superbolt.config = {
+        connection_key: 'SOME_RABBITMQ_URL'
+      }
+    end
+
+    it "should retain the configuration information" do
+      Superbolt.config.app_name.should == 'bossanova'
+      Superbolt.config.env.should == 'production'
+      Superbolt.config.env_connection_key.should == 'SOME_RABBITMQ_URL'
     end
+  end
 
-    it "stores the default" do
-      Superbolt.config.should == Superbolt::Config.new
+  describe '.config' do
+    it "has a default" do
+      Superbolt.config.should == Superbolt::Config.new({})
     end
 
     it "can be customized" do

data/superbolt.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport"
-  spec.add_dependency "bunny", "~> 1.0.5"
+  spec.add_dependency "amqp"
+  spec.add_dependency "bunny"
+  spec.add_dependency 'eventmachine'
 
   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.3
+  version: 0.3.0
 platform: ruby
 authors:
 - socialchorus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,41 +25,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: amqp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -108,6 +122,7 @@ 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
@@ -151,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Superbolt is a gem that makes SOA intra-app communication easy, via RabbitMQ