From 9fd1d7db630719dcebac5892e850c2c5fa0a5842 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Tue, 11 Oct 2011 16:53:37 -0700
Subject: [PATCH] updating gemfile and schema.rb

---
 Gemfile.lock                             | 2 ++
 app/models/post.rb                       | 2 +-
 spec/controllers/tags_controller_spec.rb | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 68bab4162..c1982af08 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -406,6 +406,7 @@ GEM
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
     ruby-hmac (0.4.0)
+    ruby-oembed (0.8.3)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
@@ -532,6 +533,7 @@ DEPENDENCIES
   rspec-rails (>= 2.0.0)
   ruby-debug
   ruby-debug19
+  ruby-oembed
   sass (= 3.1.7)
   selenium-webdriver (~> 2.7.0)
   settingslogic (= 2.0.6)
diff --git a/app/models/post.rb b/app/models/post.rb
index 9199a5b15..c9929185b 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -38,7 +38,7 @@ class Post < ActiveRecord::Base
 
   #scopes
   scope :all_public, where(:public => true, :pending => false)
-  scope :includes_for_a_stream,  includes({:author => :profile}, :mentions => {:person => :profile}) #note should include root and photos, but i think those are both on status_message
+  scope :includes_for_a_stream,  includes(:o_embed_cache, {:author => :profile}, :mentions => {:person => :profile}) #note should include root and photos, but i think those are both on status_message
 
   def self.for_a_stream(max_time, order)
     by_max_time(max_time, order).
diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb
index 16007efaa..d79ccec7d 100644
--- a/spec/controllers/tags_controller_spec.rb
+++ b/spec/controllers/tags_controller_spec.rb
@@ -16,7 +16,6 @@ describe TagsController do
     it 'responds with json' do
       get :index, :q => "ra", :format => 'json'
       #parse json
-      response.body.should include("#diaspora")
       response.body.should include("#rad")
     end