audited 4.2.0 → 4.4.0

data/test/upgrade_generator_test.rb

@@ -1,12 +1,16 @@
 require 'test_helper'
 
-require 'audited/adapters/active_record'
 require 'generators/audited/upgrade_generator'
 
 class UpgradeGeneratorTest < Rails::Generators::TestCase
   destination File.expand_path('../../tmp', __FILE__)
   setup :prepare_destination
   tests Audited::Generators::UpgradeGenerator
+  if Rails::VERSION::MAJOR == 4
+    self.use_transactional_fixtures = false
+  else
+    self.use_transactional_tests = false
+  end
 
   test "should add 'comment' to audits table" do
     load_schema 1
@@ -14,7 +18,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     run_generator %w(upgrade)
 
     assert_migration "db/migrate/add_comment_to_audits.rb" do |content|
-      assert_match /add_column :audits, :comment, :string/, content
+      assert_match(/add_column :audits, :comment, :string/, content)
     end
 
     assert_migration "db/migrate/rename_changes_to_audited_changes.rb"
@@ -28,7 +32,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     assert_no_migration "db/migrate/add_comment_to_audits.rb"
 
     assert_migration "db/migrate/rename_changes_to_audited_changes.rb" do |content|
-      assert_match /rename_column :audits, :changes, :audited_changes/, content
+      assert_match(/rename_column :audits, :changes, :audited_changes/, content)
     end
   end
 
@@ -38,7 +42,7 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     run_generator %w(upgrade)
 
     assert_migration "db/migrate/add_remote_address_to_audits.rb" do |content|
-      assert_match /add_column :audits, :remote_address, :string/, content
+      assert_match(/add_column :audits, :remote_address, :string/, content)
     end
   end
 
@@ -48,8 +52,8 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     run_generator %w(upgrade)
 
     assert_migration "db/migrate/add_association_to_audits.rb" do |content|
-      assert_match /add_column :audits, :association_id, :integer/, content
-      assert_match /add_column :audits, :association_type, :string/, content
+      assert_match(/add_column :audits, :association_id, :integer/, content)
+      assert_match(/add_column :audits, :association_type, :string/, content)
     end
   end
 
@@ -59,8 +63,8 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     run_generator %w(upgrade)
 
     assert_migration "db/migrate/rename_association_to_associated.rb" do |content|
-      assert_match /rename_column :audits, :association_id, :associated_id/, content
-      assert_match /rename_column :audits, :association_type, :associated_type/, content
+      assert_match(/rename_column :audits, :association_id, :associated_id/, content)
+      assert_match(/rename_column :audits, :association_type, :associated_type/, content)
     end
   end
 
@@ -70,8 +74,19 @@ class UpgradeGeneratorTest < Rails::Generators::TestCase
     run_generator %w(upgrade)
 
     assert_migration "db/migrate/add_request_uuid_to_audits.rb" do |content|
-      assert_match /add_column :audits, :request_uuid, :string/, content
-      assert_match /add_index :audits, :request_uuid/, content
+      assert_match(/add_column :audits, :request_uuid, :string/, content)
+      assert_match(/add_index :audits, :request_uuid/, content)
+    end
+  end
+
+  test "generate migration with correct AR migration parent" do
+    load_schema 1
+
+    run_generator %w(upgrade)
+
+    assert_migration "db/migrate/add_comment_to_audits.rb" do |content|
+      parent = Rails::VERSION::MAJOR == 4 ? 'ActiveRecord::Migration' : "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
+      assert_includes(content, "class AddCommentToAudits < #{parent}\n")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Brandon Keepers
@@ -13,24 +13,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails-observers
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: protected_attributes
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -44,117 +50,81 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0.beta2
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '4.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.18'
 description: Log all changes to your models
 email: info@collectiveidea.com
 executables: []
@@ -165,7 +135,7 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
-- CHANGELOG
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -173,14 +143,30 @@ files:
 - gemfiles/rails40.gemfile
 - gemfiles/rails41.gemfile
 - gemfiles/rails42.gemfile
