double_entry 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32faa0991a3e20450e5c310ed76831804f8f8489
-  data.tar.gz: b4d643d8739f316dc7d0b3404bfd13d6bbc5f678
+  metadata.gz: e815a7e5aabf260a4697a11f7685d362c017cdfb
+  data.tar.gz: 416041a85f823156b3211c58edcb751a07ea60d1
 SHA512:
-  metadata.gz: 3f23c6af662e48e0dd8e520111628faf5f9d59e5d6b3e10d5a9cd3cb94ec9f6f5d9829d5bc86636ec4f5cac7dc6ca502a6ef011baba6e4c3b70aa7944b5a042d
-  data.tar.gz: 34d17bcd0b139a5dad177a588c737a5ef2b3704db52b83812b6dae3e2ac600a4eef4a2b4a642d11474e2cf074eeaebdb3d64e489e1c34033f4c67283bcb0791d
+  metadata.gz: 0b36f7c934a87f36ec0250d360b043e4a98c033bd74289eaa9cade1e120f35fa438376629bb8d099de122481f28411ecc4a6890641646e56ba49afad52d99312
+  data.tar.gz: 4c8a843ba84218611d2545b161f58cddbb03617c94564027f02e85957e6754d299d5381f37527e5cc0f7b3e58e05a4821fb27c82883b750fe139db61e901cf0c

data/lib/active_record/locking_extensions.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+require "active_support/notifications"
+
 module ActiveRecord
 
   # These methods are available as class methods on ActiveRecord::Base.
@@ -21,6 +23,8 @@ module ActiveRecord
         yield
       rescue ActiveRecord::StatementInvalid => exception
         if exception.message =~ /deadlock/i || exception.message =~ /database is locked/i
+          ActiveSupport::Notifications.publish("deadlock_restart.active_record", :exception => exception)
+
           raise ActiveRecord::RestartTransaction
         else
           raise
@@ -49,6 +53,8 @@ module ActiveRecord
         yield
       rescue ActiveRecord::StatementInvalid, ActiveRecord::RecordNotUnique => exception
         if  exception.message =~ /duplicate/i || exception.message =~ /ConstraintException/
+          ActiveSupport::Notifications.publish("duplicate_ignore.active_record", :exception => exception)
+
           # Just ignore it...someone else has already created the record.
         else
           raise
@@ -66,6 +72,8 @@ module ActiveRecord
         if exception.message =~ /deadlock/i || exception.message =~ /database is locked/i
           # Somebody else is in the midst of creating the record. We'd better
           # retry, so we ensure they're done before we move on.
+          ActiveSupport::Notifications.publish("deadlock_retry.active_record", :exception => exception)
+
           retry
         else
           raise
@@ -80,4 +88,5 @@ module ActiveRecord
 
 end
 
+
 ActiveRecord::Base.extend(ActiveRecord::LockingExtensions)

data/lib/active_record/locking_extensions/log_subscriber.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+require "active_support/log_subscriber"
+
+module ActiveRecord
+  module LockingExtensions
+    class LogSubscriber < ActiveSupport::LogSubscriber
+      def deadlock_restart(event)
+        info "Deadlock causing restart"
+        debug event[:exception]
+      end
+
+      def deadlock_retry(event)
+        info "Deadlock causing retry"
+        debug event[:exception]
+      end
+
+      def duplicate_ignore(event)
+        info "Duplicate ignored"
+        debug event[:exception]
+      end
+
+      def logger
+        ActiveRecord::Base.logger
+      end
+    end
+  end
+end
+
+ActiveRecord::LockingExtensions::LogSubscriber.attach_to :active_record

data/lib/double_entry.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require 'active_record'
 require 'active_record/locking_extensions'
+require 'active_record/locking_extensions/log_subscriber'
 require 'active_support/all'
 require 'money'
 

data/lib/double_entry/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DoubleEntry
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

data/spec/active_record/locking_extensions_spec.rb

@@ -17,15 +17,34 @@ describe ActiveRecord::LockingExtensions do
   end
 
   context "#with_restart_on_deadlock" do
-    context "raises a ActiveRecord::RestartTransaction error if a deadlock occurs" do
-      it "in mysql" do
-        expect { User.with_restart_on_deadlock { raise MYSQL_DEADLOCK } }.to raise_error(ActiveRecord::RestartTransaction)
+    shared_examples "abstract adapter" do
+      it "raises a ActiveRecord::RestartTransaction error if a deadlock occurs" do
+        expect { User.with_restart_on_deadlock { raise exception } }.to raise_error(ActiveRecord::RestartTransaction)
       end
 
-      it "in postgres" do
-        expect { User.with_restart_on_deadlock { raise PG_DEADLOCK } }.to raise_error(ActiveRecord::RestartTransaction)
+      it "publishes a notification" do
+        expect(ActiveSupport::Notifications).to receive(:publish).with("deadlock_restart.active_record", hash_including(:exception => exception))
+        expect { User.with_restart_on_deadlock { raise exception } }.to raise_error
       end
     end
+
+    context "mysql" do
+      let(:exception) { MYSQL_DEADLOCK }
+
+      it_behaves_like "abstract adapter"
+    end
+
+    context "postgres" do
+      let(:exception) { PG_DEADLOCK }
+
+      it_behaves_like "abstract adapter"
+    end
+
+    context "sqlite" do
+      let(:exception) { SQLITE3_LOCK }
+
+      it_behaves_like "abstract adapter"
+    end
   end
 
   context "#create_ignoring_duplicates" do
@@ -36,27 +55,49 @@ describe ActiveRecord::LockingExtensions do
       expect { User.create_ignoring_duplicates! :username => "keith" }.to_not raise_error
     end
 
-    context "retries the creation if a deadlock error is raised from the database" do
-      it "in mysql" do
-        expect(User).to receive(:create!).ordered.and_raise(MYSQL_DEADLOCK)
-        expect(User).to receive(:create!).ordered.and_return(true)
+    it "publishes a notification when a duplicate is encountered" do
+      User.make! :username => "keith"
 
-        expect { User.create_ignoring_duplicates! }.to_not raise_error
-      end
+      expect(ActiveSupport::Notifications).to receive(:publish).with("duplicate_ignore.active_record", hash_including(:exception => kind_of(ActiveRecord::RecordNotUnique)))
 
-      it "in postgres" do
-        expect(User).to receive(:create!).ordered.and_raise(PG_DEADLOCK)
+      expect { User.create_ignoring_duplicates! :username => "keith" }.to_not raise_error
+    end
+
+    shared_examples "abstract adapter" do
+      it "retries the creation if a deadlock error is raised from the database" do
+        expect(User).to receive(:create!).ordered.and_raise(exception)
         expect(User).to receive(:create!).ordered.and_return(true)
 
         expect { User.create_ignoring_duplicates! }.to_not raise_error
       end
 
-      it "in sqlite3" do
-        expect(User).to receive(:create!).ordered.and_raise(SQLITE3_LOCK)
+      it "publishes a notification on each retry" do
+        expect(User).to receive(:create!).ordered.and_raise(exception)
+        expect(User).to receive(:create!).ordered.and_raise(exception)
         expect(User).to receive(:create!).ordered.and_return(true)
 
+        expect(ActiveSupport::Notifications).to receive(:publish).with("deadlock_retry.active_record", hash_including(:exception => exception)).twice
+
         expect { User.create_ignoring_duplicates! }.to_not raise_error
       end
     end
+
+    context "mysql" do
+      let(:exception) { MYSQL_DEADLOCK }
+
+      it_behaves_like "abstract adapter"
+    end
+
+    context "postgres" do
+      let(:exception) { PG_DEADLOCK }
+
+      it_behaves_like "abstract adapter"
+    end
+
+    context "sqlite" do
+      let(:exception) { SQLITE3_LOCK }
+
+      it_behaves_like "abstract adapter"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: double_entry
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Anthony Sellitti
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
@@ -237,6 +237,7 @@ files:
 - Rakefile
 - double_entry.gemspec
 - lib/active_record/locking_extensions.rb
+- lib/active_record/locking_extensions/log_subscriber.rb
 - lib/double_entry.rb
 - lib/double_entry/account.rb
 - lib/double_entry/account_balance.rb