acts_as_revisionable 1.1.0 → 1.1.1

data/Rakefile

@@ -33,9 +33,11 @@ begin
     gem.email = "brian@embellishedvisions.com"
     gem.homepage = "http://github.com/bdurand/acts_as_revisionable"
     gem.authors = ["Brian Durand"]
-    gem.rdoc_options = ["--charset=UTF-8", "--main", "README.rdoc", "MIT-LICENSE"]
+    gem.files = FileList["lib/**/*", "spec/**/*", "README.rdoc", "Rakefile", "MIT-LICENSE"].to_a
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = ["README.rdoc", "MIT_LICENSE"]
     
-    gem.add_dependency('activerecord', '>= 2.3.5')
+    gem.add_dependency('activerecord', '>= 2.3.9')
     gem.add_development_dependency('composite_primary_keys')
     gem.add_development_dependency('sqlite3')
     gem.add_development_dependency('rspec', '>= 2.0.0')

data/lib/acts_as_revisionable.rb

@@ -31,9 +31,9 @@ module ActsAsRevisionable
     #
     # A has_many :revision_records will also be added to the model for accessing the revisions.
     def acts_as_revisionable(options = {})
-      write_inheritable_attribute(:acts_as_revisionable_options, options)
-      class_inheritable_reader(:acts_as_revisionable_options)
-      extend ClassMethods
+      class_attribute :acts_as_revisionable_options
+      self.acts_as_revisionable_options = options.clone
+        extend ClassMethods
       include InstanceMethods
       has_many_options = {:as => :revisionable, :order => 'revision DESC', :class_name => "ActsAsRevisionable::RevisionRecord"}
       has_many_options[:dependent] = :destroy unless options[:dependent] == :keep

data/lib/acts_as_revisionable/revision_record.rb

@@ -154,6 +154,8 @@ module ActsAsRevisionable
     def serialize_attributes(record, revisionable_associations, already_serialized = {})
       return if already_serialized["#{record.class}.#{record.id}"]
       attrs = record.attributes.dup
+      primary_key = record.class.primary_key.to_s if record.class.primary_key
+      attrs.delete(primary_key) unless record.class.columns_hash.include?(primary_key)
       already_serialized["#{record.class}.#{record.id}"] = true
 
       if revisionable_associations.kind_of?(Hash)
@@ -231,7 +233,7 @@ module ActsAsRevisionable
     # Restore a record and all its associations.
     def restore_record(record, attributes)
       primary_key = record.class.primary_key
-      primary_key = [primary_key] unless primary_key.is_a?(Array)
+      primary_key = [primary_key].compact unless primary_key.is_a?(Array)
       primary_key.each do |key|
         record.send("#{key.to_s}=", attributes[key.to_s])
       end

data/spec/acts_as_revisionable_spec.rb

@@ -37,7 +37,7 @@ describe ActsAsRevisionable do
         t.column :revisionable_test_model_id, :integer
         t.column :other_id, :integer
       end unless table_exists?
-      set_primary_keys :revisionable_test_model_id, :other_id
+      set_primary_keys "revisionable_test_model_id", "other_id"
       belongs_to :revisionable_test_model
     end
 

data/spec/revision_record_spec.rb

@@ -14,7 +14,7 @@ describe ActsAsRevisionable::RevisionRecord do
         t.column :value, :integer
         t.column :test_revisionable_record_id, :integer
       end unless table_exists?
-      self.primary_key = :legacy_id
+      self.primary_key = "legacy_id"
     end
     
     class TestRevisionableOneAssociationRecord < ActiveRecord::Base
@@ -32,7 +32,7 @@ describe ActsAsRevisionable::RevisionRecord do
         t.column :name, :string
         t.column :value, :integer
       end unless table_exists?
-      set_primary_keys :first_id, :second_id
+      set_primary_keys "first_id", "second_id"
     end
 
     class TestRevisionableAssociationRecord < ActiveRecord::Base
