aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/censor_rule.rb
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-10-10 17:31:33 +0100
committerGareth Rees <gareth@mysociety.org>2014-10-15 15:48:15 +0100
commite2d4bdb629997036c6ed72d7eb14b95dae6f76cb (patch)
tree211c5e4cbb7784e04f75ff563ff3f0eb88c3c18e /app/models/censor_rule.rb
parentccd7da2ca592db909e9ea12cf7135945f31ddd01 (diff)
Privatise uncalled CensorRule methods
Make public api as slim as possible
Diffstat (limited to 'app/models/censor_rule.rb')
-rw-r--r--app/models/censor_rule.rb40
1 files changed, 20 insertions, 20 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index eda4e23af..499896e54 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -42,26 +42,6 @@ class CensorRule < ActiveRecord::Base
:user_id => nil,
:public_body_id => nil } }
- def require_user_request_or_public_body
- if info_request.nil? && user.nil? && public_body.nil?
- [:info_request, :user, :public_body].each do |a|
- errors.add(a, "Rule must apply to an info request, a user or a body")
- end
- end
- end
-
- def require_valid_regexp
- begin
- make_regexp
- rescue RegexpError => e
- errors.add(:text, e.message)
- end
- end
-
- def make_regexp
- Regexp.new(text, Regexp::MULTILINE)
- end
-
def apply_to_text!(text)
return nil if text.nil?
text.gsub!(to_replace, replacement)
@@ -84,6 +64,26 @@ class CensorRule < ActiveRecord::Base
private
+ def require_user_request_or_public_body
+ if info_request.nil? && user.nil? && public_body.nil?
+ [:info_request, :user, :public_body].each do |a|
+ errors.add(a, "Rule must apply to an info request, a user or a body")
+ end
+ end
+ end
+
+ def require_valid_regexp
+ begin
+ make_regexp
+ rescue RegexpError => e
+ errors.add(:text, e.message)
+ end
+ end
+
+ def make_regexp
+ Regexp.new(text, Regexp::MULTILINE)
+ end
+
def to_replace
regexp? ? make_regexp : text
end