pheromone 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 095307a9589c450d98d2267df1fd1d5a9a404fcb
-  data.tar.gz: f6ee446cd83c5f2623af4f904b9b02d52759d413
+  metadata.gz: 579707010487601af25f633bada8a8ffda541ef5
+  data.tar.gz: c7f027d298ea29b05c4b6ecee8d45dbc3cbbece6
 SHA512:
-  metadata.gz: 916792dd19f3d6b9b5a9a6c0ba3a36cb5c4317f526e32d6e071d25cc6bd36d109a7db1021d243406a7fec64935526d37fba3cc4266b0fb40f4862c6ea8a7f7b4
-  data.tar.gz: f9cf7439b22e1c74373792b13aca65f2ddfa22a6efe831df7545c3d73dad6ef93229f7a21db2e28c6e6b786b3e6ffbbd5cd3eb038be5e784a22f710e34786bd9
+  metadata.gz: 59485b3ecea81dbe5a612f3bbea067dea48482c51b9f7f3dbac7d381e2fa5b075b8ceb943a945693ef190165544b425087803f67a015c178cf543693500edd66
+  data.tar.gz: 55215044cf75ca43ef9678cc92be43eaa3f42feddf3606b8638b98e9c4564e786d3b6de6adb95294ca803eeb0c13643da64018bb75be6c18ab72d63f122dc27c

data/lib/pheromone/publishable.rb

@@ -39,58 +39,63 @@ module Pheromone
           message_options
         ).validate
         raise Pheromone::Exceptions::InvalidPublishOptions.new(errors) unless errors.empty?
-        __send__(:after_commit, proc { dispatch_messages(message_options: message_options) })
+        __send__(
+          :after_commit,
+          proc { dispatch_messages(message_options: message_options, current_event: :create) },
+          on: :create
+        )
+        __send__(
+          :after_commit,
+          proc { dispatch_messages(message_options: message_options, current_event: :update) },
+          on: :update
+        )
       end
     end
 
     module InstanceMethods
       include Pheromone::MethodInvoker
 
-      def dispatch_messages(message_options:)
+      def dispatch_messages(message_options:, current_event:)
         message_options.each do |options|
-          next unless check_conditions(options)
-          send_message(options)
+          next unless check_conditions(options, current_event)
+          send_message(options, current_event)
         end
       end
 
       private
 
-      def check_conditions(options)
+      def check_conditions(options, current_event)
         condition_callback = options[:if]
-        result = check_event(options)
+        result = check_event(options, current_event)
         return result unless condition_callback
         result && call_proc_or_instance_method(condition_callback)
       end
 
-      def check_event(options)
+      def check_event(options, current_event)
         options[:event_types].any? { |event| event == current_event }
       end
 
       # Manages the actual formatting and sending of messages. By default messages are sent in
       # sync mode. To override this, provide dispatch_method as :async
-      def send_message(options)
+      def send_message(options, current_event)
         Pheromone::Messaging::MessageDispatcher.new(
           message_parameters: {
             topic: options[:topic],
             blob: message_blob(options),
-            metadata: message_meta_data,
+            metadata: message_meta_data(current_event),
             producer_options: options[:producer_options]
           },
           dispatch_method: options[:dispatch_method] || :sync
         ).dispatch
       end
 
-      def message_meta_data
+      def message_meta_data(current_event)
         {
           event: current_event,
           entity: self.class.name
         }
       end
 
-      def current_event
-        id_previously_changed? ? :create : :update
-      end
-
       def message_blob(options)
         message = options[:message]
         return call_proc_or_instance_method(message) if message

data/lib/pheromone/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Pheromone
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheromone
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Ankita Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers