Fix build

.gitignore

@@ -1,3 +1,5 @@
 pkg
 .bundle
 .DS_Store
+Gemfile.lock
+gemfiles/*.lock

.travis.yml

@@ -1,6 +1,21 @@
 language: ruby
+script: "bundle exec rake test"
 rvm:
-  - 1.9.2
   - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
+  - 2.0.0
+  - 2.1
+  - ruby-head
+  - jruby
+  - rbx
+gemfile:
+  - gemfiles/active_record_40.gemfile
+  - gemfiles/active_record_41.gemfile
+  - gemfiles/active_record_42.gemfile
+  - gemfiles/active_record_edge.gemfile
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx
+    - rvm: jruby
+    - gemfile: gemfiles/active_record_edge.gemfile
+  fast_finish: true

Gemfile

@@ -1,20 +1,9 @@
-source "http://rubygems.org"
-
-gem "activerecord", "~>3.2"
+source "https://rubygems.org"
 
 # Development dependencies
-gem "rake"
-gem "activesupport", "~>3.2"
-
-platforms :ruby do
-  gem "sqlite3"
+group :development do
+  gem "sqlite3", :platforms => [:ruby]
+  gem "activerecord-jdbcsqlite3-adapter", :platforms => [:jruby]
 end
 
-platforms :jruby do
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-group :test do
-  gem "minitest"
-  gem "autotest-growl"
-end
+gemspec

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Gonçalo Silva
+Copyright (c) 2014 Zachary Scott, Gonçalo Silva, Rick Olson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.markdown → README.md

@@ -1,14 +1,16 @@
 # ActsAsParanoid
 
-A simple plugin which hides records instead of deleting them, being able to recover them.
+[![Build Status](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid.png?branch=master)](https://travis-ci.org/ActsAsParanoid/acts_as_paranoid)
 
-**This branch targets Rails 3.2.** If you're working with another version, switch to the corresponding branch.
+A Rails plugin to add soft delete.
 
-## Credits
+This gem can be used to hide records instead of deleting them, making them recoverable later.
 
-This plugin was inspired by [acts_as_paranoid](http://github.com/technoweenie/acts_as_paranoid) and [acts_as_active](http://github.com/fernandoluizao/acts_as_active).
+## Support
 
-While porting it to Rails 3, I decided to apply the ideas behind those plugins to an unified solution while removing a **lot** of the complexity found in them. I eventually ended up writing a new plugin from scratch.
+**This branch targets Rails 4.x.**
+
+If you're working with another version, switch to the corresponding branch, or require an older version of the acts_as_paranoid gem.
 
 ## Usage
 
@@ -187,13 +189,15 @@ Associations are also supported. From the simplest behaviors you'd expect to mor
 
 ```ruby
 class Parent < ActiveRecord::Base
-	has_many :children, :class_name => "ParanoiacChild"
+  has_many :children, :class_name => "ParanoiacChild"
 end
 
 class ParanoiacChild < ActiveRecord::Base
-	belongs_to :parent
-  belongs_to :parent_including_deleted, :class_name => "Parent", :with_deleted => true
-  # You cannot name association *_with_deleted
+  acts_as_paranoid
+  belongs_to :parent
+
+  # You may need to provide a foreign_key like this
+  belongs_to :parent_including_deleted, :class_name => "Parent", foreign_key => 'parent_id', :with_deleted => true
 end
 
 parent = Parent.first
@@ -214,37 +218,17 @@ Watch out for these caveats:
 -   You cannot name association `*_with_deleted`
 -   `unscoped` will return all records, deleted or not
 
-# Support
-
-This gem supports the most recent versions of Rails and Ruby.
-
-## Rails
-
-For Rails 3.2 check the README at the [rails3.2](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.2) branch and add this to your Gemfile:
-
-	gem "acts_as_paranoid", "~>0.4.0"
-
-For Rails 3.1 check the README at the [rails3.1](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.1) branch and add this to your Gemfile:
-
-	gem "rails3_acts_as_paranoid", "~>0.1.4"
-
-For Rails 3.0 check the README at the [rails3.0](https://github.com/goncalossilva/rails3_acts_as_paranoid/tree/rails3.0) branch and add this to your Gemfile:
-
-	gem "rails3_acts_as_paranoid", "~>0.0.9"
-
-
-## Ruby
-
-This gem is tested on Ruby 1.9, JRuby and Rubinius (both in 1.9 mode). It *might* work fine in 1.8, but it's not officially supported.
-
 # Acknowledgements
 
+* To [Rick Olson](https://github.com/technoweenie) for creating acts_as_paranoid
 * To [cheerfulstoic](https://github.com/cheerfulstoic) for adding recursive recovery
 * To [Jonathan Vaught](https://github.com/gravelpup) for adding paranoid validations
 * To [Geoffrey Hichborn](https://github.com/phene) for improving the overral code quality and adding support for after_commit
 * To [flah00](https://github.com/flah00) for adding support for STI-based associations (with :dependent)
 * To [vikramdhillon](https://github.com/vikramdhillon) for the idea and initial implementation of support for string column type
 * To [Craig Walker](https://github.com/softcraft-development) for Rails 3.1 support and fixing various pending issues
 * To [Charles G.](https://github.com/chuckg) for Rails 3.2 support and for making a desperately needed global code refactoring
+* To [Gonçalo Silva](https://github.com/goncalossilva) for supporting this gem prior to v0.4.3
+* To [Jean Boussier](https://github.com/byroot) for initial Rails 4.0.0 support
 
-Copyright © 2010 Gonçalo Silva, released under the MIT license
+See `LICENSE`.

Rakefile

@@ -1,27 +1,34 @@
-begin
-  require "bundler"
-  Bundler.setup
-rescue LoadError
-  $stderr.puts "You need to have Bundler installed to be able build this gem."
-end
+require "bundler/gem_tasks"
+
 require "rake/testtask"
-require "rake/rdoctask"
+require "rdoc/task"
 
 gemspec = eval(File.read(Dir["*.gemspec"].first))
 
-
 desc 'Default: run unit tests.'
-task :default => :test
+task :default => "test:all"
+
+namespace :test do
+  %w(active_record_edge active_record_40 active_record_41 active_record_42).each do |version|
+    desc "Test acts_as_paranoid against #{version}"
+    task version do
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle exec rake -t test"
+    end
+  end
+
+  desc "Run all tests for acts_as_paranoid"
+  task :all do
+    %w(active_record_edge active_record_40 active_record_41 active_record_42).each do |version|
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{version}.gemfile' bundle exec rake -t test"
+    end
+  end
+end
 
-desc 'Test the acts_as_paranoid plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.libs << 'test'
-
-  test_files = FileList['test/**/test_*.rb']
-  test_files.exclude('test/test_helper.rb')
-  t.test_files = test_files
-
+  t.pattern = 'test/test_*.rb'
   t.verbose = true
 end
 
