From 71c3a29aa659056fc32c1e28795b2a7b3c368b78 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Sun, 29 May 2011 18:28:07 -0700
Subject: [PATCH] Move YoutubeTitles callback into module

---
 app/models/comment.rb        | 1 -
 app/models/request.rb        | 2 +-
 app/models/status_message.rb | 3 ---
 lib/youtube_titles.rb        | 8 ++++++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/models/comment.rb b/app/models/comment.rb
index 08ec011e7..e3084553f 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -25,7 +25,6 @@ class Comment < ActiveRecord::Base
 
   serialize :youtube_titles, Hash
   before_save do
-    get_youtube_title text
     self.text.strip! unless self.text.nil?
   end
   def diaspora_handle
diff --git a/app/models/request.rb b/app/models/request.rb
index 775d79361..af97fc7ea 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -71,7 +71,7 @@ class Request
   private
 
   def not_already_connected
-    if sender && recipient && Contact.where(:user_id => self.recipient.owner_id, :person_id => self.sender.id).count > 0
+    if sender && recipient && Contact.where(:user_id => self.recipient.owner_id, :person_id => self.sender.id).exists?
       errors[:base] << 'You have already connected to this person'
     end
   end
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index 462b6acbe..3fb1f9b7f 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -23,9 +23,6 @@ class StatusMessage < Post
   attr_accessible :text
 
   serialize :youtube_titles, Hash
-  before_save do
-    get_youtube_title text
-  end
 
   before_create :build_tags
 
diff --git a/lib/youtube_titles.rb b/lib/youtube_titles.rb
index 8530e8ad3..cf90f28b3 100644
--- a/lib/youtube_titles.rb
+++ b/lib/youtube_titles.rb
@@ -1,4 +1,12 @@
 module YoutubeTitles
+  def self.included(model)
+    model.class_eval do
+      before_save do
+        get_youtube_title text
+      end
+    end if model.respond_to?(:before_save)
+  end
+
   def youtube_title_for video_id
     http = Net::HTTP.new('gdata.youtube.com', 80)
     path = "/feeds/api/videos/#{video_id}?v=2"