cyclone_lariat 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57a9765a6c8e7239c17807d05e70399fccb2268d
-  data.tar.gz: e54780308582d37055e6d2444972e775f2ad9927
+  metadata.gz: c2611c13c5fb86d9aa353ae3df16d5c216fb02be
+  data.tar.gz: b90c6880d34961111dc73cb9f794561fa2a42630
 SHA512:
-  metadata.gz: d54bdf09e3414a6d2c477a2bd465750e705ad961d6882d015452b48fef11b09fc24770b938a390a3dc7a91de3e0059a8908728eb22114c7bd330f1556fa7d187
-  data.tar.gz: 5bfe88a0227b3bd8016b6a9c46eb007def598f3da4ce872e12f72385de735fd5019c6b0f96fb3d3d0c6e117ea373a1216b74d2f48fbe78bdadcde2480405d954
+  metadata.gz: '092ed1050daccad64005c8c91d586057f011881ddc3564f60892f27951b67b5e4f038730143273dd724e7792310206aab0c77ab09500f13933573fb0b03590b9'
+  data.tar.gz: 8b2b9d21456541871afd95dfd0b20057bdcdea543dce49b5ad34a66eb026067ef3869ae785b3962334783e371b293d8f3daf0eec9b7766ce112cbb43235e6d12

data/CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+## [1.0.0.rc3]
+Added
+- `CycloneLariat::Messages::Builder` for building messages
+
 ## [1.0.0.rc2]
 Changed
 - README.md file

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyclone_lariat (1.0.0.rc1)
+    cyclone_lariat (1.0.0.rc3)
       aws-sdk-sns
       aws-sdk-sqs
       dry-cli (~> 0.6)
