carnivore-nsq 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b0185fa30c41067795125360e7079687ffc928
-  data.tar.gz: 03621ccff5cd21972a5fa6a9729c24d59c5fe47d
+  metadata.gz: d3b7fae9cfe352e849c07b62024e2f8d38620ab5
+  data.tar.gz: 9c16d5be35a89d929df90629a86c6b06a9afd396
 SHA512:
-  metadata.gz: 40066b6881fcd356b2973fa71994c23fa1c893b99caa1e6932b4e77dcfba7dc6c07726e39a8a71e7ce46c71d3e0c02c10893ae444f1e8f8150485c62e6916bb3
-  data.tar.gz: 2d2942cb1bcd108006ad0b54c6776c96795d043d306deac3b4ecaeac5d86555f1f12fc8d145284eb0ad50ffdb34b50f61f14d4c8d3687fc42325bccb14168511
+  metadata.gz: ade94f7e66bc8552c726f0b23f5bc4627357a86ce9206a41de82d5d1430a681ab3d1f28512c33cb7c3cce304cce4a70a8ca46ae277be9bbf70a7b278ca85ef6e
+  data.tar.gz: 801f9fce9954b3a4e4cac1da8cf2c6d13fed96597ee8b8577f8398cf61c544b23d0ffdacf0424bfb97d9c9e18c7a4294c8ebadb4e71f2c0b45a9d32a9e3f0aa7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.1.16
+* Properly support pre-extracted message content
+
 ## v0.1.14
 * Wrap message fetching within future
 

data/carnivore-nsq.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = 'Carnivore NSQ source'
   s.require_path = 'lib'
   s.license = 'Apache 2.0'
-  s.add_dependency 'carnivore', '>= 0.1.8'
+  s.add_dependency 'carnivore', '> 0.3.8'
   s.add_dependency 'krakow', '>= 0.3.6'
   s.files = Dir['lib/**/*'] + %w(carnivore-nsq.gemspec README.md CHANGELOG.md CONTRIBUTING.md LICENSE)
 end

data/lib/carnivore-nsq/nsq.rb

@@ -57,14 +57,27 @@ module Carnivore
         end
       end
 
+      # Clean up custom actors on teardown
+      def teardown_cleanup
+        [reader, writer].each do |r_con|
+          if(r_con && r_con.alive?)
+            begin
+              r_con.terminate
+            rescue Celluloid::Task::TerminatedError
+              warn 'Terminated task error when cleaning NSQ connections. Moving on.'
+            end
+          end
+        end
+        super
+      end
+
       # Build the consumer connection
       def build_consumer
         consumer_args = Smash.new(
           :nsqlookupd => lookupd,
           :topic => topic,
           :channel => channel,
-          :max_in_flight => args.fetch(:max_in_flight, 100),
-          :notifier => waiter
+          :max_in_flight => args.fetch(:max_in_flight, 100)
         ).merge(reader_args)
         @reader = Krakow::Consumer.new(consumer_args)
         link @reader
@@ -121,7 +134,13 @@ module Carnivore
       #
       # @return [String]
       def receive(*_)
-        Celluloid::Future.new{ consumer.queue.pop }.value
+        msg = Celluloid::Future.new{ consumer.queue.pop }.value
+        begin
+          content = MultiJson.load(msg.message)
+        rescue MultiJson::ParseError
+          content = msg.message
+        end
+        {:raw => msg, :content => content}
       end
 
       # Send message

data/lib/carnivore-nsq/version.rb

@@ -1,6 +1,6 @@
 module Carnivore
   module Nsq
     # current library version
-    VERSION = Gem::Version.new('0.1.14')
+    VERSION = Gem::Version.new('0.1.16')
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-nsq
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.3.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: krakow
   requirement: !ruby/object:Gem::Requirement