@@ -34,18 +41,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Validate the gemspec"
-task :gemspec do
-  gemspec.validate
-end
-
-desc "Build gem locally"
-task :build => :gemspec do
-  system "gem build #{gemspec.name}.gemspec"
-  FileUtils.mkdir_p "pkg"
-  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", "pkg"
-end
-
 desc "Install gem locally"
 task :install => :build do
   system "gem install pkg/#{gemspec.name}-#{gemspec.version}"

acts_as_paranoid.gemspec

@@ -1,17 +1,29 @@
-Gem::Specification.new do |s|
-  s.name                  = "acts_as_paranoid"
-  s.version               = "0.0.0"
-  s.platform              = Gem::Platform::RUBY
-  s.authors               = ["Goncalo Silva", "Charles G.", "Rick Olson"]
-  s.email                 = ["[email protected]"]
-  s.homepage              = "https://github.com/goncalossilva/rails3_acts_as_paranoid"
-  s.summary               = "Active Record (~>3.2) plugin which allows you to hide and restore records without actually deleting them."
-  s.description           = "Active Record (~>3.2) plugin which allows you to hide and restore records without actually deleting them. Check its GitHub page for more in-depth information."
-  s.rubyforge_project     = s.name
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'acts_as_paranoid/version'
 
-  s.required_rubygems_version = ">= 1.3.6"
+Gem::Specification.new do |spec|
+  spec.name        = "acts_as_paranoid"
+  spec.version     = ActsAsParanoid::VERSION
+  spec.authors     = ["Zachary Scott", "Goncalo Silva", "Rick Olson"]
+  spec.email       = ["[email protected]"]
+  spec.summary     = "Active Record plugin which allows you to hide and restore records without actually deleting them."
+  spec.description = "Check the home page for more in-depth information."
+  spec.homepage    = "https://github.com/ActsAsParanoid/acts_as_paranoid"
+  spec.license     = "MIT"
 
-  s.add_dependency "activerecord", "~> 3.2"
+  spec.files         = Dir["{lib}/**/*.rb", "LICENSE", "*.md"]
+  spec.test_files    = Dir["test/*.rb"]
+  spec.require_paths = ["lib"]
 
-  s.files        = Dir["{lib}/**/*.rb", "LICENSE", "*.markdown"]
+  spec.required_rubygems_version = ">= 1.3.6"
+
+  spec.add_dependency "activerecord", "~> 4.0"
+  spec.add_dependency "activesupport", "~> 4.0"
+
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rdoc"
+  spec.add_development_dependency "minitest", ">= 4.0", "<= 6.0"
 end

gemfiles/active_record_40.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.0.0', :require => 'active_record'
+gem 'activesupport', '~> 4.0.0', :require => 'active_support'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'rubysl-test-unit'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

gemfiles/active_record_41.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.1.0', :require => 'active_record'
+gem 'activesupport', '~> 4.1.0', :require => 'active_support'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'

gemfiles/active_record_42.gemfile

@@ -0,0 +1,25 @@
+source 'https://rubygems.org'
+
+gem 'activerecord', '~> 4.2.0.beta1', :require => 'active_record'
+gem 'activesupport', '~> 4.2.0.beta1', :require => 'active_support'
+
+platforms :ruby do
+  if RUBY_VERSION > "2.1.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '1.3.8'
+  end
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+end
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'racc'
+  gem 'minitest'
+  gem 'rubinius-developer_tools'
+end
+
+gemspec :path => '../'