nsq-ruby 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c931ee31ebc9745dba9e2084740d6022f97b0ef280d1661cc1391910481eee9
-  data.tar.gz: '0965ea14b66ebfa6d1ca429af3cab05f970418f5cd41241362619b1e19444a08'
+  metadata.gz: e4e154c268c869f718aa9942e54f23dc6d62b7299ac26a1facb91f7f5d6d324c
+  data.tar.gz: 164655c96eb9730b5396c1b50000378fabf4f9e97c54dff358f33bcff6c0e7dc
 SHA512:
-  metadata.gz: 67e99a8a1b6051325fd04e56bda7910eb41f46a39bf9baf9969bbfa8b04af5b9a6fc2297f707eb1ffdbb4a257a138112532639662a4e484ec47608ba93bdbcb9
-  data.tar.gz: bec66cc5f0990f97d55551b0b786ad0043c70d0dbe14e6b728726bbbdbd551caaac012adc5bf3d699113c3f11e9e9885ca579be41c9d7bcc205d7326f90d68ec
+  metadata.gz: f89d563ed42364550a1a301040e78ea758e563c0f867404b3d11b25f0d54917e10abfa754018c2d940fcc193dae3475e6e164544b7a141c67136e8a0d29fff68
+  data.tar.gz: 1b4400f790a5c16c07dd34d58e468a11e71c2026eb0567dba0584bac20d2cbe9beb227a897b69832ae0774e405cad064ed65cf318b74414ac62cf2c165586216

data/README.md

@@ -17,7 +17,7 @@ nsq-ruby is a simple NSQ client library written in Ruby.
 ```Ruby
 require 'nsq'
 producer = Nsq::Producer.new(
-  nsqd: '127.0.0.1:4150',
+  nsqd: '127.0.0.1:4150', # or ['127.0.0.1:4150']
   topic: 'some-topic'
 )
 
@@ -77,7 +77,7 @@ For example, if you'd like to publish messages to a single nsqd.
 
 ```Ruby
 producer = Nsq::Producer.new(
-  nsqd: '6.7.8.9:4150',
+  nsqd: '6.7.8.9:4150', # or ['6.7.8.9:4150']
   topic: 'topic-of-great-esteem'
 )
 ```
@@ -177,6 +177,14 @@ reconnect.
 This is automatically called `at_exit`, but it's good practice to close your
 producers when you're done with them.
 
+**Note:** This terminates the connection to NSQ immediately. If you're writing
+messages faster than they can be sent to NSQ, you may have messages in the
+producer's internal queue. Calling `#terminate` before they're sent will cause
+these messages to be lost. After you write your last message, consider sleeping
+for a second before you call `#terminate`.
+
+
+
 
 ## Consumer
 
@@ -391,7 +399,7 @@ millions of messages a day.
 
 ## MIT License
 
-Copyright (C) 2016 Wistia, Inc.
+Copyright (C) 2018 Wistia, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -410,4 +418,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

data/lib/nsq/consumer.rb

@@ -27,7 +27,7 @@ module Nsq
 
       # This is where we keep a record of our active nsqd connections
       # The key is a string with the host and port of the instance (e.g.
-      # '127.0.0.1:4150') and the key is the Connection instance.
+      # '127.0.0.1:4150') and the value is the Connection instance.
       @connections = {}
 
       if !@nsqlookupds.empty?
@@ -36,10 +36,14 @@ module Nsq
           topic: @topic,
           interval: @discovery_interval
         )
+
+      elsif opts[:nsqd]
+        nsqds = [opts[:nsqd]].flatten
+        max_per_conn = max_in_flight_per_connection(nsqds.size)
+        nsqds.each{|d| add_connection(d, max_in_flight: max_per_conn)}
+
       else
-        # normally, we find nsqd instances to connect to via nsqlookupd(s)
-        # in this case let's connect to an nsqd instance directly
-        add_connection(opts[:nsqd] || '127.0.0.1:4150', max_in_flight: @max_in_flight)
+        add_connection('127.0.0.1:4150', max_in_flight: @max_in_flight)
       end
     end
 

data/lib/nsq/discovery.rb

@@ -70,7 +70,7 @@ module Nsq
       uri.query = "ts=#{Time.now.to_i}"
       if topic
         uri.path = '/lookup'
-        uri.query += "&topic=#{URI.escape(topic)}"
+        uri.query += "&topic=#{URI.encode_www_form_component(topic)}"
       else
         uri.path = '/nodes'
       end

data/lib/nsq/frames/message.rb

@@ -9,7 +9,7 @@ module Nsq
 
     def initialize(data, connection)
       super
-      @timestamp_in_nanoseconds, @attempts, @id, @body = @data.unpack('Q>s>a16a*')
+      @timestamp_in_nanoseconds, @attempts, @id, @body = @data.unpack('Q>S>a16a*')
       @body.force_encoding('UTF-8')
     end
 

data/lib/version.rb

@@ -2,7 +2,7 @@ module Nsq
   module Version
     MAJOR = 2
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
   end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nsq-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Wistia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nsq-cluster
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +65,7 @@ homepage: http://github.com/wistia/nsq-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Ruby client library for NSQ
 test_files: []