action_subscriber 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a9be445a43340a38817ee6efe76c6c3063dcca4
-  data.tar.gz: 4f33caa19d68cfcf1e8b2b6732e3e82e5396ea5e
+  metadata.gz: 102687ae41f4f249b2ab5b0ec31dacf113ba7524
+  data.tar.gz: ccd09cd67af23fb625d8a81bdfae9480ce31b5e6
 SHA512:
-  metadata.gz: 1a7b01e0746d3266a66fb1487b6ea495ea9cfa13553df1d91cb7b27173bff2e61627c893bdd9cbe44ff5391d1623f73cb781afb2675e060a2d8b728b9713cdda
-  data.tar.gz: e7df2fa7ffa73affb739a4fa9f7f5b2d0abd093fd58638c610b3bc783a1f9a1ad5ef7d14473c9777e84424a575a029d2440788e7b715c05a2f9c4f71385bb766
+  metadata.gz: c5b1384dac0a211fea7d582547a912d6206f18409256ac10e0ed0a544190bf56cc55467924c7db373fe5e0865126ff14695dcd7f4e02da7210f649db6ccdd637
+  data.tar.gz: 384052e8b79236ab615c4c2ab34bb605884800fb6bc062b2776cbe6883265389eebbeed7306c959896a7fdcfb8d8b9a993c209cc671dc4e50885123f222be3e2

data/.travis.yml

@@ -1,12 +1,17 @@
 language: ruby
 rvm:
- - 1.9
  - 2.0
  - 2.1
  - 2.2
  - jruby
+ - jruby-1.7
  - jruby-head
+ - rbx-2
 services:
  - rabbitmq
 sudo: false
 cache: bundler
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: rbx-2

