railway-ipc 4.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f349dc76232b1cef6492bb2dc09cdbd58bf2ad22be64bfd1771e4e6d7192b16
-  data.tar.gz: 3e04b076735ca1bcc8d1cc376925311b1547b8b13a554691726f348a62625cfc
+  metadata.gz: fc7c266e2cb4bb91515fb490ec2986262f6b2031c6ddf930aa4b9a4951c73f18
+  data.tar.gz: '079506cb2cf5f62702490733b0759501a48aff202dc2d77616540e9b7d585734'
 SHA512:
-  metadata.gz: d0dd3263f9ca6c57da0fd98c25b720f1f7bad7ec87bb4c34cd110d51824b350ca255d9a467170d420aeb323faff081f03ea62c18c080f3a52fd72f0c687be49a
-  data.tar.gz: 74d6f196446603d93d42050e2c672ccac22ec49cedbc2d026cf8f8f61eb0bc4d6537b179ad2d60cd37426ad6b60ab9e428d40b21f69ce21426cc86cbeefaacaf
+  metadata.gz: d546243d3989cc7545fd1afe5c54973139df71cd32bbf6cbeb2c052ef657603154e7ec0f6f690c494e87cc808d94f07adce0a44f6a0f1fd62a862de912184c5b
+  data.tar.gz: 9813c0f55a7075a9e23ba9abb1dbcfe50990a868f6a0ccd2f08424cc58cb2491761008ef7e689dc7cdd617194223bcfbf4e51a201ca7c934ca932d3c092e4e38

data/.ruby-version

@@ -1 +1 @@
-2.6.5
+2.7.2

data/CHANGELOG.md

@@ -1,8 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 ### Added
@@ -10,6 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Fixed
 
+## [5.0.0] - 2021-02-17
+### Added
+* Message encoders. Messages can now be encoded using either binary protobufs (the default) or JSON protobufs.
+* `RailwayIpc::OutgoingMessage` abstraction that encapsulates everything about a message to be published.
+
+### Changed
+* `Publisher#publish` now takes an optional `format` parameter that specifies how the message should be encoded. It is added to the message header when the message is published. The default format is `binary_protobuf`.
+* (Breaking change) `Publisher#publish` now returns an `OutgoingMessage` instead of a `Bunny::Exchange`.
+* Refactor `PublishedMessage#store_message` to take an `OutgoingMessage`.
+
+### Removed
+* (Breaking change) Remove deprecated `SingletonPublisher`
+
+## [4.0.1] - 2021-01-12
+### Fixed
+* Fixed `undefined method fetch for Bunny::MessageProperties` error. `Bunny::MessageProperties` isn't really a Hash, it wraps one (and doesn't provide a `#fetch` method).
+
 ## [4.0.0] - 2021-01-11
 ### Added
 * JSON decoder for consumers that can handle JSON encoded Protobufs. Note that the publishers do not (yet) have the option of encoding the messages as JSON.
