twingly-amqp 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4db0f7716677c33ee82f1fc7b0530aa99a9c704b
-  data.tar.gz: a392bce55f82c6f07c39a6df3788bc8c918af654
+SHA256:
+  metadata.gz: afa12f0f296e62925302731fdcf55c620ef593536340455b757e18168e6d76b7
+  data.tar.gz: 0545a905095cb041cd1f91556b4ba868444c2c25d27117079f73a4ee8c6d0ad4
 SHA512:
-  metadata.gz: e8831829877ca9fa5ac54f2ab7cba84f91b33b3e7fe280c0c47b214dcf7365b15b80e37fc330fe5c3433de5e4ab5cf6808802ea272b79d71e54d9997fe139d21
-  data.tar.gz: 83cb819bd56f5a9737129f00bb406d977aa3386a10c0a620188b9f7521dcf7463e535db38b95aa0e06cd227d91264164ce55d9711484d219afcfce13a4804d9d
+  metadata.gz: c7c2e089cf8cd98f78706bb5e7dcbde5da880374d3d1947165152312b7757d34eef36de279031af3cd6e7662a0bef06a4ad8ca98936a99f33fafecd0e8bc2e2c
+  data.tar.gz: 12e0033eccf69edbb3e657cf67bb0486e4bab449b7acebf24c0a88b87477321d1ced6e2d5df0b10719e484841c429a17dd749f98ee2edc10565293af6f091e79

data/README.md

@@ -145,9 +145,11 @@ pinger = Twingly::AMQP::Pinger.new(
 
 # Optional, options can also be given to #ping
 pinger.default_ping_options do |options|
-  options.provider_name = "TestProvider"
-  options.source_ip     = "?.?.?.?"
-  options.priority      = 1
+  options.provider_name  = "TestProvider"
+  options.source_ip      = "?.?.?.?"
+  options.priority       = 1
+  # Optional keys/values that will be included in each ping message
+  options.custom_options = { my_option: "This is my own option" }
 end
 
 urls = [
@@ -155,10 +157,12 @@ urls = [
 ]
 
 # Optional, is merged with the default options above
+#   options given to #ping takes precedence over the default options
 options = {
   provider_name: "a-provider-name",
   source_ip:     "?.?.?.?",
   priority:      1,
+  custom_options: { my_other_option: "Another option" },
 }
 
 pinger.ping(urls, options) do |pinged_url|

data/lib/twingly/amqp/ping_options.rb

@@ -3,25 +3,40 @@ module Twingly
     class PingOptions
       attr_accessor :provider_name, :source_ip, :priority
 
-      def initialize(provider_name: nil, source_ip: nil, priority: nil)
-        self.provider_name = provider_name
-        self.source_ip     = source_ip
-        self.priority      = priority
+      attr_reader :custom_options
+
+      def initialize(provider_name: nil, source_ip: nil, priority: nil,
+                     custom_options: {})
+        self.provider_name  = provider_name
+        self.source_ip      = source_ip
+        self.priority       = priority
+        self.custom_options = custom_options
 
         yield self if block_given?
       end
 
+      def custom_options=(options)
+        unless options.respond_to?(:to_h)
+          raise ArgumentError, "custom_options must respond to 'to_h'"
+        end
+
+        @custom_options = options.to_h
+      end
+
       def to_h
         {
-          automatic_ping: false,
           provider_name:  provider_name,
           source_ip:      source_ip,
           priority:       priority,
+          custom_options: custom_options,
         }
       end
 
       def validate
-        missing_keys = to_h.select { |_, value| value.to_s.empty? }.keys
+        missing_keys = to_h.select do |key, value|
+          key != :custom_options && value.to_s.empty?
+        end.keys
+
         if missing_keys.any?
           raise ArgumentError, "Required options not set: #{missing_keys}"
         end
@@ -29,9 +44,10 @@ module Twingly
 
       def merge(other)
         PingOptions.new do |options|
-          options.provider_name = other.provider_name || provider_name
-          options.source_ip     = other.source_ip     || source_ip
-          options.priority      = other.priority      || priority
+          options.provider_name  = other.provider_name || provider_name
+          options.source_ip      = other.source_ip     || source_ip
+          options.priority       = other.priority      || priority
+          options.custom_options = custom_options.merge(other.custom_options)
         end
       end
     end

data/lib/twingly/amqp/pinger.rb

@@ -26,12 +26,11 @@ module Twingly
         options.validate
 
         Array(urls).each do |url|
-          unless cached?(url)
-            publish(url, options)
-            cache!(url)
+          next if cached?(url)
+          publish(url, options)
+          cache!(url)
 
-            yield url if block_given?
-          end
+          yield url if block_given?
         end
       end
 
@@ -67,7 +66,7 @@ module Twingly
       end
 
       class NullCache
-        def self.cached?(url)
+        def self.cached?(_url)
           false
         end
 

data/lib/twingly/amqp/session.rb

@@ -27,10 +27,6 @@ module Twingly
         options[:pass]  ||= password_from_env
         options[:hosts] ||= hosts_from_env
 
-        # Used as a workaround for
-        # https://github.com/ruby-amqp/bunny/issues/446
-        options[:hosts] = options.fetch(:hosts).dup
-
         default_connection_options.merge(options)
       end
 

data/lib/twingly/amqp/subscription.rb

@@ -63,7 +63,7 @@ module Twingly
 
       private
 
-      def create_consumer(&block)
+      def create_consumer
         @queue.subscribe(subscribe_options) do |delivery_info, metadata, payload|
           @before_handle_message_callback.call(payload)
 
@@ -74,7 +74,7 @@ module Twingly
             channel:       @channel,
           )
 
-          block.call(message)
+          yield message
         end
       end
 
@@ -112,18 +112,6 @@ module Twingly
         tag_name = Socket.gethostname
         @channel.generate_consumer_tag(tag_name)
       end
-
-      def setup_traps
-        [:INT, :TERM].each do |signal|
-          Signal.trap(signal) do
-            # Exit fast if we've already got a signal since before
-            exit!(true) if cancel?
-
-            # Set cancel flag, cancels consumers
-            cancel!
-          end
-        end
-      end
     end
   end
 end

data/lib/twingly/amqp/version.rb

@@ -1,5 +1,5 @@
 module Twingly
   module Amqp
-    VERSION = "4.3.0".freeze
+    VERSION = "4.4.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-amqp
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,56 +16,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.2
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.49'
 description: Publish and subscribe to messages via RabbitMQ
 email:
 - support@twingly.com
@@ -104,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby library for talking to RabbitMQ