From e6f3fc1d381343248db898dfa72fe96de72c33d8 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Tue, 15 Jun 2010 17:38:12 -0700
Subject: [PATCH] DG MS more test cleanup and removed a deprecation warning

---
 app/models/blog.rb              | 15 +--------------
 app/models/bookmark.rb          | 16 ++++------------
 app/views/blogs/_form.html.haml |  2 +-
 spec/models/post_spec.rb        |  2 +-
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/app/models/blog.rb b/app/models/blog.rb
index fd49ac248..3da382754 100644
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -1,21 +1,14 @@
-class Blog
-  include Mongoid::Document
-  include Mongoid::Timestamps
-  include ROXML
+class Blog < Post
   
   xml_accessor :title
   xml_accessor :body
-  xml_accessor :owner
 
   
   field :title
   field :body
-  field :owner
   
   validates_presence_of :title, :body
   
-  before_create :set_default_owner
-  
   def self.newest(owner_email)
     Blog.last(:conditions => {:owner => owner_email})
   end
@@ -23,10 +16,4 @@ class Blog
   def self.my_newest
     Blog.newest(User.first.email)
   end
-  
-  protected
-  
-  def set_default_owner
-    self.owner ||= User.first.email   
-  end
 end
diff --git a/app/models/bookmark.rb b/app/models/bookmark.rb
index 3480c72fb..c6241931f 100644
--- a/app/models/bookmark.rb
+++ b/app/models/bookmark.rb
@@ -1,20 +1,12 @@
-class Bookmark
-  include Mongoid::Document
-  include Mongoid::Timestamps
+class Bookmark < Post
   
+  xml_accessor :link
+  xml_accessor :title
   
-  field :owner
   field :link
   field :title
   
   
   validates_presence_of :link  
 
-  before_create :set_default_owner
-  
-  protected
-  
-  def set_default_owner
-    self.owner ||= User.first.email   
-  end
-end
\ No newline at end of file
+end
diff --git a/app/views/blogs/_form.html.haml b/app/views/blogs/_form.html.haml
index 5651e1eb0..5628b602e 100644
--- a/app/views/blogs/_form.html.haml
+++ b/app/views/blogs/_form.html.haml
@@ -1,4 +1,4 @@
-- form_for @blog do |f|
+= form_for @blog do |f|
   = f.error_messages
   %p
     = f.label :title
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index 33e1df1a3..313956825 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Post do
-  before(:all) do
+  before do
     Factory.create(:user, :email => "bob@aol.com")
     @post = Factory.create(:post, :owner => nil, :source => nil, :snippet => nil)    
   end