acts_as_trashable 1.0.4 → 1.0.6

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.6

data/acts_as_trashable.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_trashable}
-  s.version = "1.0.4"
+  s.version = "1.0.6"
 
   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-02-08}
   s.description = %q{ActiveRecord extension that serializes destroyed records into a trash table from which they can be restored. This is intended to reduce the risk of users misusing your application's delete function and losing data.}
   s.email = %q{brian@embellishedvisions.com}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "acts_as_trashable.gemspec",
-     "lib/acts_as_trashable.rb",
-     "lib/acts_as_trashable/trash_record.rb",
-     "spec/acts_as_trashable_spec.rb",
-     "spec/full_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/trash_record_spec.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "acts_as_trashable.gemspec",
+    "lib/acts_as_trashable.rb",
+    "lib/acts_as_trashable/trash_record.rb",
+    "spec/acts_as_trashable_spec.rb",
+    "spec/full_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/trash_record_spec.rb"
   ]
   s.homepage = %q{http://github.com/bdurand/acts_as_trashable}
   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 serializes destroyed records into a trash table from which they can be restored.}
   s.test_files = [
     "spec/acts_as_trashable_spec.rb",
-     "spec/full_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/trash_record_spec.rb"
+    "spec/full_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/trash_record_spec.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_trashable/trash_record.rb

@@ -56,12 +56,15 @@ module ActsAsTrashable
     def restore
       restore_class = self.trashable_type.constantize
     
-      # Check if we have a type field, if yes, assume single table inheritance and restore the actual class instead of the stored base class
       sti_type = self.trashable_attributes[restore_class.inheritance_column]
       if sti_type
         begin
-          restore_class = self.trashable_type.send(:type_name_with_module, sti_type).constantize
-        rescue NameError
+          if !restore_class.store_full_sti_class && !sti_type.start_with?("::")
+            sti_type = "#{restore_class.parent.name}::#{sti_type}"
+          end
+          restore_class = sti_type.constantize
+        rescue NameError => e
+          raise e
           # Seems our assumption was wrong and we have no STI
         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_trashable', __FILE__)
 require 'sqlite3'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_trashable
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 6
+  version: 1.0.6
 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-02-08 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 serializes destroyed records into a trash table from which they can be restored.

data/.gitignore

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