acts_as_audited 2.0.0.rc5 → 2.0.0.rc6

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -1,8 +1,11 @@
1
1
  source :gemcutter
2
2
 
3
3
  gem "rails", "3.0.3"
4
- gem "sqlite3-ruby"
5
- gem "rspec-rails", "~> 2.4.0"
6
- gem "rcov"
7
- gem "yard"
8
- gem "jeweler"
4
+
5
+ group :development do
6
+ gem "sqlite3-ruby"
7
+ gem "rspec-rails", "~> 2.4.0"
8
+ gem "rcov"
9
+ gem "yard"
10
+ gem "jeweler"
11
+ end
data/Rakefile CHANGED
@@ -19,10 +19,6 @@ begin
19
19
  gem.authors = ["Brandon Keepers", "Kenneth Kalmer"]
20
20
  gem.rdoc_options << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
21
21
  gem.version = ActsAsAudited::VERSION
22
-
23
- gem.add_dependency 'activerecord', '3.0.3'
24
- gem.add_development_dependency "rails", '3.0.3'
25
- gem.add_development_dependency "rspec-rails", '~> 2.4.0'
26
22
  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
27
23
  end
28
24
  # Jeweler::GemcutterTasks.new
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Brandon Keepers", "Kenneth Kalmer"]
12
- s.date = %q{2011-02-05}
12
+ s.date = %q{2011-02-08}
13
13
  s.email = %q{brandon@opensoul.org}
14
14
  s.extra_rdoc_files = [
15
15
  "LICENSE",
@@ -101,14 +101,11 @@ Gem::Specification.new do |s|
101
101
 
102
102
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
103
103
  s.add_runtime_dependency(%q<rails>, ["= 3.0.3"])
104
- s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 0"])
105
- s.add_runtime_dependency(%q<rspec-rails>, ["~> 2.4.0"])
106
- s.add_runtime_dependency(%q<rcov>, [">= 0"])
107
- s.add_runtime_dependency(%q<yard>, [">= 0"])
108
- s.add_runtime_dependency(%q<jeweler>, [">= 0"])
109
- s.add_runtime_dependency(%q<activerecord>, ["= 3.0.3"])
110
- s.add_development_dependency(%q<rails>, ["= 3.0.3"])
104
+ s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
111
105
  s.add_development_dependency(%q<rspec-rails>, ["~> 2.4.0"])
106
+ s.add_development_dependency(%q<rcov>, [">= 0"])
107
+ s.add_development_dependency(%q<yard>, [">= 0"])
108
+ s.add_development_dependency(%q<jeweler>, [">= 0"])
112
109
  else
113
110
  s.add_dependency(%q<rails>, ["= 3.0.3"])
114
111
  s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -116,9 +113,6 @@ Gem::Specification.new do |s|
116
113
  s.add_dependency(%q<rcov>, [">= 0"])
117
114
  s.add_dependency(%q<yard>, [">= 0"])
118
115
  s.add_dependency(%q<jeweler>, [">= 0"])
119
- s.add_dependency(%q<activerecord>, ["= 3.0.3"])
120
- s.add_dependency(%q<rails>, ["= 3.0.3"])
121
- s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
122
116
  end
123
117
  else
124
118
  s.add_dependency(%q<rails>, ["= 3.0.3"])
@@ -127,9 +121,6 @@ Gem::Specification.new do |s|
127
121
  s.add_dependency(%q<rcov>, [">= 0"])
128
122
  s.add_dependency(%q<yard>, [">= 0"])
129
123
  s.add_dependency(%q<jeweler>, [">= 0"])
130
- s.add_dependency(%q<activerecord>, ["= 3.0.3"])
131
- s.add_dependency(%q<rails>, ["= 3.0.3"])
132
- s.add_dependency(%q<rspec-rails>, ["~> 2.4.0"])
133
124
  end
134
125
  end
135
126
 
@@ -24,7 +24,7 @@ require 'active_record'
24
24
 
25
25
  # To get started, please review ActsAsAudited::Auditor::ClassMethods#acts_as_audited
26
26
  module ActsAsAudited
27
- VERSION = '2.0.0.rc5'
27
+ VERSION = '2.0.0.rc6'
28
28
 
29
29
  mattr_accessor :current_user_method
30
30
  # The method to be called to return the current user for logging in the audits.
@@ -67,7 +67,7 @@ module ActsAsAudited
67
67
  write_inheritable_attribute :audit_associated_with, options[:associated_with]
68
68
 
69
69
  if options[:comment_required]
70
- validates_presence_of :audit_comment
70
+ validates_presence_of :audit_comment, :if => :auditing_enabled
71
71
  before_destroy :require_comment
72
72
  end
73
73
 
@@ -215,7 +215,7 @@ module ActsAsAudited
215
215
  end
216
216
 
217
217
  def require_comment
218
- if audit_comment.blank?
218
+ if auditing_enabled && audit_comment.blank?
219
219
  errors.add(:audit_comment, "Comment required before destruction")
220
220
  return false
221
221
  end
@@ -32,7 +32,7 @@ describe ActsAsAudited::Auditor do
32
32
  :activated => true,
33
33
  :suspended_at => yesterday,
34
34
  :logins => 2)
