fastly_nsq 1.16.0 → 1.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7ddfaca7ffa4121e56b173447b114ccd61ea104bc3804f2833920438492f4da
-  data.tar.gz: 570739450b84d445d190cb29b6d2ce7f22287bb4bde73f2af75e533eb00b2fc3
+  metadata.gz: 0a0de08856671c960970c164a3b95efdaef29bfb05ba2c8282cbc81d0e3d8282
+  data.tar.gz: bb52cbe4e13ca5bce686409eb20c7f13fd1975f41da73cc14a231a94d737a80c
 SHA512:
-  metadata.gz: 9b9b61eb6bfb2cc6453f259887e4b045368fc87ab4d88f05ef1591c83c1a488d36bf555034990495221a92ef697933a9ed0d007f650f0f11ee8bf4357f0b826d
-  data.tar.gz: 9e0202b599608733735097989d7f853b0e98def7299f366321509550ce9ea850ac23d757f81505bc2c7df1a73d3f742200b078733a9ba8036f6e96b175d7a4a5
+  metadata.gz: 71ed32139074cf89fdb848675df2b52a9a62dc76d3a9027f78620c9656791c580e2132a4ab06bbdcfe726c42a7b22e54b85c5fe3096cbcfbe4a32ee68c8cf9e8
+  data.tar.gz: fc1b312239fa56c20f49e37dbf999b8decedff1532b1882be3358e524ff14cdc4e0091c727f1ac11d378cb71ba8112dab61fc0736dd9db063baa11cfc6f4f674

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.3.5
   - 2.4.2
   - 2.5.1
 script:

data/ChangeLog.md

@@ -1,7 +1,23 @@
 # Change Log
 
-## [v1.15.0](https://github.com/fastly/fastly_nsq/tree/v1.15.0)
+## [v1.17.0](https://github.com/fastly/fastly_nsq/tree/v1.17.0) (2021-02-11)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.16.0...v1.17.0)
 
