Merge remote-tracking branch 'jpmckinney_github/class_methods' into rails-3-develop

1 files changed, 21 insertions, 21 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index f11b3a854..bdc9ec040 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -336,7 +336,7 @@ public
     # only they are sent the email address with the has in it. (We don't check
     # the prefix and domain, as sometimes those change, or might be elided by
     # copying an email, and that doesn't matter)
-    def InfoRequest.find_by_incoming_email(incoming_email)
+    def self.find_by_incoming_email(incoming_email)
         id, hash = InfoRequest._extract_id_hash_from_email(incoming_email)
         if hash_from_id(id) == hash
             # Not using find(id) because we don't exception raised if nothing found
@@ -346,7 +346,7 @@ public
 
     # Return list of info requests which *might* be right given email address
     # e.g. For the id-hash email addresses, don't match the hash.
-    def InfoRequest.guess_by_incoming_email(incoming_message)
+    def self.guess_by_incoming_email(incoming_message)
         guesses = []
         # 1. Try to guess based on the email address(es)
         incoming_message.addresses.each do |address|
@@ -358,7 +358,7 @@ public
     end
 
     # Internal function used by find_by_magic_email and guess_by_incoming_email
-    def InfoRequest._extract_id_hash_from_email(incoming_email)
+    def self._extract_id_hash_from_email(incoming_email)
         # Match case insensitively, FOI officers often write Request with capital R.
         incoming_email = incoming_email.downcase
 
@@ -385,7 +385,7 @@ public
     # repeated requests, say once a quarter for time information, then might need to do that.
     # TODO: this *should* also check outgoing message joined to is an initial
     # request (rather than follow up)
-    def InfoRequest.find_existing(title, public_body_id, body)
+    def self.find_existing(title, public_body_id, body)
         return InfoRequest.find(:first, :conditions => [ "title = ? and public_body_id = ? and outgoing_messages.body = ?", title, public_body_id, body ], :include => [ :outgoing_messages ] )
     end
 
@@ -525,7 +525,7 @@ public
 
     # The "holding pen" is a special request which stores incoming emails whose
     # destination request is unknown.
