emailbutler 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07e27b9787bb6f85389d9d6628041cec10a2c422c5806b216c1e8a597a6b65f2
-  data.tar.gz: 1728e696da05d221df0c990f2248c0bd5e8753f2b8b3569905b054ed624845f5
+  metadata.gz: 86c998b3d9e29ae064f2b2881b392661d785534883a28f40cb7fd5e846e5cf69
+  data.tar.gz: 4952983e5fc06ea2e90f2d2504d66d6c7ea083281796d30b7e71154096235e1d
 SHA512:
-  metadata.gz: 34af5717bd9e42499faa83988388cc65b6ad87e33ff7d31912e120a7e69e7d381c92ad4a4b6e926fe8c845505311bc046114caa00fb9debaceba7f2d5ceed1be
-  data.tar.gz: f8d56d0c8d13d74f90c32ea95a9edd6eaa3fd064eadb343233f5678389059d4eebcb74e9e1fa3e15c583fccff639371d4389b95511d51875e26c5316667c8618
+  metadata.gz: eedddd11e3d27324ceeb712c3f9821ede81fe3a02970166c6d7c67b546333ffdd8ce5ffc9cf885879a8020c966233c6aa51088d683546dda472645156f77c3d2
+  data.tar.gz: da1e97498ff6853525d05a8cfe988aef95cccd3b82e39803c966218945904a45c2830b17bd3a5eea5a728b02eb0e47faf0e4d3b9fdd2e503c87423f3d816df6d

data/db/migrate/{20220908180903_create_emailbutler_tables.rb → 20220916162720_create_emailbutler_tables.rb}

@@ -9,20 +9,15 @@ class CreateEmailbutlerTables < ActiveRecord::Migration[7.0]
       t.string :action, null: false
       t.jsonb :params, null: false, default: {}
       t.string :send_to, array: true
-      t.timestamps
-    end
-    add_index :emailbutler_messages, :uuid, unique: true
-
-    create_table :emailbutler_events do |t|
-      t.integer :emailbutler_message_id, null: false, index: true
-      t.integer :status, null: false
+      t.integer :status, null: false, default: 0
       t.datetime :timestamp
+      t.integer :lock_version
       t.timestamps
     end
+    add_index :emailbutler_messages, :uuid, unique: true
   end
 
   def self.down
     drop_table :emailbutler_messages
-    drop_table :emailbutler_events
   end
 end

data/lib/emailbutler/adapters/active_record.rb

@@ -13,15 +13,13 @@ module Emailbutler
       class Emailbutler::Message < Model
         self.table_name = :emailbutler_messages
 
+        CREATED = 'created'
         REJECTED = 'rejected'
         PROCESSED = 'processed'
         FAILED = 'failed'
         DELIVERED = 'delivered'
 
-        has_many :emailbutler_events,
-                 class_name: 'Emailbutler::Event', dependent: :destroy, foreign_key: :emailbutler_message_id
-
-        enum status: { REJECTED => 0, PROCESSED => 1, FAILED => 2, DELIVERED => 3 }
+        enum status: { CREATED => 0, REJECTED => 1, PROCESSED => 2, FAILED => 3, DELIVERED => 4 }
 
         after_initialize :generate_uuid
 
@@ -32,24 +30,16 @@ module Emailbutler
         end
       end
 
-      class Emailbutler::Event < Model
-        self.table_name = :emailbutler_events
-
-        belongs_to :emailbutler_message, class_name: 'Emailbutler::Message'
-      end
-
       # Public: The name of the adapter.
-      attr_reader :name, :message_class, :event_class
+      attr_reader :name, :message_class
 
       # Public: Initialize a new ActiveRecord adapter instance.
       #
       # name - The Symbol name for this adapter. Optional (default :active_record)
       # message_class - The AR class responsible for the messages table.
-      # event_class - The AR class responsible for the messages events table.
       def initialize(options={})
         @name = options.fetch(:name, :active_record)
         @message_class = options.fetch(:message_class) { Emailbutler::Message }
-        @event_class = options.fetch(:event_class) { Emailbutler::Event }
       end
 
       # Public: Builds a message.
@@ -72,9 +62,11 @@ module Emailbutler
         @message_class.find_by(args)
       end
 
-      # Public: Creates a message event.
-      def create_message_event(message, args={})
-        @event_class.create(args.merge(emailbutler_message_id: message.id))
+      # Public: Updates the message.
+      def update_message(message, args={})
+        message.update(args) if message.timestamp.nil? || args[:timestamp] > message.timestamp
+      rescue ::ActiveRecord::StaleObjectError
+        update_message(message.reload, args)
       end
     end
   end

data/lib/emailbutler/dsl.rb

@@ -31,9 +31,9 @@ module Emailbutler
       adapter.find_message_by(args)
     end
 
-    # Public: Creates a message event.
-    def create_message_event(message, args={})
-      adapter.create_message_event(message, args)
+    # Public: Updates the message.
+    def update_message(message, args={})
+      adapter.update_message(message, args)
     end
   end
 end

data/lib/emailbutler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Emailbutler
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/emailbutler/webhooks/receiver.rb

@@ -16,7 +16,7 @@ module Emailbutler
           .call(payload: payload)
           .each { |event|
             message = Emailbutler.find_message_by(uuid: event.delete(:message_uuid))
-            Emailbutler.create_message_event(message, event)
+            Emailbutler.update_message(message, event)
           }
       end
 

data/lib/emailbutler.rb

@@ -42,5 +42,5 @@ module Emailbutler
   # Public: All the methods delegated to instance. These should match the interface of Emailbutler::DSL.
   def_delegators :instance,
                  :adapter, :build_message, :set_message_attribute, :save_message, :find_message_by,
-                 :create_message_event
+                 :update_message
 end

data/lib/generators/emailbutler/templates/migration.erb

@@ -9,20 +9,15 @@ class CreateEmailbutlerTables < ActiveRecord::Migration<%= migration_version %>
       t.string :action, null: false
       t.jsonb :params, null: false, default: {}
       t.string :send_to, array: true
-      t.timestamps
-    end
-    add_index :emailbutler_messages, :uuid, unique: true
-
-    create_table :emailbutler_events do |t|
-      t.integer :emailbutler_message_id, null: false, index: true
-      t.integer :status, null: false
+      t.integer :status, null: false, default: 0
       t.datetime :timestamp
+      t.integer :lock_version
       t.timestamps
     end
+    add_index :emailbutler_messages, :uuid, unique: true
   end
 
   def self.down
     drop_table :emailbutler_messages
-    drop_table :emailbutler_events
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emailbutler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bogdanov Anton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,7 +166,7 @@ files:
 - app/controllers/emailbutler/webhooks_controller.rb
 - app/views/layouts/emailbutler/application.html.erb
 - config/routes.rb
-- db/migrate/20220908180903_create_emailbutler_tables.rb
+- db/migrate/20220916162720_create_emailbutler_tables.rb
 - lib/emailbutler.rb
 - lib/emailbutler/adapters/active_record.rb
 - lib/emailbutler/configuration.rb