From 6d4dbb0c9b9222a700fc43cdee42896a6fe1e15f Mon Sep 17 00:00:00 2001
From: owen2345 <owenperedo@gmail.com>
Date: Thu, 10 Jun 2021 05:04:20 -0400
Subject: [PATCH] style: improve code style

---
 lib/pub_sub_model_sync/initializers/before_commit.rb | 6 +++---
 lib/pub_sub_model_sync/publisher_concern.rb          | 4 ++--
 lib/pub_sub_model_sync/transaction.rb                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/pub_sub_model_sync/initializers/before_commit.rb b/lib/pub_sub_model_sync/initializers/before_commit.rb
index 3845da5..e2ae23a 100644
--- a/lib/pub_sub_model_sync/initializers/before_commit.rb
+++ b/lib/pub_sub_model_sync/initializers/before_commit.rb
@@ -2,11 +2,11 @@
 
 # Rails 4 backward compatibility (Add "simple" ps_before_*_commit callbacks)
 ActiveRecord::ConnectionAdapters::RealTransaction.class_eval do
-  alias_method :commit_with_before_commit, :commit
+  alias_method :commit_without_before_commit, :commit
 
   def commit
-    call_before_commit_records if Rails::VERSION::MAJOR == 4
-    commit_with_before_commit
+    call_before_commit_records if PubSubModelSync::Config.enable_rails4_before_commit
+    commit_without_before_commit
   end
 
   private
diff --git a/lib/pub_sub_model_sync/publisher_concern.rb b/lib/pub_sub_model_sync/publisher_concern.rb
index 7ba180d..bbe333a 100644
--- a/lib/pub_sub_model_sync/publisher_concern.rb
+++ b/lib/pub_sub_model_sync/publisher_concern.rb
@@ -96,8 +96,8 @@ def ps_init_transaction_callbacks
         before_create start_transaction, prepend: true
         before_update start_transaction, prepend: true
         before_destroy start_transaction, prepend: true
-        after_commit { @ps_transaction.finish }
-        after_rollback(prepend: true) { @ps_transaction.rollback }
+        after_commit { @ps_transaction&.finish }
+        after_rollback(prepend: true) { @ps_transaction&.rollback }
       end
     end
   end
diff --git a/lib/pub_sub_model_sync/transaction.rb b/lib/pub_sub_model_sync/transaction.rb
index e97d4fb..bf48991 100644
--- a/lib/pub_sub_model_sync/transaction.rb
+++ b/lib/pub_sub_model_sync/transaction.rb
@@ -42,7 +42,7 @@ def add_transaction(transaction)
     end
 
     def rollback
-      log("rollback #{payloads.count} notifications", :warn) if children.any? && debug?
+      log("Rollback #{payloads.count} notifications", :warn) if children.any? && debug?
       self.children = []
       root&.rollback
       clean_publisher