pg_audit_log 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 924d22fb7b34cf8d77d2b73f2c18195731d0da64
-  data.tar.gz: 19640f9a6f1ddbc464b705c0a994bf051eddb2d3
+  metadata.gz: b43d8eee277c9366119fc9c86605ab282492c3fa
+  data.tar.gz: 99a1cfc28254c4ce377a6f9aefb47179272866bf
 SHA512:
-  metadata.gz: affe074c0f10332d56ac57f831d4a6b0e38379d6fb674bab44a1c11bda617606e94c99f72e31e5ff025308b0afa7b8a2dda64f33d6e24927e9d3c7abfc7715c4
-  data.tar.gz: 3e9adb9a60b4e09f3c666f5129e077dbc56671ce7ca998d1d2295134dd27c3b3f1a6f2cf06d07742f1deae472c4e2f262b9f89c89173af714bc1acf69af958cb
+  metadata.gz: c5da4365b340f209b756b75775296d7d94ec59224820f05a99099b15863892cbedef024bc2aca1ee45e95079076f02d2a7ddc48d11e79b773eec6ea4ca99f54a
+  data.tar.gz: aabcef8f79fbf213fbd6ceed0e6dcddd6e6ba78b78d73a93d10e6027b00b753365fa855614fe580b49fd905bc184b0596bdc75898e02db4b66896e5e4e478faa

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies the .gemspec
 gemspec
 
-gem 'rails', :github => 'rails', :branch => ENV['RAILS_RECORD_BRANCH'] if ENV['ACTIVE_RECORD_BRANCH']
-gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_RECORD_VERSION']
+gem 'rails', :github => 'rails', :branch => ENV['ACTIVE_RECORD_BRANCH'] if ENV['ACTIVE_RECORD_BRANCH']
+gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']

data/lib/pg_audit_log/extensions/postgresql_adapter.rb

@@ -62,19 +62,33 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   alias_method_chain :reconnect!, :pg_audit_log
 
   def execute_with_pg_audit_log(sql, name = nil)
-    conn = execute_without_pg_audit_log(sql, name = nil)
     set_audit_user_id_and_name
+    conn = execute_without_pg_audit_log(sql, name = nil)
     conn
   end
   alias_method_chain :execute, :pg_audit_log
 
   def exec_query_with_pg_audit_log(sql, name = 'SQL', binds = [])
-    conn = exec_query_without_pg_audit_log(sql, name, binds)
     set_audit_user_id_and_name
+    conn = exec_query_without_pg_audit_log(sql, name, binds)
     conn
   end
   alias_method_chain :exec_query, :pg_audit_log
 
+  def exec_update_with_pg_audit_log(sql, name = 'SQL', binds = [])
+    set_audit_user_id_and_name
+    conn = exec_update_without_pg_audit_log(sql, name, binds)
+    conn
+  end
+  alias_method_chain :exec_update, :pg_audit_log
+
+  def exec_delete_with_pg_audit_log(sql, name = 'SQL', binds = [])
+    set_audit_user_id_and_name
+    conn = exec_delete_without_pg_audit_log(sql, name, binds)
+    conn
+  end
+  alias_method_chain :exec_delete, :pg_audit_log
+
   private
 
   def user_id_and_name

data/lib/pg_audit_log/version.rb

@@ -1,3 +1,3 @@
 module PgAuditLog
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

data/spec/pg_audit_log_spec.rb

@@ -27,6 +27,7 @@ describe PgAuditLog do
     end
 
     after do
+      Thread.current[:current_user] = nil
       PgAuditLog::Entry.connection.execute("TRUNCATE #{PgAuditLog::Entry.quoted_table_name}")
     end
 
@@ -34,37 +35,42 @@ describe PgAuditLog do
 
     describe "on create" do
       context "the audit log record with a primary key" do
-        before do
-          AuditedModel.create!(attributes)
-        end
-
         subject { PgAuditLog::Entry.where(:field_name => 'str').last }
 
-        it { should be }
-        its(:occurred_at) { should be }
-        its(:table_name) { should == AuditedModel.table_name }
-        its(:field_name) { should == 'str' }
-        its(:primary_key) { should == AuditedModel.last.id.to_s }
-        its(:operation) { should == 'INSERT' }
+        context "recording changes" do
+          before do
+            AuditedModel.create!(attributes)
+          end
+
+          it { should be }
+          its(:occurred_at) { should be }
+          its(:table_name) { should == AuditedModel.table_name }
+          its(:field_name) { should == 'str' }
+          its(:primary_key) { should == AuditedModel.last.id.to_s }
+          its(:operation) { should == 'INSERT' }
+        end
 
-        context "when a user is present" do
+        context "when a user is present, having just been changed" do
           before do
+            record = AuditedModel.new
             Thread.current[:current_user] = double('User', :id => 1, :unique_name => 'my current user')
-            AuditedModel.create!
+            ActiveRecord::Persistence.instance_method(:save).bind(record).call # call save without transaction
           end
 
-          after { Thread.current[:current_user] = nil }
-
           its(:user_id) { should == 1 }
           its(:user_unique_name) { should == 'my current user' }
         end
 
         context "when no user is present" do
+          before { AuditedModel.create!(attributes) }
+
           its(:user_id) { should == -1 }
           its(:user_unique_name) { should == 'UNKNOWN' }
         end
 
         it "captures all new values for all fields" do
+          AuditedModel.create!(attributes)
+
           attributes.each do |field_name, value|
             entry = PgAuditLog::Entry.where(:field_name => field_name).last
             if field_name == :dt
@@ -96,6 +102,19 @@ describe PgAuditLog do
           @model = AuditedModel.create!(attributes)
         end
 
+        context "when a user is present, having just been changed" do
+          subject { PgAuditLog::Entry.where(:field_name => 'str').last }
+          before do
+            Thread.current[:current_user] = double('User', :id => 1, :unique_name => 'my current user')
+            @model.str = 'foobarbaz'
+            # @model.class.connection.execute "select * from #{AuditedModel.table_name}"
+            ActiveRecord::Persistence.instance_method(:save).bind(@model).call # call save without transaction
+          end
+
+          its(:user_id) { should == 1 }
+          its(:user_unique_name) { should == 'my current user' }
+        end
+
         context "when going from a value to a another value" do
           before { @model.update_attributes!(:str => 'bar') }
           subject { PgAuditLog::Entry.where(:field_name => 'str').last }
@@ -207,6 +226,13 @@ describe PgAuditLog do
         end
       end
 
+      it "records with the correct user after just changing the user" do
+        record = AuditedModel.create!
+        Thread.current[:current_user] = double('User', :id => 1, :unique_name => 'my current user')
+        record.delete
+        expect(PgAuditLog::Entry.order(:occurred_at).last.user_id).to eq 1
+      end
+
       context "the audit log record without a primary key" do
         before do
           AuditedModelWithoutPrimaryKey.create!(attributes)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Case Commons, LLC
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: PostgreSQL-only database-level audit logging of all databases changes.