+- gemfiles/rails50.gemfile
+- gemfiles/rails51.gemfile
+- lib/audited-rspec.rb
 - lib/audited.rb
-- lib/audited/active_record/version.rb
 - lib/audited/audit.rb
 - lib/audited/auditor.rb
-- lib/audited/mongo_mapper/version.rb
 - lib/audited/rspec_matchers.rb
 - lib/audited/sweeper.rb
 - lib/audited/version.rb
+- lib/generators/audited/install_generator.rb
+- lib/generators/audited/migration.rb
+- lib/generators/audited/migration_helper.rb
+- lib/generators/audited/templates/add_association_to_audits.rb
+- lib/generators/audited/templates/add_comment_to_audits.rb
+- lib/generators/audited/templates/add_remote_address_to_audits.rb
+- lib/generators/audited/templates/add_request_uuid_to_audits.rb
+- lib/generators/audited/templates/install.rb
+- lib/generators/audited/templates/rename_association_to_associated.rb
+- lib/generators/audited/templates/rename_changes_to_audited_changes.rb
+- lib/generators/audited/templates/rename_parent_to_association.rb
+- lib/generators/audited/upgrade_generator.rb
+- spec/audited/audit_spec.rb
+- spec/audited/auditor_spec.rb
+- spec/audited/sweeper_spec.rb
 - spec/audited_spec_helpers.rb
 - spec/rails_app/config/application.rb
 - spec/rails_app/config/database.yml
@@ -194,9 +180,9 @@ files:
 - spec/rails_app/config/routes.rb
 - spec/spec_helper.rb
 - spec/support/active_record/models.rb
+- spec/support/active_record/postgres/1_change_audited_changes_type_to_json.rb
+- spec/support/active_record/postgres/2_change_audited_changes_type_to_jsonb.rb
 - spec/support/active_record/schema.rb
-- spec/support/mongo_mapper/connection.rb
-- spec/support/mongo_mapper/models.rb
 - test/db/version_1.rb
 - test/db/version_2.rb
 - test/db/version_3.rb
@@ -226,24 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Log all changes to your models
-test_files:
-- spec/audited_spec_helpers.rb
-- spec/rails_app/config/application.rb
-- spec/rails_app/config/database.yml
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/backtrace_silencers.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/secret_token.rb
-- spec/rails_app/config/routes.rb
-- spec/spec_helper.rb
-- spec/support/active_record/models.rb
-- spec/support/active_record/schema.rb
-- spec/support/mongo_mapper/connection.rb
-- spec/support/mongo_mapper/models.rb
+test_files: []

data/CHANGELOG

@@ -1,34 +0,0 @@
-Audited ChangeLog
--------------------------------------------------------------------------------
-* 2012-04-10 - Add Audit scopes for creates, updates and destroys [chriswfx]
-* 2011-10-25 - Made ignored_attributes configurable [senny]
-* 2011-09-09 - Rails 3.x support
-               Support for associated audits
-               Support for remote IP address storage
-               Plenty of bug fixes and refactoring
-               [kennethkalmer, ineu, PatrickMa, jrozner, dwarburton, bsiggelkow, dgm]
-* 2009-01-27 - Store old and new values for updates, and store all attributes on destroy.
-               Refactored revisioning methods to work as expected
-* 2008-10-10 - changed to make it work in development mode
-* 2008-09-24 - Add ability to record parent record of the record being audited
-               [Kenneth Kalmer]
-* 2008-04-19 - refactored to make compatible with dirty tracking in edge rails
-               and to stop storing both old and new values in a single audit
-* 2008-04-18 - Fix NoMethodError when trying to access the :previous revision
-               on a model that doesn't have previous revisions [Alex Soto]
-* 2008-03-21 - added #changed_attributes to get access to the changes before a
-               save [Chris Parker]
-* 2007-12-16 - Added #revision_at for retrieving a revision from a specific
-               time [Jacob Atzen]
-* 2007-12-16 - Fix error when getting revision from audit with no changes
-               [Geoffrey Wiseman]
-* 2007-12-16 - Remove dependency on acts_as_list
-* 2007-06-17 - Added support getting previous revisions
-* 2006-11-17 - Replaced use of singleton User.current_user with cache sweeper
-               implementation for auditing the user that made the change
-* 2006-11-17 - added migration generator
-* 2006-08-14 - incorporated changes from Michael Schuerig to write_attribute
-               that saves the new value after every change and not just the
-               first, and performs proper type-casting before doing comparisons
-* 2006-08-14 - The "changes" are now saved as a serialized hash
-* 2006-07-21 - initial version

