nsq-ruby 2.3.1 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af8d77120d7905bfe73739801e6c7237984dfb9c
-  data.tar.gz: b9f1bdbb317de45b6e47d1923e86e1d9295a7bc1
+SHA256:
+  metadata.gz: 28f6367f843e0cf5a7c0728e4304099ad9847600a670e334c4915fc9e58a6dcc
+  data.tar.gz: ee967b3c8b66483577373a97a2b563002ab95b3dd8d461f891a4a2b03e1823b3
 SHA512:
-  metadata.gz: 515ad2a7d29426b69e0cd4c6c0388140c0d5a75d4ea9bbb7879d34185cd8fbd0356bec49e2b6e63f6c785aae302ecc5623ca8d4b50b39704394dcaff62cdae80
-  data.tar.gz: 3ede61bb31257542fb6ed7ce16dab944d94ebfe45b1b16d5e3cc6e09ceb01984181fef53ffacdf9052263ee5e1790cb61ca92ef0026fb710bae27837c78fdb62
+  metadata.gz: dff4ecce775e6a7081e6b726dbfc49e4f501a3abb65c34fadaeb585629db0daef4562937f5b1b2a3ccee1cd31e66681978e4e78efe9b1ff55f271003c3f4bf3e
+  data.tar.gz: 6c7dce7efa81c23dc7a19575cfe8c2badda252ff7596e0b6c9d378b1068b177378dae2054f099b25121b5bc6bbbc00dc0ef3e0c3d2df555e8cdf9dc9ce8d88c7

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'
 )
 ```
@@ -418,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/VERSION

@@ -0,0 +1 @@
+2.4.1

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/version.rb

@@ -1,9 +1,5 @@
 module Nsq
   module Version
-    MAJOR = 2
-    MINOR = 3
-    PATCH = 1
-    BUILD = nil
-    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+    STRING = File.read(File.expand_path('../../VERSION', __FILE__)).strip
   end
 end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: nsq-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.1
 platform: ruby
 authors:
 - Wistia
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 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
@@ -76,6 +48,7 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- VERSION
 - lib/nsq.rb
 - lib/nsq/client_base.rb
 - lib/nsq/connection.rb
@@ -93,7 +66,7 @@ homepage: http://github.com/wistia/nsq-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Ruby client library for NSQ
 test_files: []