acts_as_audited_collection 1.0.1 → 1.0.2

data/README.md

@@ -37,6 +37,14 @@ Generating the migration
     script/generate audited_collection_migration add_collection_audits_table
     rake db:migrate
 
+Upgrading
+---------
+
+Specify the version you're upgrading *from* as a parameter.
+
+    rails generate audited_collect_migration upgrade_collection_audits_table 0.4.0
+    rake db:migrate
+
 Usage
 =====
 

data/acts_as_audited_collection.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'ruby-debug'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rails', '~>3.0'
+  gem.add_development_dependency 'rails', '~>3.2'
   gem.add_development_dependency 'sqlite3'
 end

data/lib/active_record/acts/audited_collection.rb

@@ -7,13 +7,13 @@ module ActiveRecord
             # First time use in this class, we have some extra work to do.
             send :include, InstanceMethods 
 
-            class_inheritable_reader :audited_collections
-            write_inheritable_attribute :audited_collections, {}
+            class_attribute :audited_collections
+            send :audited_collections=, {}
             attr_accessor :collection_audit_object_is_soft_deleted
 
             after_create :collection_audit_create
             before_update :collection_audit_update
-            after_destroy :collection_audit_destroy
+            before_destroy :collection_audit_destroy
 
             has_many :child_collection_audits, :as => :child_record,
               :class_name => 'CollectionAudit'
@@ -42,7 +42,7 @@ module ActiveRecord
 
           # Try explicit first, then default
           options[:foreign_key] ||= parent_association.options[:foreign_key]
-          options[:foreign_key] ||= parent_association.primary_key_name
+          options[:foreign_key] ||= parent_association.foreign_key
 
           # TODO Remove this when polymorphic is supported.
           if parent_association.options[:polymorphic]
@@ -68,12 +68,12 @@ module ActiveRecord
 
           has_many :"#{options[:for]}_audits", :as => :parent_record,
               :class_name => 'CollectionAudit',
-              :conditions => ['association = ?', options[:for].to_s]
+              :conditions => ['audited_association = ?', options[:for].to_s]
         end
 
         def define_acts_as_audited_collection(options)
           key = "#{options[:parent_type]}##{options[:name]}"
-          yield(read_inheritable_attribute(:audited_collections)[key] ||= {})
+          yield(audited_collections[key] ||= {})
         end
 
         def without_collection_audit
@@ -167,11 +167,12 @@ module ActiveRecord
                 (object_being_restored and opts[:action] != 'add') or
                 object_is_deleted
 
-              audit = child_collection_audits.create :parent_record_id => fk_val,
+              audit = child_collection_audits.create({:parent_record_id => fk_val,
                 :parent_record_type => mappings[fk][:parent_type],
+                :audited_association => mappings[fk][:name].to_s,
                 :action => opts[:action],
-                :association => mappings[fk][:name].to_s,
-                :child_audit => opts[:child_audit]
+                :child_audit => opts[:child_audit]},
+                :without_protection => true)
 
               if mappings[fk][:cascade]
                 parent = mappings[fk][:parent_type].constantize.send :find, fk_val

data/lib/acts_as_audited_collection/collection_audit.rb

@@ -20,7 +20,7 @@ class CollectionAudit < ActiveRecord::Base
       :parent_record_id => parent_record_id,
       :child_record_type => child_record_type,
       :child_record_id => child_record_id,
-      :association => association,
+      :audited_association => audited_association,
       :current => true
     ).update_all :current => false
     self.current = true

data/lib/acts_as_audited_collection/version.rb

@@ -1,3 +1,3 @@
 module ActsAsAuditedCollection
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/generators/audited_collection_migration/audited_collection_migration_generator.rb

@@ -1,6 +1,13 @@
 # Released under the MIT license. See the LICENSE file for details
 
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'rails/generators/active_record/migration'
+
 class AuditedCollectionMigrationGenerator < Rails::Generators::NamedBase
+  include Rails::Generators::Migration
+  extend ActiveRecord::Generators::Migration
+
   source_root File.join(File.dirname(__FILE__), 'templates')
 
   def manifest

data/lib/generators/audited_collection_migration/templates/migration.rb

@@ -6,7 +6,8 @@ class <%= class_name %> < ActiveRecord::Migration
       t.references :user, :polymorphic => {}
       t.references :child_audit
       t.string :action
-      t.string :association
+      t.string :audited_association
+      t.boolean :current
       t.datetime :created_at
 
       t.index [:parent_record_id, :parent_record_type], :name => 'parent_record_index'

data/lib/generators/audited_collection_upgrade/templates/migration.rb

@@ -16,9 +16,17 @@ class <%= class_name %> < ActiveRecord::Migration
       set ca_old.current = false
     }
 <% end %>
+
+<% if (from_version <=> [1,0,2]) < 0 %>
+    rename_column :collection_audits, :association, :audited_association
+<% end %>
   end
 
   def self.down
+<% if (from_version <=> [1,0,2]) < 0 %>
+    rename_column :collection_audits, :audited_association, :association
+<% end %>
+
 <% if (from_version <=> [1,0,0]) < 0 %>
     remove_index :collection_audits, :current
     remove_column :collection_audits, :current

data/spec/acts_as_audited_collection_spec.rb

@@ -195,7 +195,7 @@ describe 'Acts as audited collection plugin' do
   it 'saves the collection name with the audit entry' do
     p = TestParent.create :name => 'test parent'
     c = p.test_children.create :name => 'test child'
-    CollectionAudit.last.association.should == 'test_children'
+    CollectionAudit.last.audited_association.should == 'test_children'
   end
 
   it 'makes the collection history available through the parent class' do
@@ -224,7 +224,7 @@ describe 'Acts as audited collection plugin' do
     p.other_test_children_audits.last.child_record.should == c
     p.other_test_children_audits.last.parent_record.should == p
     p.other_test_children_audits.last.action.should == 'add'
-    p.other_test_children_audits.last.association.should == 'other_test_children'
+    p.other_test_children_audits.last.audited_association.should == 'other_test_children'
   end
 
   it 'correctly audits when a parent is reassociated through a secondary collection' do

data/spec/db/schema.rb

@@ -47,7 +47,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.references :user, :polymorphic => {}
     t.references :child_audit
     t.string :action
-    t.string :association
+    t.string :audited_association
     t.boolean :current
     t.datetime :created_at
   end

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ ActiveRecord::Base.send :extend, ActiveRecord::Acts::AuditedCollection::ClassMet
 
 databases = YAML::load(IO.read(plugin_spec_dir + "/db/database.yml"))
 ActiveRecord::Base.establish_connection(databases[ENV["DB"] || "sqlite3"])
-load(File.join(plugin_spec_dir, "db", "schema.rb"))
+require File.join(plugin_spec_dir, "db", "schema.rb")
 
 require File.join(File.dirname(__FILE__), '..', 'init.rb')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited_collection
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Shaun Mangelsdorf
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 Z
+date: 2012-11-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -67,11 +67,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 2
+        version: "3.2"
   requirement: *id004
   type: :development
 - !ruby/object:Gem::Dependency