acts_as_revisionable 1.0.4 → 1.0.5

data/Rakefile

@@ -6,14 +6,13 @@ desc 'Default: run unit tests.'
 task :default => :test
 
 begin
-  require 'spec/rake/spectask'
-  desc 'Test the gem.'
-  Spec::Rake::SpecTask.new(:test) do |t|
-    t.spec_files = FileList.new('spec/**/*_spec.rb')
-  end
+  require 'rspec'
+  require 'rspec/core/rake_task'
+  desc 'Run the unit tests'
+  RSpec::Core::RakeTask.new(:test)
 rescue LoadError
-  tast :test do
-    STDERR.puts "You must have rspec >= 1.3.0 to run the tests"
+  task :test do
+    STDERR.puts "You must have rspec 2.0 installed to run the tests"
   end
 end
 
@@ -38,7 +37,7 @@ begin
     
     gem.add_dependency('activerecord', '>= 2.2')
     gem.add_development_dependency('sqlite3')
-    gem.add_development_dependency('rspec', '>= 1.3.0')
+    gem.add_development_dependency('rspec', '>= 2.0.0')
     gem.add_development_dependency('jeweler')
   end
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/acts_as_revisionable.gemspec

@@ -1,65 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Durand"]
-  s.date = %q{2010-10-08}
+  s.date = %q{2011-01-28}
   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 = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "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/full_spec.rb",
-     "spec/revision_record_spec.rb",
-     "spec/spec_helper.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "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/full_spec.rb",
+    "spec/revision_record_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/bdurand/acts_as_revisionable}
   s.rdoc_options = ["--charset=UTF-8", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.1}
   s.summary = %q{ActiveRecord extension that provides revision support so that history can be tracked and changes can be reverted.}
   s.test_files = [
     "spec/acts_as_revisionable_spec.rb",
-     "spec/full_spec.rb",
-     "spec/revision_record_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/full_spec.rb",
+    "spec/revision_record_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.2"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.2"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.2"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/acts_as_revisionable/revision_record.rb

@@ -75,8 +75,8 @@ module ActsAsRevisionable
             sti_type = (/^::/ =~ type_name) ? type_name : "#{restore_class.parent.name}::#{type_name}"
           end
           restore_class = sti_type.constantize
-        rescue NameError
-          raise
+        rescue NameError => e
+          raise e
           # Seems our assumption was wrong and we have no STI
         end
       end
@@ -95,8 +95,10 @@ module ActsAsRevisionable
       association_attrs.each_pair do |association, attribute_values|
         restore_association(record, association, attribute_values)
       end
-    
-      record.instance_variable_set(:@new_record, nil)
+      
+      record.instance_variable_set(:@new_record, nil) if record.instance_variable_defined?(:@new_record)
+      # ActiveRecord 3.0.2 and 3.0.3 used @persisted instead of @new_record
+      record.instance_variable_set(:@persisted, true) if record.instance_variable_defined?(:@persisted)
     
       return record
     end
@@ -220,8 +222,12 @@ module ActsAsRevisionable
       association_attrs.each_pair do |key, values|
         restore_association(associated_record, key, values)
       end
-    
-      associated_record.instance_variable_set(:@new_record, nil) if exists
+      
+      if exists
+        associated_record.instance_variable_set(:@new_record, nil) if associated_record.instance_variable_defined?(:@new_record)
+        # ActiveRecord 3.0.2 and 3.0.3 used @persisted instead of @new_record
+        associated_record.instance_variable_set(:@persisted, true) if associated_record.instance_variable_defined?(:@persisted)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,11 @@
 require 'rubygems'
+
+if ENV["ACTIVE_RECORD_VERSION"]
+  gem 'activerecord', ENV["ACTIVE_RECORD_VERSION"]
+else
+  gem 'activerecord'
+end
+
 require File.expand_path('../../lib/acts_as_revisionable', __FILE__)
 require 'sqlite3'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_revisionable
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Brian Durand
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -05:00
+date: 2011-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,12 +55,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15
         segments: 
-        - 1
-        - 3
+        - 2
+        - 0
         - 0
-        version: 1.3.0
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -130,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: ActiveRecord extension that provides revision support so that history can be tracked and changes can be reverted.

data/.gitignore

@@ -1 +0,0 @@
-pkg