pg_audit_log 0.2.0 → 0.3.0

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-p136@pg_audit_log --create
+rvm 1.9.2@pg_audit_log --create

data/lib/pg_audit_log/extensions/3.0/postgresql_adapter.rb

@@ -50,5 +50,32 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     execute_without_auditing("RELEASE SAVEPOINT #{current_savepoint_name}")
   end
 
+  def drop_table_with_auditing(table_name, options = {})
+    if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.drop_for_table(table_name)
+    end
+    drop_table_without_auditing(table_name, options)
+  end
+  alias_method_chain :drop_table, :auditing
+
+  def create_table_with_auditing(table_name, options = {}, &block)
+    create_table_without_auditing(table_name, options, &block)
+    unless PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.create_for_table(table_name)
+    end
+  end
+  alias_method_chain :create_table, :auditing
+
+  def rename_table_with_auditing(table_name, new_name)
+    rename_table_without_auditing(table_name, new_name)
+    if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.drop_for_table(table_name)
+    end
+    unless PgAuditLog::Triggers.tables_with_triggers.include?(new_name)
+      PgAuditLog::Triggers.create_for_table(new_name)
+    end
+  end
+  alias_method_chain :rename_table, :auditing
+
 end
 

data/lib/pg_audit_log/extensions/3.1/postgresql_adapter.rb

@@ -59,6 +59,32 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     execute_without_auditing("RELEASE SAVEPOINT #{current_savepoint_name}")
   end
 
-end
+  def drop_table_with_auditing(table_name, options = {})
+    if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.drop_for_table(table_name)
+    end
+    drop_table_without_auditing(table_name, options)
+  end
+  alias_method_chain :drop_table, :auditing
+
+  def create_table_with_auditing(table_name, options = {}, &block)
+    create_table_without_auditing(table_name, options, &block)
+    unless PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.create_for_table(table_name)
+    end
+  end
+  alias_method_chain :create_table, :auditing
 
+  def rename_table_with_auditing(table_name, new_name)
+    rename_table_without_auditing(table_name, new_name)
+    if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
+      PgAuditLog::Triggers.drop_for_table(table_name)
+    end
+    unless PgAuditLog::Triggers.tables_with_triggers.include?(new_name)
+      PgAuditLog::Triggers.create_for_table(new_name)
+    end
+  end
+  alias_method_chain :rename_table, :auditing
+
+end
 

data/lib/pg_audit_log/triggers.rb

@@ -30,13 +30,13 @@ module PgAuditLog
 
       def install
         tables.each do |table|
-          create_for_table(table)
+          create_for_table(table) unless tables_with_triggers.include?(table)
         end
       end
 
       def uninstall
         tables_with_triggers.each do |table|
-          drop_for_table(table)
+          drop_for_table(table) if tables_with_triggers.include?(table)
         end
       end
 

data/lib/pg_audit_log/version.rb

@@ -1,3 +1,3 @@
 module PgAuditLog
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/pg_audit_log.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_dependency("pg", ">= 0.9.0")
   s.add_development_dependency('rspec-rails')
   s.add_development_dependency('with_model', '>= 0.1.3')
+  s.add_development_dependency('autotest')
 end

data/spec/pg_audit_log_spec.rb

@@ -24,14 +24,7 @@ describe PgAuditLog do
       end
     end
 
-    before do
-      PgAuditLog::Triggers.create_for_table(AuditedModel.table_name)
-      PgAuditLog::Triggers.create_for_table(AuditedModelWithoutPrimaryKey.table_name)
-    end
-
     after do
-      PgAuditLog::Triggers.drop_for_table(AuditedModel.table_name)
-      PgAuditLog::Triggers.drop_for_table(AuditedModelWithoutPrimaryKey.table_name)
       PgAuditLog::Entry.connection.execute("TRUNCATE #{PgAuditLog::Entry.quoted_table_name}")
     end
 
@@ -229,4 +222,44 @@ describe PgAuditLog do
     end
   end
 