data/lib/audited/active_record/version.rb

@@ -1,5 +0,0 @@
-module Audited
-  module ActiveRecord
-    VERSION = "4.2.0"
-  end
-end

data/lib/audited/mongo_mapper/version.rb

@@ -1,5 +0,0 @@
-module Audited
-  module MongoMapper
-    VERSION = "4.2.0"
-  end
-end

data/spec/support/mongo_mapper/connection.rb

@@ -1,4 +0,0 @@
-require 'mongo_mapper'
-
-MongoMapper.connection = Mongo::Connection.new
-MongoMapper.database = 'audited_test'

data/spec/support/mongo_mapper/models.rb

@@ -1,214 +0,0 @@
-require 'cgi'
-require 'mongo_mapper'
-require File.expand_path('../connection', __FILE__)
-
-module Models
-  module MongoMapper
-    class User
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      audited :allow_mass_assignment => true, :except => :password
-
-      attr_protected :logins
-
-      def name=(val)
-        write_attribute(:name, CGI.escapeHTML(val))
-      end
-    end
-
-    class CommentRequiredUser
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      audited :comment_required => true
-    end
-
-    class AccessibleAfterDeclarationUser
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      audited
-      attr_accessible :name, :username, :password
-    end
-
-    class AccessibleBeforeDeclarationUser
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      attr_accessible :name, :username, :password # declare attr_accessible before calling aaa
-      audited
-    end
-
-    class NoAttributeProtectionUser
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      audited :allow_mass_assignment => true
-    end
-
-    class UserWithAfterAudit
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      audited
-      attr_accessor :bogus_attr, :around_attr
-
-      def after_audit
-        self.bogus_attr = "do something"
-      end
-
-      def around_audit
-        self.around_attr = yield
-      end
-    end
-
-    class Company
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      audited
-    end
-
-    class Owner
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :username, String
-      key :password, String
-      key :activated, Boolean
-      key :suspended_at, Time
-      key :logins, Integer, :default => 0
-      timestamps!
-
-      has_associated_audits
-    end
-
-    class OwnedCompany
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      belongs_to :owner, :class_name => "Owner"
-      attr_accessible :name, :owner # declare attr_accessible before calling aaa
-      audited :associated_with => :owner
-    end
-
-    class OnUpdateDestroy
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      audited :on => [:update, :destroy]
-    end
-
-    class OnCreateDestroy
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      audited :on => [:create, :destroy]
-    end
-
-    class OnCreateDestroyExceptName
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      audited :except => :name, :on => [:create, :destroy]
-    end
-
-    class OnCreateUpdate
-      include ::MongoMapper::Document
-
-      key :name, String
-      key :owner_id, ObjectId
-
-      audited :on => [:create, :update]
-    end
-
-    class RichObjectUser
-      include ::MongoMapper::Document
-
-      class Name
-        attr_accessor :first_name, :last_name
-
-        def self.from_mongo(value)
-          case value
-          when String then new(*value.split)
-          when self then value
-          end
-        end
-
-        def self.to_mongo(value)
-          case value
-          when String then value
-          when self then value.to_s
-          end
-        end
-
-        def initialize(first_name, last_name)
-          self.first_name, self.last_name = first_name, last_name
-        end
-
-        def to_s
-          [first_name, last_name].compact.join(' ')
-        end
-      end
-
-      key :name, Name
-
-      attr_accessible :name
-
-      audited
-    end
-  end
-end