outboxer 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7fa112786d6fc9a6352d8dec8d8a88ddaa3e352e42bd9bc49c20639a7f173b
-  data.tar.gz: 3edfd6a9e839c3ba75731abc42aa6c3c5d73faa84b39f9c556f39af46ab61ee7
+  metadata.gz: '09cf4072016f1a5b13d16bbef92f26ac4efaaa1d953b0a4752440e4acfda203a'
+  data.tar.gz: 7dd61b6f0bb552fd13e6e9f607c34fce18c44095c5902edc09b4cbfec0009e30
 SHA512:
-  metadata.gz: 6117656da5d2fee53f531986690d311ac68f7a1c70d48f8870de6c3ee36f1aad6767a3b2c0f39c07b40a85b599a88df643d7275d37ca982295f678a6ea84ae52
-  data.tar.gz: 4397e26b12d9c854ed80ae051701be3860dd410270a127899beeb6181b7e95e1634bc890b727c9c256cc74d292e5cab8aa9fdef514792881ba6136d2db946f23
+  metadata.gz: fcc1a3b0e3cf6c7b29ede1469148d78a567456726a87113f5355209fa3623b35ec8e401ad3dcd155888d057c1c45bb95893c613aee5f849448a9a6eca6b5de2a
+  data.tar.gz: 84f3e8873c693f8c0652561a848f0da423764de489902456c335d9f638882964052f08e7a63e2d65fd020a0338110df8b84cf789a9b1fe87936b0ee68ed2ee14

data/README.md

@@ -51,11 +51,12 @@ end
 
 ```ruby
 Outboxer::Publisher.publish do |args|
-  args.logger.info("[#{message.id}] publishing")
+  logger = args.logger
+  message = args.message
 
-  Worker.perform_async({ message_id: args.message.id })
-
-  args.logger.info("[#{message.id}] published")
+  logger.info("[#{message.id}] publishing")
+  HardJob.perform_async({ "message_id" => message.id })
+  logger.info("[#{message.id}] published")
 end
 ```
 

data/Rakefile

@@ -1,10 +1,14 @@
-require "bundler/gem_tasks"
+# require "bundler/gem_tasks"
+# require "bundler/setup"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
+require 'pry'
 require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
 task default: %i[spec rubocop]
+
+load 'lib/tasks/gem.rake'

data/generators/outboxer/templates/bin/publisher.rb

@@ -7,8 +7,6 @@ Outboxer::Publisher.publish do |args|
   message = args.message
 
   logger.info("[#{message.id}] publishing")
-
   HardJob.perform_async({ "message_id" => message.id })
-
   logger.info("[#{message.id}] published")
 end

data/lib/outboxer/exception.rb

@@ -0,0 +1,9 @@
+require "active_record"
+
+module Outboxer
+  class Exception < ::ActiveRecord::Base
+    self.table_name = :outboxer_exceptions
+
+    belongs_to :message, class_name: "::Outboxer::Message"
+  end
+end

data/lib/outboxer/message.rb

@@ -0,0 +1,19 @@
+require "active_record"
+
+module Outboxer
+  class Message < ::ActiveRecord::Base
+    self.table_name = :outboxer_messages
+
+    STATUS = {
+      unpublished: "unpublished",
+      publishing: "publishing",
+      failed: "failed"
+    }.freeze
+
+    belongs_to :message, polymorphic: true
+
+    has_many :exceptions, -> { order(created_at: :asc) },
+             class_name: "::Outboxer::Exception",
+             dependent: :destroy
+  end
+end

data/lib/outboxer/outboxable.rb

@@ -0,0 +1,21 @@
+module Outboxer
+  module Outboxable
+    def self.included(base)
+      base.extend ClassMethods
+
+      base.class_eval do
+        has_one :message, class_name: "::Outboxer::Message", as: :outbox_message,
+                          dependent: :destroy
+
+        after_create :create_outbox_message!
+      end
+    end
+
+    def create_outbox_message!
+      Message.create!(message: self, status: Message::STATUS[:unpublished])
+    end
+
+    module ClassMethods
+    end
+  end
+end

data/lib/outboxer/publisher.rb

@@ -54,14 +54,14 @@ module Outboxer
     def dequeue(backoff:)
       retry_on_error(backoff: backoff) do
         ActiveRecord::Base.transaction do
-          message = Models::Message
-            .where(status: Models::Message::STATUS[:unpublished])
+          message = Message
+            .where(status: Message::STATUS[:unpublished])
             .order(created_at: :asc)
             .limit(1)
             .lock("FOR UPDATE SKIP LOCKED")
             .first
 
