fastly_nsq 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fe5f821a6bb5bd6af76cc175f01a84b64ef9af71
-  data.tar.gz: 5199dbad2e9238e52bd696ef01582dc7c0d46701
+SHA256:
+  metadata.gz: 6a40b18d43363206c94cbb448ba4ac54a2af31420a7fe89bada891d704513dde
+  data.tar.gz: ce9b562df928b8d46466f52be7dab00aba65fb3a4f0301b0c76d5647fa8c639a
 SHA512:
-  metadata.gz: db022dcaab20d18ba13b68f1e5f8bb128883d5a94672215d920a84856f107a930b0af77f1db26de7bcfced4954b9c47c175b0834733fb872f629925e9e4a9ada
-  data.tar.gz: 6bae07517c8ba657b31f53c80810c8d44686c2bb3bb461ecfd359bd8b666a18dff5525f83467eff63959322c225c87a1c27cf2738808ec42af90775fff575503
+  metadata.gz: e33edc84dde18aed11956c98a412944d08694403c5237cb02b61bddfa0087e9589dd0cfdf214939c1446205bab79afe8ad7c24a0863231307e07e3353ca7548f
+  data.tar.gz: 2f1f3cb6c36e13d181f742caec494ed31f0b4f2275ced090849b878ec8c40f6da6d852724ba7adc244aba7b0a99b1932459a5dc026e9e8cbd5998a77ad6dfc96

data/ChangeLog.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v1.13.1](https://github.com/fastly/fastly_nsq/tree/v1.13.1)
+## [v1.14.0](https://github.com/fastly/fastly_nsq/tree/v1.14.0)
 
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.13.1...v1.14.0)
+
+**Merged pull requests:**
+
+- set Nsq.logger when setting logger [\#92](https://github.com/fastly/fastly_nsq/pull/92) ([leklund](https://github.com/leklund))
+
+## [v1.13.1](https://github.com/fastly/fastly_nsq/tree/v1.13.1) (2018-07-27)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.13.0...v1.13.1)
 
 **Merged pull requests:**

data/lib/fastly_nsq.rb

@@ -30,9 +30,6 @@ module FastlyNsq
     # @return [Integer]
     attr_writer :max_req_timeout
 
-    # @return [Logger]
-    attr_writer :logger
-
     ##
     # Map of lifecycle events
     # @return [Hash]
@@ -51,8 +48,20 @@ module FastlyNsq
       FastlyNsq::Listener.new(topic: topic, processor: processor, **options)
     end
 
+    ##
+    # Return logger or set logger to default.
+    # @return [Logger]
     def logger
-      @logger ||= Logger.new(nil)
+      return @logger if @logger
+
+      self.logger = Logger.new(STDERR)
+    end
+
+    ##
+    # Set the logger and also set Nsq.logger
+    # @params logger [Logger]
+    def logger=(new_logger)
+      @logger = Nsq.logger = new_logger
     end
 
     ##

data/lib/fastly_nsq/version.rb

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

data/spec/fastly_nsq_spec.rb

@@ -35,6 +35,28 @@ RSpec.describe FastlyNsq do
     end
   end
 
+  describe '#logger' do
+    let!(:default_logger) { subject.logger }
+    after { subject.logger = default_logger }
+
+    it 'returns the set logger' do
+      logger = Logger.new(nil)
+      subject.logger = logger
+
+      expect(subject.logger).to eq logger
+    end
+
+    it 'sets the default logger if none is set' do
+      subject.instance_variable_set(:@logger, nil)
+      expect(subject.instance_variable_get(:@logger)).to be nil
+      logger = subject.logger
+
+      expect(logger).to be_instance_of(Logger)
+      expect(logger.instance_variable_get(:@logdev).dev).to eq(STDERR)
+      expect(logger).to eq(Nsq.logger)
+    end
+  end
+
   describe '#logger=' do
     let!(:default_logger) { subject.logger }
     after { subject.logger = default_logger }
@@ -45,6 +67,13 @@ RSpec.describe FastlyNsq do
 
       expect(subject.logger).to eq logger
     end
+
+    it 'sets Nsq.logger' do
+      logger = Logger.new(STDOUT)
+      subject.logger = logger
+
+      expect(Nsq.logger).to eq logger
+    end
   end
 
   describe '#manager' do
@@ -77,7 +106,8 @@ RSpec.describe FastlyNsq do
     it 'registers callbacks for events' do
       %i[startup shutdown heartbeat].each do |event|
         block = -> {}
-        expect { FastlyNsq.on(event, &block) }.to change { FastlyNsq.events[event] }.by([block])
+        FastlyNsq.on(event, &block)
+        expect(FastlyNsq.events[event]).to eq([block])
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter