bi-frost 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3473e63e0afb70a565b476a6ff3b8e65ef87f96
-  data.tar.gz: df2842a9f4838f55156ea570c0c5a476326ec4bd
+  metadata.gz: 0ab76d504bbb328cedf3acd5717d455acb79867d
+  data.tar.gz: c8a72d0ecf9f08f3b072ef31b4e1a0a010c8dc8e
 SHA512:
-  metadata.gz: 0dfb17e4d710b6e52e70d13ef610878cb3086e2e007cf4549e72f53c381ff5f0e94109275d500a0ceefe60d4703e00cdb0e5a6ce52794a6c06887321a2816b6e
-  data.tar.gz: db30185a5cab2f29980fc8d59575207bd81df1887d66847013396b323c787e2088d3710597da7c6c20012ce337df5b2881688d96036eaaa9c8351eecf43d4e4b
+  metadata.gz: 73a898d4281aa3c2107bb99c6776baf217a843a468414d31b830761dfb39e3c20d9c787770c7168f51d29f2e17936247a0b28aeac569833e50a4a2dfc372dd8b
+  data.tar.gz: 2c25a237b5df367a21f5eb4e6234db02cb38831d0a9789378b2a253fcd45ec65fe0273977740a65146e1e8c5f7da67ff6ae1fa224f8475dc4e107d5834b3b400

data/lib/bifrost/manager.rb

@@ -21,11 +21,11 @@ module Bifrost
 
     # A supervised worker can be added to the current collection of supervised workers
     # this also starts the actor
-    def add(topic, subscriber, proc)
+    def add(topic, subscriber, proc, options = {})
       if topic.nil? || subscriber.nil? || proc.nil?
         raise InvalidWorkerDefinitionError, 'Invalid worker'
       else
-        Worker.supervise(as: Worker.handle(topic, subscriber), args: [topic, subscriber, proc])
+        Worker.supervise(as: Worker.handle(topic, subscriber), args: [topic, subscriber, proc, append_default_options(options)])
       end
     end
 
@@ -59,6 +59,13 @@ module Bifrost
 
     private
 
+    ##
+    # Create default options hash if custom options do not exit
+    def append_default_options(custom_options)
+      options = { non_repeatable: false }
+      options.merge(custom_options)
+    end
+
     # Retrieve a worker through the supervisory structure, this can take a while as the worker might
     # be going through a restart procedure by the actor framework
     def get_worker(topic, subscriber)

data/lib/bifrost/version.rb

@@ -5,11 +5,11 @@ module Bifrost
   MAJOR_VERSION = 0
 
   # The minor version of Bifrost, updated for new feature releases.
-  MINOR_VERSION = 4
+  MINOR_VERSION = 5
 
   # The patch version of Bifrost, updated only for bug fixes from the last
   # feature release.
-  PATCH_VERSION = 1
+  PATCH_VERSION = 0
 
   # The full version as a string.
   VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{PATCH_VERSION}".freeze

data/lib/bifrost/worker.rb

@@ -12,14 +12,15 @@ module Bifrost
     include Celluloid::Internals::Logger
     include Celluloid::Notifications
 
-    attr_reader :topic, :subscriber, :callback
+    attr_reader :topic, :subscriber, :callback, :options
 
     # Initialise the worker/actor. This actually starts the worker by implicitly calling the run method
-    def initialize(topic, subscriber, callback)
+    def initialize(topic, subscriber, callback, options = {})
       raise Bifrost::Exceptions::UnsupportedLambdaError, 'callback is not a proc' unless callback.respond_to?(:call)
       @topic ||= topic
       @subscriber ||= subscriber
       @callback ||= callback
+      @options ||= options
       super()
       info("Worker #{self} starting up...")
       publish('worker_ready', topic, subscriber)
@@ -61,8 +62,13 @@ module Bifrost
       if raw_message
         info("Worker #{self} picked up message #{raw_message}") if Bifrost.debug?
         message = Bifrost::Message.new(raw_message)
-        callback.call(message)
-        @bus.interface.delete_subscription_message(raw_message)
+        if options[:non_repeatable]
+          @bus.interface.delete_subscription_message(raw_message)
+          callback.call(message)
+        else
+          callback.call(message)
+          @bus.interface.delete_subscription_message(raw_message)
+        end
       elsif Bifrost.debug?
         info("Worker #{self} no message...")
       end

data/spec/bifrost/manager_spec.rb

@@ -10,4 +10,14 @@ describe Bifrost::Manager do
     manager.add('topicX', 'blah', proc { |m| puts "Secondary Received: message #{m}" })
     manager.run
   end
+
+  it 'should append default options to empty options param' do
+    manager.add('topicX', 'blah', proc { |m| puts "Secondary Received: message #{m}" })
+    expect(manager.send(:append_default_options, {})).to eq({ non_repeatable: false })
+  end
+
+  it 'should append default options to custom options param' do
+    manager.add('topicX', 'blah', proc { |m| puts "Secondary Received: message #{m}" })
+    expect(manager.send(:append_default_options, { custom_option: true })).to eq({ custom_option: true, non_repeatable: false })
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bi-frost
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Shirren Premaratne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Bifrost is a pub/sub wrapper library which uses the Azure message bus and