-          message&.update!(status: Models::Message::STATUS[:publishing])
+          message&.update!(status: Message::STATUS[:publishing])
 
           message
         end
@@ -81,7 +81,7 @@ module Outboxer
 
       retry_on_error(backoff: backoff) do
         ActiveRecord::Base.transaction do
-          outboxer_message.update!(status: Models::Message::STATUS[:failed])
+          outboxer_message.update!(status: Message::STATUS[:failed])
 
           outboxer_message.exceptions.create!(
             class_name: exception.class.name,

data/lib/outboxer/version.rb

@@ -1,3 +1,3 @@
 module Outboxer
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.5"
 end

data/lib/outboxer.rb

@@ -2,14 +2,12 @@ require "active_support"
 
 require_relative "outboxer/version"
 require_relative "outboxer/railtie" if defined?(Rails)
-require_relative "outboxer/models/outboxable"
-require_relative "outboxer/models/message"
-require_relative "outboxer/models/exception"
+
+require_relative "outboxer/outboxable"
+require_relative "outboxer/message"
+require_relative "outboxer/exception"
 
 require_relative "outboxer/publisher"
 
 module Outboxer
-  Outboxable = Models::Outboxable
-  Message = Models::Message
-  Exception = Models::Exception
 end

data/outboxer.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/fast-programmer/outboxer"
   spec.metadata["documentation_uri"] = "https://rubydoc.info/github/fast-programmer/outboxer/master"
-  spec.metadata["changelog_uri"] = "https://github.com/fast-programmer/outboxer/blob/main/CHANGELOG.md"
+  spec.metadata["changelog_uri"] = "https://github.com/fast-programmer/outboxer/blob/master/CHANGELOG.md"
   spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files = Dir.chdir(__dir__) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outboxer
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Adam Mikulasev
@@ -43,9 +43,9 @@ files:
 - generators/outboxer/templates/migrations/create_outboxer_exceptions.rb
 - generators/outboxer/templates/migrations/create_outboxer_messages.rb
 - lib/outboxer.rb
-- lib/outboxer/models/exception.rb
-- lib/outboxer/models/message.rb
-- lib/outboxer/models/outboxable.rb
+- lib/outboxer/exception.rb
+- lib/outboxer/message.rb
+- lib/outboxer/outboxable.rb
 - lib/outboxer/publisher.rb
 - lib/outboxer/railtie.rb
 - lib/outboxer/version.rb
@@ -58,7 +58,7 @@ metadata:
   homepage_uri: https://github.com/fast-programmer/outboxer
   source_code_uri: https://github.com/fast-programmer/outboxer
   documentation_uri: https://rubydoc.info/github/fast-programmer/outboxer/master
-  changelog_uri: https://github.com/fast-programmer/outboxer/blob/main/CHANGELOG.md
+  changelog_uri: https://github.com/fast-programmer/outboxer/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/lib/outboxer/models/exception.rb

@@ -1,11 +0,0 @@
-require "active_record"
-
-module Outboxer
-  module Models
-    class Exception < ::ActiveRecord::Base
-      self.table_name = :outboxer_exceptions
-
-      belongs_to :message, class_name: "::Outboxer::Models::Message"
-    end
-  end
-end

data/lib/outboxer/models/message.rb

@@ -1,21 +0,0 @@
-require "active_record"
-
-module Outboxer
-  module Models
-    class Message < ::ActiveRecord::Base
-      self.table_name = :outboxer_messages
-
-      STATUS = {
-        unpublished: "unpublished",
-        publishing: "publishing",
-        failed: "failed"
-      }.freeze
-
-      belongs_to :message, polymorphic: true
-
-      has_many :exceptions, -> { order(created_at: :asc) },
-               class_name: "::Outboxer::Models::Exception",
-               dependent: :destroy
-    end
-  end
-end

data/lib/outboxer/models/outboxable.rb

@@ -1,23 +0,0 @@
-module Outboxer
-  module Models
-    module Outboxable
-      def self.included(base)
-        base.extend ClassMethods
-
-        base.class_eval do
-          has_one :message, class_name: "Outboxer::Models::Message", as: :outbox_message,
-                            dependent: :destroy
-
-          after_create :create_outbox_message!
-        end
-      end
-
-      def create_outbox_message!
-        Models::Message.create!(message: self, status: Models::Message::STATUS[:unpublished])
-      end
-
-      module ClassMethods
-      end
-    end
-  end
-end