data/README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/moneydesktop/action_subscriber.svg?branch=master)](https://travis-ci.org/moneydesktop/action_subscriber)
 [![Code Climate](https://codeclimate.com/github/moneydesktop/action_subscriber/badges/gpa.svg)](https://codeclimate.com/github/moneydesktop/action_subscriber)
 [![Dependency Status](https://gemnasium.com/moneydesktop/action_subscriber.svg)](https://gemnasium.com/moneydesktop/action_subscriber)
+[![Join the chat at https://gitter.im/moneydesktop/action_subscriber](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/moneydesktop/action_subscriber?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ActionSubscriber
 =================

data/action_subscriber.gemspec

@@ -4,19 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'action_subscriber/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "action_subscriber"
-  spec.version       = ActionSubscriber::VERSION
-  spec.authors       = ["Brian Stien","Adam Hutchison","Brandon Dewitt","Devin Christensen","Michael Ries"]
-  spec.email         = ["brianastien@gmail.com","liveh2o@gmail.com","brandonsdewitt@gmail.com","quixoten@gmail.com","michael@riesd.com"]
-  spec.description   = %q{ActionSubscriber is a DSL that allows a rails app to consume messages from a RabbitMQ broker.}
-  spec.summary       = %q{ActionSubscriber is a DSL that allows a rails app to consume messages from a RabbitMQ broker.}
-  spec.homepage      = "https://github.com/moneydesktop/action_subscriber"
-  spec.license       = "MIT"
+  spec.name                  = "action_subscriber"
+  spec.version               = ActionSubscriber::VERSION
+  spec.authors               = ["Brian Stien","Adam Hutchison","Brandon Dewitt","Devin Christensen","Michael Ries"]
+  spec.email                 = ["brianastien@gmail.com","liveh2o@gmail.com","brandonsdewitt@gmail.com","quixoten@gmail.com","michael@riesd.com"]
+  spec.description           = %q{ActionSubscriber is a DSL that allows a rails app to consume messages from a RabbitMQ broker.}
+  spec.summary               = %q{ActionSubscriber is a DSL that allows a rails app to consume messages from a RabbitMQ broker.}
+  spec.homepage              = "https://github.com/moneydesktop/action_subscriber"
+  spec.license               = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files                 = `git ls-files`.split($/)
+  spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths         = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.0")
 
   spec.add_dependency 'activesupport', '>= 3.2'
 

data/lib/action_subscriber/base.rb

@@ -32,7 +32,7 @@ module ActionSubscriber
     #
 
     def self.connection
-      ::ActionSubscriber::RabbitConnection.connection
+      ::ActionSubscriber::RabbitConnection.subscriber_connection
     end
 
     # Inherited callback, save a reference to our descendents

data/lib/action_subscriber/default_routing.rb

@@ -8,7 +8,7 @@ module ActionSubscriber
       queue_name = queue_name_for_method(method_name)
       routing_key_name = routing_key_name_for_method(method_name)
 
-      channel = ::ActionSubscriber::RabbitConnection.connection.create_channel
+      channel = connection.create_channel
       exchange = channel.topic(exchange_name)
       queue = channel.queue(queue_name)
       queue.bind(exchange, :routing_key => routing_key_name)

data/lib/action_subscriber/rabbit_connection.rb

@@ -2,29 +2,63 @@ require 'thread'
 
 module ActionSubscriber
   module RabbitConnection
-    CONNECTION_MUTEX = ::Mutex.new
-
-    def self.connect!
-      CONNECTION_MUTEX.synchronize do
-        return @connection if @connection
-        if ::RUBY_PLATFORM == "java"
-          @connection = ::MarchHare.connect(connection_options)
-        else
-          @connection = ::Bunny.new(connection_options)
-          @connection.start
+    SUBSCRIBER_CONNECTION_MUTEX = ::Mutex.new
+    PUBLISHER_CONNECTION_MUTEX = ::Mutex.new
+
+    def self.publisher_connected?
+      publisher_connection.try(:connected?)
+    end
+
+    def self.publisher_connection
+      SUBSCRIBER_CONNECTION_MUTEX.synchronize do
+        return @publisher_connection if @publisher_connection
+        @publisher_connection = create_connection
+      end
+    end
+
+    def self.publisher_disconnect!
+      SUBSCRIBER_CONNECTION_MUTEX.synchronize do
+        if @publisher_connection && @publisher_connection.connected?
+          @publisher_connection.close
         end
-        @connection
+
+        @publisher_connection = nil
       end
     end
 
-    def self.connected?
-      connection && connection.connected?
+    def self.subscriber_connected?
+      subscriber_connection.try(:connected?)
     end
 
-    def self.connection
-      connect!
+    def self.subscriber_connection
+      SUBSCRIBER_CONNECTION_MUTEX.synchronize do
+        return @subscriber_connection if @subscriber_connection
+        @subscriber_connection = create_connection
+      end
     end
 
+    def self.subscriber_disconnect!
+      SUBSCRIBER_CONNECTION_MUTEX.synchronize do
+        if @subscriber_connection && @subscriber_connection.connected?
+          @subscriber_connection.close
+        end
+
+        @subscriber_connection = nil
+      end
+    end
+
+    # Private API
+    def self.create_connection
+      if ::RUBY_PLATFORM == "java"
+        connection = ::MarchHare.connect(connection_options)
+      else
+        connection = ::Bunny.new(connection_options)
+        connection.start
+        connection
+      end
+    end
+    private_class_method :create_connection
+
     def self.connection_options
       {
         :heartbeat                     => ::ActionSubscriber.configuration.heartbeat,
@@ -36,15 +70,6 @@ module ActionSubscriber
         :recover_from_connection_close => true,
       }
     end
-
-    def self.disconnect!
-      CONNECTION_MUTEX.synchronize do
-        if @connection && @connection.connected?
-          @connection.close
-        end
-
-        @connection = nil
-      end
-    end
+    private_class_method :connection_options
   end
 end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/integration/around_filters_spec.rb

@@ -31,8 +31,9 @@ describe "subscriber filters", :integration => true do
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish("hEY Guyz!", :routing_key => "insta.first")
-    sleep 0.1
 
-    expect($messages).to eq [:whisper_before, :yell_before, "hEY Guyz!", :yell_after, :whisper_after]
+    verify_expectation_within(1.0) do
+      expect($messages).to eq [:whisper_before, :yell_before, "hEY Guyz!", :yell_after, :whisper_after]
+    end
   end
 end

data/spec/integration/at_least_once_spec.rb

@@ -16,8 +16,9 @@ describe "at_least_once! mode", :integration => true do
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish("GrumpFace", :routing_key => "gorby_puff.grumpy")
-    sleep 0.1
 
-    expect($messages).to eq Set.new(["GrumpFace::0","GrumpFace::1","GrumpFace::2"])
+    verify_expectation_within(1.0) do
+      expect($messages).to eq Set.new(["GrumpFace::0","GrumpFace::1","GrumpFace::2"])
+    end
   end
 end

data/spec/integration/at_most_once_spec.rb

@@ -16,8 +16,9 @@ describe "at_most_once! mode", :integration => true do
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish("All Pokemon have been caught", :routing_key => "pokemon.caught_em_all")
-    sleep 0.1
 
-    expect($messages.size).to eq 1
+    verify_expectation_within(1.0) do
+      expect($messages.size).to eq 1
+    end
   end
 end

data/spec/integration/automatic_reconnect_spec.rb

@@ -16,15 +16,22 @@ describe "Automatically reconnect on connection failure", :integration => true,
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish("First", :routing_key => "gus.spoke")
-    sleep 0.1
+    verify_expectation_within(5.0) do
+      expect($messages).to eq(Set.new(["First"]))
+    end
 
     close_all_connections!
-    sleep_until_reconnected
+    sleep 5.0
+    verify_expectation_within(5.0) do
+      expect(connection).to be_open
+    end
 
+    channel = connection.create_channel
+    exchange = channel.topic("events")
     exchange.publish("Second", :routing_key => "gus.spoke")
-    sleep 0.1
-
-    expect($messages).to eq(Set.new(["First", "Second"]))
+    verify_expectation_within(5.0) do
+      expect($messages).to eq(Set.new(["First", "Second"]))
+    end
   end
 
   def close_all_connections!
@@ -32,12 +39,4 @@ describe "Automatically reconnect on connection failure", :integration => true,
       http_client.close_connection(conn_info.name)
     end
   end
-
-  def sleep_until_reconnected
-    100.times do
-      sleep 0.1
-      break if connection.open?
-    end
-    sleep 0.2
-  end
 end

data/spec/integration/basic_subscriber_spec.rb

@@ -25,11 +25,11 @@ describe "A Basic Subscriber", :integration => true do
       exchange = channel.topic("events")
       exchange.publish("Ohai Booked", :routing_key => "greg.basic_push.booked")
       exchange.publish("Ohai Cancelled", :routing_key => "basic.cancelled")
-      sleep 0.1
 
-      ::ActionSubscriber.auto_pop!
-
-      expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+      verify_expectation_within(2.0) do
+        ::ActionSubscriber.auto_pop!
+        expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+      end
     end
   end
 
@@ -40,9 +40,10 @@ describe "A Basic Subscriber", :integration => true do
       exchange = channel.topic("events")
       exchange.publish("Ohai Booked", :routing_key => "greg.basic_push.booked")
       exchange.publish("Ohai Cancelled", :routing_key => "basic.cancelled")
-      sleep 0.1
 
-      expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+      verify_expectation_within(2.0) do
+        expect($messages).to eq(Set.new(["Ohai Booked", "Ohai Cancelled"]))
+      end
     end
   end
 end

data/spec/integration/decoding_payloads_spec.rb

@@ -18,12 +18,13 @@ describe "Payload Decoding", :integration => true do
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish(json_string, :routing_key => "twitter.tweet", :content_type => "application/json")
-    sleep 0.1
 
-    expect($messages).to eq Set.new([{
-      :decoded => JSON.parse(json_string),
-      :raw => json_string,
-    }])
+    verify_expectation_within(2.0) do
+      expect($messages).to eq Set.new([{
+        :decoded => JSON.parse(json_string),
+        :raw => json_string,
+      }])
+    end
   end
 
   context "Custom Decoder" do
@@ -37,12 +38,13 @@ describe "Payload Decoding", :integration => true do
       channel = connection.create_channel
       exchange = channel.topic("events")
       exchange.publish(json_string, :routing_key => "twitter.tweet", :content_type => content_type)
-      sleep 0.1
 
-      expect($messages).to eq Set.new([{
-        :decoded => :foo,
-        :raw => json_string,
-      }])
+      verify_expectation_within(2.0) do
+        expect($messages).to eq Set.new([{
+          :decoded => :foo,
+          :raw => json_string,
+        }])
+      end
     end
   end
 end

data/spec/integration/manual_acknowledgement_spec.rb

@@ -20,8 +20,9 @@ describe "Manual Message Acknowledgment", :integration => true do
     channel = connection.create_channel
     exchange = channel.topic("events")
     exchange.publish("BACON!", :routing_key => "bacon.served")
-    sleep 0.1
 
-    expect($messages).to eq(Set.new(["BACON!::0", "BACON!::1", "BACON!::2"]))
+    verify_expectation_within(2.0) do
+      expect($messages).to eq(Set.new(["BACON!::0", "BACON!::1", "BACON!::2"]))
+    end
   end
 end

data/spec/spec_helper.rb

@@ -20,13 +20,27 @@ RSpec.configure do |config|
 
   config.before(:each, :integration => true) do
     $messages = Set.new
-    ::ActionSubscriber::RabbitConnection.connect!
+    ::ActionSubscriber::RabbitConnection.subscriber_connection
     ::ActionSubscriber.setup_queues!
   end
   config.after(:each, :integration => true) do
-    ::ActionSubscriber::RabbitConnection.disconnect!
+    ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
     ::ActionSubscriber::Base.inherited_classes.each do |klass|
       klass.instance_variable_set("@_queues", nil)
     end
   end
 end
+
+def verify_expectation_within(number_of_seconds, check_every = 0.02)
+  waiting_since = ::Time.now
+  begin
+    sleep check_every
+    yield
+  rescue RSpec::Expectations::ExpectationNotMetError => e
+    if ::Time.now - waiting_since > number_of_seconds
+      raise e
+    else
+      retry
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from