pg_audit_log 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec491dc91a88e95b3a62a99119d71b9880b1633
-  data.tar.gz: 5eb489c343b5d17208ae25a3f00ecc418d3aeecd
+  metadata.gz: 946dc5231a6ed7b9c032ce8885e92d057546e25f
+  data.tar.gz: 78793aadac855b97c3feec7d26a974a9adf6f965
 SHA512:
-  metadata.gz: 83c89e0684320a261368562fbeb03167adc617814f858c59747787c3e775a57ea2d3783c8771561ead90692b3a8a7acaf30a5a3fe66ff5841aa7815424cc01e4
-  data.tar.gz: 5f29260cda979560c08e8a2cd76474363595daba8f1821f79c6148f555a5f839fd56c8b3badf7f86655376c0901cfb5860d9134760eeae5422144e5a2a4ba216
+  metadata.gz: c2118e06daae669ab31cec6c757b5a87ca9f977fc07af5f580dd4f907ff1a204b6a0bbf5c79330d81af941e51841b22e0b28c0c3e82a21efd1ace611fc150b00
+  data.tar.gz: 1178296898b04f3c9361b7491029eb7cf9a5b3e9f00fbbd172d60de0cda164f9b3293cd50be037aa5007c5d331b623fce8e6c8916da62fea84bb1dac9d4694f4

data/.travis.yml

@@ -8,19 +8,21 @@ before_script:
   - psql -c 'CREATE DATABASE pg_audit_log_test;' -U postgres
 
 rvm:
-  - "1.9"
-  - "2.0"
-  - "2.1"
-  - "2.2"
-  #- jruby-19mode
-  - rbx-2.2
+  - "2.1.10"
+  - "2.2.6"
+  - "2.3.3"
+  - "2.4.1"
 
 env:
   - RAILS_VERSION="~> 4.2.0"
-  - RAILS_VERSION="~> 4.1.0"
-  - RAILS_VERSION="~> 4.0.0"
-  - RAILS_VERSION="~> 3.2.0"
+  - RAILS_VERSION="~> 5.0.0"
+  - RAILS_BRANCH="master"
 
 matrix:
   allow_failures:
     - env: RAILS_BRANCH="master"
+  exclude:
+    - rvm: "2.1.10"
+      env: RAILS_VERSION="~> 5.0.0"
+    - rvm: "2.1.10"
+      env: RAILS_BRANCH="master"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.7
+- Fix nested calls to 'without_triggers'.
+
+
 ### 0.6.6
 - Bump Rails dependency to include all 4.2.x (@MrJaba)
 - Fixed migration name to be .rb file (@MrJaba)

data/lib/pg_audit_log/extensions/postgresql_adapter.rb

@@ -68,23 +68,23 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   end
   alias_method_chain :execute, :pg_audit_log
 
-  def exec_query_with_pg_audit_log(sql, name = 'SQL', binds = [])
+  def exec_query_with_pg_audit_log(*args, &block)
     set_audit_user_id_and_name
-    conn = exec_query_without_pg_audit_log(sql, name, binds)
+    conn = exec_query_without_pg_audit_log(*args, &block)
     conn
   end
   alias_method_chain :exec_query, :pg_audit_log
 
-  def exec_update_with_pg_audit_log(sql, name = 'SQL', binds = [])
+  def exec_update_with_pg_audit_log(*args, &block)
     set_audit_user_id_and_name
-    conn = exec_update_without_pg_audit_log(sql, name, binds)
+    conn = exec_update_without_pg_audit_log(*args, &block)
     conn
   end
   alias_method_chain :exec_update, :pg_audit_log
 
-  def exec_delete_with_pg_audit_log(sql, name = 'SQL', binds = [])
+  def exec_delete_with_pg_audit_log(*args, &block)
     set_audit_user_id_and_name
-    conn = exec_delete_without_pg_audit_log(sql, name, binds)
+    conn = exec_delete_without_pg_audit_log(*args, &block)
     conn
   end
   alias_method_chain :exec_delete, :pg_audit_log

data/lib/pg_audit_log/triggers.rb

@@ -49,18 +49,21 @@ module PgAuditLog
       end
 
       def enable
+        @disabled = false
         connection.set_user_id(nil)
       end
 
       def disable
+        @disabled = true
         connection.set_user_id(PgAuditLog::Function::DISABLED_USER)
       end
 
       def without_triggers
-        disable
+        was_disabled = @disabled
+        disable unless was_disabled
         yield
       ensure
-        enable
+        enable unless was_disabled
       end
 
       def create_for_table(table_name)

data/lib/pg_audit_log/version.rb

@@ -1,3 +1,3 @@
 module PgAuditLog
-  VERSION = '0.6.6'.freeze
+  VERSION = '0.6.7'.freeze
 end

data/pg_audit_log.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rails', '>= 3.2', '< 4.3'
+  spec.add_dependency 'rails', '>= 4.2', '< 5.1'
   spec.add_dependency 'pg', '>= 0.9.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-rails'

data/spec/triggers_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe PgAuditLog::Triggers do
   before :each do
+    PgAuditLog::Triggers.enable
     PgAuditLog::Triggers.uninstall rescue nil
   end
 
@@ -132,6 +133,20 @@ describe PgAuditLog::Triggers do
         }.to change(PgAuditLog::Entry, :count)
         expect(PgAuditLog::Entry.last.user_id).to eq(-1)
       end
+
+      context 'when nested' do
+        it 'does not enable prematurely' do
+          expect {
+            PgAuditLog::Triggers.without_triggers do
+              TableWithTriggers.create!
+              PgAuditLog::Triggers.without_triggers do
+                TableWithTriggers.create!
+              end
+              TableWithTriggers.create!
+            end
+          }.to_not change(PgAuditLog::Entry, :count)
+        end
+      end
     end
 
     describe ".create_for_table" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Case Commons, LLC
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL-only database-level audit logging of all databases changes.
@@ -156,4 +156,3 @@ test_files:
 - spec/pg_audit_log_spec.rb
 - spec/spec_helper.rb
 - spec/triggers_spec.rb
-has_rdoc: