railway-ipc 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab62556fdb38e6d714ae0eeaf2210fc39c6611e5a193734b0edb44b18851edf1
-  data.tar.gz: be864c9a46dcb21e120fab860781189fbfea59f72a9f563ac68146df84b23b69
+  metadata.gz: 110c82fedd170e47574c5cce683f08a1bad9b6fe27ce4ed91428c04153b4c317
+  data.tar.gz: 70da4ff747fbb8ca79f161c3e8148d7034ed1975ad5a9aa5f5f619d67e30dd31
 SHA512:
-  metadata.gz: 225b0aded5a0880fbae40da74823707fea29741d98c13b4fedb9e80e7df9acc0e00c8a9d711df6a949b5bf7ac8898a5e3f0be7897c30a5068326fdc5d2ce9015
-  data.tar.gz: 235bb3d12d988761fffa79128d6cb4e4f68bec15856ca6fcc4262312d025ea840cf1f5a948c34ac83607981ff6f63857260e071a5edac240aaa88c4dd5e56b28
+  metadata.gz: ffa82d046eacfd17e63bd27c99a3078ed0fa7a5e9521e28b87e29bbda3da81167ec6d8940657c4d5fc298c814872910c3bbe8e11f82e17333fc7aa547a95c151
+  data.tar.gz: c332dfdb14d28209fe2f07ded7784bd5a82c98b5cb2810a547ddfb3f406d8879a9aab3f74ff44c0d8555f99de0a947e96fba3333626d2f5e7efe00e024118101

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    railway-ipc (0.1.4)
+    railway-ipc (0.1.6)
       bunny (~> 2.2.0)
       sneakers (~> 2.3.5)
 

data/lib/railway_ipc/consumer/consumer.rb

@@ -35,29 +35,25 @@ module RailwayIpc
         @protobuf_message = message_klass.decode(decoded_payload.message)
         process_known_message_type
       else
-        @handler = RailwayIpc::NullHandler.new
         @protobuf_message = RailwayIpc::BaseMessage.decode(decoded_payload.message)
         process_unknown_message_type
       end
-
-      rescue StandardError => e
-        RailwayIpc.logger.log_exception(
-          feature: "railway_consumer",
-          error: e.class,
-          error_message: e.message,
-          payload: payload,
-        )
-        raise e
+      ack!
+    rescue StandardError => e
+      RailwayIpc.logger.log_exception(
+        feature: "railway_consumer",
+        error: e.class,
+        error_message: e.message,
+        payload: payload,
+      )
+      raise e
     end
 
     private
 
     def process_protobuf!(message)
-      if handler.handle(protobuf_message).success?
-        message.status = RailwayIpc::ConsumedMessage::STATUSES[:success]
-      else
-        message.status = RailwayIpc::ConsumedMessage::STATUSES[:failed_to_process]
-      end
+      response = handler.handle(protobuf_message)
+      message.status = RailwayIpc::ConsumedMessage.response_to_status(response)
 
       message.save!
     end
@@ -65,28 +61,22 @@ module RailwayIpc
     def process_known_message_type
       message = RailwayIpc::ConsumedMessage.find_by(uuid: protobuf_message.uuid)
 
-      if message && message.processed?
-        handler.ack!
-      elsif message && !message.processed?
+      return if message && message.processed?
+
+      if message && !message.processed?
         message.with_lock("FOR UPDATE NOWAIT") { process_protobuf!(message) }
       else
         message = create_message_with_status!(RailwayIpc::ConsumedMessage::STATUSES[:processing])
         message.with_lock("FOR UPDATE NOWAIT") { process_protobuf!(message) }
       end
-
-      nil
     end
 
     def process_unknown_message_type
-      handler.ack!
-
       if RailwayIpc::ConsumedMessage.exists?(uuid: protobuf_message.uuid)
         return
       else
         create_message_with_status!(RailwayIpc::ConsumedMessage::STATUSES[:unknown_message_type])
       end
-
-      nil
     end
 
     def create_message_with_status!(status)

data/lib/railway_ipc/handler.rb

@@ -1,6 +1,5 @@
 module RailwayIpc
   class Handler
-    include Sneakers::Worker
     class << self
       attr_reader :block
     end
@@ -10,14 +9,12 @@ module RailwayIpc
     end
 
     def handle(message)
-      RailwayIpc.logger.info(message, "Handling message")
+      RailwayIpc.logger.info(message, 'Handling message')
       response = self.class.block.call(message)
       if response.success?
-        RailwayIpc.logger.info(message, "Successfully handled message")
-        ack!
+        RailwayIpc.logger.info(message, 'Successfully handled message')
       else
-        RailwayIpc.logger.error(message, "Failed to handle message")
-        ack!
+        RailwayIpc.logger.error(message, 'Failed to handle message')
       end
 
       response

data/lib/railway_ipc/models/consumed_message.rb

@@ -14,6 +14,14 @@ module RailwayIpc
     validates :uuid, :status, presence: true
     validates :status, inclusion: { in: STATUSES.values }
 
+    def self.response_to_status(response)
+      if response.success?
+        STATUSES[:success]
+      else
+        STATUSES[:failed_to_process]
+      end
+    end
+
     def processed?
       self.status == STATUSES[:success]
     end

data/lib/railway_ipc/null_handler.rb

@@ -1,7 +1,7 @@
 module RailwayIpc
   class NullHandler < RailwayIpc::Handler
     def handle(message)
-      ack!
+      nil
     end
   end
 end

data/lib/railway_ipc/version.rb

@@ -1,3 +1,3 @@
 module RailwayIpc
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railway-ipc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -214,7 +214,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".tool-versions"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -281,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: IPC components for Rails

data/.tool-versions

@@ -1 +0,0 @@
-ruby 2.6.3