railway-ipc 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b0a9b840874946f0f7e80b0221e3df161eed5ce0926299356856cb5b81f76db
-  data.tar.gz: 252e1f3e84801e50cfccc47d6674c985a690e514cd2732b62c5f6cbbef71f0fc
+  metadata.gz: f2a31b80fc9d4f13598bdc2fbd14c84c78360bd4adeb588bb63b3bb20c33a2de
+  data.tar.gz: 2bfef85b0fbe56b0d66df365f8ffa5b7913b188658edbb63484aaa0138dfa6ba
 SHA512:
-  metadata.gz: 69cde1dbbfcabb1ed5f3a27ace4a126f7cf231096aa8b8761c6ac3f19f0c36a4a79183a44140367117eab13f01e1507e53ef9a484abb89510df17ff040395407
-  data.tar.gz: a2a85998d976faa746820474bb9e5597964bb92f379b95b7b55cc5936a72af532d3b5321d3228194f4209dbdab3b76dc430dbd2d357df33e9929ff3748465b6a
+  metadata.gz: a27c830370df223add103179c9e8b60d5259abbb5b21b664f0b2642d96e5736926325c07e271b08822401c312ef532ec8a6f3c03dba30ce5a637edcbbba1ed12
+  data.tar.gz: 555cb81425239fba2c5752e238bd541db554f48eb7d46d1336122d730781e40fdd0b339a8266a49a42ace8b73909d7a26f145b9e3ea5d9602fbfcefb9db1a022

data/{CHANGELOG.MD → CHANGELOG.md}

@@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [1.1.0] - 2020-08-07
+### Changed
+* allow multiple consumers to handle the same message
+* consumed messages table requires its own primary key due to ActiveRecord not having support for composite primary keys
+
 ## [1.0.1] - 2020-07-23
 ### Fixed
 * Fix publisher connection by using default connection if one isn't provided
