fastly_nsq 0.10.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97d45e36727661d9562ff471038e7760086e079
-  data.tar.gz: 3061cd5fd59e767ee80419de54260728c7a2414a
+  metadata.gz: ec5180b8b65ede93fdbb509c673c8bb539f9010e
+  data.tar.gz: 58705d4fe6bd3fb791803f393db63fb53b57c3ae
 SHA512:
-  metadata.gz: 34b7cece9416006546dd8621953964e30dcb0eec305bf25979f68b1ba41557fc67ecbc99ab99455d68535db4fe2cfa398809a6dce306fe674da95a511fe3cdba
-  data.tar.gz: 0fa641c48320197ef521e714bb5713adcf0f98d26f17fd28ba250150b95ad65cbd9cc50ac1e4ac8c0b0bf0dfab3267cd8a453338cfa9ff99291cb5be94e005f5
+  metadata.gz: 787a47a30094daac20acc0db56e9a257716be62f2a212df288fa2c488646508bc49fd8589d034b661bbdf38183ddba1ad627c10967796a63cbeb29f8fc3c66de
+  data.tar.gz: c0cfe65d8a15bca78def1d826f98ce4d632f6b09a581298e37ebfa8e4a3fca94d2e2b5b12473015291c881886e3ffa8cab442d1276d8620c755e7b1d06d59b8a

data/lib/fastly_nsq.rb

@@ -12,6 +12,8 @@ require 'fastly_nsq/version'
 module FastlyNsq
   module_function
 
+  @preprocessor = nil
+
   def channel=(channel)
     @channel ||= channel
   end
@@ -20,7 +22,7 @@ module FastlyNsq
     strategy.logger = logger
   end
 
-  def self.preprocessor=(preprocessor)
+  def preprocessor=(preprocessor)
     @preprocessor ||= preprocessor
   end
 
@@ -32,7 +34,7 @@ module FastlyNsq
     strategy.logger
   end
 
-  def self.preprocessor
+  def preprocessor
     @preprocessor
   end
 

data/lib/fastly_nsq/cli.rb

@@ -55,11 +55,20 @@ class FastlyNsq::CLI
   end
 
   def startup
+    boot_rails
     require options[:require] if options[:require]
     FastlyNsq.logger.info "Running in #{RUBY_DESCRIPTION}"
     FastlyNsq.logger.info 'Starting processing, hit Ctrl-C to stop' unless options[:daemon]
   end
 
+  def boot_rails
+    return unless ENV['RAILS_ENV']
+
+    require 'rails'
+    require File.expand_path('./config/application.rb')
+    require File.expand_path('./config/environment.rb')
+  end
+
   def parse(args)
     opts = {}
 

data/lib/fastly_nsq/listener.rb

@@ -94,8 +94,9 @@ module FastlyNsq
     end
 
     def next_message
-      message = @consumer.pop # TODO: consumer.pop do |message|
-      result  = yield FastlyNsq::Message.new(message.body)
+      nsq_message = @consumer.pop # TODO: consumer.pop do |message|
+      message = FastlyNsq::Message.new(nsq_message)
+      result  = yield message
       message.finish if result
     end
 

data/lib/fastly_nsq/message.rb

@@ -1,11 +1,16 @@
 require 'json'
 
 class FastlyNsq::Message
-  attr_reader :raw_body
+  extend Forwardable
+
+  def_delegators :@nsq_message, :attempts, :touch, :timestamp
+
+  attr_reader :managed, :nsq_message, :raw_body
   alias to_s raw_body
 
-  def initialize(raw_body)
-    @raw_body = raw_body
+  def initialize(nsq_message)
+    @nsq_message = nsq_message
+    @raw_body = nsq_message.body
   end
 
   def data
@@ -15,4 +20,18 @@ class FastlyNsq::Message
   def body
     @body ||= JSON.parse(raw_body)
   end
+
+  def finish
+    return managed if managed
+
+    @managed = :finished
+    nsq_message.finish
+  end
+
+  def requeue(*args)
+    return managed if managed
+
+    @managed = :requeued
+    nsq_message.requeue(*args)
+  end
 end

