cyclone_lariat 0.3.0 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c2975656b4c950bc5dd8959d06450260fb5ac823005d9c2372b263944b64e4
-  data.tar.gz: 4ac631178ba3087ba437cbf9c2e0a502032c53ee133b71d46adcdceb7e1079bc
+  metadata.gz: de7e05c5fba57a9db6c827549404f12b1f88be0336b00d2d5dfb4dc77132b328
+  data.tar.gz: 54d81b79a812fdf91513cdee886933d32055fd405c55bb032aae4dec81ac1ff3
 SHA512:
-  metadata.gz: 125fdc253fdbd93896c7de8c715f0d1cf64288e658f0b870ef1d6ae32351e85d24611be9ababca096b813c1c863f346ca92af604ac91dc60dc0282c8f2c4e3dc
-  data.tar.gz: 7435eeadbf5047dc7b9e99488d32a8886cd2a90cef40f627f65aaa20459f220893bd417fbfe1b6b4f2d1a5665051d2cbdc34e7b96968a4a303352f579456b7ea
+  metadata.gz: 3d8ce1ebcd03c53309165592b7e4e0cbe342a3033694afdc639e033fb76a88dd1f340ee2204c5602f02399a5e9e56f47a7483dba867d9aafcd9947b3958933c1
+  data.tar.gz: 8c8668274a9435e56804739e6625703b733810e46401aca602c04f51763274dafa9456f625fc315ae7b322c62d4a426a582a62db8b6061716ad46aced0ab5ef0

data/CHANGELOG.md

@@ -4,6 +4,18 @@ 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).
 
+## [0.3.3] - 2021-07-14
+Changed
+- Bugfix of message equality check
+
+## [0.3.2] - 2021-06-11
+Changed
+- Bugfix
+
+## [0.3.1] - 2021-06-11
+Changed
+- Command
+- SqsClient
 
 ## [0.3.0] - 2021-06-09
 Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyclone_lariat (0.3.0)
+    cyclone_lariat (0.3.2)
       aws-sdk-sns
       aws-sdk-sqs
       luna_park (~> 0.11)

data/README.md

@@ -128,7 +128,8 @@ As you see all params identity. And you can easily change your sqs-queue to sns-
 subscribes. But you should define destination.
 
 ```ruby
-client.publish_event 'email_is_created', data: { mail: 'john.doe@example.com' }, dest: 'notify_service'
+client.publish_event 'email_is_created', data: { mail: 'john.doe@example.com' }, dest: 'notify_service'  
+# prod-event-queue-pilot-email_is_created-notify_service
 ```
 
 Or you can define topic directly:
@@ -158,7 +159,6 @@ class Receiver
                     queue: 'your_sqs_queue_name'
 
   server_middleware do |chain|
-    
     # Options dataset, errors_notifier and message_notifier is optionals.
     # If you dont define notifiers - middleware does not notify
     # If you dont define dataset - middleware does store events in db

data/lib/cyclone_lariat/abstract/message.rb

@@ -9,13 +9,8 @@ module CycloneLariat
       attr :uuid,      String, :new
       attr :publisher, String, :new
       attr :type,      String, :new
-      attr :client_error
-      attr :version
-      attr :data
-
-      attr_reader :sent_at,
-                  :processed_at,
-                  :received_at
+      attrs :client_error, :version, :data,
+            :sent_at, :processed_at, :received_at
 
       def kind
         raise LunaPark::Errors::AbstractMethod
@@ -37,6 +32,10 @@ module CycloneLariat
         @processed_at = wrap_time(value)
       end
 
+      def processed?
+        !@processed_at.nil?
+      end
+
       def client_error_message=(txt)
         return unless txt
 
@@ -57,11 +56,10 @@ module CycloneLariat
           publisher == other.publisher &&
           type == other.type &&
           client_error&.message == other.client_error&.message &&
-          client_error&.details == other.client_error&.details &&
           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
+          received_at.to_i == other.received_at.to_i &&
+          processed_at.to_i == other.processed_at.to_i
       end
 
       def to_json(*args)
@@ -77,7 +75,7 @@ module CycloneLariat
         when String   then Time.parse(value)
         when Time     then value
         when NilClass then nil
-        else raise Argumentevent.rbError, "Unknown type `#{value.class}`"
+        else raise ArgumentError, "Unknown type `#{value.class}`"
         end
       end
     end

data/lib/cyclone_lariat/messages_mapper.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module CycloneLariat
+  class MessagesMapper
+    class << self
+      def from_row(row)
+        return if row.nil?
+
+        row[:data] = hash_from_json_column(row[:data])
+        row[:client_error_details] = hash_from_json_column(row[:client_error_details]) if row[:client_error_details]
+        row
+      end
+
+      def to_row(input)
+        row = {
+          uuid:                   input.uuid,
+          kind:                   input.kind,
+          type:                   input.type,
+          publisher:              input.publisher,
+          data:                   JSON.generate(input.data),
+          client_error_message:   input.client_error&.message,
+          client_error_details:   JSON.generate(input.client_error&.details),
+          version:                input.version,
+          sent_at:                input.sent_at
+        }
+        row
+      end
+
+      private
+
+      def hash_from_json_column(data)
+        return JSON.parse(data) if data.is_a?(String)
+
+        if pg_json_extension_enabled?
+          return data.to_h             if data.is_a?(Sequel::Postgres::JSONHash)
+          return JSON.parse(data.to_s) if data.is_a?(Sequel::Postgres::JSONString)
+        end
+
+        raise ArgumentError, "Unknown type of `#{data}`"
+      end
+
+      def pg_json_extension_enabled?
+        Object.const_defined?('Sequel::Postgres::JSONHash')
+      end
+    end
+  end
+end
+
+

