notifiably_audited 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTY0YTNmZTUxMzRiMmI0OGZhZGFkMDdkYjMyODUxMzAyMGUxYmFmMw==
+    NWE2NzIwZTJkZjkwNWI4ZWVjNzZiZjRlNGE2ZWVmNjVjZWJhODk3Mg==
   data.tar.gz: !binary |-
-    ODFjOTkwZjMzMzliYWY0MDJhM2ZmNjZkYzYzNTI5ZTg5YTExMmNkOQ==
+    YzYzODE2Mzg1ZWM1YjVkZjJjODc5OTE4MzgzYzdmMzU1NTE5ODk3OA==
 SHA512:
   metadata.gz: !binary |-
-    ODM0ZWFiMWFjMjM0YmZjMWQ0ZDU3YWVhYWY2ZDc3ZmI4NzJlMWEzMDVmMGRh
-    MGM4ZWU3MWIxZDMzMmM2NmUzNjMxNzU5ZGFkNmFlZjBjMTZmODdjNzIxMjY0
-    NTVjZTFiYzRmNDRkOGQ5ODc3YjY3OTI0NDZkY2EwY2VlZmFjMmM=
+    NzVkNzBlZmU5MzU0MGNiMTY5MWEyZjNmNTM5ZTY5YTUzMWE4NTg2MWYxNDE5
+    ZGRiYjAwZGIwODk5YWE5Y2NlYWU0Y2Y5ZjFlNWM3NjU2NjFiNjgzZGRkMDAw
+    NGVjYzY1N2RlNGFlNGYzOWE5NDU3ZWY4NGUzZGJkMjdmMzI3M2Q=
   data.tar.gz: !binary |-
-    ODc5OTFmMmE1YzNlZDhiY2FhN2Y0MWI4ZjM2ZDE4M2UzNWMzOTM3YzgzZDk4
-    MGE1NGJkZDY1NmQ0NmY1NzQ3ZTllMmQ2NTJhY2MwZDhmYzIzZWFlNmYwZDdm
-    NTYxMjNhNWQxYjIyNzk2NDdjNmFjMWVhYjE5NDViNGY3NGI1OTQ=
+    OTMyZTdkNTgzZTBjNDIwYzE4Yjk0NTMzYzY3ZWM4YTkzYWJmZDNmZGZiMjcx
+    ZmMxN2MwNDVlNWIzZmRiYzNiNjRlYzdjOTM5YWQ1YzBlYTg5ZDUyMTM5YTAx
+    YWZmOTg4ZWZlNDI5NjEyNGUyMjA3ZDQzYmNhOWQzZDY2MTcyZmQ=

data/lib/audited/adapters/active_record/audit.rb

@@ -0,0 +1,69 @@
+require 'set'
+require 'audited/audit'
+
+module Audited
+  module Adapters
+    module ActiveRecord
+      # Audit saves the changes to ActiveRecord models.  It has the following attributes:
+      #
+      # * <tt>auditable</tt>: the ActiveRecord model that was changed
+      # * <tt>user</tt>: the user that performed the change; a string or an ActiveRecord model
+      # * <tt>action</tt>: one of create, update, or delete
+      # * <tt>audited_changes</tt>: a serialized hash of all the changes
+      # * <tt>comment</tt>: a comment set with the audit
+      # * <tt>created_at</tt>: Time that the change was performed
+      #
+      class Audit < ::ActiveRecord::Base
+        include Audited::Audit
+
+
+        serialize :audited_changes
+
+        default_scope         order(:version)
+        scope :descending,    reorder("version DESC")
+        scope :creates,       :conditions => {:action => 'create'}
+        scope :updates,       :conditions => {:action => 'update'}
+        scope :destroys,      :conditions => {:action => 'destroy'}
+
+        scope :up_until,      lambda {|date_or_time| where("created_at <= ?", date_or_time) }
+        scope :from_version,  lambda {|version| where(['version >= ?', version]) }
+        scope :to_version,    lambda {|version| where(['version <= ?', version]) }
+
+        # Return all audits older than the current one.
+        def ancestors
+          self.class.where(['auditable_id = ? and auditable_type = ? and version <= ?',
+            auditable_id, auditable_type, version])
+        end
+
+        # Allows user to be set to either a string or an ActiveRecord object
+        # @private
+        def user_as_string=(user)
+          # reset both either way
+          self.user_as_model = self.username = nil
+          user.is_a?(::ActiveRecord::Base) ?
+            self.user_as_model = user :
+            self.username = user
+        end
+        alias_method :user_as_model=, :user=
+        alias_method :user=, :user_as_string=
+
+        # @private
+        def user_as_string
+          self.user_as_model || self.username
+        end
+        alias_method :user_as_model, :user
+        alias_method :user, :user_as_string
+
+      private
+        def set_version_number
+          max = self.class.maximum(:version,
+            :conditions => {
+              :auditable_id => auditable_id,
+              :auditable_type => auditable_type
+            }) || 0
+          self.version = max + 1
+        end
+      end
+    end
+  end
+end

