nsque 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10c1646bd342cfa399501357e129b2f1d09bffb3
-  data.tar.gz: 89d400c7cda79d472a419ef0e8cbad40561ef84d
+  metadata.gz: 734f493bd1dd04ac57dbc697ee7480d40dab23f8
+  data.tar.gz: 77df636ef88b9d3f04cd9eac58a221325cb9c76e
 SHA512:
-  metadata.gz: 7c67c3da80194460899e2eef2554409e5e2c07024e8ce6850ebc130baee0c703bd96b58f7e8cf7209056dababb302abc233045f97d552f3799f1f7c5f40262f4
-  data.tar.gz: facf3aa916dc619e57a9b131cc09eed8b300cb8bce970d59d3a1dafad55d448d10511f11d9c29bb794d64aa9d979dfcb14d6cf736d820a4d1f4177d331f884e1
+  metadata.gz: 416fea2498eac34ea1ed5b3477ffec181c84ca8e6594be6db33b2feeeb47bcb0e4c783163d6e18e52f5b06216f0ca788666ffdf441826d3d6341c8d8e4315d3f
+  data.tar.gz: 72e29d7950c923480d5698b4a505c50f36bedc0fb7da31a1f28d82b1202af34fd1a1a4d09ea5598d3565dca9a3342968615f2f14de86de7aae808f5866268acb

data/lib/nsque.rb

@@ -5,8 +5,6 @@ require 'nsque/job'
 require 'nsque/producer'
 require 'nsque/worker'
 
-require 'krakow'
-require 'krakow/version'
 require 'json'
 
 module Nsque

data/lib/nsque/producer.rb

@@ -3,14 +3,13 @@ module Nsque
     attr_reader :messages_count
 
     def initialize(options = {})
-      Krakow::Utils::Logging.level = options.delete(:logging_level) || :warn
-      @producer = Krakow::Producer.new(options)
+      @producer = Nsqrb::Producer.new(options[:host], options[:port], options[:topic])
       @messages_count = 0
     end
 
     def write(item)
       message = JSON.generate(item)
-      @producer.write(message)
+      @producer.post!(message)
       @messages_count += 1
     end
 

data/lib/nsque/testing_worker.rb

@@ -7,18 +7,22 @@ module Nsque
       raise ProducerCantBeNilError.new if options[:producer].nil?
       @options = options
       @producer = options[:producer]
-      @consumer = Krakow::Consumer.new(@options)
+      @consumer = Nsqrb::Consumer.new(@options)
+      @consumer.connect!
     end
 
     def process_all
       count = 0
       while @producer.messages_count > count
-        message = @consumer.queue.pop
-        hash = JSON.parse(message.message)
+        @consumer.receive
+        message = @consumer.messages.pop
+        next unless message
+        hash = JSON.parse(message.content)
         begin
           klass = hash['class'].constantize
           klass.new.perform(hash['args'])
-        rescue
+        rescue => e
+          puts e.inspect
         end
         @consumer.confirm(message)
         count += 1
@@ -30,11 +34,11 @@ module Nsque
 
     def clear_all
       count = 0
-
-      while !@consumer.queue.empty?
-        message = @consumer.queue.pop
+      while @producer.messages_count > count
+        @consumer.receive
+        message = @consumer.messages.pop
+        next unless message
         @consumer.confirm(message)
-
         count += 1
       end
 

data/lib/nsque/version.rb

@@ -1,3 +1,3 @@
 module Nsque
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/nsque/worker.rb

@@ -2,42 +2,40 @@ module Nsque
   class Worker
 
     def initialize(options)
-      Krakow::Utils::Logging.level = options.delete(:logging_level) || :warn
       raise ChannelRequiredError.new unless options.has_key?(:channel)
       @options = options
     end
 
     def run
-      consumer = Krakow::Consumer.new(@options)
       initialize_traps
+      consumer = Nsqrb::Consumer.new(@options)
+      consumer.connect!
 
       loop do
-        begin
-          message = Timeout::timeout(1) { consumer.queue.pop }
-        rescue Timeout::Error
-          break if @shutdown
-          next if message.nil?
-        end
-        begin
-          hash = JSON.parse(message.message)
-          puts hash.inspect
-          enqueue_after = (hash['at'].to_f - Time.now.to_f) * 1000
-          if enqueue_after <= 0
-            klass = hash['class'].constantize
-            klass.new.perform(hash['args'])
-          else
-            puts "Requeued: #{enqueue_after} ms"
-            consumer.requeue(message, enqueue_after.to_i)
-            next
+        Timeout::timeout(1) { consumer.receive } rescue Timeout::Error
+
+        while message = consumer.messages.pop
+          begin
+            hash = JSON.parse(message.content)
+            puts hash.inspect
+            enqueue_after = (hash['at'].to_f - Time.now.to_f) * 1000
+            if enqueue_after <= 0
+              klass = hash['class'].constantize
+              klass.new.perform(hash['args'])
+            else
+              puts "Requeued: #{enqueue_after} ms"
+              consumer.requeue(message, enqueue_after.to_i)
+              next
+            end
+          rescue => e
+            p e.message
           end
-        rescue => e
-          p e.message
+          consumer.confirm(message)
         end
-        consumer.confirm(message)
         break if @shutdown
       end
     ensure
-      consumer.terminate if consumer
+      consumer.close! if consumer
     end
 
     private

data/nsque.gemspec

@@ -10,5 +10,5 @@ Gem::Specification.new do |gem|
   gem.test_files  = `git ls-files -- test/*`.split("\n")
   gem.homepage    = 'http://rubygems.org/gems/nsque'
   gem.license     = 'MIT'
-  gem.add_dependency 'krakow', '~> 0.3.2'
+  gem.add_dependency 'nsqrb', '~> 0.0.3'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nsque
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mikhail Salosin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: krakow
+  name: nsqrb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.0.3
 description: Background job library based on NSQ (http://nsq.io)
 email: mikhail@salosin.me
 executables: []