@@ -96,7 +112,9 @@ 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/v4.0.0...HEAD
+[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v5.0.0...HEAD
+[5.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v4.0.1...v5.0.0
+[4.0.1]: https://github.com/learn-co/railway_ipc_gem/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v3.0.0...v4.0.0
 [3.0.0]: https://github.com/learn-co/railway_ipc_gem/compare/v2.2.2...v3.0.0
 [2.2.2]: https://github.com/learn-co/railway_ipc_gem/compare/v2.2.1...v2.2.2

data/lib/railway_ipc/consumer/consumer.rb

@@ -60,8 +60,8 @@ module RailwayIpc
     # methods as part of Railway's public API since clients can (and do)
     # override them. -BN
     def work_with_params(payload, _delivery_info, metadata)
-      message_format = metadata.fetch('headers', {})
-                               .fetch('message_format', 'protobuf_binary')
+      headers = metadata.headers || {}
+      message_format = headers.fetch('message_format', 'binary_protobuf')
 
       message = RailwayIpc::IncomingMessage.new(payload, message_format: message_format)
       RailwayIpc::ProcessIncomingMessage.call(self, message)

data/lib/railway_ipc/incoming_message.rb

@@ -47,8 +47,8 @@ module RailwayIpc
 
     def get_decoder(name)
       {
-        'protobuf_binary' => RailwayIpc::MessageDecoders::ProtobufBinaryDecoder,
-        'protobuf_json' => RailwayIpc::MessageDecoders::ProtobufJsonDecoder
+        'binary_protobuf' => RailwayIpc::MessageDecoders::ProtobufBinaryDecoder,
+        'json_protobuf' => RailwayIpc::MessageDecoders::ProtobufJsonDecoder
       }.fetch(name, DEFAULT_DECODER)
     end
   end

data/lib/railway_ipc/message_encoders.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RailwayIpc
+  module MessageEncoders
+    ProtobufBinaryEncoder = lambda do |message|
+      {
+        type: message.type,
+        encoded_message: Base64.encode64(message.proto.class.encode(message.proto))
+      }.to_json
+    rescue NoMethodError
+      raise RailwayIpc::InvalidProtobuf.new("Message #{message} is not a valid protobuf")
+    end
+
+    ProtobufJsonEncoder = lambda do |message|
+      {
+        type: message.type,
+        encoded_message: message.proto.to_h
+      }.to_json
+    rescue NoMethodError
+      raise RailwayIpc::InvalidProtobuf.new("Message #{message} is not a valid protobuf")
+    end
+  end
+end

data/lib/railway_ipc/models/consumed_message.rb

@@ -54,8 +54,18 @@ module RailwayIpc
 
     private
 
+    # rails <= 5.1 uses this method to know the name of the created_at/updated_at fields
     def timestamp_attributes_for_create
       super << :inserted_at
     end
+
+    # rails >= 6.0 moved this to the class level and uses strings instead of symbols
+    class << self
+      private
+
+      def timestamp_attributes_for_create
+        super << 'inserted_at'
+      end
+    end
   end
 end

data/lib/railway_ipc/models/published_message.rb

@@ -7,23 +7,32 @@ module RailwayIpc
 
     validates :uuid, :status, presence: true
 
-    def self.store_message(exchange_name, message)
-      encoded_message = RailwayIpc::Rabbitmq::Payload.encode(message)
+    def self.store_message(outgoing_message)
       create!(
-        uuid: message.uuid,
-        message_type: message.class.to_s,
-        user_uuid: message.user_uuid,
-        correlation_id: message.correlation_id,
-        encoded_message: encoded_message,
+        uuid: outgoing_message.uuid,
+        message_type: outgoing_message.type,
+        user_uuid: outgoing_message.user_uuid,
+        correlation_id: outgoing_message.correlation_id,
+        encoded_message: outgoing_message.encoded,
         status: 'sent',
-        exchange: exchange_name
+        exchange: outgoing_message.exchange
       )
     end
 
     private
 
+    # rails <= 5.1 uses this method to know the name of the created_at/updated_at fields
     def timestamp_attributes_for_create
       super << :inserted_at
     end
+
+    # rails >= 6.0 moved this to the class level and uses strings instead of symbols
+    class << self
+      private
+
+      def timestamp_attributes_for_create
+        super << 'inserted_at'
+      end
+    end
   end
 end

data/lib/railway_ipc/outgoing_message.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module RailwayIpc
+  class OutgoingMessage
+    extend Forwardable
+
+    attr_reader :proto, :exchange, :format
+
+    def_delegators :@proto, :uuid, :user_uuid, :correlation_id
+
+    def initialize(proto, exchange, format=nil)
+      proto.uuid = SecureRandom.uuid if proto.uuid.blank?
+      proto.correlation_id = SecureRandom.uuid if proto.correlation_id.blank?
+      @proto = proto
+      @exchange = exchange
+      @format = format
+    end
+
+    def type
+      proto.class.to_s
+    end
+
+    def encoded
+      @encoded ||= encoder.call(self)
+    end
+
+    private
+
+    DEFAULT_ENCODER = RailwayIpc::MessageEncoders::ProtobufBinaryEncoder
+
+    def encoder
+      {
+        'binary_protobuf' => RailwayIpc::MessageEncoders::ProtobufBinaryEncoder,
+        'json_protobuf' => RailwayIpc::MessageEncoders::ProtobufJsonEncoder
+      }.fetch(format, DEFAULT_ENCODER)
+    end
+  end
+end

data/lib/railway_ipc/publisher.rb

@@ -1,55 +1,5 @@
 # frozen_string_literal: true
 
-module RailwayIpc
-  class SingletonPublisher < Sneakers::Publisher
-    include ::Singleton
-
-    def self.exchange(exchange)
-      @exchange_name = exchange
-    end
-
-    def self.exchange_name
-      raise 'Subclass must set the exchange' unless @exchange_name
-
-      @exchange_name
-    end
-
-    def initialize
-      super(exchange: self.class.exchange_name, exchange_type: :fanout)
-    end
-
-    def publish(message, published_message_store=RailwayIpc::PublishedMessage)
-      RailwayIpc.logger.warn('DEPRECATED: Use new PublisherInstance class', log_message_options)
-      ensure_message_uuid(message)
-      ensure_correlation_id(message)
-      RailwayIpc.logger.info('Publishing message', log_message_options(message))
-      result = super(RailwayIpc::Rabbitmq::Payload.encode(message))
-      published_message_store.store_message(self.class.exchange_name, message)
-      result
-    rescue RailwayIpc::InvalidProtobuf => e
-      RailwayIpc.logger.error('Invalid protobuf', log_message_options(message))
-      raise e
-    end
-
-    private
-
-    def ensure_message_uuid(message)
-      message.uuid = SecureRandom.uuid if message.uuid.blank?
-      message
-    end
-
-    def ensure_correlation_id(message)
-      message.correlation_id = SecureRandom.uuid if message.correlation_id.blank?
-      message
-    end
-
-    def log_message_options(message=nil)
-      options = { feature: 'railway_ipc_publisher', exchange: self.class.exchange_name }
-      message.nil? ? options : options.merge(protobuf: { type: message.class, data: message })
-    end
-  end
-end
-
 module RailwayIpc
   class Publisher
     attr_reader :exchange_name, :message_store
@@ -60,13 +10,12 @@ module RailwayIpc
     end
 
     # rubocop:disable Metrics/AbcSize
-    def publish(message)
-      message.uuid = SecureRandom.uuid if message.uuid.blank?
-      message.correlation_id = SecureRandom.uuid if message.correlation_id.blank?
+    def publish(message, format='binary_protobuf')
+      outgoing_message = OutgoingMessage.new(message, exchange_name, format)
+      stored_message = message_store.store_message(outgoing_message)
       RailwayIpc.logger.info('Publishing message', log_message_options(message))
-
-      stored_message = message_store.store_message(exchange_name, message)
-      exchange.publish(RailwayIpc::Rabbitmq::Payload.encode(message))
+      exchange.publish(outgoing_message.encoded, headers: { message_format: format })
+      outgoing_message
     rescue RailwayIpc::InvalidProtobuf => e
       RailwayIpc.logger.error('Invalid protobuf', log_message_options(message))
       raise e

data/lib/railway_ipc/version.rb

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

data/lib/railway_ipc.rb

@@ -14,8 +14,10 @@ require 'railway_ipc/unknown_message.pb'
 require 'railway_ipc/rabbitmq/adapter'
 require 'railway_ipc/handler'
 require 'railway_ipc/handler_store'
+require 'railway_ipc/message_encoders'
 require 'railway_ipc/message_decoders'
 require 'railway_ipc/incoming_message'
+require 'railway_ipc/outgoing_message'
 require 'railway_ipc/connection_manager'
 require 'railway_ipc/publisher'
 require 'railway_ipc/responder'

data/priv/migrations/add_railway_ipc_consumed_messages.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddRailwayIpcConsumedMessages < ActiveRecord::Migration
+class AddRailwayIpcConsumedMessages < ActiveRecord::Migration[4.2]
   def change
     create_table :railway_ipc_consumed_messages do |t|
       t.uuid :uuid, null: false

data/priv/migrations/add_railway_ipc_published_messages.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddRailwayIpcPublishedMessages < ActiveRecord::Migration
+class AddRailwayIpcPublishedMessages < ActiveRecord::Migration[4.2]
   def change
     create_table :railway_ipc_published_messages, id: false do |t|
       t.uuid :uuid, null: false

data/railway_ipc.gemspec

@@ -47,9 +47,9 @@ Gem::Specification.new do |spec|
   # Setup for testing Rails type code within mock Rails app
   spec.add_development_dependency 'database_cleaner', '~> 1.7'
   spec.add_development_dependency 'listen', '~> 3.0.5'
-  spec.add_development_dependency 'pg', '~> 0.18'
+  spec.add_development_dependency 'pg', '~> 1.1'
   spec.add_development_dependency 'pry', '~> 0.13'
-  spec.add_development_dependency 'rails', '~> 5.0.7'
+  spec.add_development_dependency 'rails', '~> 6.0'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'shoulda-matchers', '~> 4.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railway-ipc
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.7
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -249,8 +249,10 @@ files:
 - lib/railway_ipc/incoming_message.rb
 - lib/railway_ipc/logger.rb
 - lib/railway_ipc/message_decoders.rb
+- lib/railway_ipc/message_encoders.rb
 - lib/railway_ipc/models/consumed_message.rb
 - lib/railway_ipc/models/published_message.rb
+- lib/railway_ipc/outgoing_message.rb
 - lib/railway_ipc/publisher.rb
 - lib/railway_ipc/rabbitmq/adapter.rb
 - lib/railway_ipc/rabbitmq/payload.rb
@@ -295,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: IPC components for Rails