-    def InfoRequest.holding_pen_request
+    def self.holding_pen_request
         ir = InfoRequest.find_by_url_title("holding_pen")
         if ir.nil?
             ir = InfoRequest.new(
@@ -555,7 +555,7 @@ public
 
     # states which require administrator action (hence email administrators
     # when they are entered, and offer state change dialog to them)
-    def InfoRequest.requires_admin_states
+    def self.requires_admin_states
         return ['requires_admin', 'error_message', 'attention_requested']
     end
 
@@ -872,7 +872,7 @@ public
 
 
     # Display version of status
-    def InfoRequest.get_status_description(status)
+    def self.get_status_description(status)
         descriptions = {
             'waiting_classification'        => _("Awaiting classification."),
             'waiting_response'              => _("Awaiting response."),
@@ -934,7 +934,7 @@ public
         return InfoRequest.magic_email_for_id(prefix_part, self.id)
     end
 
-    def InfoRequest.magic_email_for_id(prefix_part, id)
+    def self.magic_email_for_id(prefix_part, id)
         magic_email = AlaveteliConfiguration::incoming_email_prefix
         magic_email += prefix_part + id.to_s
         magic_email += "-" + InfoRequest.hash_from_id(id)
@@ -948,7 +948,7 @@ public
         self.idhash = InfoRequest.hash_from_id(self.id)
     end
 
-    def InfoRequest.create_from_attributes(info_request_atts, outgoing_message_atts, user=nil)
+    def self.create_from_attributes(info_request_atts, outgoing_message_atts, user=nil)
         info_request = new(info_request_atts)
         default_message_params = {
             :status => 'ready',
@@ -962,12 +962,12 @@ public
         info_request
     end
 
-    def InfoRequest.hash_from_id(id)
+    def self.hash_from_id(id)
         return Digest::SHA1.hexdigest(id.to_s + AlaveteliConfiguration::incoming_email_secret)[0,8]
     end
 
     # Used to find when event last changed
-    def InfoRequest.last_event_time_clause(event_type=nil, join_table=nil, join_clause=nil)
+    def self.last_event_time_clause(event_type=nil, join_table=nil, join_clause=nil)
         event_type_clause = ''
         event_type_clause = " AND info_request_events.event_type = '#{event_type}'" if event_type
         tables = ['info_request_events']
@@ -982,13 +982,13 @@ public
           LIMIT 1)"
     end
 
-    def InfoRequest.last_public_response_clause
+    def self.last_public_response_clause
         join_clause = "incoming_messages.id = info_request_events.incoming_message_id
                        AND incoming_messages.prominence = 'normal'"
         last_event_time_clause('response', 'incoming_messages', join_clause)
     end
 
-    def InfoRequest.old_unclassified_params(extra_params, include_last_response_time=false)
+    def self.old_unclassified_params(extra_params, include_last_response_time=false)
         last_response_created_at = last_public_response_clause
         age = extra_params[:age_in_days] ? extra_params[:age_in_days].days : OLD_AGE_IN_DAYS
         params = { :conditions => ["awaiting_description = ?
@@ -1003,13 +1003,13 @@ public
         return params
     end
 
-    def InfoRequest.count_old_unclassified(extra_params={})
+    def self.count_old_unclassified(extra_params={})
         params = old_unclassified_params(extra_params)
         add_conditions_from_extra_params(params, extra_params)
         count(:all, params)
     end
 
-    def InfoRequest.get_random_old_unclassified(limit, extra_params)
+    def self.get_random_old_unclassified(limit, extra_params)
         params = old_unclassified_params({})
         add_conditions_from_extra_params(params, extra_params)
         params[:limit] = limit
@@ -1017,7 +1017,7 @@ public
         find(:all, params)
     end
 
-    def InfoRequest.find_old_unclassified(extra_params={})
+    def self.find_old_unclassified(extra_params={})
         params = old_unclassified_params(extra_params, include_last_response_time=true)
         [:limit, :include, :offset].each do |extra|
             params[extra] = extra_params[extra] if extra_params[extra]
@@ -1030,7 +1030,7 @@ public
         find(:all, params)
     end
 
-    def InfoRequest.download_zip_dir
+    def self.download_zip_dir
         File.join(Rails.root, "cache", "zips", "#{Rails.env}")
     end
 
@@ -1181,7 +1181,7 @@ public
     end
 
     # This is called from cron regularly.
-    def InfoRequest.stop_new_responses_on_old_requests
+    def self.stop_new_responses_on_old_requests
         # 6 months since last change to request, only allow new incoming messages from authority domains
         InfoRequest.update_all "allow_new_responses_from = 'authority_only' where updated_at < (now() - interval '6 months') and allow_new_responses_from = 'anybody' and url_title <> 'holding_pen'"
         # 1 year since last change requests, don't allow any new incoming messages
@@ -1275,7 +1275,7 @@ public
         return [xapian_similar, xapian_similar_more]
     end
 
-    def InfoRequest.request_list(filters, page, per_page, max_results)
+    def self.request_list(filters, page, per_page, max_results)
         xapian_object = ActsAsXapian::Search.new([InfoRequestEvent],
                                                  InfoRequestEvent.make_query_from_params(filters),
                                                  :offset => (page - 1) * per_page,
@@ -1292,7 +1292,7 @@ public
                  :show_no_more_than => show_no_more_than }
     end
 
-    def InfoRequest.recent_requests
+    def self.recent_requests
         request_events = []
         request_events_all_successful = false
         # Get some successful requests
@@ -1339,7 +1339,7 @@ public
         return [request_events, request_events_all_successful]
     end
 
-    def InfoRequest.find_in_state(state)
+    def self.find_in_state(state)
         select("*, #{ last_event_time_clause } as last_event_time").
             where(:described_state => state).
                 order('last_event_time')