twingly-amqp 4.5.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7551c367b84090b3f0e7345ef8b24128983e194074bea558e3595aeaf7d846ce
-  data.tar.gz: 8c633747ce2675338de1ac65eb7b67e21e3f39ce036351482736653a1755a597
+SHA1:
+  metadata.gz: 4bf473c247b052b8ce685889a9635c1ebc6d2d29
+  data.tar.gz: 76f4b60b762f886504740e7d339abd10c2e977c8
 SHA512:
-  metadata.gz: 1838eadf2e3fec47833c1dfdbc8000bb18d0c77b3d39d30252cb4d7855f2c83bacf3ffcbc70627043da7d6b402adc95110c28cf60eef84838d49b3b075b4b84d
-  data.tar.gz: 17c0fa7c47552ff00832b0484dbaea894bf15ecce43c65e3d8cd1cb9abaae6717237ade7b26a77ea7daac4aa43d7ace7092de87ca2d823e0f37161b7e8cfdfbd
+  metadata.gz: 7eed41cba865d45e552319c2e6d69542295b2156b3bc0634f158e66db88085cc6f9cee1cfd38622c47b8a96c656e8666248503d8b4c06d755a801e63438130fc
+  data.tar.gz: 12ad08613eca61a511fcdf117a913119b304d0ce60f7be67aaea3388f88a1851bc5f0d4210e6a244144c271a13d72276e75628d4565fad590414fdc05e400878

data/lib/twingly/amqp.rb

@@ -4,6 +4,7 @@ require "twingly/amqp/connection"
 require "twingly/amqp/subscription"
 require "twingly/amqp/ping_options"
 require "twingly/amqp/pinger"
+require "twingly/amqp/publisher"
 require "twingly/amqp/default_exchange_publisher"
 require "twingly/amqp/topic_exchange_publisher"
 require "twingly/amqp/null_logger"

data/lib/twingly/amqp/default_exchange_publisher.rb

@@ -1,48 +1,17 @@
+require "twingly/amqp/publisher"
 require "twingly/amqp/connection"
-require "json"
-require "ostruct"
 
 module Twingly
   module AMQP
     class DefaultExchangePublisher
+      include Publisher
+
       def initialize(queue_name:, connection: nil)
         options.routing_key = queue_name
 
         connection ||= Connection.instance
         @exchange = connection.create_channel.default_exchange
       end
-
-      def publish(message)
-        raise ArgumentError unless message.respond_to?(:to_h)
-
-        payload = message.to_h.to_json
-        opts    = options.to_h
-        @exchange.publish(payload, opts)
-      end
-
-      # only used by tests to avoid sleeping
-      def publish_with_confirm(message)
-        channel = @exchange.channel
-        channel.confirm_select unless channel.using_publisher_confirmations?
-
-        publish(message)
-
-        @exchange.wait_for_confirms
-      end
-
-      def configure_publish_options
-        yield options
-      end
-
-      private
-
-      def options
-        @options ||=
-          OpenStruct.new(
-            content_type: "application/json",
-            persistent: true,
-          )
-      end
     end
   end
 end

data/lib/twingly/amqp/publisher.rb

@@ -0,0 +1,47 @@
+require "json"
+require "ostruct"
+
+module Twingly
+  module AMQP
+    module Publisher
+      def publish(message)
+        payload =
+          if message.kind_of?(Array)
+            message
+          elsif message.respond_to?(:to_h)
+            message.to_h
+          else
+            raise ArgumentError
+          end
+
+        json_payload = payload.to_json
+        opts         = options.to_h
+        @exchange.publish(json_payload, opts)
+      end
+
+      # only used by tests to avoid sleeping
+      def publish_with_confirm(message)
+        channel = @exchange.channel
+        channel.confirm_select unless channel.using_publisher_confirmations?
+
+        publish(message)
+
+        @exchange.wait_for_confirms
+      end
+
+      def configure_publish_options
+        yield options
+      end
+
+      private
+
+      def options
+        @options ||=
+          OpenStruct.new(
+            content_type: "application/json",
+            persistent: true,
+          )
+      end
+    end
+  end
+end

data/lib/twingly/amqp/topic_exchange_publisher.rb

@@ -1,48 +1,17 @@
+require "twingly/amqp/publisher"
 require "twingly/amqp/connection"
-require "json"
-require "ostruct"
 
 module Twingly
   module AMQP
     class TopicExchangePublisher
+      include Publisher
+
       def initialize(exchange_name:, routing_key: nil, connection: nil, opts: {})
         options.routing_key = routing_key
 
         connection ||= Connection.instance
         @exchange = connection.create_channel.topic(exchange_name, opts)
       end
-
-      def publish(message)
-        raise ArgumentError unless message.respond_to?(:to_h)
-
-        payload = message.to_h.to_json
-        opts    = options.to_h
-        @exchange.publish(payload, opts)
-      end
-
-      # only used by tests to avoid sleeping
-      def publish_with_confirm(message)
-        channel = @exchange.channel
-        channel.confirm_select unless channel.using_publisher_confirmations?
-
-        publish(message)
-
-        @exchange.wait_for_confirms
-      end
-
-      def configure_publish_options
-        yield options
-      end
-
-      private
-
-      def options
-        @options ||=
-          OpenStruct.new(
-            content_type: "application/json",
-            persistent: true,
-          )
-      end
     end
   end
 end

data/lib/twingly/amqp/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   module Amqp
-    VERSION = "4.5.0".freeze
+    VERSION = "5.0.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-amqp
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -87,6 +87,7 @@ files:
 - lib/twingly/amqp/null_logger.rb
 - lib/twingly/amqp/ping_options.rb
 - lib/twingly/amqp/pinger.rb
+- lib/twingly/amqp/publisher.rb
 - lib/twingly/amqp/session.rb
 - lib/twingly/amqp/subscription.rb
 - lib/twingly/amqp/topic_exchange_publisher.rb
@@ -110,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Ruby library for talking to RabbitMQ