3 files changed, 54 insertions, 24 deletions
diff --git a/app/models/censor_rule.rb b/app/models/censor_rule.rb
index cedbd767e..da3f49760 100644
--- a/app/models/censor_rule.rb
+++ b/app/models/censor_rule.rb
@@ -29,17 +29,39 @@ class CensorRule < ActiveRecord::Base
     belongs_to :user
     belongs_to :public_body
 
-    named_scope :regexps, {:conditions => {:regexp => true}}
+    # a flag to allow the require_user_request_or_public_body validation to be skipped
+    attr_accessor :allow_global
+    validate :require_user_request_or_public_body, :unless => proc{ |rule| rule.allow_global == true }
+    validate :require_valid_regexp, :if => proc{ |rule| rule.regexp? == true }
+    validates_presence_of :text
 
-    def binary_replacement
-        self.text.gsub(/./, 'x')
+    named_scope :global, {:conditions => {:info_request_id => nil,
+                                          :user_id => nil,
+                                          :public_body_id => nil}}
+
+    def require_user_request_or_public_body
+        if self.info_request.nil? && self.user.nil? && self.public_body.nil?
+            errors.add("Censor must apply to an info request a user or a body; ")
+        end
+    end
+
+    def require_valid_regexp
+        begin
+            self.make_regexp()
+        rescue RegexpError => e
+            errors.add(:text, e.message)
+        end
+    end
+
+    def make_regexp
+        return Regexp.new(self.text, Regexp::MULTILINE)
     end
 
     def apply_to_text!(text)
         if text.nil?
             return nil
         end
-        to_replace = regexp? ? Regexp.new(self.text, Regexp::MULTILINE) : self.text
+        to_replace = regexp? ? self.make_regexp() : self.text
         text.gsub!(to_replace, self.replacement)
     end
 
@@ -47,18 +69,19 @@ class CensorRule < ActiveRecord::Base
         if binary.nil?
             return nil
         end
-        binary.gsub!(self.text, self.binary_replacement)
+        to_replace = regexp? ? self.make_regexp() : self.text
+        binary.gsub!(to_replace){ |match| match.gsub(/./, 'x') }
     end
 
-    def validate
-        if !self.regexp? && self.info_request.nil? && self.user.nil? && self.public_body.nil?
-            errors.add("Censor must apply to an info request a user or a body; ")
+    def for_admin_column
+        self.class.content_columns.each do |column|
+          yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
         end
     end
 
-  def for_admin_column
-    self.class.content_columns.each do |column|
-      yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
+    def is_global?
+        return true if (info_request_id.nil? && user_id.nil? && public_body_id.nil?)
+        return false
     end
-  end
+
 end
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 19ec949ba..6f472c290 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1001,24 +1001,28 @@ public
         return ret.reverse
     end
 
+    # Get the list of censor rules that apply to this request
+    def applicable_censor_rules
+        applicable_rules = [self.censor_rules, self.public_body.censor_rules, CensorRule.global.all]
+        if self.user && !self.user.censor_rules.empty?
+            applicable_rules << self.user.censor_rules
+        end
+        return applicable_rules.flatten
+    end
+
     # Call groups of censor rules
     def apply_censor_rules_to_text!(text)
-        [self.censor_rules, self.user.try(:censor_rules),
-            CensorRule.regexps.all].flatten.compact.each do |censor_rule|
-                censor_rule.apply_to_text!(text)
-            end
+        self.applicable_censor_rules.each do |censor_rule|
+            censor_rule.apply_to_text!(text)
+        end
         return text
     end
 
     def apply_censor_rules_to_binary!(binary)
-        for censor_rule in self.censor_rules
+        self.applicable_censor_rules.each do |censor_rule|
             censor_rule.apply_to_binary!(binary)
         end
-        if self.user # requests during construction have no user
-            for censor_rule in self.user.censor_rules
-                censor_rule.apply_to_binary!(binary)
-            end
-        end
+        return binary
     end
 
     def is_owning_user?(user)
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 9efeadf55..60ecb2781 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # == Schema Information
 #
 # Table name: public_bodies
@@ -41,6 +42,7 @@ class PublicBody < ActiveRecord::Base
 
     has_many :info_requests, :order => 'created_at desc'
     has_many :track_things, :order => 'created_at desc'
+    has_many :censor_rules, :order => 'created_at desc'
 
     has_tag_string
 
@@ -91,8 +93,9 @@ class PublicBody < ActiveRecord::Base
       # Make sure publication_scheme gets the correct default value.
       # (This would work automatically, were publication_scheme not a translated attribute)
       self.publication_scheme = "" if self.publication_scheme.nil?
-      
-      # Set an API key if there isn’t one
+    end
+
+    def before_save
       self.api_key = SecureRandom.base64(33) if self.api_key.nil?
     end