paper_trail_manager 0.2.0 → 0.3.0

data/{rails_test/common/spec → spec}/controllers/entities_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe EntitiesController do
 
   def mock_entity(stubs={})
-    @mock_entity ||= mock_model(Entity, stubs).as_null_object
+    @mock_entity ||= mock_model(Entity, stubs)
   end
 
   describe "GET index" do

data/{rails_test/common/spec → spec}/controllers/platforms_controller_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe PlatformsController do
 
   def mock_platform(stubs={})
-    @mock_platform ||= mock_model(Platform, stubs).as_null_object
+    @mock_platform ||= mock_model(Platform, stubs)
   end
 
   describe "GET index" do

data/spec/dummy/Gemfile

@@ -0,0 +1,9 @@
+        source :gemcutter
+        gem "rails", "=3.2.21"
+        gem "i18n", ">= 0.5", "< 0.7"
+        gem "sqlite3-ruby", :require => "sqlite3"
+        gem "rake"
+        gem "will_paginate", "~> 3.0.pre2"
+        gem "paper_trail_manager", :path => "/home/micah/work/paper_trail_manager"
+        gem 'factory_girl_rails', '~> 1.7.0'
+        gem 'rspec-rails', '~> 2.11.0'

data/{rails_test/common → spec/dummy}/app/models/entity.rb

@@ -1,8 +1,6 @@
 class Entity < ActiveRecord::Base
   has_paper_trail
 
-  attr_accessible :name, :status
-
   validates_presence_of :name
   validates_presence_of :status
 end

data/{rails_test/rails-3.1.8 → spec/dummy}/app/models/platform.rb

@@ -1,8 +1,6 @@
 class Platform < ActiveRecord::Base
   has_paper_trail
 
-  attr_accessible :name, :status
-
   validates_presence_of :name
   validates_presence_of :status
 end

data/{rails_test/rails-3.1.8 → spec/dummy}/app/views/entities/index.html.erb

@@ -11,7 +11,7 @@
   <tr>
     <td><%= link_to 'Show', entity %></td>
     <td><%= link_to 'Edit', edit_entity_path(entity) %></td>
-    <td><%= link_to 'Destroy', entity, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', entity, :method => :delete, :data => { :confirm => 'Are you sure?' } %></td>
   </tr>
 <% end %>
 </table>

data/{rails_test/common → spec/dummy}/app/views/platforms/index.html.erb

@@ -11,7 +11,7 @@
   <tr>
     <td><%= link_to 'Show', platform %></td>
     <td><%= link_to 'Edit', edit_platform_path(platform) %></td>
-    <td><%= link_to 'Destroy', platform, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', platform, :method => :delete, :data => { :confirm => 'Are you sure?' } %></td>
   </tr>
 <% end %>
 </table>

data/{rails_test/rails-3.2.8 → spec/dummy}/config/application.rb

@@ -51,7 +51,9 @@ module Rails328
     # 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.
-    config.active_record.whitelist_attributes = true
+    if Rails.version < "4.1"
+      config.active_record.whitelist_attributes = false
+    end
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/{rails_test/rails-3.2.8 → spec/dummy}/config/environments/development.rb

@@ -23,7 +23,7 @@ Rails328::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)

data/{rails_test/rails-3.2.8 → spec/dummy}/config/environments/production.rb

@@ -9,7 +9,7 @@ Rails328::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # config.serve_static_assets = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true

data/{rails_test/rails-3.2.8 → spec/dummy}/config/environments/test.rb

@@ -8,12 +8,9 @@ Rails328::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  # config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -30,7 +27,9 @@ Rails328::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # config.active_record.mass_assignment_sanitizer = :strict
+
+  config.eager_load = false
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

data/{rails_test/rails-3.1.8 → spec/dummy}/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Rails318::Application.config.secret_token = 'a84a557a65035cc783faad26be3cd10a71726ed75b7419c7740f357cc6301febb39c333154c4f1d7c5899a18d721c4b7c34b2949e50c367d37ae1147652104db'
+Rails328::Application.config.secret_key_base = Rails328::Application.config.secret_token = '96169e00f121ca10adb3df3e38edd800c2b0972dc6c9054a9e124979643558199e4245eb3bd60d0fb0f6e71734cc170ce4b57721e55fa106221cda73c9281c5e'

data/{rails_test/rails-3.1.8 → spec/dummy}/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -8,33 +9,33 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110228094444) do
+ActiveRecord::Schema.define(version: 20110228094444) do
 
