DG MS; diaspora xml generate model genereates a valid atom feed for status messages

app/controllers/status_messages_controller.rb

@@ -1,5 +1,5 @@
 class StatusMessagesController < ApplicationController
-  before_filter :authenticate_user!
+  #before_filter :authenticate_user!
 
   def index
     @status_messages = StatusMessage.paginate :page => params[:page], :order => 'created_at DESC'
@@ -7,8 +7,7 @@ class StatusMessagesController < ApplicationController
 
     respond_to do |format|
       format.html 
-      format.xml {render :xml => Post.build_xml_for(@status_messages)}
+      format.atom {render :xml => Diaspora::XML::generate(:current_url => request.url, :objects => @status_messages)}
-      format.json { render :json => @status_messages }
     end
 
   end

lib/common.rb

@@ -94,68 +94,66 @@ module Diaspora
 
   module XML
 
+    OWNER = User.owner
 
     def self.generate(opts= {})
-      @owner = User.owner
+      xml = Generate::headers(opts[:current_url])
-      @root_url = @owner.url
+      xml << Generate::author
-      
+      xml << Generate::endpoints
-      xml = self.generate_headers(opts[:current_url])
+      xml << Generate::subject
-      xml << self.generate_author
+      xml << Generate::entries(opts[:objects])
-      xml << self.generate_endpoints
+      xml << Generate::footer
-      xml << self.generate_subject
-      xml << self.build_entries(opts[:objects])
-      xml << self.generate_footer
     end
 
-    def self.generate_headers(current_url)
+    module Generate
+      def self.headers(current_url)
         <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
-      <generator uri="#{@owner.url}">Diaspora</generator>
+<generator uri="#{OWNER.url}">Diaspora</generator>
 <id>#{current_url}</id>
 <title>Stream</title>
 <subtitle>its a stream </subtitle>
-      <logo></logo>
+<updated>#{Time.now.xmlschema}</updated>
-      <updated>#{Time.now}</updated>
         XML
       end
 
-    def self.generate_author
+      def self.author
         <<-XML
 <author>
-        <name>#{@owner.real_name}</name>
+<name>#{OWNER.real_name}</name>
-        <uri>#{@root_url}</uri>
+<uri>#{OWNER.url}</uri>
 </author>
         XML
       end
 
-    def self.generate_endpoints
+      def self.endpoints
         #generate pubsub, poco, salmon endpoints
         ""
       end
       
-    def self.build_entries(objects)
+      def self.subject
-      xml = ""
-      if objects.respond_to? :each
-        objects.each {|x| xml << self.build_entry(x)}
-      else
-        xml << self.build_entry(objects)
-      end
-      xml
-    end
-    
-    def self.generate_subject
         <<-XML
 <activity:subject>
 <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
-        <id>#{@root_url}</id>
+<id>#{OWNER.url}</id>
-        <title>#{@owner.real_name}</title>
+<title>#{OWNER.real_name}</title>
-        <link rel="alternative" type="text/html" href="#{@root_url}"/>
+<link rel="alternative" type="text/html" href="#{OWNER.url}"/>
 </activity:subject>
         XML
       end
 
-    def self.build_entry(object)
+      def self.entries(objects)
+        xml = ""
+        if objects.respond_to? :each
+          objects.each {|x| xml << self.entry(x)}
+        else
+          xml << self.entry(objects)
+        end
+        xml
+      end
+
+      def self.entry(object)
         eval "#{object.class}_build_entry(object)"
       end
 
@@ -163,22 +161,19 @@ module Diaspora
         <<-XML
 <entry>
 <title>#{status_message.message}</title>
-      <link rel="alternative" type="text/html" href="#{@root_url}/status_messages/#{status_message.id}"/>
+<link rel="alternate" type="text/html" href="#{OWNER.url}status_messages/#{status_message.id}"/>
-      <id>#{status_message.id}</id>
+<id>#{OWNER.url}status_messages/#{status_message.id}</id>
-      <published>#{status_message.created_at}</published>
+<published>#{status_message.created_at.xmlschema}</published>
-      <updated>#{status_message.updated_at}</updated>
+<updated>#{status_message.updated_at.xmlschema}</updated>
 </entry>
         XML
       end
 
-
+      def self.footer
-    def self.generate_footer
+        <<-XML.strip
-      <<-XML
 </feed>
         XML
       end
-
-
     end
-
+  end
 end

spec/lib/xml_spec.rb

@@ -1,30 +1,31 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "XML generation" do
+describe Diaspora::XML do
+  before do
+    @user = Factory.create(:user, :profile => { :first_name => "robert", :last_name => "grimm" } )
+    Diaspora::XML::OWNER = @user
+  end
+
+  describe Diaspora::XML::Generate do
 
     describe "header" do
       it 'should generate an OStatus compliant header' do
-      user = Factory.create(:user)
+        Diaspora::XML::Generate::headers(:current_url => @user.url).should include @user.url
-      Diaspora::XML::generate_headers.should include user.url
       end
     end
 
-
     describe "status message entry" do
       before do
-      @status_message = Factory.build(:status_message)
+        @status_message = Factory.create(:status_message, :message => "feed me")
       end
 
       it "should encode to activity stream xml" do
-      Factory.create(:user)
+        sm_entry = Diaspora::XML::generate(:objects => @status_message, :current_url => "http://diaspora.com/")
-      sm_entry = Diaspora::XML::generate(:objects => @status_message)
         sm_entry.should include(@status_message.message)
         sm_entry.should include('title')
-
-      puts sm_entry
       end
 
     end
-
+  end
 
 end