@@ -172,7 +172,7 @@ describe ActsAsRevisionable::RevisionRecord do
     original.save!
     revision = ActsAsRevisionable::RevisionRecord.new(original)
     revision.revision_attributes['one_association'].should == {
-      "id"=>one.id, "name"=>"one", "value"=>2, "test_revisionable_record_id"=>original.id
+      "name"=>"one", "value"=>2, "test_revisionable_record_id"=>original.id
     }
   end
 
@@ -444,7 +444,7 @@ describe ActsAsRevisionable::RevisionRecord do
   
   it "should delete revisions for models in a class that no longer exist if they are older than a specified number of seconds" do
     record_1 = TestRevisionableRecord.create(:name => 'record_1')
-    record_2 = TestRevisionableAssociationLegacyRecord.new(:name => 'record_2')
+    record_2 = TestRevisionableAssociationLegacyRecord.create!(:name => 'record_2')
     record_2.id = record_1.id
     record_2.save!
     revision_0 = ActsAsRevisionable::RevisionRecord.create(record_1)

data/spec/spec_helper.rb

@@ -8,7 +8,6 @@ else
   gem 'activerecord'
 end
 require 'active_record'
-require 'active_record/version'
 ActiveRecord::ActiveRecordError
 
 ActiveRecord::Base.logger = Logger.new(StringIO.new)
@@ -16,7 +15,11 @@ puts "Testing with ActiveRecord #{ActiveRecord::VERSION::STRING}"
 
 composite_primary_key_version = nil
 if ActiveRecord::VERSION::MAJOR >= 3
-  composite_primary_key_version = ">=3.0.0"
+  if ActiveRecord::VERSION::MINOR == 0
+    composite_primary_key_version = "~>3.1.0"
+  else
+    composite_primary_key_version = "~>4.0.0.a"
+  end
 else
   composite_primary_key_version = "~>2.3.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_revisionable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -05:00
+date: 2011-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 17
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
+        - 9
+        version: 2.3.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -103,10 +103,7 @@ extra_rdoc_files:
 files: 
 - MIT-LICENSE
 - README.rdoc
-- RELEASES.txt
 - Rakefile
-- VERSION
-- acts_as_revisionable.gemspec
 - lib/acts_as_revisionable.rb
 - lib/acts_as_revisionable/revision_record.rb
 - spec/acts_as_revisionable_spec.rb
@@ -118,11 +115,8 @@ homepage: http://github.com/bdurand/acts_as_revisionable
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-- --main
-- README.rdoc
-- MIT-LICENSE
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/RELEASES.txt

@@ -1,7 +0,0 @@
-1.1.0
-
-- Add support for compound_primary_keys gem
-- Incorporate acts_as_trashable functionality
-- More helper functions for finding revisions from the model
-- Remove support for ActiveRecord < 2.3.5
-- Users of earlier versions will need to upgrade the table with a migration

data/VERSION

@@ -1 +0,0 @@
-1.1.0

data/acts_as_revisionable.gemspec

@@ -1,62 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{acts_as_revisionable}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brian Durand"]
-  s.date = %q{2011-06-23}
-  s.description = %q{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.}
-  s.email = %q{brian@embellishedvisions.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "MIT-LICENSE",
-    "README.rdoc",
-    "RELEASES.txt",
-    "Rakefile",
-    "VERSION",
-    "acts_as_revisionable.gemspec",
-    "lib/acts_as_revisionable.rb",
-    "lib/acts_as_revisionable/revision_record.rb",
-    "spec/acts_as_revisionable_spec.rb",
-    "spec/revision_record_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/version_1_1_upgrade_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/bdurand/acts_as_revisionable}
-  s.rdoc_options = ["--charset=UTF-8", "--main", "README.rdoc", "MIT-LICENSE"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{ActiveRecord extension that provides revision support so that history can be tracked and changes can be reverted.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.5"])
-      s.add_development_dependency(%q<composite_primary_keys>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.3.5"])
-      s.add_dependency(%q<composite_primary_keys>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.3.5"])
-    s.add_dependency(%q<composite_primary_keys>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-