audited 3.0.0.rc1 → 3.0.0.rc2

data/README.md

@@ -174,14 +174,22 @@ company.associated_audits.last.auditable # => #<User name: "Steve Richert">
 
 ## Gotchas
 
-### ActiveRecord Accessible Attributes
+### Accessible Attributes
 
-If your model calls `attr_accessible` after `audited`, you'll need to set the `:protect => false` option. By default, Audited uses `attr_protected` to prevent malicious users from dissociating your audits, but Rails doesn't allow both `attr_protected` and `attr_accessible`.
+Audited assumes you are using `attr_accessible`, however, if you are using `attr_protected` or just going at it unprotected you will have to set the `:allow_mass_assignment => true` option.
+
+If using `attr_protected` be sure to add `audit_ids` to the list of protected attributes to prevent data loss.
+
+```ruby
+class User < ActiveRecord::Base
+  audited :allow_mass_assignment => true
+end
+```
 
 ```ruby
 class User < ActiveRecord::Base
-  audited :protect => false
-  attr_accessible :name
+  audited :allow_mass_assignment => true
+  attr_protected :logins, :audit_ids
 end
 ```
 

data/audited-activerecord.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'audited-activerecord'
-  gem.version = '3.0.0.rc1'
+  gem.version = '3.0.0.rc2'
 
   gem.authors     = ['Brandon Keepers', 'Kenneth Kalmer', 'Daniel Morrison', 'Brian Ryckbost', 'Steve Richert', 'Ryan Glover']
   gem.email       = 'info@collectiveidea.com'

data/audited-mongo_mapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'audited-mongo_mapper'
-  gem.version = '3.0.0.rc1'
+  gem.version = '3.0.0.rc2'
 
   gem.authors     = ['Brandon Keepers', 'Kenneth Kalmer', 'Daniel Morrison', 'Brian Ryckbost', 'Steve Richert', 'Ryan Glover']
   gem.email       = 'info@collectiveidea.com'

data/audited.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name    = 'audited'
-  gem.version = '3.0.0.rc1'
+  gem.version = '3.0.0.rc2'
 
   gem.authors     = ['Brandon Keepers', 'Kenneth Kalmer', 'Daniel Morrison', 'Brian Ryckbost', 'Steve Richert', 'Ryan Glover']
   gem.email       = 'info@collectiveidea.com'

data/lib/audited/auditor.rb

@@ -47,8 +47,6 @@ module Audited
         # don't allow multiple calls
         return if self.included_modules.include?(Audited::Auditor::AuditedInstanceMethods)
 
-        options = { :protect => accessible_attributes.blank? }.merge(options)
-
         class_attribute :non_audited_columns,   :instance_writer => false
         class_attribute :auditing_enabled,      :instance_writer => false
         class_attribute :audit_associated_with, :instance_writer => false
@@ -68,12 +66,11 @@ module Audited
         end
 
         attr_accessor :audit_comment
-        unless accessible_attributes.blank? || options[:protect]
+        unless options[:allow_mass_assignment]
           attr_accessible :audit_comment
         end
 
         has_many :audits, :as => :auditable, :class_name => Audited.audit_class.name
-        attr_protected :audit_ids if options[:protect]
         Audited.audit_class.audited_class_names << self.to_s
 
         after_create  :audit_create if !options[:on] || (options[:on] && options[:on].include?(:create))
@@ -157,6 +154,7 @@ module Audited
           revision.send :instance_variable_set, '@persisted', !self.destroyed?
           revision.send :instance_variable_set, '@readonly', false
           revision.send :instance_variable_set, '@destroyed', false
+          revision.send :instance_variable_set, '@_destroyed', false
           revision.send :instance_variable_set, '@marked_for_destruction', false
           Audited.audit_class.assign_revision_attributes(revision, attributes)
 

data/spec/support/active_record/models.rb

@@ -4,7 +4,7 @@ require File.expand_path('../schema', __FILE__)
 module Models
   module ActiveRecord
     class User < ::ActiveRecord::Base
-      audited :except => :password
+      audited :allow_mass_assignment => true, :except => :password
 
       attr_protected :logins
 
@@ -18,13 +18,13 @@ module Models
       audited :comment_required => true
     end
 
-    class UnprotectedUser < ::ActiveRecord::Base
+    class AccessibleAfterDeclarationUser < ::ActiveRecord::Base
       self.table_name = :users
-      audited :protect => false
+      audited
       attr_accessible :name, :username, :password
     end
 
-    class AccessibleUser < ::ActiveRecord::Base
+    class AccessibleBeforeDeclarationUser < ::ActiveRecord::Base
       self.table_name = :users
       attr_accessible :name, :username, :password # declare attr_accessible before calling aaa
       audited
@@ -32,7 +32,7 @@ module Models
 
     class NoAttributeProtectionUser < ::ActiveRecord::Base
       self.table_name = :users
-      audited
+      audited :allow_mass_assignment => true
     end
 
     class UserWithAfterAudit < ::ActiveRecord::Base

data/spec/support/mongo_mapper/models.rb

@@ -15,7 +15,7 @@ module Models
       key :logins, Integer, :default => 0
       timestamps!
 
-      audited :except => :password
+      audited :allow_mass_assignment => true, :except => :password
 
       attr_protected :logins
 
@@ -38,7 +38,7 @@ module Models
       audited :comment_required => true
     end
 
-    class UnprotectedUser
+    class AccessibleAfterDeclarationUser
       include ::MongoMapper::Document
 
       key :name, String
@@ -49,11 +49,11 @@ module Models
       key :logins, Integer, :default => 0
       timestamps!
 
-      audited :protect => false
+      audited
       attr_accessible :name, :username, :password
     end
 
-    class AccessibleUser
+    class AccessibleBeforeDeclarationUser
       include ::MongoMapper::Document
 
       key :name, String
@@ -79,7 +79,7 @@ module Models
       key :logins, Integer, :default => 0
       timestamps!
 
-      audited
+      audited :allow_mass_assignment => true
     end
 
     class UserWithAfterAudit
@@ -170,5 +170,41 @@ module Models
 
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: audited
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -189,6 +189,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1912523767266881932
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Log all changes to your models