+  describe "during migrations" do
+    let(:connection) { ActiveRecord::Base.connection }
+
+    before do
+      connection.drop_table("test_table") rescue nil
+      connection.drop_table("new_table") rescue nil
+    end
+
+    after do
+      connection.drop_table("test_table") rescue nil
+    end
+
+    describe "when creating the table" do
+      it "should automatically create the trigger" do
+        PgAuditLog::Triggers.tables_with_triggers.should_not include("test_table")
+        connection.create_table("test_table")
+        PgAuditLog::Triggers.tables_with_triggers.should include("test_table")
+      end
+    end
+
+    describe "when dropping the table" do
+      it "should automatically drop the trigger" do
+        connection.create_table("test_table")
+        connection.drop_table("test_table")
+        PgAuditLog::Triggers.tables_with_triggers.should_not include("test_table")
+      end
+    end
+
+    describe "when renaming the table" do
+      it "should automatically drop and create the trigger" do
+        new_table_name = "new_table_#{Time.now.to_i}"
+        connection.create_table("test_table")
+        connection.rename_table("test_table", new_table_name)
+        PgAuditLog::Triggers.tables_with_triggers.should_not include("test_table")
+        PgAuditLog::Triggers.tables_with_triggers.should include(new_table_name)
+        connection.drop_table(new_table_name) rescue nil
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -18,14 +18,21 @@ rescue PGError => e
   raise e
 end
 
-PgAuditLog::Entry.uninstall
-PgAuditLog::Entry.install
-PgAuditLog::Function.install
 
 RSpec.configure do |config|
   config.mock_with :rspec
   config.extend WithModel
 
+  config.before(:all) do
+    connection.tables.each do |table|
+      connection.drop_table_without_auditing(table)
+    end
+    PgAuditLog::Triggers.uninstall rescue nil
+    PgAuditLog::Entry.uninstall
+    PgAuditLog::Entry.install
+    PgAuditLog::Function.install
+  end
+
   config.after(:each) do
     ActiveRecord::Base.connection.reconnect!
   end

data/spec/triggers_spec.rb

@@ -13,11 +13,11 @@ describe PgAuditLog::Triggers do
     table {}
   end
 
-  describe ".tables_with_triggers" do
-    before do
-      PgAuditLog::Triggers.create_for_table(TableWithTriggers.table_name)
-    end
+  before do
+    PgAuditLog::Triggers.drop_for_table(TableWithoutTriggers.table_name) rescue nil
+  end
 
+  describe ".tables_with_triggers" do
     it "should return an array of all tables that do have an audit trigger installed" do
       PgAuditLog::Triggers.tables_with_triggers.should include(TableWithTriggers.table_name)
       PgAuditLog::Triggers.tables_with_triggers.should_not include(TableWithoutTriggers.table_name)
@@ -25,29 +25,43 @@ describe PgAuditLog::Triggers do
   end
 
   describe ".tables_without_triggers" do
-    before do
-      PgAuditLog::Triggers.create_for_table(TableWithTriggers.table_name)
-    end
-
     it "should return an array of all tables that do not have an audit trigger installed" do
       PgAuditLog::Triggers.tables_without_triggers.should_not include(TableWithTriggers.table_name)
       PgAuditLog::Triggers.tables_without_triggers.should include(TableWithoutTriggers.table_name)
     end
   end
 
-  describe ".install" do
-    it "should work" do
-      ->{
-        PgAuditLog::Triggers.install
-      }.should_not raise_error
+  context "when no triggers are installed" do
+    before do
+      PgAuditLog::Triggers.uninstall
+    end
+
+    describe ".install" do
+      it "should work" do
+        ->{
+          PgAuditLog::Triggers.install
+        }.should_not raise_error
+      end
+    end
+
+    describe ".uninstall" do
+      it "should work" do
+        ->{
+          PgAuditLog::Triggers.uninstall
+        }.should_not raise_error
+      end
     end
+
   end
 
   context "when triggers are installed" do
-    before do
-      PgAuditLog::Triggers.create_for_table(TableWithTriggers.table_name)
+    describe ".install" do
+      it "should work" do
+        ->{
+          PgAuditLog::Triggers.install
+        }.should_not raise_error
+      end
     end
-
     describe ".uninstall" do
       it "should work" do
         ->{
@@ -87,7 +101,5 @@ describe PgAuditLog::Triggers do
     end
 
   end
-
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2011-10-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152957860 !ruby/object:Gem::Requirement
+  requirement: &2164856600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152957860
+  version_requirements: *2164856600
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2152957060 !ruby/object:Gem::Requirement
+  requirement: &2164769800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152957060
+  version_requirements: *2164769800
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152956560 !ruby/object:Gem::Requirement
+  requirement: &2164769120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152956560
+  version_requirements: *2164769120
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2152955700 !ruby/object:Gem::Requirement
+  requirement: &2164768300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2152955700
+  version_requirements: *2164768300
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &2164767660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164767660
 description: A completely transparent audit logging component for your application
   using a stored procedure and triggers. Comes with specs for your project and a rake
   task to generate the reverse SQL to undo changes logged
@@ -107,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1882203804259823280
+      hash: -4145320202553197092
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1882203804259823280
+      hash: -4145320202553197092
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10