action_subscriber 1.1.1-java → 1.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e32c3b5817aba153c54f3fcbadaa3091f8b64f64
-  data.tar.gz: 22f1904111089d88355560514e9e950a3a945e81
+  metadata.gz: d8ac8ca1abfdea9c1287f1ab1a3eb0f4cb87202e
+  data.tar.gz: 4aa07506925ccece2a22b7ef791440b16dbaa296
 SHA512:
-  metadata.gz: 5c4506c7523b167c80b3e8b5fd3461d756b178484fca2cc9d063047ab02fdfc3bb6d6d7b06c35d3606990050906257cfc918a79fb206089b13c0f7c2f1af10cd
-  data.tar.gz: d883ce7283959c1b5670704d07bf9334110b09e68dd8f15e2e2574fd5afe30dd97187c29a8defe2c6e88b36c4a08674ceff44a0d1f0209186353378c99909782
+  metadata.gz: b2c368899041edc7e2a7fae22f57b99395999ec1e4ce36e71d55f207151c412b8813769556cb9ed570353c22f7a708d36d2a8f13c495cabe745ebeff1686621b
+  data.tar.gz: 3067a218566272a88497743de4a01ebb314a65af374f21943850d3077e9ff4d5270752eb9bedae848f00983e0d6289e1a4a810fee6f987627fcaa84aea85112c

data/lib/action_subscriber.rb

@@ -20,6 +20,7 @@ require "action_subscriber/subscribable"
 require "action_subscriber/bunny/subscriber"
 require "action_subscriber/march_hare/subscriber"
 require "action_subscriber/babou"
+require "action_subscriber/publisher"
 require "action_subscriber/threadpool"
 require "action_subscriber/base"
 
@@ -92,3 +93,7 @@ module ActionSubscriber
 end
 
 require "action_subscriber/railtie" if defined?(Rails)
+
+at_exit do
+  ::ActionSubscriber::RabbitConnection.publisher_disconnect!
+end

data/lib/action_subscriber/configuration.rb

@@ -11,11 +11,12 @@ module ActionSubscriber
                   :pop_interval,
                   :port,
                   :prefetch,
+                  :publisher_confirms,
                   :threadpool_size,
                   :timeout,
                   :times_to_pop
 
-    DEFAULTS = { 
+    DEFAULTS = {
       :allow_low_priority_methods => false,
       :default_exchange => 'events',
       :heartbeat => 5,
@@ -25,6 +26,7 @@ module ActionSubscriber
       :pop_interval => 100, # in milliseconds
       :port => 5672,
       :prefetch => 200,
+      :publisher_confirms => false,
       :threadpool_size => 8,
       :timeout => 1,
       :times_to_pop => 8
@@ -51,7 +53,6 @@ module ActionSubscriber
     ##
     # Instance Methods
     #
-
     def initialize
       self.decoder = {
         'application/json' => lambda { |payload| JSON.parse(payload) },

data/lib/action_subscriber/publisher.rb

@@ -0,0 +1,44 @@
+module ActionSubscriber
+  module Publisher
+    # Publish a message to RabbitMQ
+    #
+    # @param [String] route The routing key to use for this message.
+    # @param [String] payload The message you are sending. Should already be encoded as a string.
+    # @param [String] exchange The exchange you want to publish to.
+    # @param [Hash] options hash to set message parameters (e.g. headers)
+    def self.publish(route, payload, exchange_name, options = {})
+      with_exchange(exchange_name) do |exchange|
+        exchange.publish(payload, publishing_options(route, options))
+      end
+    end
+
+    def self.with_exchange(exchange_name)
+      connection = RabbitConnection.publisher_connection
+      channel = connection.create_channel
+      begin
+        channel.confirm_select if ActionSubscriber.configuration.publisher_confirms
+        exchange = channel.topic(exchange_name)
+        yield(exchange)
+        channel.wait_for_confirms if ActionSubscriber.configuration.publisher_confirms
+      ensure
+        channel.close rescue nil
+      end
+    end
+
+    def self.publishing_options(route, options = {})
+      options[:mandatory] = false unless options.key(:mandatory)
+      options[:persistent] = false unless options.key(:persistent)
+      options[:routing_key] = route
+
+      if ::RUBY_PLATFORM == "java"
+        java_options = {}
+        java_options[:mandatory]   = options.delete(:mandatory)
+        java_options[:routing_key] = options.delete(:routing_key)
+        java_options[:properties]  = options
+        java_options
+      else
+        options
+      end
+    end
+  end
+end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/spec/integration/basic_subscriber_spec.rb

@@ -21,10 +21,8 @@ describe "A Basic Subscriber", :integration => true do
 
   context "ActionSubscriber.auto_pop!" do
     it "routes messages to the right place" do
-      channel = connection.create_channel
-      exchange = channel.topic("events")
-      exchange.publish("Ohai Booked", :routing_key => "greg.basic_push.booked")
-      exchange.publish("Ohai Cancelled", :routing_key => "basic.cancelled")
+      ::ActionSubscriber::Publisher.publish("greg.basic_push.booked", "Ohai Booked", "events")
+      ::ActionSubscriber::Publisher.publish("basic.cancelled", "Ohai Cancelled", "events")
 
       verify_expectation_within(2.0) do
         ::ActionSubscriber.auto_pop!

data/spec/lib/action_subscriber/publisher_spec.rb

@@ -0,0 +1,35 @@
+describe ::ActionSubscriber::Publisher do
+  let(:exchange) { double("Rabbit Exchange") }
+  let(:exchange_name) { "events" }
+  let(:payload) { "Yo Dawg" }
+  let(:route) { "bob.users.created" }
+
+  before { allow(described_class).to receive(:with_exchange).with(exchange_name).and_yield(exchange) }
+
+  describe '.publish' do
+
+    if ::RUBY_PLATFORM == "java"
+      it "publishes to the exchange with default options for march_hare" do
+        expect(exchange).to receive(:publish) do |published_payload, published_options|
+          expect(published_payload).to eq(payload)
+          expect(published_options[:routing_key]).to eq(route)
+          expect(published_options[:mandatory]).to eq(false)
+          expect(published_options[:properties][:persistent]).to eq(false)
+        end
+
+        described_class.publish(route, payload, exchange_name)
+      end
+    else
+      it "publishes to the exchange with default options for bunny" do
+        expect(exchange).to receive(:publish) do |published_payload, published_options|
+          expect(published_payload).to eq(payload)
+          expect(published_options[:routing_key]).to eq(route)
+          expect(published_options[:persistent]).to eq(false)
+          expect(published_options[:mandatory]).to eq(false)
+        end
+
+        described_class.publish(route, payload, exchange_name)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -196,6 +196,7 @@ files:
 - lib/action_subscriber/middleware/error_handler.rb
 - lib/action_subscriber/middleware/router.rb
 - lib/action_subscriber/middleware/runner.rb
+- lib/action_subscriber/publisher.rb
 - lib/action_subscriber/rabbit_connection.rb
 - lib/action_subscriber/railtie.rb
 - lib/action_subscriber/rspec.rb
@@ -219,6 +220,7 @@ files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
+- spec/lib/action_subscriber/publisher_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/lib/action_subscriber/threadpool_spec.rb
 - spec/spec_helper.rb
@@ -265,6 +267,7 @@ test_files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
+- spec/lib/action_subscriber/publisher_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/lib/action_subscriber/threadpool_spec.rb
 - spec/spec_helper.rb