+**Merged pull requests:**
+
+- Support for arbitary sent\_at Time [\#99](https://github.com/fastly/fastly_nsq/pull/99) ([leklund](https://github.com/leklund))
+- remove version pin on rake for development [\#97](https://github.com/fastly/fastly_nsq/pull/97) ([leklund](https://github.com/leklund))
+- Ignore from Humane Registry [\#96](https://github.com/fastly/fastly_nsq/pull/96) ([leklund](https://github.com/leklund))
+
+## [v1.16.0](https://github.com/fastly/fastly_nsq/tree/v1.16.0) (2019-08-16)
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.15.0...v1.16.0)
+
+**Merged pull requests:**
+
+- Log the internal NSQ id [\#95](https://github.com/fastly/fastly_nsq/pull/95) ([leklund](https://github.com/leklund))
+- Consumer still attempts connections in Test mode [\#93](https://github.com/fastly/fastly_nsq/pull/93) ([alieander](https://github.com/alieander))
+
+## [v1.15.0](https://github.com/fastly/fastly_nsq/tree/v1.15.0) (2018-10-05)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.14.0...v1.15.0)
 
 **Merged pull requests:**
@@ -431,4 +447,4 @@
 ## [v0.0.1](https://github.com/fastly/fastly_nsq/tree/v0.0.1) (2016-01-30)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 gem 'bundler-audit'
 gem 'newrelic_rpm', require: false
 gem 'overcommit', '~> 0.32.0'
-gem 'rake', '~> 11.1.2'
-gem 'rdoc', '~> 4.2.2'
+gem 'rake'
+gem 'rdoc'
 gem 'rubocop', '~> 0.51.0'
 gem 'rubygems-tasks', '~> 0.2'

data/README.md

@@ -334,3 +334,7 @@ You will still need the `ENV` variables as defined above.
 Copyright (c) 2016 [Fastly, Inc](https://fastly.com) under an MIT license.
 
 See [LICENSE.txt](LICENSE.txt) for details.
+
+# Metadata
+
+- Ignore

data/lib/fastly_nsq/messenger.rb

@@ -18,23 +18,26 @@ module FastlyNsq::Messenger
   ##
   # Deliver an NSQ message. Uses +pub+
   #
-  # Will add two keys to the `+meta+ payload that cannot be overidden:
-  #   +originating_service+ which defaults to {FastlyNsq#originating_service} and
-  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when the payload is created.
+  # Adds keys to the `+meta+:
+  #   +originating_service+ which defaults to {FastlyNsq#originating_service}.
+  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ if the +sent_at+ param is nil OR
+  #   if the passed +sent_at+ is not a valid timestamp.
   # @param message [#to_json(*)] written to the +data+ key of the NSQ message payload
   # @param topic [String] NSQ topic on which to deliver the message
   # @param originating_service [String] added to meta key of message payload
+  # @param sent_at [Time] Timestamp that will be added to the meta payload
   # @param meta [Hash]
   # @return [Void]
   # @example
   #   FastlyNsq::Messenger.deliver(
   #     message: {a: 1, count: 123},
   #     topic: 'count',
+  #     meta: { sent_at: Time.now }
   #   )
-  def deliver(message:, topic:, originating_service: nil, meta: {})
+  def deliver(message:, topic:, originating_service: nil, sent_at: nil, meta: {})
     payload = {
       data: message,
-      meta: populate_meta(originating_service: originating_service, meta: meta),
+      meta: populate_meta(originating_service: originating_service, sent_at: sent_at, meta: meta),
     }
 
     deliver_payload(topic: topic, payload: payload.to_json)
@@ -43,15 +46,16 @@ module FastlyNsq::Messenger
   ##
   # Deliver many NSQ messages at once. Uses +mpub+
   #
-  # For each message will add two keys to the `+meta+ payload of each message
-  # that cannot be overidden:
-  #   +originating_service+ which defaults to {FastlyNsq#originating_service} and
-  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when messages are processed.
+  # For each message will add two keys to the `+meta+ payload of each message:
+  #   +originating_service+ which defaults to {FastlyNsq#originating_service}
+  #   +sent_at+ which will be set to +Time.now.iso8601(5)+ when messages are processed if not included
+  #   in the +meta+ param OR if the pased +sent_at+ is not a valid timestamp.
   #   The +sent_at+ time and +originating_service+ will be the same for every message.
   # @param messages [Array] Array of message which will be written to +data+ key of the
   #   individual NSQ message payload. Each message needs to respond to +to_json(*)+.
   # @param topic [String] NSQ topic on which to deliver the message
   # @param originating_service [String] added to meta key of message payload
+  # @param sent_at [Time] Timestamp that will be added to the meta payload
   # @param meta [Hash]
   # @return [Void]
   # @example
@@ -59,8 +63,8 @@ module FastlyNsq::Messenger
   #     messages: [{a: 1, count: 11}, {a: 2, count: 22}],
   #     topic: 'counts',
   #   )
-  def deliver_multi(messages:, topic:, originating_service: nil, meta: {})
-    meta = populate_meta(originating_service: originating_service, meta: meta)
+  def deliver_multi(messages:, topic:, originating_service: nil, sent_at: nil, meta: {})
+    meta = populate_meta(originating_service: originating_service, sent_at: sent_at, meta: meta)
 
     payload = messages.each_with_object([]) do |message, a|
       msg = {
@@ -121,9 +125,15 @@ module FastlyNsq::Messenger
     producer_for(topic: topic) { |producer| producer.write payload }
   end
 
-  def populate_meta(originating_service: nil, meta: {})
+  def populate_meta(originating_service: nil, sent_at: nil, meta: {})
     meta[:originating_service] = originating_service || self.originating_service
-    meta[:sent_at] = Time.now.iso8601(5)
+
+    meta[:sent_at] = if sent_at && sent_at.respond_to?(:iso8601)
+                       sent_at.iso8601(5)
+                     else
+                       Time.now.iso8601(5)
+                     end
+
     meta
   end
 end

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.16.0'
+  VERSION = '1.17.0'
 end

data/spec/messenger_spec.rb

@@ -72,6 +72,19 @@ RSpec.describe FastlyNsq::Messenger do
 
       expect(producer).to have_received(:write).with(expected_attributes.to_json)
     end
+
+    it 'can set the sent_at in the metadata' do
+      sent_at = Time.parse('2020-06-08 23:42:42')
+      meta = {}
+
+      expected_attributes = { data: message, meta: meta.merge(originating_service: origin, sent_at: sent_at.iso8601(5)) }
+
+      subject.producers['topic'] = producer
+
+      subject.deliver message: message, topic: 'topic', sent_at: sent_at, meta: meta, originating_service: origin
+
+      expect(producer).to have_received(:write).with(expected_attributes.to_json)
+    end
   end
 
   describe '#deliver_multi' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -10,10 +10,10 @@ authors:
 - Lukas Eklund
 - Josh Lane
 - Hassan Shahid
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -254,7 +254,7 @@ homepage: https://github.com/fastly/fastly_nsq
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -269,9 +269,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fastly NSQ Adapter
 test_files: []