@@ -38,6 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Correlation ID and message UUID are auto generated for messages for IDs are not passed in [#23](https://github.com/learn-co/railway_ipc_gem/pull/23)
 
-[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/learn-co/railway_ipc_gem/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/learn-co/railway_ipc_gem/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v0.1.7...v1.0.0
 [0.1.7]: https://github.com/learn-co/railway_ipc_gem/releases/tag/v0.1.7

data/lib/railway_ipc/consumer/consumer.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require 'railway_ipc/consumer/consumer_response_handlers'
-
 module RailwayIpc
   class Consumer
     include Sneakers::Worker
+    def self.inherited(base)
+      base.instance_eval do
+        def handlers
+          @handlers ||= RailwayIpc::HandlerStore.new
+        end
+      end
+    end
 
     def self.listen_to(queue:, exchange:)
       from_queue queue,
@@ -15,11 +20,15 @@ module RailwayIpc
     end
 
     def self.handle(message_type, with:)
-      ConsumerResponseHandlers.instance.register(message: message_type, handler: with)
+      handlers.register(message: message_type, handler: with)
+    end
+
+    def handlers
+      self.class.handlers
     end
 
     def registered_handlers
-      ConsumerResponseHandlers.instance.registered
+      handlers.registered
     end
 
     def queue_name
@@ -45,7 +54,7 @@ module RailwayIpc
     end
 
     def get_handler(type)
-      manifest = ConsumerResponseHandlers.instance.get(type)
+      manifest = handlers.get(type)
       manifest ? manifest.handler.new : nil
     end
   end

data/lib/railway_ipc/consumer/process_incoming_message.rb

@@ -86,11 +86,10 @@ module RailwayIpc
     end
 
     def find_or_create_consumed_message
-      RailwayIpc::ConsumedMessage.find_by(uuid: incoming_message.uuid) ||
+      RailwayIpc::ConsumedMessage.find_by(uuid: incoming_message.uuid, queue: consumer.queue_name) ||
         RailwayIpc::ConsumedMessage.create_processing(consumer, incoming_message)
     end
 
-    # rubocop:disable Metrics/AbcSize
     def classify_message
       if incoming_message.decoded.is_a?(RailwayIpc::Messages::Unknown)
         UnknownMessageJob.new(incoming_message, logger)
@@ -100,6 +99,5 @@ module RailwayIpc
         IgnoredMessageJob.new(incoming_message, logger)
       end
     end
-    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/railway_ipc/handler_store.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'railway_ipc/handler_manifest'
 module RailwayIpc
+  HandlerManifest = Struct.new(:message, :handler)
   class HandlerStore
     attr_reader :handler_map
 
@@ -14,7 +14,7 @@ module RailwayIpc
     end
 
     def register(message:, handler:)
-      handler_map[message.to_s] = HandlerManifest.new(message: message, handler: handler)
+      handler_map[message.to_s] = HandlerManifest.new(message, handler)
     end
 
     def get(response_message)

data/lib/railway_ipc/models/consumed_message.rb

@@ -19,7 +19,6 @@ module RailwayIpc
     attr_reader :decoded_message
 
     self.table_name = 'railway_ipc_consumed_messages'
-    self.primary_key = 'uuid'
 
     validates :uuid, :status, presence: true
     validates :status, inclusion: { in: VALID_STATUSES }

data/lib/railway_ipc/rpc/server/server.rb

@@ -56,7 +56,6 @@ module RailwayIpc
     # rubocop:enable Metrics/AbcSize
     # rubocop:enable Metrics/MethodLength
 
-    # rubocop:disable Metrics/AbcSize
     def handle_request(payload)
       response = work(payload)
     rescue StandardError => e
@@ -69,7 +68,6 @@ module RailwayIpc
         )
       end
     end
-    # rubocop:enable Metrics/AbcSize
 
     private
 

data/lib/railway_ipc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailwayIpc
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/priv/migrations/add_railway_ipc_consumed_messages.rb

@@ -2,20 +2,20 @@
 
 class AddRailwayIpcConsumedMessages < ActiveRecord::Migration
   def change
-    create_table :railway_ipc_consumed_messages, id: false do |t|
+    create_table :railway_ipc_consumed_messages do |t|
       t.uuid :uuid, null: false
       t.string :message_type
       t.uuid :user_uuid
       t.uuid :correlation_id
       t.text :encoded_message
       t.string :status, null: false
-      t.string :queue
+      t.string :queue, null: false
       t.string :exchange
 
       t.datetime :updated_at
       t.datetime :inserted_at
     end
 
-    add_index :railway_ipc_consumed_messages, :uuid, unique: true
+    add_index :railway_ipc_consumed_messages, %i[uuid queue], unique: true
   end
 end

data/railway_ipc.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |spec|
   spec.version = RailwayIpc::VERSION
   spec.authors = ''
   spec.email = ''
+  spec.required_ruby_version = '>= 2.5'
 
   spec.summary = 'IPC components for Rails'
   spec.description = 'IPC components for Rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railway-ipc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - ''
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,7 +213,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CHANGELOG.MD
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -226,11 +226,9 @@ files:
 - lib/railway_ipc.rb
 - lib/railway_ipc/Rakefile
 - lib/railway_ipc/consumer/consumer.rb
-- lib/railway_ipc/consumer/consumer_response_handlers.rb
 - lib/railway_ipc/consumer/process_incoming_message.rb
 - lib/railway_ipc/errors.rb
 - lib/railway_ipc/handler.rb
-- lib/railway_ipc/handler_manifest.rb
 - lib/railway_ipc/handler_store.rb
 - lib/railway_ipc/incoming_message.rb
 - lib/railway_ipc/logger.rb
@@ -265,7 +263,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -273,16 +271,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.7.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: IPC components for Rails
 test_files: []

data/lib/railway_ipc/consumer/consumer_response_handlers.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-require 'railway_ipc/handler_store'
-module RailwayIpc
-  class ConsumerResponseHandlers
-    include Singleton
-    extend Forwardable
-    def_delegators :handler_store, :registered, :register, :get
-
-    private
-
-    def handler_store
-      @handler_store ||= RailwayIpc::HandlerStore.new
-    end
-  end
-end

data/lib/railway_ipc/handler_manifest.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module RailwayIpc
-  class HandlerManifest
-    attr_reader :message, :handler
-
-    def initialize(message:, handler:)
-      @message = message
-      @handler = handler
-    end
-  end
-end