-  create_table "entities", :force => true do |t|
-    t.string   "name"
-    t.string   "status"
+  create_table "entities", force: :cascade do |t|
+    t.string   "name",       limit: 255
+    t.string   "status",     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "platforms", :force => true do |t|
-    t.string   "name"
-    t.string   "status"
+  create_table "platforms", force: :cascade do |t|
+    t.string   "name",       limit: 255
+    t.string   "status",     limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "versions", :force => true do |t|
-    t.string   "item_type",  :null => false
-    t.integer  "item_id",    :null => false
-    t.string   "event",      :null => false
-    t.string   "whodunnit"
+  create_table "versions", force: :cascade do |t|
+    t.string   "item_type",  limit: 255, null: false
+    t.integer  "item_id",                null: false
+    t.string   "event",      limit: 255, null: false
+    t.string   "whodunnit",  limit: 255
     t.text     "object"
     t.datetime "created_at"
   end
 
-  add_index "versions", ["item_type", "item_id"], :name => "index_versions_on_item_type_and_item_id"
+  add_index "versions", ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
 
 end

data/{rails_test/rails-3.1.8/spec → spec}/integration/paper_trail_manager_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PaperTrailManager do
+describe PaperTrailManager, :versioning => true do
   def version
     return assigns[:version]
   end
@@ -41,21 +41,21 @@ describe PaperTrailManager do
   end
 
   context "with changes" do
-    before(:all) do
+    before do
       populate
     end
 
-    after(:all) do
+    after do
       Entity.destroy_all
       Platform.destroy_all
-      Version.destroy_all
+      PaperTrail::Version.destroy_all
     end
 
     context "index" do
       context "when getting all changes" do
         context "and authorized" do
           context "and getting default index" do
-            before(:all) { get changes_path }
+            before { get changes_path }
 
             it "should have all changes" do
               versions.size.should == 10
@@ -74,7 +74,7 @@ describe PaperTrailManager do
             let(:page) { 2 }
             let(:per_page) { 3 }
 
-            before(:all) { get changes_path(:page => page, :per_page => per_page) }
+            before { get changes_path(:page => page, :per_page => per_page) }
 
             it "should set :page parameter" do
               assigns[:page].should == page
@@ -90,7 +90,7 @@ describe PaperTrailManager do
           end
 
           context "and getting invalid pagination" do
-            before(:all) { get changes_path(:page => "Shanghai", :per_page => "Alice") }
+            before { get changes_path(:page => "Shanghai", :per_page => "Alice") }
 
             it "should set default :page parameter" do
               assigns[:page].should be_nil
@@ -110,7 +110,7 @@ describe PaperTrailManager do
 
       context "when getting changes for a specific type" do
         context "that exists" do
-          before(:all) { get changes_path(:type => "Entity") }
+          before { get changes_path(:type => "Entity") }
 
           it "should show a subset of the changes" do
             versions.size.should == 6
@@ -129,7 +129,7 @@ describe PaperTrailManager do
 
       context "when getting changes for a specific record" do
         context "that exists" do
-          before(:all) { get changes_path(:type => "Entity", :id => @reimu.id) }
+          before { get changes_path(:type => "Entity", :id => @reimu.id) }
 
           it "should show a subset of the changes" do
             versions.size.should == 3
@@ -154,7 +154,7 @@ describe PaperTrailManager do
     context "show a change" do
       context "that exists" do
         context "when authorized" do
-          before(:all) do
+          before do
             @version = @reimu.versions.last
             get change_path(@version)
           end
@@ -191,11 +191,11 @@ describe PaperTrailManager do
 
       context "when authorized" do
         it "should rollback a newly-created record by deleting it" do
-          Entity.exists?(@reimu.id).should be_true
+          Entity.exists?(@reimu.id).should be_truthy
 
           put change_path(@reimu.versions.first)
 
-          Entity.exists?(@reimu.id).should be_false
+          Entity.exists?(@reimu.id).should be_falsey
         end
 
         it "should rollback an edit by reverting to the previous state" do
@@ -209,9 +209,9 @@ describe PaperTrailManager do
         end
 
         it "should rollback a delete by restoring the record" do
-          Entity.exists?(@flanchan.id).should be_false
+          Entity.exists?(@flanchan.id).should be_falsey
 
-          put change_path(Version.where(:item_id => @flanchan.id, :item_type => "Entity").last)
+          put change_path(PaperTrail::Version.where(:item_id => @flanchan.id, :item_type => "Entity").last)
 
           flanchan = Entity.find(@flanchan.id)
           flanchan.status.should == "The Embodiment of Scarlet Devil"