railway-ipc 4.0.1 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa6ce7e4b6f8667fa4939cc334dd66845c39e5f357bd4887eb030b7f4edcf3a
-  data.tar.gz: ea8f959e0cf43ed38b71276baac73c4c4e417ee8d4323d47605390a95d573c53
+  metadata.gz: a50920a8e02fc13ab3c9afef0761aff015d6acd1d5b252d4dd63e5398954cd87
+  data.tar.gz: 8f30819cb0a237b4af1761cb81387b5d0377a788355432f708bf88953a209add
 SHA512:
-  metadata.gz: e76cd2483ea799dd04f7acc27cd5f7799a6f7bd6d6e9bc6e64c08e0a621f55ad6e9ba37fb53c685fea4dd8847b78bde3b73bb97091d9f3764d15c3ce5237c84b
-  data.tar.gz: 62955dfb46eb250156ff8d9c1c9c1570169bc1c45742ca231dbbceadeb091f71439793645620cad63ba5e0c21e393894aa13d96444ac0da4f440c0b7179076a7
+  metadata.gz: 6b2981894fb61a8fd32d66a309f44164d3007f1c1c52f9c743cc18a2526d17f01e60bdd85f0787ad2ae6bca39e068650bb71eafb7ea1f2033550191fd4c103ee
+  data.tar.gz: e35e1ad6e26ca87816df9dd5acefb9851c65cf66eee9fa9a69d8d6cf0b3dc4c27c7770ca81e7c43cf638b081c844a8ca64e78987f4df9a5f8119cac4cc60c1aa

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.1.1] - 2022-09-09
+### Fixed
+* Made `google-protobuf` dependency explicit
+
+## [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).
@@ -100,7 +116,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.1...HEAD
+[Unreleased]: https://github.com/learn-co/railway_ipc_gem/compare/v5.1.1...HEAD
+[5.1.1]: https://github.com/learn-co/railway_ipc_gem/compare/v5.1.0...v5.1.1
+[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

data/lib/railway_ipc/consumer/consumer.rb

@@ -61,7 +61,7 @@ module RailwayIpc
     # override them. -BN
     def work_with_params(payload, _delivery_info, metadata)
       headers = metadata.headers || {}
-      message_format = headers.fetch('message_format', 'protobuf_binary')
+      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.1'
+  VERSION = '5.1.1'
 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

@@ -42,14 +42,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop', '~> 0.86'
 
   spec.add_dependency 'bunny', '~> 2.2.0'
+  spec.add_dependency 'google-protobuf', '> 3.7'
   spec.add_dependency 'sneakers', '~> 2.3.5'
 
   # 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.1
+  version: 5.1.1
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: google-protobuf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: sneakers
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,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 +198,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 +263,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 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: IPC components for Rails