acts_as_audited 2.0.0.rc5 → 2.0.0.rc6

data/Gemfile

@@ -1,8 +1,11 @@
 source :gemcutter
 
 gem "rails", "3.0.3"
-gem "sqlite3-ruby"
-gem "rspec-rails", "~> 2.4.0"
-gem "rcov"
-gem "yard"
-gem "jeweler"
+
+group :development do
+  gem "sqlite3-ruby"
+  gem "rspec-rails", "~> 2.4.0"
+  gem "rcov"
+  gem "yard"
+  gem "jeweler"
+end

data/Rakefile

@@ -19,10 +19,6 @@ begin
     gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
     gem.rdoc_options << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
     gem.version = ActsAsAudited::VERSION
-
-    gem.add_dependency 'activerecord', '3.0.3'
-    gem.add_development_dependency "rails", '3.0.3'
-    gem.add_development_dependency "rspec-rails", '~> 2.4.0'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   # Jeweler::GemcutterTasks.new

data/acts_as_audited.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Keepers", "Kenneth Kalmer"]
-  s.date = %q{2011-02-05}
+  s.date = %q{2011-02-08}
   s.email = %q{brandon@opensoul.org}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -101,14 +101,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<rspec-rails>, ["~> 2.4.0"])
-      s.add_runtime_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, ["= 3.0.3"])
-      s.add_development_dependency(%q<rails>, ["= 3.0.3"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["= 3.0.3"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -116,9 +113,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["= 3.0.3"])
-      s.add_dependency(%q<rails>, ["= 3.0.3"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
     end
   else
     s.add_dependency(%q<rails>, ["= 3.0.3"])
@@ -127,9 +121,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["= 3.0.3"])
-    s.add_dependency(%q<rails>, ["= 3.0.3"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
   end
 end
 

data/lib/acts_as_audited.rb

@@ -24,7 +24,7 @@ require 'active_record'
 
 # To get started, please review ActsAsAudited::Auditor::ClassMethods#acts_as_audited
 module ActsAsAudited
-  VERSION = '2.0.0.rc5'
+  VERSION = '2.0.0.rc6'
 
   mattr_accessor :current_user_method
   # The method to be called to return the current user for logging in the audits.

data/lib/acts_as_audited/auditor.rb

@@ -67,7 +67,7 @@ module ActsAsAudited
         write_inheritable_attribute :audit_associated_with, options[:associated_with]
 
         if options[:comment_required]
-          validates_presence_of :audit_comment
+          validates_presence_of :audit_comment, :if => :auditing_enabled
           before_destroy :require_comment
         end
 
@@ -215,7 +215,7 @@ module ActsAsAudited
       end
 
       def require_comment
-        if audit_comment.blank?
+        if auditing_enabled && audit_comment.blank?
           errors.add(:audit_comment, "Comment required before destruction")
           return false
         end

data/spec/acts_as_audited_spec.rb

@@ -32,7 +32,7 @@ describe ActsAsAudited::Auditor do
                                         :activated    => true,
                                         :suspended_at => yesterday,
                                         :logins       => 2)
-      
+
       u.name.should eq('name')
       u.username.should eq('username')
       u.password.should eq('password')
@@ -182,7 +182,7 @@ describe ActsAsAudited::Auditor do
       owned_company.update_attribute(:name, 'The Auditors')
       owned_company.audits.last.association.should == owner
     end
-    
+
     it "should store the associated object on destroy" do
       owned_company.destroy
       owned_company.audits.last.association.should == owner
@@ -382,10 +382,16 @@ describe ActsAsAudited::Auditor do
       it "should validate when audit_comment is supplied" do
         CommentRequiredUser.new( :audit_comment => 'Create').should be_valid
       end
+
+      it "should validate when audit_comment is not supplied, and auditing is disabled" do
+        CommentRequiredUser.disable_auditing
+        CommentRequiredUser.new.should be_valid
+        CommentRequiredUser.enable_auditing
+      end
     end
 
     describe "on update" do
-      let( :user ) { CommentRequiredUser.create!( :audit_comment => 'Create' )}
+      let( :user ) { CommentRequiredUser.create!( :audit_comment => 'Create' ) }
 
       it "should not validate when audit_comment is not supplied" do
         user.update_attributes(:name => 'Test').should be_false
@@ -394,6 +400,12 @@ describe ActsAsAudited::Auditor do
       it "should validate when audit_comment is supplied" do
         user.update_attributes(:name => 'Test', :audit_comment => 'Update').should be_true
       end
+
+      it "should validate when audit_comment is not supplied, and auditing is disabled" do
+        CommentRequiredUser.disable_auditing
+        user.update_attributes(:name => 'Test').should be_true
+        CommentRequiredUser.enable_auditing
+      end
     end
 
     describe "on destroy" do
@@ -407,6 +419,12 @@ describe ActsAsAudited::Auditor do
         user.audit_comment = "Destroy"
         user.destroy.should == user
       end
+
+      it "should validate when audit_comment is not supplied, and auditing is disabled" do
+        CommentRequiredUser.disable_auditing
+        user.destroy.should == user
+        CommentRequiredUser.enable_auditing
+      end
     end
 
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_audited
 version: !ruby/object:Gem::Version 
+  hash: 977940587
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - rc5
-  version: 2.0.0.rc5
+  - rc6
+  version: 2.0.0.rc6
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -16,136 +17,97 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +02:00
+date: 2011-02-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 3
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: sqlite3-ruby
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rspec-rails
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 2
         - 4
         - 0
         version: 2.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: rcov
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: yard
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rails
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
-  type: :development
-  prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *id009
+  requirement: *id006
 description: 
 email: brandon@opensoul.org
 executables: []
@@ -219,6 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -227,6 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3