acts_as_revisionable 1.2.1 → 1.2.2

data/lib/acts_as_revisionable/revision_record.rb

@@ -7,7 +7,7 @@ module ActsAsRevisionable
     before_create :set_revision_number
     attr_reader :data_encoding
 
-    set_table_name :revision_records
+    self.table_name = :revision_records
 
     class << self
       # Find a specific revision record.
@@ -204,7 +204,12 @@ module ActsAsRevisionable
       begin
         if reflection.macro == :has_many
           if association_attributes.kind_of?(Array)
-            record.send("#{association}=", [])
+            # Pop all the associated records to remove all records. In Rails 3.2 setting the value of the list
+            # will immediately affect the database
+            records = record.send(association)
+            while records.pop do
+              # no-op
+            end
             association_attributes.each do |attrs|
               restore_association(record, association, attrs)
             end

data/spec/acts_as_revisionable_spec.rb

@@ -89,7 +89,7 @@ describe ActsAsRevisionable do
     end
     
     class RevisionRecord2 < ActsAsRevisionable::RevisionRecord
-      set_table_name "revision_records_2"
+      self.table_name = "revision_records_2"
       create_table
       connection.add_column(table_name, :label, :string)
       connection.add_column(table_name, :updated_by, :string)
@@ -113,7 +113,7 @@ describe ActsAsRevisionable do
           t.column :type_name, :string
         end unless table_exists?
 
-        set_inheritance_column :type_name
+        self.inheritance_column = :type_name
         acts_as_revisionable :dependent => :keep, :on_destroy => true, :encoding => :xml
         self.store_full_sti_class = false
       end
@@ -491,7 +491,7 @@ describe ActsAsRevisionable do
       restored.many_other_things.collect{|t| t.name}.sort.should == ['many_other_thing_3', 'new_many_other_thing_1']
       restored.valid?.should == true
   
-      # make the restore to memory didn't affect the database
+      # make sure the restore to memory didn't affect the database
       model.reload
       model.name.should == 'new_name'
       model.many_things(true).collect{|t| t.name}.sort.should == ['many_thing_3', 'new_many_thing_1']

data/spec/revision_record_spec.rb

@@ -23,6 +23,8 @@ describe ActsAsRevisionable::RevisionRecord do
         t.column :value, :integer
         t.column :test_revisionable_record_id, :integer
       end unless table_exists?
+      
+      self.primary_key = nil if ActiveRecord::VERSION::MAJOR >= 3 && ActiveRecord::VERSION::MINOR > 0
     end
     
     class TestRevisionableAssociationComposite < ActiveRecord::Base
@@ -304,8 +306,7 @@ describe ActsAsRevisionable::RevisionRecord do
   it "should be able to restore the has_one associations" do
     revision = ActsAsRevisionable::RevisionRecord.new(TestRevisionableRecord.new)
     record = TestRevisionableRecord.new
-    revision.send(:restore_association, record, :one_association, {'id' => 1, 'name' => 'one', 'value' => 1})
-    record.one_association.id.should == 1
+    revision.send(:restore_association, record, :one_association, {'name' => 'one', 'value' => 1})
     record.one_association.name.should == 'one'
     record.one_association.value.should == 1
   end

data/spec/spec_helper.rb

@@ -18,8 +18,10 @@ composite_primary_key_version = nil
 if ActiveRecord::VERSION::MAJOR >= 3
   if ActiveRecord::VERSION::MINOR == 0
     composite_primary_key_version = "~>3.1.0"
+  elsif ActiveRecord::VERSION::MINOR == 1
+    composite_primary_key_version = "~>4"
   else
-    composite_primary_key_version = ">=4.0.0"
+    composite_primary_key_version = ">4"
   end
 else
   composite_primary_key_version = "~>2.3.5"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_revisionable
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2161226620 !ruby/object:Gem::Requirement
+  requirement: &2164450060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2161226620
+  version_requirements: *2164450060
 - !ruby/object:Gem::Dependency
   name: composite_primary_keys
-  requirement: &2161226000 !ruby/object:Gem::Requirement
+  requirement: &2164449520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161226000
+  version_requirements: *2164449520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2161225440 !ruby/object:Gem::Requirement
+  requirement: &2164448760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161225440
+  version_requirements: *2164448760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161224920 !ruby/object:Gem::Requirement
+  requirement: &2164447140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161224920
+  version_requirements: *2164447140
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2161224300 !ruby/object:Gem::Requirement
+  requirement: &2164446380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161224300
+  version_requirements: *2164446380
 description: ActiveRecord extension that provides revision support so that history
   can be tracked and changes can be reverted. Emphasis for this plugin versus similar
   ones is including associations, saving on storage, and extensibility of the model.