Updates to support Rails4

.travis.yml

@@ -1,5 +1,3 @@
 language: ruby
 rvm:
-  - 1.9.2
-  - 1.8.7
-  - ree
+  - 1.9.3

Gemfile

@@ -1,2 +1,5 @@
 source :rubygems
+
+gem 'rails',     github: 'rails/rails'
+
 gemspec

lib/generators/paper_trail/install_generator.rb

@@ -1,11 +1,9 @@
 require 'rails/generators'
 require 'rails/generators/migration'
-require 'rails/generators/active_record/migration'
 
 module PaperTrail
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
-    extend ActiveRecord::Generators::Migration
 
     source_root File.expand_path('../templates', __FILE__)
     class_option :with_changes, :type => :boolean, :default => false, :desc => "Store changeset (diff) with each version"
@@ -16,5 +14,10 @@ def create_migration_file
       migration_template 'create_versions.rb', 'db/migrate/create_versions.rb'
       migration_template 'add_object_changes_column_to_versions.rb', 'db/migrate/add_object_changes_column_to_versions.rb' if options.with_changes?
     end
+
+    def self.next_migration_number(dirname)
+      next_migration_number = current_migration_number(dirname) + 1
+      ActiveRecord::Migration.next_migration_number(next_migration_number)
+    end
   end
 end

lib/paper_trail/version.rb

@@ -1,7 +1,6 @@
 class Version < ActiveRecord::Base
   belongs_to :item, :polymorphic => true
   validates_presence_of :event
-  attr_accessible :item_type, :item_id, :event, :whodunnit, :object, :object_changes
 
   def self.with_item_keys(item_type, item_id)
     scoped(:conditions => { :item_type => item_type, :item_id => item_id })

paper_trail.gemspec

@@ -15,11 +15,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'railties', '~> 3.0'
-  s.add_dependency 'activerecord', '~> 3.0'
+  s.add_dependency 'railties', '~> 4.0.0.beta'
+  s.add_dependency 'activerecord', '~> 4.0.0.beta'
 
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'shoulda', '~> 3.3'
-  s.add_development_dependency 'sqlite3', '~> 1.2'
+  s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'ffaker', '>= 1.15'
 end

test/dummy/app/controllers/widgets_controller.rb

@@ -5,13 +5,13 @@ def paper_trail_enabled_for_controller
   end
 
   def create
-    @widget = Widget.create params[:widget]
+    @widget = Widget.create params[:widget].permit!
     head :ok
   end
 
   def update
     @widget = Widget.find params[:id]
-    @widget.update_attributes params[:widget]
+    @widget.update_attributes params[:widget].permit!
     head :ok
   end
 

test/dummy/config/initializers/paper_trail.rb

@@ -1,3 +1,2 @@
 class Version < ActiveRecord::Base
-  attr_accessible :created_at, :updated_at, :answer, :action, :question, :article_id, :ip, :user_agent, :title
 end

test/functional/thread_safety_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ThreadSafetyTest < ActionController::TestCase
-  should "be thread safe" do
+  test "be thread safe" do
     blocked = true
 
     slow_thread = Thread.new do

test/test_helper.rb

@@ -3,14 +3,14 @@
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
+require "minitest/autorun"
 
 #ActionMailer::Base.delivery_method = :test
 #ActionMailer::Base.perform_deliveries = true
 #ActionMailer::Base.default_url_options[:host] = "test.com"
 
 Rails.backtrace_cleaner.remove_silencers!
 
-require 'shoulda'
 require 'ffaker'
 
 # Run any available migration

test/unit/inheritance_column_test.rb

@@ -2,7 +2,7 @@
 
 class InheritanceColumnTest < ActiveSupport::TestCase
 
-  context 'STI models' do
+  describe 'STI models' do
     setup do
       @animal = Animal.create :name => 'Animal'
       @animal.update_attributes :name => 'Animal from the Muppets'