35
-
35
+
36
36
  u.name.should eq('name')
37
37
  u.username.should eq('username')
38
38
  u.password.should eq('password')
@@ -182,7 +182,7 @@ describe ActsAsAudited::Auditor do
182
182
  owned_company.update_attribute(:name, 'The Auditors')
183
183
  owned_company.audits.last.association.should == owner
184
184
  end
185
-
185
+
186
186
  it "should store the associated object on destroy" do
187
187
  owned_company.destroy
188
188
  owned_company.audits.last.association.should == owner
@@ -382,10 +382,16 @@ describe ActsAsAudited::Auditor do
382
382
  it "should validate when audit_comment is supplied" do
383
383
  CommentRequiredUser.new( :audit_comment => 'Create').should be_valid
384
384
  end
385
+
386
+ it "should validate when audit_comment is not supplied, and auditing is disabled" do
387
+ CommentRequiredUser.disable_auditing
388
+ CommentRequiredUser.new.should be_valid
389
+ CommentRequiredUser.enable_auditing
390
+ end
385
391
  end
386
392
 
387
393
  describe "on update" do
388
- let( :user ) { CommentRequiredUser.create!( :audit_comment => 'Create' )}
394
+ let( :user ) { CommentRequiredUser.create!( :audit_comment => 'Create' ) }
389
395
 
390
396
  it "should not validate when audit_comment is not supplied" do
391
397
  user.update_attributes(:name => 'Test').should be_false
@@ -394,6 +400,12 @@ describe ActsAsAudited::Auditor do
394
400
  it "should validate when audit_comment is supplied" do
395
401
  user.update_attributes(:name => 'Test', :audit_comment => 'Update').should be_true
396
402
  end
403
+
404
+ it "should validate when audit_comment is not supplied, and auditing is disabled" do
405
+ CommentRequiredUser.disable_auditing
406
+ user.update_attributes(:name => 'Test').should be_true
407
+ CommentRequiredUser.enable_auditing
408
+ end
397
409
  end
398
410
 
399
411
  describe "on destroy" do
@@ -407,6 +419,12 @@ describe ActsAsAudited::Auditor do
407
419
  user.audit_comment = "Destroy"
408
420
  user.destroy.should == user
409
421
  end
422
+
423
+ it "should validate when audit_comment is not supplied, and auditing is disabled" do
424
+ CommentRequiredUser.disable_auditing
425
+ user.destroy.should == user
426
+ CommentRequiredUser.enable_auditing
427
+ end
410
428
  end
411
429
 
412
430
  end
metadata CHANGED
@@ -1,13 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: acts_as_audited
3
3
  version: !ruby/object:Gem::Version
4
+ hash: 977940587
4
5
  prerelease: true
5
6
  segments:
6
7
  - 2
7
8
  - 0
8
9
  - 0
9
- - rc5
10
- version: 2.0.0.rc5
10
+ - rc6
11
+ version: 2.0.0.rc6
11
12
  platform: ruby
12
13
  authors:
13
14
  - Brandon Keepers
@@ -16,136 +17,97 @@ autorequire:
16
17
  bindir: bin
17
18
  cert_chain: []
18
19
 
19
- date: 2011-02-05 00:00:00 +02:00
20
+ date: 2011-02-08 00:00:00 +02:00
20
21
  default_executable:
21
22
  dependencies:
22
23
  - !ruby/object:Gem::Dependency
24
+ prerelease: false
25
+ type: :runtime
23
26
  name: rails
24
- requirement: &id001 !ruby/object:Gem::Requirement
27
+ version_requirements: &id001 !ruby/object:Gem::Requirement
25
28
  none: false
26
29
  requirements:
27
30
  - - "="
28
31
  - !ruby/object:Gem::Version
32
+ hash: 1
29
33
  segments:
30
34
  - 3
31
35
  - 0
32
36
  - 3
33
37
  version: 3.0.3
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: *id001
38
+ requirement: *id001
37
39
  - !ruby/object:Gem::Dependency
40
+ prerelease: false
41
+ type: :development
38
42
  name: sqlite3-ruby
39
- requirement: &id002 !ruby/object:Gem::Requirement
43
+ version_requirements: &id002 !ruby/object:Gem::Requirement
40
44
  none: false