data/lib/audited/adapters/active_record.rb

@@ -0,0 +1,15 @@
+require 'active_record'
+require 'audited/auditor'
+require 'audited/adapters/active_record/audit'
+
+module Audited::Auditor::ClassMethods
+  def default_ignored_attributes
+    [self.primary_key, inheritance_column]
+  end
+end
+
+::ActiveRecord::Base.send :include, Audited::Auditor
+
+Audited.audit_class = Audited::Adapters::ActiveRecord::Audit
+
+require 'audited/sweeper'

data/lib/audited-activerecord.rb

@@ -0,0 +1,2 @@
+require 'audited'
+require 'audited/adapters/active_record'

data/lib/generators/audited/install_generator.rb

@@ -0,0 +1,28 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'active_record'
+require 'rails/generators/active_record'
+
+module Audited
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+
+      def copy_migration
+        migration_template 'install.rb', 'db/migrate/install_audited.rb'
+      end
+    end
+  end
+end

data/lib/generators/audited/templates/add_association_to_audits.rb

@@ -0,0 +1,11 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    add_column :audits, :association_id, :integer
+    add_column :audits, :association_type, :string
+  end
+
+  def self.down
+    remove_column :audits, :association_type
+    remove_column :audits, :association_id
+  end
+end

data/lib/generators/audited/templates/add_comment_to_audits.rb

@@ -0,0 +1,9 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    add_column :audits, :comment, :string
+  end
+
+  def self.down
+    remove_column :audits, :comment
+  end
+end

data/lib/generators/audited/templates/add_remote_address_to_audits.rb

@@ -0,0 +1,10 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    add_column :audits, :remote_address, :string
+  end
+
+  def self.down
+    remove_column :audits, :remote_address
+  end
+end
+

data/lib/generators/audited/templates/install.rb

@@ -0,0 +1,35 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :audits, :force => true do |t|
+      t.column :auditable_id, :integer
+      t.column :auditable_type, :string
+      t.column :associated_id, :integer
+      t.column :associated_type, :string
+      t.column :user_id, :integer
+      t.column :user_type, :string
+      t.column :username, :string
+      t.column :action, :string
+      t.column :audited_changes, :text
+      t.column :version, :integer, :default => 0
+      t.column :comment, :string
+      t.column :remote_address, :string
+      # added by senthil 
+      #========
+      t.column :meta, :string
+      t.column :receiver_id, :integer
+      t.column :checked, :boolean
+      t.column :title, :string
+      #========
+      t.column :created_at, :datetime
+    end
+
+    add_index :audits, [:auditable_id, :auditable_type], :name => 'auditable_index'
+    add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
+    add_index :audits, [:user_id, :user_type], :name => 'user_index'
+    add_index :audits, :created_at
+  end
+
+  def self.down
+    drop_table :audits
+  end
+end

data/lib/generators/audited/templates/rename_association_to_associated.rb

@@ -0,0 +1,23 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    if index_exists? :audits, [:association_id, :association_type], :name => 'association_index'
+      remove_index :audits, :name => 'association_index'
+    end
+
+    rename_column :audits, :association_id, :associated_id
+    rename_column :audits, :association_type, :associated_type
+
+    add_index :audits, [:associated_id, :associated_type], :name => 'associated_index'
+  end
+
+  def self.down
+    if index_exists? :audits, [:associated_id, :associated_type], :name => 'associated_index'
+      remove_index :audits, :name => 'associated_index'
+    end
+
+    rename_column :audits, :associated_type, :association_type
+    rename_column :audits, :associated_id, :association_id
+
+    add_index :audits, [:association_id, :association_type], :name => 'association_index'
+  end
+end