data/lib/cyclone_lariat/messages_repo.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'event'
+require_relative 'messages_mapper'
 
 module CycloneLariat
   class MessagesRepo
@@ -11,17 +12,7 @@ module CycloneLariat
     end
 
     def create(msg)
-      dataset.insert(
-        uuid: msg.uuid,
-        kind: msg.kind,
-        type: msg.type,
-        publisher: msg.publisher,
-        data: JSON.generate(msg.data),
-        client_error_message: msg.client_error&.message,
-        client_error_details: JSON.generate(msg.client_error&.details),
-        version: msg.version,
-        sent_at: msg.sent_at
-      )
+      dataset.insert MessagesMapper.to_row(msg)
     end
 
     def exists?(uuid:)
@@ -36,32 +27,20 @@ module CycloneLariat
     end
 
     def find(uuid:)
-      raw = dataset.where(uuid: uuid).first
-      raw[:data] = JSON.parse(raw[:data], symbolize_names: true)
-      if raw[:client_error_details]
-        raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-      end
-      build raw
+      row = dataset.where(uuid: uuid).first
+      build MessagesMapper.from_row(row)
     end
 
     def each_unprocessed
-      dataset.where(processed_at: nil).each do |raw|
-        raw[:data]                 = JSON.parse(raw[:data], symbolize_names: true)
-        if raw[:client_error_details]
-          raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-        end
-        msg = build raw
+      dataset.where(processed_at: nil).each do |row|
+        msg = build MessagesMapper.from_row(row)
         yield(msg)
       end
     end
 
     def each_with_client_errors
-      dataset.where { (processed_at !~ nil) & (client_error_message !~ nil) }.each do |raw|
-        raw[:data] = JSON.parse(raw[:data], symbolize_names: true)
-        if raw[:client_error_details]
-          raw[:client_error_details] = JSON.parse(raw[:client_error_details], symbolize_names: true)
-        end
-        msg = build raw
+      dataset.where { (processed_at !~ nil) & (client_error_message !~ nil) }.each do |row|
+        msg = build MessagesMapper.from_row(row)
         yield(msg)
       end
     end

data/lib/cyclone_lariat/middleware.rb

@@ -13,15 +13,15 @@ module CycloneLariat
     end
 
     def call(_worker_instance, queue, _sqs_msg, body, &block)
-      log_received_message queue, body
+      msg = receive_message(body)
 
-      catch_standard_error(queue, body) do
-        return true unless check(body[:Message])
+      message_notifier&.info 'Receive message', message: msg, queue: queue
 
-        event = Event.wrap(JSON.parse(body[:Message]))
+      catch_standard_error(queue, msg) do
+        event = Event.wrap(msg)
 
-        catch_business_error(event) do
-          store_in_dataset(event, &block)
+        store_in_dataset(event) do
+          catch_business_error(event, &block)
         end
       end
     end
@@ -30,15 +30,17 @@ module CycloneLariat
 
     attr_reader :errors_notifier, :message_notifier, :events_repo
 
-    def log_received_message(queue, body)
-      message_notifier&.info 'Receive message', queue: queue, aws_message_id: body[:MessageId], message: body[:Message]
+    def receive_message(body)
+      body[:Message] ? JSON.parse(body[:Message], symbolize_names: true ) : body
     end
 
     def store_in_dataset(event)
       return yield if events_repo.nil?
-      return true  if events_repo.exists?(uuid: event.uuid)
 
-      events_repo.create(event)
+      existed = events_repo.find(uuid: event.uuid)
+      return true if existed&.processed?
+
+      events_repo.create(event) unless existed
       yield
       events_repo.processed! uuid: event.uuid, error: event.client_error
     end
@@ -50,20 +52,11 @@ module CycloneLariat
       event.client_error = e
     end
 
-    def catch_standard_error(queue, body)
+    def catch_standard_error(queue, msg)
       yield
-    rescue StandardError => e
-      errors_notifier&.error(e, queue: queue, aws_message_id: body[:MessageId], message: body[:Message])
+    rescue Exception => e
+      errors_notifier&.error(e, queue: queue, message: msg)
       raise e
     end
-
-    def check(msg)
-      if msg.nil? || msg.empty?
-        errors_notifier&.error(Errors::EmptyMessage.new)
-        false
-      else
-        true
-      end
-    end
   end
 end

data/lib/cyclone_lariat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CycloneLariat
-  VERSION = '0.3.0'
+  VERSION = '0.3.4'
 end

data/lib/cyclone_lariat.rb

@@ -3,6 +3,7 @@
 require_relative 'cyclone_lariat/sns_client'
 require_relative 'cyclone_lariat/errors'
 require_relative 'cyclone_lariat/event'
+require_relative 'cyclone_lariat/messages_mapper'
 require_relative 'cyclone_lariat/messages_repo'
 require_relative 'cyclone_lariat/middleware'
 require_relative 'cyclone_lariat/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyclone_lariat
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2021-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
@@ -279,6 +279,7 @@ files:
 - lib/cyclone_lariat/command.rb
 - lib/cyclone_lariat/errors.rb
 - lib/cyclone_lariat/event.rb
+- lib/cyclone_lariat/messages_mapper.rb
 - lib/cyclone_lariat/messages_repo.rb
 - lib/cyclone_lariat/middleware.rb
 - lib/cyclone_lariat/sns_client.rb