data/lib/fastly_nsq/messenger.rb

@@ -1,5 +1,10 @@
 module FastlyNsq::Messenger
-  def self.deliver(message:, on_topic:, originating_service: nil)
+  DEFAULT_ORIGIN = 'Unknown'.freeze
+  @originating_service = DEFAULT_ORIGIN
+
+  module_function
+
+  def deliver(message:, on_topic:, originating_service: nil)
     payload = {
       data: message,
       meta: {
@@ -12,11 +17,11 @@ module FastlyNsq::Messenger
     end
   end
 
-  def self.originating_service=(service)
+  def originating_service=(service)
     @originating_service = service
   end
 
-  def self.producer_for(topic:)
+  def producer_for(topic:)
     producer = producers[topic]
 
     yield producer if block_given?
@@ -24,25 +29,23 @@ module FastlyNsq::Messenger
     producer
   end
 
-  def self.producers
+  def producers
     @producers ||= Hash.new { |hash, topic| hash[topic] = FastlyNsq::Producer.new(topic: topic) }
   end
 
-  def self.terminate_producer(topic:)
+  def terminate_producer(topic:)
     producer_for(topic: topic).terminate
     producers.delete(topic)
   end
 
-  def self.terminate_all_producers
+  def terminate_all_producers
     producers.each do |topic, producer|
       producer.terminate
       producers.delete(topic)
     end
   end
 
-  private_class_method
-
-  def self.originating_service
-    @originating_service || 'Unknown'.freeze
+  def originating_service
+    @originating_service || DEFAULT_ORIGIN
   end
 end

data/lib/fastly_nsq/strategy.rb

@@ -8,8 +8,6 @@ module FastlyNsq
       real_queue || fake_queue || error
     end
 
-    private_class_method
-
     ERR_MESSAGE = "You must set ENV['FAKE_QUEUE'] to either true or false".freeze
 
     def error

data/lib/fastly_nsq/version.rb

@@ -1,3 +1,3 @@
 module FastlyNsq
-  VERSION = '0.10.1'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/spec/lib/fastly_nsq/message_spec.rb

@@ -2,9 +2,10 @@ require 'spec_helper'
 require 'json'
 
 RSpec.describe FastlyNsq::Message do
-  let(:body)      { { 'data' => 'goes here', 'other_field' => 'is over here' } }
-  let(:json_body) { body.to_json }
-  subject         { FastlyNsq::Message.new json_body }
+  let(:nsq_message) { double 'Nsq::Message', body: json_body, attempts: nil, finish: nil, requeue: nil, touch: nil, timestamp: nil }
+  let(:body)        { { 'data' => 'goes here', 'other_field' => 'is over here' } }
+  let(:json_body)   { body.to_json }
+  subject           { FastlyNsq::Message.new nsq_message }
 
   it 'preserves original message body as raw_body' do
     expect(subject.raw_body).to eq(json_body)
@@ -21,4 +22,33 @@ RSpec.describe FastlyNsq::Message do
   it 'aliases raw_body to to_s' do
     expect(subject.to_s).to eq(json_body)
   end
+
+  it 'delegates methods to the nsq_message object' do
+    %w(attempts finish requeue touch timestamp).each do |method|
+      subject = FastlyNsq::Message.new nsq_message
+      expect(nsq_message).to receive(method)
+
+      subject.send(method)
+    end
+  end
+
+  it 'does not finish if the message was requeued' do
+    expect(nsq_message).to receive(:requeue).with(1000)
+    expect(nsq_message).not_to receive(:finish)
+
+    subject.requeue(1000)
+    subject.finish
+
+    expect(subject.managed).to eq(:requeued)
+  end
+
+  it 'does not requeue if the message was finished' do
+    expect(nsq_message).to receive(:finish)
+    expect(nsq_message).not_to receive(:requeue)
+
+    subject.finish
+    subject.requeue
+
+    expect(subject.managed).to eq(:finished)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print