From b3f46a4232e244e19c9dc1345c37322ea4a091da Mon Sep 17 00:00:00 2001 From: Robin Houston Date: Wed, 4 Jul 2012 11:27:43 +0100 Subject: WIP new requests feed --- app/models/info_request.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index d09acbcf6..a41d6d2db 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1,11 +1,10 @@ # == Schema Information -# Schema version: 114 # # Table name: info_requests # # id :integer not null, primary key # title :text not null -# user_id :integer not null +# user_id :integer # public_body_id :integer not null # created_at :datetime not null # updated_at :datetime not null @@ -17,10 +16,11 @@ # allow_new_responses_from :string(255) default("anybody"), not null # handle_rejected_responses :string(255) default("bounce"), not null # idhash :string(255) not null +# external_user_name :string(255) +# external_url :string(255) # attention_requested :boolean default(FALSE) # - require 'digest/sha1' class InfoRequest < ActiveRecord::Base -- cgit v1.2.3 From 088bc961328f4d876971994102cde52c1ad49246 Mon Sep 17 00:00:00 2001 From: Seb Bacon Date: Thu, 12 Jul 2012 13:04:27 +0100 Subject: Support regular expressions in CensorRules; also support 'global' CensorRules that aren't attached to a User or Request or Public Body (but don't expose this in the admin UI). Fixes #33 --- app/models/info_request.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index a41d6d2db..d73dd6c70 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -997,14 +997,11 @@ public # Call groups of censor rules def apply_censor_rules_to_text!(text) - for censor_rule in self.censor_rules - censor_rule.apply_to_text!(text) - end - if self.user # requests during construction have no user - for censor_rule in self.user.censor_rules + [self.censor_rules, self.user.try(:censor_rules), + CensorRule.regexps.all].flatten.compact.each do |censor_rule| censor_rule.apply_to_text!(text) end - end + return text end def apply_censor_rules_to_binary!(binary) -- cgit v1.2.3 From a3bee933105768f12e13fd1334ef12c159183212 Mon Sep 17 00:00:00 2001 From: Seb Bacon Date: Thu, 12 Jul 2012 13:10:27 +0100 Subject: Fix bug that only occurs when loading sample data - sometimes an InfoRequest doesn't have a PublicBody at the time its slug is being calculated. --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index d73dd6c70..4c8181faa 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -136,7 +136,7 @@ class InfoRequest < ActiveRecord::Base else fake_slug = external_user_name.parameterize end - public_body.url_name + "_"+fake_slug + (public_body.url_name || "") + "_" + fake_slug else user.url_name end -- cgit v1.2.3 From 5ad7ebf25cc684d68325681db4471e522ac31569 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 14 Aug 2012 11:20:51 +0100 Subject: Add concept of global censor rules as orthogonal to regex censor rules. Apply global rules to every request, not regex rules. --- app/models/info_request.rb | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 4c8181faa..9290ab77d 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -104,7 +104,7 @@ class InfoRequest < ActiveRecord::Base errors.add(:described_state, "is not a valid state") if !InfoRequest.enumerate_states.include? described_state end - + # The request must either be internal, in which case it has # a foreign key reference to a User object and no external_url or external_user_name, # or else be external in which case it has no user_id but does have an external_url, @@ -120,15 +120,15 @@ class InfoRequest < ActiveRecord::Base errors.add(:external_url, "must be null for an internal request") if !external_url.nil? end end - + def is_external? !external_url.nil? end - + def user_name is_external? ? external_user_name : user.name end - + def user_name_slug if is_external? if external_user_name.nil? @@ -708,10 +708,10 @@ public return self.public_body.is_followupable? end def recipient_name_and_email - return TMail::Address.address_from_name_and_email( - _("{{law_used}} requests at {{public_body}}", - :law_used => self.law_used_short, - :public_body => self.public_body.short_or_long_name), + return TMail::Address.address_from_name_and_email( + _("{{law_used}} requests at {{public_body}}", + :law_used => self.law_used_short, + :public_body => self.public_body.short_or_long_name), self.recipient_email).to_s end @@ -997,10 +997,13 @@ public # 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 + applicable_rules = [self.censor_rules, CensorRule.global.all] + if self.user && !self.user.censor_rules.empty? + applicable_rules << self.user.censor_rules + end + applicable_rules.flatten.each do |censor_rule| + censor_rule.apply_to_text!(text) + end return text end -- cgit v1.2.3 From 03a875ae16520d7a5fc1c5e8f7e607c7fa6aded2 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 14 Aug 2012 11:34:24 +0100 Subject: Add association between public bodies and censor rules, have info_request apply rules from its public body. --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 9290ab77d..83456b54f 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -997,7 +997,7 @@ public # Call groups of censor rules def apply_censor_rules_to_text!(text) - applicable_rules = [self.censor_rules, CensorRule.global.all] + 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 -- cgit v1.2.3 From 30019ed58f0cd608f6196d03b9679bbca2ea0881 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Tue, 14 Aug 2012 14:41:54 +0100 Subject: Apply global and public body censor rules to binary files. --- app/models/info_request.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 83456b54f..dfaa524b2 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -995,27 +995,28 @@ public return ret.reverse end - # Call groups of censor rules - def apply_censor_rules_to_text!(text) + # 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 - applicable_rules.flatten.each do |censor_rule| + return applicable_rules.flatten + end + + # Call groups of censor rules + def apply_censor_rules_to_text!(text) + 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) -- cgit v1.2.3