@@ -28,16 +28,16 @@ GEM
     arel (9.0.0)
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.694.0)
-    aws-sdk-core (3.168.4)
+    aws-partitions (1.703.0)
+    aws-sdk-core (3.170.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-sns (1.57.0)
+    aws-sdk-sns (1.59.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.52.1)
+    aws-sdk-sqs (1.53.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.5.2)

data/lib/cyclone_lariat/messages/abstract.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require 'luna_park/entities/attributable'
+require 'luna_park/extensions/validatable'
+require 'cyclone_lariat/errors'
+
+module CycloneLariat
+  module Messages
+    class Abstract < LunaPark::Entities::Attributable
+      include LunaPark::Extensions::Validatable
+
+      KIND = 'unknown'
+
+      attr :uuid,      String, :new
+      attr :publisher, String, :new
+      attr :type,      String, :new
+
+      attrs :client_error, :version, :data, :request_id, :sent_at,
+            :deduplication_id, :group_id, :processed_at, :received_at
+
+      # Make validation public
+      def validation
+        super
+      end
+
+      def kind
+        KIND
+      end
+
+      def serialize
+        {
+          uuid: uuid,
+          publisher: publisher,
+          type: [kind, type].join('_'),
+          version: version,
+          data: data,
+          request_id: request_id,
+          sent_at: sent_at&.iso8601(3)
+        }.compact
+      end
+
+      def to_json(*args)
+        serialize.to_json(*args)
+      end
+
+      def params
+        serialize
+      end
+
+      def data
+        @data ||= {}
+      end
+
+      def version=(value)
+        @version = Integer(value)
+      end
+
+      def sent_at=(value)
+        @sent_at = wrap_time(value)
+      end
+
+      def received_at=(value)
+        @received_at = wrap_time(value)
+      end
+
+      def processed_at=(value)
+        @processed_at = wrap_time(value)
+      end
+
+      def request_id=(value)
+        @request_id = wrap_string(value)
+      end
+
+      def group_id=(value)
+        @group_id = wrap_string(value)
+      end
+
+      def deduplication_id=(value)
+        @deduplication_id = wrap_string(value)
+      end
+
+      def processed?
+        !@processed_at.nil?
+      end
+
+      def client_error_message=(txt)
+        return unless txt
+
+        @client_error ||= Errors::ClientError.new
+        @client_error.message = txt
+      end
+
+      def client_error_details=(details)
+        return unless details
+
+        @client_error ||= Errors::ClientError.new
+        @client_error.details = details
+      end
+
+      def fifo?
+        !@group_id.nil?
+      end
+
+      def ==(other)
+        kind == other.kind &&
+          uuid == other.uuid &&
+          publisher == other.publisher &&
+          type == other.type &&
+          client_error&.message == other.client_error&.message &&
+          version == other.version &&
+          sent_at.to_i == other.sent_at.to_i &&
+          received_at.to_i == other.received_at.to_i &&
+          processed_at.to_i == other.processed_at.to_i
+      end
+
+      private
+
+      def wrap_time(value)
+        case value
+        when String   then Time.parse(value)
+        when Time     then value
+        when NilClass then nil
+        else raise ArgumentError, "Unknown type `#{value.class}`"
+        end
+      end
+
+      def wrap_string(value)
+        case value
+        when String then String(value)
+        when Integer then String(value)
+        when NilClass then nil
+        when FalseClass then nil
+        else raise ArgumentError, "Unknown type `#{value.class}`"
+        end
+      end
+    end
+  end
+end

data/lib/cyclone_lariat/messages/builder.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'cyclone_lariat/messages/v1/event'
+require 'cyclone_lariat/messages/v1/command'
+require 'cyclone_lariat/messages/v2/event'
+require 'cyclone_lariat/messages/v2/command'
+require 'cyclone_lariat/messages/common'
+
+module CycloneLariat
+  module Messages
+    class Builder
+      attr_reader :raw_message
+
+      def initialize(raw_message:)
+        @raw_message = raw_message
+        @kind = kind
+        @raw_message[:type] = message_type
+      end
+
+      def call
+        case @kind
+        when 'event' then event_builder
+        when 'command' then command_builder
+        else Messages::Common.wrap(message_without_kind)
+        end
+      end
+
+      private
+
+      def event_builder
+        case message_version
+        when 1 then event_v1
+        when 2 then event_v2
+        else raise ArgumentError, "Unknown event message version #{message_version}"
+        end
+      end
+
+      def command_builder
+        case message_version
+        when 1 then command_v1
+        when 2 then command_v2
+        else raise ArgumentError, "Unknown command message version #{message_version}"
+        end
+      end
+
+      def event_v1
+        Messages::V1::Event.wrap(message_without_kind)
+      end
+
+      def event_v2
+        Messages::V2::Event.wrap(message_without_kind)
+      end
+
+      def command_v1
+        Messages::V1::Command.wrap(message_without_kind)
+      end
+
+      def command_v2
+        Messages::V2::Command.wrap(message_without_kind)
+      end
+
+      def message_version
+        Integer(@raw_message[:version])
+      end
+
+      def message_without_kind
+        @raw_message.except(:kind)
+      end
+
+      def kind
+        return @raw_message[:kind] if @raw_message[:kind]
+
+        @raw_message[:type].split('_').first
+      end
+
+      def message_type
+        return @raw_message[:type] if @raw_message[:kind]
+
+        @raw_message[:type].gsub(/^(event_|command_)/, '')
+      end
+    end
+  end
+end

data/lib/cyclone_lariat/messages/common.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'cyclone_lariat/messages/abstract'
+
+module CycloneLariat
+  module Messages
+    class Common < Abstract
+      KIND = 'unknown'
+
+      attrs :subject, :object
+
+      def kind
+        KIND
+      end
+
+      def serialize
+        {
+          uuid: uuid,
+          publisher: publisher,
+          type: [kind, type].join('_'),
+          version: version,
+          data: data,
+          request_id: request_id,
+          sent_at: sent_at&.iso8601(3),
+          subject: subject,
+          object: object
+        }.compact
+      end
+
+      def subject
+        @subject ||= {}
+      end
+
+      def object
+        @object ||= {}
+      end
+    end
+  end
+end

data/lib/cyclone_lariat/messages/v1/command.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'cyclone_lariat/messages/v1/abstract'
+require 'cyclone_lariat/messages/abstract'
+require 'cyclone_lariat/messages/v1/validator'
 
 module CycloneLariat
   module Messages
     module V1
       class Command < Abstract
-        include LunaPark::Extensions::Validatable
-        validator Messages::V1::Validator
+        validator Validator
 
         KIND = 'command'
 

data/lib/cyclone_lariat/messages/v1/event.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'cyclone_lariat/messages/v1/abstract'
+require 'cyclone_lariat/messages/abstract'
+require 'cyclone_lariat/messages/v1/validator'
 
 module CycloneLariat
   module Messages
     module V1
       class Event < Abstract
-        include LunaPark::Extensions::Validatable
-        validator Messages::V1::Validator
+        validator Validator
 
         KIND = 'event'
 

data/lib/cyclone_lariat/messages/v2/command.rb

@@ -1,19 +1,43 @@
 # frozen_string_literal: true
 
-require 'cyclone_lariat/messages/v2/abstract'
+require 'cyclone_lariat/messages/abstract'
+require 'cyclone_lariat/messages/v2/validator'
 
 module CycloneLariat
   module Messages
     module V2
       class Command < Abstract
-        include LunaPark::Extensions::Validatable
-        validator Messages::V2::Validator
+        validator Validator
+
+        attrs :subject, :object
 
         KIND = 'command'
 
         def kind
           KIND
         end
+
+        def serialize
+          {
+            uuid: uuid,
+            publisher: publisher,
+            type: [kind, type].join('_'),
+            version: version,
+            data: data,
+            request_id: request_id,
+            sent_at: sent_at&.iso8601(3),
+            subject: subject,
+            object: object
+          }.compact
+        end
+
+        def subject
+          @subject ||= {}
+        end
+
+        def object
+          @object ||= {}
+        end
       end
     end
   end

data/lib/cyclone_lariat/messages/v2/event.rb

@@ -1,19 +1,43 @@
 # frozen_string_literal: true
 
-require 'cyclone_lariat/messages/v2/abstract'
+require 'cyclone_lariat/messages/abstract'
+require 'cyclone_lariat/messages/v2/validator'
 
 module CycloneLariat
   module Messages
     module V2
       class Event < Abstract
-        include LunaPark::Extensions::Validatable
-        validator Messages::V2::Validator
+        validator Validator
+
+        attrs :subject, :object
 
         KIND = 'event'
 
         def kind
           KIND
         end
+
+        def serialize
+          {
+            uuid: uuid,
+            publisher: publisher,
+            type: [kind, type].join('_'),
+            version: version,
+            data: data,
+            request_id: request_id,
+            sent_at: sent_at&.iso8601(3),
+            subject: subject,
+            object: object
+          }.compact
+        end
+
+        def subject
+          @subject ||= {}
+        end
+
+        def object
+          @object ||= {}
+        end
       end
     end
   end

data/lib/cyclone_lariat/middleware.rb

@@ -3,6 +3,7 @@
 require 'cyclone_lariat/repo/messages'
 require 'cyclone_lariat/core'
 require 'luna_park/errors'
+require 'cyclone_lariat/messages/builder'
 require 'json'
 
 module CycloneLariat
@@ -23,7 +24,7 @@ module CycloneLariat
       return if msg.is_a? String
 
       catch_standard_error(queue, msg) do
-        event = Messages::V1::Event.wrap(msg)
+        event = Messages::Builder.new(raw_message: msg).call
 
         store_in_dataset(event) do
           catch_business_error(event, &block)

data/lib/cyclone_lariat/repo/active_record/messages.rb

@@ -3,6 +3,7 @@
 require 'cyclone_lariat/messages/v1/event'
 require 'cyclone_lariat/messages/v1/command'
 require 'cyclone_lariat/repo/messages_mapper'
+require 'cyclone_lariat/messages/builder'
 
 module CycloneLariat
   module Repo
@@ -80,11 +81,7 @@ module CycloneLariat
         end
 
         def build(raw)
-          case kind = raw.delete(:kind)
-          when 'event'   then CycloneLariat::Messages::V1::Event.wrap raw
-          when 'command' then CycloneLariat::Messages::V1::Command.wrap raw
-          else raise ArgumentError, "Unknown kind `#{kind}` of message"
-          end
+          CycloneLariat::Messages::Builder.new(raw_message: raw).call
         end
       end
     end

data/lib/cyclone_lariat/repo/sequel/messages.rb

@@ -3,6 +3,7 @@
 require 'cyclone_lariat/messages/v1/event'
 require 'cyclone_lariat/messages/v1/command'
 require 'cyclone_lariat/repo/messages_mapper'
+require 'cyclone_lariat/messages/builder'
 
 module CycloneLariat
   module Repo
@@ -61,11 +62,7 @@ module CycloneLariat
         private
 
         def build(raw)
-          case kind = raw.delete(:kind)
-          when 'event'   then CycloneLariat::Messages::V1::Event.wrap raw
-          when 'command' then CycloneLariat::Messages::V1::Command.wrap raw
-          else raise ArgumentError, "Unknown kind `#{kind}` of message"
-          end
+          CycloneLariat::Messages::Builder.new(raw_message: raw).call
         end
       end
     end

data/lib/cyclone_lariat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CycloneLariat
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0.rc3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyclone_lariat
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -388,11 +388,12 @@ files:
 - lib/cyclone_lariat/generators/event.rb
 - lib/cyclone_lariat/generators/queue.rb
 - lib/cyclone_lariat/generators/topic.rb
-- lib/cyclone_lariat/messages/v1/abstract.rb
+- lib/cyclone_lariat/messages/abstract.rb
+- lib/cyclone_lariat/messages/builder.rb
+- lib/cyclone_lariat/messages/common.rb
 - lib/cyclone_lariat/messages/v1/command.rb
 - lib/cyclone_lariat/messages/v1/event.rb
 - lib/cyclone_lariat/messages/v1/validator.rb
-- lib/cyclone_lariat/messages/v2/abstract.rb
 - lib/cyclone_lariat/messages/v2/command.rb
 - lib/cyclone_lariat/messages/v2/event.rb
 - lib/cyclone_lariat/messages/v2/validator.rb

data/lib/cyclone_lariat/messages/v1/abstract.rb

@@ -1,139 +0,0 @@
-# frozen_string_literal: true
-
-require 'luna_park/entities/attributable'
-require 'luna_park/extensions/validatable'
-require 'cyclone_lariat/messages/v1/validator'
-require 'cyclone_lariat/errors'
-
-module CycloneLariat
-  module Messages
-    module V1
-      class Abstract < LunaPark::Entities::Attributable
-        include LunaPark::Extensions::Validatable
-
-        attr :uuid,      String, :new
-        attr :publisher, String, :new
-        attr :type,      String, :new
-
-        attrs :client_error, :version, :data, :request_id, :sent_at,
-              :deduplication_id, :group_id, :processed_at, :received_at
-
-        validator Validator
-
-        # Make validation public
-        def validation
-          super
-        end
-
-        def serialize
-          {
-            uuid: uuid,
-            publisher: publisher,
-            type: [kind, type].join('_'),
-            version: version,
-            data: data,
-            request_id: request_id,
-            sent_at: sent_at&.iso8601(3)
-          }.compact
-        end
-
-        def to_json(*args)
-          serialize.to_json(*args)
-        end
-
-        alias params serialize
-
-        def kind
-          raise LunaPark::Errors::AbstractMethod
-        end
-
-        def data
-          @data ||= {}
-        end
-
-        def version=(value)
-          @version = Integer(value)
-        end
-
-        def sent_at=(value)
-          @sent_at = wrap_time(value)
-        end
-
-        def received_at=(value)
-          @received_at = wrap_time(value)
-        end
-
-        def processed_at=(value)
-          @processed_at = wrap_time(value)
-        end
-
-        def request_id=(value)
-          @request_id = wrap_string(value)
-        end
-
-        def group_id=(value)
-          @group_id = wrap_string(value)
-        end
-
-        def deduplication_id=(value)
-          @deduplication_id = wrap_string(value)
-        end
-
-        def processed?
-          !@processed_at.nil?
-        end
-
-        def client_error_message=(txt)
-          return unless txt
-
-          @client_error ||= Errors::ClientError.new
-          @client_error.message = txt
-        end
-
-        def client_error_details=(details)
-          return unless details
-
-          @client_error ||= Errors::ClientError.new
-          @client_error.details = details
-        end
-
-        def fifo?
-          !@group_id.nil?
-        end
-
-        def ==(other)
-          kind == other.kind &&
-            uuid == other.uuid &&
-            publisher == other.publisher &&
-            type == other.type &&
-            client_error&.message == other.client_error&.message &&
-            version == other.version &&
-            sent_at.to_i == other.sent_at.to_i &&
-            received_at.to_i == other.received_at.to_i &&
-            processed_at.to_i == other.processed_at.to_i
-        end
-
-        private
-
-        def wrap_time(value)
-          case value
-          when String   then Time.parse(value)
-          when Time     then value
-          when NilClass then nil
-          else raise ArgumentError, "Unknown type `#{value.class}`"
-          end
-        end
-
-        def wrap_string(value)
-          case value
-          when String then String(value)
-          when Integer then String(value)
-          when NilClass then nil
-          when FalseClass then nil
-          else raise ArgumentError, "Unknown type `#{value.class}`"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/cyclone_lariat/messages/v2/abstract.rb

@@ -1,149 +0,0 @@
-# frozen_string_literal: true
-
-require 'luna_park/entities/attributable'
-require 'luna_park/extensions/validatable'
-require 'cyclone_lariat/messages/v2/validator'
-require 'cyclone_lariat/errors'
-
-module CycloneLariat
-  module Messages
-    module V2
-      class Abstract < LunaPark::Entities::Attributable
-        include LunaPark::Extensions::Validatable
-
-        attr :uuid,      String, :new
-        attr :publisher, String, :new
-        attr :type,      String, :new
-        attrs :client_error, :version, :data, :request_id, :sent_at,
-          :deduplication_id, :group_id, :processed_at, :received_at,
-          :subject, :object
-
-        validator Validator
-
-        # Make validation public
-        def validation
-          super
-        end
-
-        def serialize
-          {
-            uuid: uuid,
-            publisher: publisher,
-            type: [kind, type].join('_'),
-            version: version,
-            data: data,
-            request_id: request_id,
-            sent_at: sent_at&.iso8601(3),
-            subject: subject,
-            object: object
-          }.compact
-        end
-
-        def to_json(*args)
-          serialize.to_json(*args)
-        end
-
-        alias params serialize
-
-        def kind
-          raise LunaPark::Errors::AbstractMethod
-        end
-
-        def data
-          @data ||= {}
-        end
-
-        def subject
-          @subject ||= {}
-        end
-
-        def object
-          @object ||= {}
-        end
-
-        def version=(value)
-          @version = Integer(value)
-        end
-
-        def sent_at=(value)
-          @sent_at = wrap_time(value)
-        end
-
-        def received_at=(value)
-          @received_at = wrap_time(value)
-        end
-
-        def processed_at=(value)
-          @processed_at = wrap_time(value)
-        end
-
-        def request_id=(value)
-          @request_id = wrap_string(value)
-        end
-
-        def group_id=(value)
-          @group_id = wrap_string(value)
-        end
-
-        def deduplication_id=(value)
-          @deduplication_id = wrap_string(value)
-        end
-
-        def processed?
-          !@processed_at.nil?
-        end
-
-        def client_error_message=(txt)
-          return unless txt
-
-          @client_error ||= Errors::ClientError.new
-          @client_error.message = txt
-        end
-
-        def client_error_details=(details)
-          return unless details
-
-          @client_error ||= Errors::ClientError.new
-          @client_error.details = details
-        end
-
-        def fifo?
-          !@group_id.nil?
-        end
-
-        def ==(other)
-          kind == other.kind &&
-            uuid == other.uuid &&
-            publisher == other.publisher &&
-            type == other.type &&
-            client_error&.message == other.client_error&.message &&
-            version == other.version &&
-            sent_at.to_i == other.sent_at.to_i &&
-            received_at.to_i == other.received_at.to_i &&
-            processed_at.to_i == other.processed_at.to_i
-        end
-
-        private
-
-        def wrap_time(value)
-          case value
-          when String   then Time.parse(value)
-          when Time     then value
-          when NilClass then nil
-          else raise ArgumentError, "Unknown type `#{value.class}`"
-          end
-        end
-
-        def wrap_string(value)
-          case value
-          when String then String(value)
-          when Integer then String(value)
-          when NilClass then nil
-          when FalseClass then nil
-          else raise ArgumentError, "Unknown type `#{value.class}`"
-          end
-        end
-      end
-    end
-  end
-end