fastly_nsq 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135337a9892fdb4e0ddb5d448cae0f9d298b66a3a1a2d53966b9ba1c3c31d734
-  data.tar.gz: 103ab244297b6e29b0f50fdda88881cbe030943b2d019dcf31f9080203b8d36b
+  metadata.gz: b7ddfaca7ffa4121e56b173447b114ccd61ea104bc3804f2833920438492f4da
+  data.tar.gz: 570739450b84d445d190cb29b6d2ce7f22287bb4bde73f2af75e533eb00b2fc3
 SHA512:
-  metadata.gz: 948bd9896a2709c88b2dffdfc8fa13de42d8f0d46f62c8cd635ff4323dd57a2be75cb805598a6878059a7416aa5e78f719cd4d026462833fe609168a46e8ebd9
-  data.tar.gz: 299eb6013dc14fd5f7fc84e752d75b60c633883e60517b9f507e7247bca4d6bb0a2ca4825cffc8b3836697208e76cac464a83ec25bda5119b852c724b25b82bc
+  metadata.gz: 9b9b61eb6bfb2cc6453f259887e4b045368fc87ab4d88f05ef1591c83c1a488d36bf555034990495221a92ef697933a9ed0d007f650f0f11ee8bf4357f0b826d
+  data.tar.gz: 9e0202b599608733735097989d7f853b0e98def7299f366321509550ce9ea850ac23d757f81505bc2c7df1a73d3f742200b078733a9ba8036f6e96b175d7a4a5

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'bundler-audit', '~> 0.5.0'
+gem 'bundler-audit'
 gem 'newrelic_rpm', require: false
 gem 'overcommit', '~> 0.32.0'
 gem 'rake', '~> 11.1.2'

data/fastly_nsq.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_development_dependency 'awesome_print', '~> 1.6'
-  gem.add_development_dependency 'bundler', '~> 1.12'
+  gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'dotenv'
   gem.add_development_dependency 'pry-byebug', '~> 3.3'
   gem.add_development_dependency 'rspec', '~> 3.4'

data/lib/fastly_nsq/listener.rb

@@ -116,8 +116,9 @@ class FastlyNsq::Listener
     msg_info = {
       channel:  channel,
       topic:    topic,
-      attempts: nsq_message.attempts,
+      attempts: message.attempts,
       id:       Digest::MD5.hexdigest(nsq_message.body.to_s),
+      nsq_id:   message.id,
       metadata: message.meta,
     }
 

data/lib/fastly_nsq/message.rb

@@ -20,7 +20,11 @@ class FastlyNsq::Message
   #   Delegated to +self.nsq_message+
   #   @return [Nsq::Message#timestamp]
   #   @see https://www.rubydoc.info/gems/nsq-ruby/Nsq/Message#timestamp-instance_method
-  def_delegators :@nsq_message, :attempts, :touch, :timestamp
+  # @!method id
+  #   Delegated to +self.nsq_message+
+  #   @return [Nsq::Message#id]
+  #   @see https://www.rubydoc.info/gems/nsq-ruby/Nsq/Message#id-instance_method
+  def_delegators :@nsq_message, :attempts, :touch, :timestamp, :id
 
   # @return [Symbol] Message state. Returns +nil+ if message has not been requeued or finished.
   attr_reader :managed

data/lib/fastly_nsq/testing.rb

@@ -249,6 +249,10 @@ module FastlyNsq
 
   FastlyNsq::Listener.prepend(ListenerTesting)
 
+  class FakeConnection
+    def connected?; end
+  end
+
   module ConsumerTesting
     module ClassMethods
       def messages(topic = nil)
@@ -278,6 +282,11 @@ module FastlyNsq
       @connected
     end
 
+    def connect(*args)
+      return super(*args) unless FastlyNsq::Testing.enabled?
+      @connected = FakeConnection.new
+    end
+
     def empty?
       FastlyNsq::Testing.enabled? ? messages.empty? : super
     end

data/lib/fastly_nsq/version.rb

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

data/spec/message_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'json'
 
 RSpec.describe FastlyNsq::Message do
-  let(:nsq_message) { double 'Nsq::Message', body: json_body, attempts: 1, finish: nil, requeue: nil, touch: nil, timestamp: nil }
+  let(:nsq_message) { double 'Nsq::Message', body: json_body, attempts: 1, finish: nil, requeue: nil, touch: nil, timestamp: nil, id: nil }
   let(:body)        { { 'data' => 'goes here', 'other_field' => 'is over here', 'meta' => 'meta stuff' } }
   let(:json_body)   { body.to_json }
   subject           { FastlyNsq::Message.new nsq_message }
@@ -30,7 +30,7 @@ RSpec.describe FastlyNsq::Message do
   end
 
   it 'delegates methods to the nsq_message object' do
-    %w[attempts finish requeue touch timestamp].each do |method|
+    %w[attempts finish requeue touch timestamp id].each do |method|
       subject = FastlyNsq::Message.new nsq_message
       expect(nsq_message).to receive(method)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -33,16 +33,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter