paper_trail 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70bf4fda92d269f953d7e88fc0a78f72ff3e288e
-  data.tar.gz: 52bf0491880b3dba4905af331f84bc9de67d0bef
+  metadata.gz: e2aaa66f683707d78b3d5c9a294e01c9e9b16813
+  data.tar.gz: f9e5043fea515093cd21d151eda33e7b915de194
 SHA512:
-  metadata.gz: 7b139581b4bf0efa29562edc58d30e3854d746d6064c1e4d0a36204ffb1ed34c81d909eea0e6866fa42b35c34f8a3b0fef5e77858f00579bdeca50441d3c13d7
-  data.tar.gz: 1608f17448169a8f2084ce44782cfcac844bd6cf4faba4f283c81b5c338dbed9afc68f5b985279e35019cdb5f40f90a2835a2f9b4ed50ff1e998dc5d78471ea2
+  metadata.gz: ac92887f5f16f868f7f5936e9e9c6353533c3a9f233989ae075d3cb1550a3c4bc9b51b6523dc22899e695b2bbfded7f3a9ed4a7bbd814fe9e9c4ec15eabea30b
+  data.tar.gz: 8b31ac54123aeba74eb156b5d6971c3a579e3a3cae0ee8e2b55c2c824c018e8e0267f616fb92aa09ebec1a2404b93e57e2ffe8ad4c9554a9509c4ea4d38e142f

data/.github/CONTRIBUTING.md

@@ -89,9 +89,9 @@ DB=postgres bundle exec appraisal ar-5.0 rake
 1. In the changelog,
   - Replace "Unreleased" with the date in iso-8601 format
   - Add a new "Unreleased" section
-1. In the readme,
-  - Update any other references to version number, including
-  - Update version number(s) in the documentation links table
+1. In the readme, update references to version number, including
+  - documentation links table
+  - compatability table
 1. Commit
 1. git tag -a -m "v5.0.0" "v5.0.0" # or whatever number
 1. git push --tags origin 5-stable # or whatever branch

data/CHANGELOG.md

@@ -17,6 +17,21 @@ recommendations of [keepachangelog.com](http://keepachangelog.com/).
 
 - None
 
+## 6.0.1 (2016-12-04)
+
+### Breaking Changes
+
+- None
+
+### Added
+
+- None
+
+### Fixed
+
+- Remove rails 3 features that are no longer supported, most notably,
+  `protected_attributes`.
+
 ## 6.0.0 (2016-12-03)
 
 Now with rails 5.1 support, and less model pollution! About 40 methods that were

data/README.md

@@ -10,7 +10,8 @@ has been destroyed.
 
 | Version        | Documentation |
 | -------------- | ------------- |
-| 6.0.0          | https://github.com/airblade/paper_trail/blob/master/README.md |
+| Unreleased     | https://github.com/airblade/paper_trail/blob/master/README.md |
+| 6.0.1          | https://github.com/airblade/paper_trail/blob/v6.0.1/README.md |
 | 5.2.3          | https://github.com/airblade/paper_trail/blob/v5.2.3/README.md |
 | 4.2.0          | https://github.com/airblade/paper_trail/blob/v4.2.0/README.md |
 | 3.0.9          | https://github.com/airblade/paper_trail/blob/v3.0.9/README.md |
@@ -45,6 +46,7 @@ has been destroyed.
   - [5.a. Single Table Inheritance](#5a-single-table-inheritance-sti)
   - [5.b. Configuring the `versions` Association](#5b-configuring-the-versions-association)
   - [5.c. Generators](#5c-generators)
+  - [5.d. Protected Attributes](#5d-protected-attributes)
 - [6. Extensibility](#6-extensibility)
   - [6.a. Custom Version Classes](#6a-custom-version-classes)
   - [6.b. Custom Serializer](#6b-custom-serializer)
@@ -1008,30 +1010,12 @@ class ApplicationController
 end
 ```
 
-#### Protected Attributes and Metadata
-
-If you are using rails 3 or the [protected_attributes][17] gem you must declare
-your metadata columns to be `attr_accessible`.
-
-```ruby
-# app/models/paper_trail/version.rb
-module PaperTrail
-  class Version < ActiveRecord::Base
-    include PaperTrail::VersionConcern
-    attr_accessible :author_id, :word_count, :answer
-  end
-end
-```
-
-If you're using [strong_parameters][18] instead of [protected_attributes][17]
-then there is no need to use `attr_accessible`.
-
 ## 5. ActiveRecord
 
 ### 5.a. Single Table Inheritance (STI)
 
 PaperTrail supports [Single Table Inheritance][39], and even supports an
-un-versioned base model, as of 23ffbdc7e1.
+un-versioned base model, as of `23ffbdc7e1`.
 
 ```ruby
 class Fruit < ActiveRecord::Base
@@ -1087,6 +1071,12 @@ Runtime options:
 Generates (but does not run) a migration to add a versions table.  Also generates an initializer file for configuring PaperTrail
 ```
 
+### 5.d. Protected Attributes
+
+As of version 6, PT no longer supports rails 3 or the [protected_attributes][17]
+gem. If you are still using them, you may use PT 5 or lower. We recommend
+upgrading to [strong_parameters][18] as soon as possible.
+
 ## 6. Extensibility
 
 ### 6.a. Custom Version Classes

data/lib/paper_trail.rb

@@ -121,15 +121,6 @@ module PaperTrail
       PaperTrail.config.serializer
     end
 
-    # Returns a boolean indicating whether "protected attibutes" should be
-    # configured, e.g. attr_accessible, mass_assignment_sanitizer,
-    # whitelist_attributes, etc.
-    # @api public
-    def active_record_protected_attributes?
-      @active_record_protected_attributes ||= ::ActiveRecord::VERSION::MAJOR < 4 ||
-        !!defined?(ProtectedAttributes)
-    end
-
     # @api public
     def transaction?
       ::ActiveRecord::Base.connection.open_transactions > 0
@@ -167,17 +158,6 @@ module PaperTrail
   end
 end
 
-# If available, ensure that the `protected_attributes` gem is loaded
-# before the `Version` class.
-unless PaperTrail.active_record_protected_attributes?
-  PaperTrail.send(:remove_instance_variable, :@active_record_protected_attributes)
-  begin
-    require "protected_attributes"
-  rescue LoadError # rubocop:disable Lint/HandleExceptions
-    # In case `protected_attributes` gem is not available.
-  end
-end
-
 ActiveSupport.on_load(:active_record) do
   include PaperTrail::Model
 end

data/lib/paper_trail/frameworks/rails/controller.rb

@@ -4,24 +4,11 @@ module PaperTrail
     # information to the model layer, with `controller_info` and `whodunnit`.
     # Also includes a convenient on/off switch, `enabled_for_controller`.
     module Controller
-      def self.included(base)
-        before = [
+      def self.included(controller)
+        controller.before_action(
           :set_paper_trail_enabled_for_controller,
           :set_paper_trail_controller_info
-        ]
-        after = [
-          :warn_about_not_setting_whodunnit
-        ]
-
-        if base.respond_to? :before_action
-          # Rails 4+
-          before.map { |sym| base.before_action sym }
-          after.map  { |sym| base.after_action  sym }
-        else
-          # Rails 3.
-          before.map { |sym| base.before_filter sym }
-          after.map  { |sym| base.after_filter  sym }
-        end
+        )
       end
 
       protected
@@ -89,24 +76,14 @@ module PaperTrail
         ::PaperTrail.controller_info = info_for_paper_trail if ::PaperTrail.enabled_for_controller?
       end
 
+      # We have removed this warning. We no longer add it as a callback.
+      # However, some people use `skip_after_action :warn_about_not_setting_whodunnit`,
+      # so removing this method would be a breaking change. We can remove it
+      # in the next major version.
       def warn_about_not_setting_whodunnit
-        return unless ::PaperTrail.enabled_for_controller?
-
-        user_present = user_for_paper_trail.present?
-        whodunnit_blank = ::PaperTrail.whodunnit.blank?
-        if user_present && whodunnit_blank && !@set_paper_trail_whodunnit_called
-          source_file_location = self.class.instance_methods(false).map { |m|
-            self.class.instance_method(m).source_location.first
-          }.uniq.first
-          ::Kernel.warn <<-EOS.strip_heredoc
-            #{source_file_location}:
-            user_for_paper_trail is present, but whodunnit has not been set.
-            PaperTrail no longer adds the set_paper_trail_whodunnit callback for
-            you. To continue recording whodunnit, please add this before_action
-            callback to your ApplicationController. For more information,
-            please see https://git.io/vrTsk
-          EOS
-        end
+        ::ActiveSupport::Deprecation.warn(
+          "warn_about_not_setting_whodunnit is a no-op and is deprecated."
+        )
       end
     end
   end

data/lib/paper_trail/version_association_concern.rb

@@ -8,10 +8,6 @@ module PaperTrail
 
     included do
       belongs_to :version
-
-      if PaperTrail.active_record_protected_attributes?
-        attr_accessible :version_id, :foreign_key_name, :foreign_key_id
-      end
     end
   end
 end

data/lib/paper_trail/version_concern.rb

@@ -21,22 +21,7 @@ module PaperTrail
       end
 
       validates_presence_of :event
-
-      if PaperTrail.active_record_protected_attributes?
-        attr_accessible(
-          :item_type,
-          :item_id,
-          :event,
-          :whodunnit,
-          :object,
-          :object_changes,
-          :transaction_id,
-          :created_at
-        )
-      end
-
       after_create :enforce_version_limit!
-
       scope :within_transaction, ->(id) { where transaction_id: id }
     end
 
@@ -225,9 +210,7 @@ module PaperTrail
     #
     def reify(options = {})
       return nil if object.nil?
-      without_identity_map do
-        ::PaperTrail::Reifier.reify(self, options)
-      end
+      ::PaperTrail::Reifier.reify(self, options)
     end
 
     # Returns what changed in this version of the item.
@@ -323,17 +306,6 @@ module PaperTrail
       end
     end
 
-    # In Rails 3.1+, calling reify on a previous version confuses the
-    # IdentityMap, if enabled. This prevents insertion into the map.
-    # @api private
-    def without_identity_map(&block)
-      if defined?(::ActiveRecord::IdentityMap) && ::ActiveRecord::IdentityMap.respond_to?(:without)
-        ::ActiveRecord::IdentityMap.without(&block)
-      else
-        yield
-      end
-    end
-
     # Checks that a value has been set for the `version_limit` config
     # option, and if so enforces it.
     # @api private

data/lib/paper_trail/version_number.rb

@@ -3,7 +3,7 @@ module PaperTrail
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY = 0
+    TINY = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

data/spec/models/post_with_status_spec.rb

@@ -1,49 +1,45 @@
 require "rails_helper"
 
-# This model tests ActiveRecord::Enum, which was added in AR 4.1
-# http://edgeguides.rubyonrails.org/4_1_release_notes.html#active-record-enums
 describe PostWithStatus, type: :model do
-  if defined?(ActiveRecord::Enum)
-    with_versioning do
-      let(:post) { described_class.create!(status: "draft") }
+  with_versioning do
+    let(:post) { described_class.create!(status: "draft") }
 
-      it "should stash the enum value properly in versions" do
-        post.published!
-        post.archived!
-        expect(post.paper_trail.previous_version.published?).to be true
-      end
+    it "should stash the enum value properly in versions" do
+      post.published!
+      post.archived!
+      expect(post.paper_trail.previous_version.published?).to be true
+    end
 
-      it "can read enums in version records written by PT 4" do
-        post = described_class.create(status: "draft")
-        post.published!
-        version = post.versions.last
-        # Simulate behavior PT 4, which used to save the string version of
-        # enums to `object_changes`
-        version.update(object_changes: "---\nid:\n- \n- 1\nstatus:\n- draft\n- published\n")
-        assert_equal %w(draft published), version.changeset["status"]
-      end
+    it "can read enums in version records written by PT 4" do
+      post = described_class.create(status: "draft")
+      post.published!
+      version = post.versions.last
+      # Simulate behavior PT 4, which used to save the string version of
+      # enums to `object_changes`
+      version.update(object_changes: "---\nid:\n- \n- 1\nstatus:\n- draft\n- published\n")
+      assert_equal %w(draft published), version.changeset["status"]
+    end
 
-      context "storing enum object_changes" do
-        subject { post.versions.last }
+    context "storing enum object_changes" do
+      subject { post.versions.last }
 
-        it "should stash the enum value properly in versions object_changes" do
-          post.published!
-          post.archived!
-          expect(subject.changeset["status"]).to eql %w(published archived)
-        end
+      it "should stash the enum value properly in versions object_changes" do
+        post.published!
+        post.archived!
+        expect(subject.changeset["status"]).to eql %w(published archived)
       end
+    end
 
-      describe "#touch_with_version" do
-        it "preserves the enum value (and all other attributes)" do
-          post = described_class.create(status: :draft)
-          expect(post.versions.count).to eq(1)
-          expect(post.status).to eq("draft")
-          Timecop.travel 1.second.since # because MySQL lacks fractional seconds precision
-          post.paper_trail.touch_with_version
-          expect(post.versions.count).to eq(2)
-          expect(post.versions.last[:object]).to include("status: 0")
-          expect(post.paper_trail.previous_version.status).to eq("draft")
-        end
+    describe "#touch_with_version" do
+      it "preserves the enum value (and all other attributes)" do
+        post = described_class.create(status: :draft)
+        expect(post.versions.count).to eq(1)
+        expect(post.status).to eq("draft")
+        Timecop.travel 1.second.since # because MySQL lacks fractional seconds precision
+        post.paper_trail.touch_with_version
+        expect(post.versions.count).to eq(2)
+        expect(post.versions.last[:object]).to include("status: 0")
+        expect(post.paper_trail.previous_version.status).to eq("draft")
       end
     end
   end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,18 +1,15 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  # Rails 5 deprecates `before_filter`
-  name_of_before_callback = respond_to?(:before_action) ? :before_action : :before_filter
-
   # Some applications and libraries modify `current_user`. Their changes need
   # to be reflected in `whodunnit`, so the `set_paper_trail_whodunnit` below
   # must happen after this.
-  send(name_of_before_callback, :modify_current_user)
+  before_action :modify_current_user
 
-  # Going forward, we'll no longer add this `before_filter`, requiring people
-  # to do so themselves, allowing them to control the order in which this filter
-  # happens.
-  send(name_of_before_callback, :set_paper_trail_whodunnit)
+  # PT used to add this callback automatically. Now people are required to add
+  # it themsevles, like this, allowing them to control the order of callbacks.
+  # The `modify_current_user` callback above shows why this control is useful.
+  before_action :set_paper_trail_whodunnit
 
   def rescue_action(e)
     raise e

data/test/dummy/app/controllers/articles_controller.rb

@@ -11,10 +11,6 @@ class ArticlesController < ApplicationController
   private
 
   def article_params
-    if PaperTrail.active_record_protected_attributes?
-      params[:article]
-    else
-      params.require(:article).permit!
-    end
+    params.require(:article).permit!
   end
 end

data/test/dummy/app/controllers/widgets_controller.rb

@@ -23,10 +23,6 @@ class WidgetsController < ApplicationController
   private
 
   def widget_params
-    if PaperTrail.active_record_protected_attributes?
-      params[:widget]
-    else
-      params[:widget].permit!
-    end
+    params[:widget].permit!
   end
 end

data/test/dummy/app/models/animal.rb

@@ -1,6 +1,4 @@
 class Animal < ActiveRecord::Base
   has_paper_trail
   self.inheritance_column = "species"
-
-  attr_accessible :species, :name if ::PaperTrail.active_record_protected_attributes?
 end

data/test/dummy/app/models/document.rb

@@ -1,4 +1,6 @@
 class Document < ActiveRecord::Base
-  has_paper_trail versions: :paper_trail_versions,
-                  on: [:create, :update]
+  has_paper_trail(
+    versions: :paper_trail_versions,
+    on: [:create, :update]
+  )
 end

data/test/dummy/app/models/legacy_widget.rb

@@ -1,4 +1,3 @@
 class LegacyWidget < ActiveRecord::Base
-  has_paper_trail ignore: :version,
-                  version: "custom_version"
+  has_paper_trail ignore: :version, version: "custom_version"
 end

data/test/dummy/app/models/post_with_status.rb

@@ -1,8 +1,7 @@
+# This model tests ActiveRecord::Enum, which was added in AR 4.1
+# http://edgeguides.rubyonrails.org/4_1_release_notes.html#active-record-enums
 class PostWithStatus < ActiveRecord::Base
   has_paper_trail
 
-  # ActiveRecord::Enum is only supported in AR4.1+
-  if defined?(ActiveRecord::Enum)
-    enum status: { draft: 0, published: 1, archived: 2 }
-  end
+  enum status: { draft: 0, published: 1, archived: 2 }
 end

data/test/dummy/app/models/skipper.rb

@@ -1,6 +1,3 @@
 class Skipper < ActiveRecord::Base
-  has_paper_trail(
-    ignore: [:created_at],
-    skip: [:another_timestamp]
-  )
+  has_paper_trail ignore: [:created_at], skip: [:another_timestamp]
 end

data/test/dummy/app/models/translation.rb

@@ -1,4 +1,6 @@
 class Translation < ActiveRecord::Base
-  has_paper_trail if: proc { |t| t.language_code == "US" },
-                  unless: proc { |t| t.type == "DRAFT" }
+  has_paper_trail(
+    if: proc { |t| t.language_code == "US" },
+    unless: proc { |t| t.type == "DRAFT" }
+  )
 end

data/test/dummy/app/models/vehicle.rb

@@ -1,4 +1,4 @@
 class Vehicle < ActiveRecord::Base
   # This STI parent class specifically does not call `has_paper_trail`.
-  # Of the sub-classes of `Vehicle`, only `Car` is versioned.
+  # Of its sub-classes, only `Car` is versioned.
 end

data/test/dummy/app/models/widget.rb

@@ -1,16 +1,8 @@
 class Widget < ActiveRecord::Base
+  EXCLUDED_NAME = "Biglet".freeze
   has_paper_trail
   has_one :wotsit
+  has_many :fluxors, -> { order(:name) }
   has_many :whatchamajiggers, as: :owner
-
-  EXCLUDED_NAME = "Biglet".freeze
-
   validates :name, exclusion: { in: [EXCLUDED_NAME] }
-
-  # `has_many` syntax for specifying order uses a lambda in Rails 4
-  if ::ActiveRecord::VERSION::MAJOR >= 4
-    has_many :fluxors, -> { order(:name) }
-  else
-    has_many :fluxors, order: :name
-  end
 end

data/test/dummy/config/application.rb

@@ -45,14 +45,6 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    if ::PaperTrail.active_record_protected_attributes?
-      config.active_record.whitelist_attributes = false
-    end
-
     # `config.assets` is a `NoMethodError` in rails 5.
     config.assets.enabled = false if config.respond_to?(:assets)
 

data/test/dummy/config/environments/development.rb

@@ -22,11 +22,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  if ::PaperTrail.active_record_protected_attributes?
-    config.active_record.mass_assignment_sanitizer = :strict
-  end
-
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   # config.active_record.auto_explain_threshold_in_seconds = 0.5

data/test/dummy/config/environments/test.rb

@@ -41,11 +41,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   # config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  if ::PaperTrail.active_record_protected_attributes?
-    config.active_record.mass_assignment_sanitizer = :strict
-  end
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/test/dummy/config/initializers/paper_trail.rb

@@ -1,9 +1 @@
 PaperTrail.config.track_associations = true
-
-module PaperTrail
-  class Version < ActiveRecord::Base
-    if ::PaperTrail.active_record_protected_attributes?
-      attr_accessible :answer, :action, :question, :article_id, :ip, :user_agent, :title
-    end
-  end
-end

data/test/test_helper.rb

@@ -104,16 +104,7 @@ module CleanupCallbacks
     original_callbacks = nil
 
     setup do
-      if ActiveRecord::VERSION::MAJOR > 3
-        original_callbacks = target.send(:get_callbacks, type).deep_dup
-      else
-        # While this defeats the purpose of targeted callback
-        # cleanup, callbacks were incredibly difficult to modify
-        # prior to Rails 4, and Rails internal callbacks were only
-        # used for autosaving associations in Rails 3. Our tests
-        # don't care whether a Fluxor's widget is autosaved.
-        target.reset_callbacks(type)
-      end
+      original_callbacks = target.send(:get_callbacks, type).deep_dup
     end
 
     teardown do

data/test/unit/model_test.rb

@@ -678,39 +678,22 @@ class HasPaperTrailModelTest < ActiveSupport::TestCase
     end
   end
 
-  context "Timestamps" do
-    setup do
-      @wotsit = Wotsit.create! name: "wotsit"
-    end
-
-    should "record timestamps" do
-      @wotsit.update_attributes! name: "changed"
-      assert_not_nil @wotsit.versions.last.reify.created_at
-      assert_not_nil @wotsit.versions.last.reify.updated_at
-    end
-
-    # Tests that it doesn't try to write created_on as an attribute just because
-    # a created_on method exists.
-    #
-    # - Deprecation warning in Rails 3.2
-    # - ActiveModel::MissingAttributeError in Rails 4
-    #
-    # In rails 5, `capture` is deprecated in favor of `capture_io`.
-    #
-    should "not generate warning" do
-      assert_update_raises_nothing = lambda {
-        assert_nothing_raised {
-          @wotsit.update_attributes! name: "changed"
-        }
-      }
-      warnings =
-        if respond_to?(:capture_io)
-          capture_io { assert_update_raises_nothing.call }.last
-        else
-          capture(:stderr) { assert_update_raises_nothing.call }
-        end
-      assert_equal "", warnings
-    end
+  test "update_attributes! records timestamps" do
+    wotsit = Wotsit.create! name: "wotsit"
+    wotsit.update_attributes! name: "changed"
+    reified = wotsit.versions.last.reify
+    assert_not_nil reified.created_at
+    assert_not_nil reified.updated_at
+  end
+
+  # Tests that it doesn't try to write created_on as an attribute just because
+  # a created_on method exists.
+  #
+  # - ActiveModel::MissingAttributeError in Rails 4
+  #
+  test "update_attributes! does not raise error" do
+    wotsit = Wotsit.create! name: "name1"
+    assert_nothing_raised { wotsit.update_attributes! name: "name2" }
   end
 
   context "A subclass" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paper_trail
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Andy Stewart
@@ -356,7 +356,6 @@ files:
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/test_controller.rb
 - test/dummy/app/controllers/widgets_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/animal.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/authorship.rb
@@ -389,7 +388,6 @@ files:
 - test/dummy/app/models/person.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/models/post_with_status.rb
-- test/dummy/app/models/protected_widget.rb
 - test/dummy/app/models/quotation.rb
 - test/dummy/app/models/section.rb
 - test/dummy/app/models/skipper.rb
@@ -406,7 +404,6 @@ files:
 - test/dummy/app/versions/json_version.rb
 - test/dummy/app/versions/kitchen/banana_version.rb
 - test/dummy/app/versions/post_version.rb
-- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -427,7 +424,6 @@ files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
 - test/dummy/db/schema.rb
-- test/dummy/script/rails
 - test/functional/controller_test.rb
 - test/functional/enabled_for_controller_test.rb
 - test/functional/modular_sinatra_test.rb
@@ -439,7 +435,6 @@ files:
 - test/unit/cleaner_test.rb
 - test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb
-- test/unit/protected_attrs_test.rb
 - test/unit/serializer_test.rb
 - test/unit/serializers/json_test.rb
 - test/unit/serializers/mixin_json_test.rb
@@ -505,7 +500,6 @@ test_files:
 - test/dummy/app/controllers/articles_controller.rb
 - test/dummy/app/controllers/test_controller.rb
 - test/dummy/app/controllers/widgets_controller.rb
-- test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/models/animal.rb
 - test/dummy/app/models/article.rb
 - test/dummy/app/models/authorship.rb
@@ -538,7 +532,6 @@ test_files:
 - test/dummy/app/models/person.rb
 - test/dummy/app/models/post.rb
 - test/dummy/app/models/post_with_status.rb
-- test/dummy/app/models/protected_widget.rb
 - test/dummy/app/models/quotation.rb
 - test/dummy/app/models/section.rb
 - test/dummy/app/models/skipper.rb
@@ -555,7 +548,6 @@ test_files:
 - test/dummy/app/versions/json_version.rb
 - test/dummy/app/versions/kitchen/banana_version.rb
 - test/dummy/app/versions/post_version.rb
-- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -576,7 +568,6 @@ test_files:
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
 - test/dummy/db/schema.rb
-- test/dummy/script/rails
 - test/functional/controller_test.rb
 - test/functional/enabled_for_controller_test.rb
 - test/functional/modular_sinatra_test.rb
@@ -588,7 +579,6 @@ test_files:
 - test/unit/cleaner_test.rb
 - test/unit/inheritance_column_test.rb
 - test/unit/model_test.rb
-- test/unit/protected_attrs_test.rb
 - test/unit/serializer_test.rb
 - test/unit/serializers/json_test.rb
 - test/unit/serializers/mixin_json_test.rb

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

data/test/dummy/app/models/protected_widget.rb

@@ -1,3 +0,0 @@
-class ProtectedWidget < Widget
-  attr_accessible :name, :a_text if ::PaperTrail.active_record_protected_attributes?
-end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

data/test/dummy/script/rails

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-# This command will automatically be run when you run "rails" with Rails 3 gems
-# installed from the root of your application.
-
-APP_PATH = File.expand_path("../../config/application", __FILE__)
-require File.expand_path("../../config/boot", __FILE__)
-require "rails/commands"

data/test/unit/protected_attrs_test.rb

@@ -1,52 +0,0 @@
-require "test_helper"
-
-class ProtectedAttrsTest < ActiveSupport::TestCase
-  subject { ProtectedWidget.new }
-
-  # These ActiveModel matchers (provided by shoulda-matchers) only work for
-  # Rails 3.
-  if ActiveRecord::VERSION::MAJOR < 4
-    accessible_attrs = ProtectedWidget.accessible_attributes.to_a
-    accessible_attrs.each do |attr_name|
-      should allow_mass_assignment_of(attr_name.to_sym)
-    end
-    inaccessible = ProtectedWidget.
-      column_names.
-      reject { |column_name| accessible_attrs.include?(column_name) }
-    inaccessible.each do |attr_name|
-      should_not allow_mass_assignment_of(attr_name.to_sym)
-    end
-  end
-
-  context "A model with `attr_accessible` created" do
-    setup do
-      @widget = ProtectedWidget.create! name: "Henry"
-      @initial_attributes = @widget.attributes
-    end
-
-    should "be `nil` in its previous version" do
-      assert_nil @widget.paper_trail.previous_version
-    end
-
-    context "which is then updated" do
-      setup do
-        @widget.assign_attributes(name: "Jeff", a_text: "Short statement")
-        @widget.an_integer = 42
-        @widget.save!
-      end
-
-      should "not be `nil` in its previous version" do
-        assert_not_nil @widget.paper_trail.previous_version
-      end
-
-      should "the previous version should contain right attributes" do
-        # For some reason this test seems to be broken in JRuby 1.9 mode in the
-        # test env even though it works in the console. WTF?
-        unless ActiveRecord::VERSION::MAJOR >= 4 && defined?(JRUBY_VERSION)
-          previous_attributes = @widget.paper_trail.previous_version.attributes
-          assert_attributes_equal previous_attributes, @initial_attributes
-        end
-      end
-    end
-  end
-end