From 015879a96a4d30acc07390e158d084d8600e8b74 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Tue, 9 Aug 2011 14:23:50 -0700
Subject: [PATCH] Move the unserialized_attribute override into the
 youtube_titles module.

---
 app/models/status_message.rb | 12 ------------
 lib/youtube_titles.rb        | 11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index c3c75c09d..fd460f245 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -131,18 +131,6 @@ class StatusMessage < Post
     end
   end
 
-  def unserialize_attribute attr_name
-    if attr_name == "youtube_titles"
-      begin
-        super
-      rescue ActiveRecord::SerializationTypeMismatch
-        {}
-      end
-    else
-      super
-    end
-  end
-
   protected
 
   def message_or_photos_present?
diff --git a/lib/youtube_titles.rb b/lib/youtube_titles.rb
index 06fc6efa7..62fe2efd9 100644
--- a/lib/youtube_titles.rb
+++ b/lib/youtube_titles.rb
@@ -31,5 +31,16 @@ module YoutubeTitles
     self.youtube_titles = matches unless matches.empty?
   end
 
+  def unserialize_attribute attr_name
+    if attr_name == "youtube_titles"
+      begin
+        super
+      rescue ActiveRecord::SerializationTypeMismatch
+        {}
+      end
+    else
+      super
+    end
+  end
   YOUTUBE_ID_REGEX = /(?:https?:\/\/)(?:youtu\.be\/|(?:[a-z]{2,3}\.)?youtube\.com\/watch(?:\?|#!|.+&|.+&amp;)v=)([\w-]{11})(?:\S*(#[^ ]+)|\S+)?/im unless defined? YOUTUBE_ID_REGEX
 end