Method-style callbacks are deprecated for after_initialize

5 files changed, 74 insertions, 57 deletions

diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index 9029ec0ef..df362b410 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -81,6 +81,8 @@ class InfoRequest < ActiveRecord::Base
         'blackhole' # just dump them
     ]
 
+    after_initialize :set_defaults
+
     def self.enumerate_states
         states = [
         'waiting_response',
@@ -171,16 +173,6 @@ class InfoRequest < ActiveRecord::Base
 
     OLD_AGE_IN_DAYS = 21.days
 
-    def after_initialize
-        if self.described_state.nil?
-            self.described_state = 'waiting_response'
-        end
-        # FOI or EIR?
-        if !self.public_body.nil? && self.public_body.eir_only?
-            self.law_used = 'eir'
-        end
-    end
-
     def visible_comments
         self.comments.find(:all, :conditions => 'visible')
     end
@@ -1155,5 +1147,17 @@ public
         yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
       end
     end
+
+    private
+
+    def set_defaults
+        if self.described_state.nil?
+            self.described_state = 'waiting_response'
+        end
+        # FOI or EIR?
+        if !self.public_body.nil? && self.public_body.eir_only?
+            self.law_used = 'eir'
+        end
+    end
 end
 
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 2e98e1021..eb9f1bd5e 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -50,6 +50,8 @@ class OutgoingMessage < ActiveRecord::Base
         end
     end
 
+    after_initialize :set_default_letter
+
     # How the default letter starts and ends
     def get_salutation
         ret = ""
@@ -129,13 +131,6 @@ class OutgoingMessage < ActiveRecord::Base
         MySociety::Validate.contains_postcode?(self.body)
     end
 
-    # Set default letter
-    def after_initialize
-        if self.body.nil?
-            self.body = get_default_message
-        end
-    end
-
     # Check have edited letter
     def validate
         if self.body.empty? || self.body =~ /\A#{get_salutation}\s+#{get_signoff}/ || self.body =~ /#{get_internal_review_insert_here_note}/
@@ -275,6 +270,14 @@ class OutgoingMessage < ActiveRecord::Base
             yield(column.human_name, self.send(column.name), column.type.to_s, column.name)
         end
     end
+
+    private
+
+    def set_default_letter
+        if self.body.nil?
+            self.body = get_default_message
+        end
+    end
 end
 
 
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 31f08c21a..dfca936e2 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -32,6 +32,8 @@ class PostRedirect < ActiveRecord::Base
     # Optional, does a login confirm before redirect for use in email links.
     belongs_to :user
 
+    after_initialize :generate_token
+
     # We store YAML version of POST parameters in the database
     def post_params=(params)
         self.post_params_yaml = params.to_yaml
@@ -62,18 +64,6 @@ class PostRedirect < ActiveRecord::Base
         MySociety::Util.generate_token
     end
 
-    # Make the token
-    def after_initialize
-        # The token is used to return you to what you are doing after the login form.
-        if not self.token
-            self.token = PostRedirect.generate_random_token
-        end
-        # There is a separate token to use in the URL if we send a confirmation email.
-        if not self.email_token
-            self.email_token = PostRedirect.generate_random_token
-        end
-    end
-
     # Used by (rspec) test code only
     def self.get_last_post_redirect
         # XXX yeuch - no other easy way of getting the token so we can check
@@ -89,6 +79,18 @@ class PostRedirect < ActiveRecord::Base
         PostRedirect.delete_all "updated_at < (now() - interval '2 months')"
     end
 
+    private
+
+    def generate_token
+        # The token is used to return you to what you are doing after the login form.
+        if not self.token
+            self.token = PostRedirect.generate_random_token
+        end
+        # There is a separate token to use in the URL if we send a confirmation email.
+        if not self.email_token
+            self.email_token = PostRedirect.generate_random_token
+        end
+    end
 end
 
 
diff --git a/app/models/profile_photo.rb b/app/models/profile_photo.rb
index 6e605651d..e6562b904 100644
--- a/app/models/profile_photo.rb
+++ b/app/models/profile_photo.rb
@@ -27,25 +27,9 @@ class ProfilePhoto < ActiveRecord::Base
 
     attr_accessor :x, :y, :w, :h
 
-    # convert binary data blob into ImageMagick image when assigned
     attr_accessor :image
-    def after_initialize
-        if data.nil?
-            self.image = nil
-            return
-        end
 
-        image_list = Magick::ImageList.new
-        begin
-            image_list.from_blob(data)
-        rescue Magick::ImageMagickError
-            self.image = nil
-            return
-        end
-
-        self.image = image_list[0] # XXX perhaps take largest image or somesuch if there were multiple in the file?
-        self.convert_image
-    end
+    after_initialize :convert_data_to_image
 
     # make image valid format and size
     def convert_image
@@ -108,6 +92,27 @@ class ProfilePhoto < ActiveRecord::Base
             raise "Internal error, real pictures must have a user"
         end
     end
+
+    private
+
+    # Convert binary data blob into ImageMagick image when assigned
+    def convert_data_to_image
+        if data.nil?
+            self.image = nil
+            return
+        end
+
+        image_list = Magick::ImageList.new
+        begin
+            image_list.from_blob(data)
+        rescue Magick::ImageMagickError
+            self.image = nil
+            return
+        end
+
+        self.image = image_list[0] # XXX perhaps take largest image or somesuch if there were multiple in the file?
+        self.convert_image
+    end
 end
 
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 6e1e21481..dba04a30a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -56,6 +56,9 @@ class User < ActiveRecord::Base
         ],
         :terms => [ [ :variety, 'V', "variety" ] ],
         :if => :indexed_by_search?
+
+    after_initialize :set_defaults
+
     def created_at_numeric
         # format it here as no datetime support in Xapian's value ranges
         return self.created_at.strftime("%Y%m%d%H%M%S")
@@ -65,17 +68,6 @@ class User < ActiveRecord::Base
         "user"
     end
 
-    def after_initialize
-        if self.admin_level.nil?
-            self.admin_level = 'none'
-        end
-        if self.new_record?
-            # make alert emails go out at a random time for each new user, so
-            # overall they are spread out throughout the day.
-            self.last_daily_track_email = User.random_time_in_last_day
-        end
-    end
-
     # requested_by: and commented_by: search queries also need updating after save
     after_update :reindex_referencing_models
     def reindex_referencing_models
@@ -413,6 +405,17 @@ class User < ActiveRecord::Base
         self.salt = self.object_id.to_s + rand.to_s
     end
 
+    def set_defaults
+        if self.admin_level.nil?
+            self.admin_level = 'none'
+        end
+        if self.new_record?
+            # make alert emails go out at a random time for each new user, so
+            # overall they are spread out throughout the day.
+            self.last_daily_track_email = User.random_time_in_last_day
+        end
+    end
+
     ## Class methods
     def User.encrypted_password(password, salt)
         string_to_hash = password + salt # XXX need to add a secret here too?