41
45
  requirements:
42
46
  - - ">="
43
47
  - !ruby/object:Gem::Version
48
+ hash: 3
44
49
  segments:
45
50
  - 0
46
51
  version: "0"
47
- type: :runtime
48
- prerelease: false
49
- version_requirements: *id002
52
+ requirement: *id002
50
53
  - !ruby/object:Gem::Dependency
54
+ prerelease: false
55
+ type: :development
51
56
  name: rspec-rails
52
- requirement: &id003 !ruby/object:Gem::Requirement
57
+ version_requirements: &id003 !ruby/object:Gem::Requirement
53
58
  none: false
54
59
  requirements:
55
60
  - - ~>
56
61
  - !ruby/object:Gem::Version
62
+ hash: 31
57
63
  segments:
58
64
  - 2
59
65
  - 4
60
66
  - 0
61
67
  version: 2.4.0
62
- type: :runtime
63
- prerelease: false
64
- version_requirements: *id003
68
+ requirement: *id003
65
69
  - !ruby/object:Gem::Dependency
70
+ prerelease: false
71
+ type: :development
66
72
  name: rcov
67
- requirement: &id004 !ruby/object:Gem::Requirement
73
+ version_requirements: &id004 !ruby/object:Gem::Requirement
68
74
  none: false
69
75
  requirements:
70
76
  - - ">="
71
77
  - !ruby/object:Gem::Version
78
+ hash: 3
72
79
  segments:
73
80
  - 0
74
81
  version: "0"
75
- type: :runtime
76
- prerelease: false
77
- version_requirements: *id004
82
+ requirement: *id004
78
83
  - !ruby/object:Gem::Dependency
84
+ prerelease: false
85
+ type: :development
79
86
  name: yard
80
- requirement: &id005 !ruby/object:Gem::Requirement
87
+ version_requirements: &id005 !ruby/object:Gem::Requirement
81
88
  none: false
82
89
  requirements:
83
90
  - - ">="
84
91
  - !ruby/object:Gem::Version
92
+ hash: 3
85
93
  segments:
86
94
  - 0
87
95
  version: "0"
88
- type: :runtime
89
- prerelease: false
90
- version_requirements: *id005
96
+ requirement: *id005
91
97
  - !ruby/object:Gem::Dependency
98
+ prerelease: false
99
+ type: :development
92
100
  name: jeweler
93
- requirement: &id006 !ruby/object:Gem::Requirement
101
+ version_requirements: &id006 !ruby/object:Gem::Requirement
94
102
  none: false
95
103
  requirements:
96
104
  - - ">="
97
105
  - !ruby/object:Gem::Version
106
+ hash: 3
98
107
  segments:
99
108
  - 0
100
109
  version: "0"
101
- type: :runtime
102
- prerelease: false
103
- version_requirements: *id006
104
- - !ruby/object:Gem::Dependency
105
- name: activerecord
106
- requirement: &id007 !ruby/object:Gem::Requirement
107
- none: false
108
- requirements:
109
- - - "="
110
- - !ruby/object:Gem::Version
111
- segments:
112
- - 3
113
- - 0
114
- - 3
115
- version: 3.0.3
116
- type: :runtime
117
- prerelease: false
118
- version_requirements: *id007
119
- - !ruby/object:Gem::Dependency
120
- name: rails
121
- requirement: &id008 !ruby/object:Gem::Requirement
122
- none: false
123
- requirements:
124
- - - "="
125
- - !ruby/object:Gem::Version
126
- segments:
127
- - 3
128
- - 0
129
- - 3
130
- version: 3.0.3
131
- type: :development
132
- prerelease: false
133
- version_requirements: *id008
134
- - !ruby/object:Gem::Dependency
135
- name: rspec-rails
136
- requirement: &id009 !ruby/object:Gem::Requirement
137
- none: false
138
- requirements:
139
- - - ~>
140
- - !ruby/object:Gem::Version
141
- segments:
142
- - 2
143
- - 4
144
- - 0
145
- version: 2.4.0
146
- type: :development
147
- prerelease: false
148
- version_requirements: *id009
110
+ requirement: *id006
149
111
  description:
150
112
  email: brandon@opensoul.org
151
113
  executables: []
@@ -219,6 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
219
181
  requirements:
220
182
  - - ">="
221
183
  - !ruby/object:Gem::Version
184
+ hash: 3
222
185
  segments:
223
186
  - 0
224
187
  version: "0"
@@ -227,6 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
227
190
  requirements:
228
191
  - - ">"
229
192
  - !ruby/object:Gem::Version
193
+ hash: 25
230
194
  segments:
231
195
  - 1
232
196
  - 3