data/lib/generators/audited/templates/rename_changes_to_audited_changes.rb

@@ -0,0 +1,9 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    rename_column :audits, :changes, :audited_changes
+  end
+
+  def self.down
+    rename_column :audits, :audited_changes, :changes
+  end
+end

data/lib/generators/audited/templates/rename_parent_to_association.rb

@@ -0,0 +1,11 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    rename_column :audits, :auditable_parent_id, :association_id
+    rename_column :audits, :auditable_parent_type, :association_type
+  end
+
+  def self.down
+    rename_column :audits, :association_type, :auditable_parent_type
+    rename_column :audits, :association_id, :auditable_parent_id
+  end
+end

data/lib/generators/audited/upgrade_generator.rb

@@ -0,0 +1,63 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'active_record'
+require 'rails/generators/active_record'
+
+module Audited
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+
+      def copy_templates
+        migrations_to_be_applied do |m|
+          migration_template "#{m}.rb", "db/migrate/#{m}.rb"
+        end
+      end
+
+      private
+
+      def migrations_to_be_applied
+        Audited::Adapters::ActiveRecord::Audit.reset_column_information
+        columns = Audited::Adapters::ActiveRecord::Audit.columns.map(&:name)
+
+        unless columns.include?( 'comment' )
+          yield :add_comment_to_audits
+        end
+
+        if columns.include?( 'changes' )
+          yield :rename_changes_to_audited_changes
+        end
+
+        unless columns.include?( 'remote_address' )
+          yield :add_remote_address_to_audits
+        end
+
+        unless columns.include?( 'association_id' )
+          if columns.include?('auditable_parent_id')
+            yield :rename_parent_to_association
+          else
+            unless columns.include?( 'associated_id' )
+              yield :add_association_to_audits
+            end
+          end
+        end
+
+        if columns.include?( 'association_id' )
+          yield :rename_association_to_associated
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiably_audited
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Brandon Keepers
@@ -16,169 +16,52 @@ cert_chain: []
 date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: audited
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :development
+        version: 0.0.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: private_pub
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Log all changes to your models
+description: Log all changes to your ActiveRecord models
 email: info@collectiveidea.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Appraisals
-- CHANGELOG
-- Gemfile
 - LICENSE
-- LICENSE.txt
-- README.md
-- Rakefile
-- audited-activerecord.gemspec
-- audited-mongo_mapper.gemspec
-- audited.gemspec
-- gemfiles/rails30.gemfile
-- gemfiles/rails31.gemfile
-- gemfiles/rails32.gemfile
-- lib/audited.rb
-- lib/audited/audit.rb
-- lib/audited/auditor.rb
-- lib/audited/rspec_matchers.rb
-- lib/audited/sweeper.rb
-- lib/notifiably_audited.rb
-- lib/notifiably_audited/version.rb
-- notifiably_audited.gemspec
-- 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/db/version_1.rb
-- test/db/version_2.rb
-- test/db/version_3.rb
-- test/db/version_4.rb
-- test/db/version_5.rb
-- test/install_generator_test.rb
-- test/test_helper.rb
-- test/upgrade_generator_test.rb
+- lib/audited-activerecord.rb
+- lib/audited/adapters/active_record.rb
+- lib/audited/adapters/active_record/audit.rb
+- lib/generators/audited/install_generator.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/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
 homepage: https://github.com/collectiveidea/audited
 licenses:
 - MIT
@@ -202,22 +85,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 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
+summary: Log all changes to your ActiveRecord models
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,17 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/Appraisals

@@ -1,11 +0,0 @@
-appraise 'rails30' do
-  gem 'rails', '~> 3.0.0'
-end
-
-appraise 'rails31' do
-  gem 'rails', '~> 3.1.0'
-end
-
-appraise 'rails32' do
-  gem 'rails', '~> 3.2.0'
-end

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/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :name => 'audited'

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 TODO: Write your name
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.