cyclone_lariat 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fe1faa17fac474b04c873eb81272506724e8ac3ac23e18549b2f63287174e97
-  data.tar.gz: d645f4859619af32a96448a8357aaf08c6ffc31e1138666df149e44284e00389
+  metadata.gz: de7e05c5fba57a9db6c827549404f12b1f88be0336b00d2d5dfb4dc77132b328
+  data.tar.gz: 54d81b79a812fdf91513cdee886933d32055fd405c55bb032aae4dec81ac1ff3
 SHA512:
-  metadata.gz: 4acacb0d92e72eb15a7247f04e06ad171935f3ab54da976a3427aec45af35beac28f7ce2bbfd79213ce7331cf07541bc7d4a839ff44fc0c76359119b5e341503
-  data.tar.gz: 23b2bc0a32aa5b10392392249f4f23ee8db12edaafd994fd5505b854da3a5f8773f5d101e972678d6e8c33b74bde1f5a2ab4d68ff757852c513e409c5de9bf89
+  metadata.gz: 3d8ce1ebcd03c53309165592b7e4e0cbe342a3033694afdc639e033fb76a88dd1f340ee2204c5602f02399a5e9e56f47a7483dba867d9aafcd9947b3958933c1
+  data.tar.gz: 8c8668274a9435e56804739e6625703b733810e46401aca602c04f51763274dafa9456f625fc315ae7b322c62d4a426a582a62db8b6061716ad46aced0ab5ef0

data/lib/cyclone_lariat/abstract/message.rb

@@ -56,7 +56,6 @@ 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 &&

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,34 +27,20 @@ module CycloneLariat
     end
 
     def find(uuid:)
-      raw = dataset.where(uuid: uuid).first
-      return nil unless 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
-      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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CycloneLariat
-  VERSION = '0.3.3'
+  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.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Kudrin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-14 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