From 0bcbd5b16c1de95c085ea5c3e69cfc86fe85cc0b Mon Sep 17 00:00:00 2001 From: maxwell Date: Tue, 13 Jul 2010 12:09:06 -0700 Subject: [PATCH] DG MS; diaspora xml generate model genereates a valid atom feed for status messages --- app/controllers/status_messages_controller.rb | 5 +- lib/common.rb | 155 +++++++++--------- spec/lib/xml_spec.rb | 37 +++-- 3 files changed, 96 insertions(+), 101 deletions(-) diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb index d4061d124..1e68a74da 100644 --- a/app/controllers/status_messages_controller.rb +++ b/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.json { render :json => @status_messages } + format.atom {render :xml => Diaspora::XML::generate(:current_url => request.url, :objects => @status_messages)} end end diff --git a/lib/common.rb b/lib/common.rb index 5ff71fe7b..7e053a4fc 100644 --- a/lib/common.rb +++ b/lib/common.rb @@ -94,91 +94,86 @@ module Diaspora module XML + OWNER = User.owner def self.generate(opts= {}) - @owner = User.owner - @root_url = @owner.url - - xml = self.generate_headers(opts[:current_url]) - xml << self.generate_author - xml << self.generate_endpoints - xml << self.generate_subject - xml << self.build_entries(opts[:objects]) - xml << self.generate_footer + xml = Generate::headers(opts[:current_url]) + xml << Generate::author + xml << Generate::endpoints + xml << Generate::subject + xml << Generate::entries(opts[:objects]) + xml << Generate::footer end - def self.generate_headers(current_url) - <<-XML - - - Diaspora - #{current_url} - Stream - its a stream - - #{Time.now} - XML - end - - def self.generate_author - <<-XML - - #{@owner.real_name} - #{@root_url} - - XML - end - - def self.generate_endpoints - #generate pubsub, poco, salmon endpoints - "" - end - - def self.build_entries(objects) - xml = "" - if objects.respond_to? :each - objects.each {|x| xml << self.build_entry(x)} - else - xml << self.build_entry(objects) + module Generate + def self.headers(current_url) + <<-XML + + +Diaspora +#{current_url} +Stream +its a stream +#{Time.now.xmlschema} + XML + end + + def self.author + <<-XML + +#{OWNER.real_name} +#{OWNER.url} + + XML + end + + def self.endpoints + #generate pubsub, poco, salmon endpoints + "" + end + + def self.subject + <<-XML + +http://activitystrea.ms/schema/1.0/person +#{OWNER.url} +#{OWNER.real_name} + + + XML + end + + 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 + + def self.StatusMessage_build_entry(status_message) + <<-XML + +#{status_message.message} + +#{OWNER.url}status_messages/#{status_message.id} +#{status_message.created_at.xmlschema} +#{status_message.updated_at.xmlschema} + + XML + end + + def self.footer + <<-XML.strip + + XML end - xml end - - def self.generate_subject - <<-XML - - http://activitystrea.ms/schema/1.0/person - #{@root_url} - #{@owner.real_name} - - - XML - end - - def self.build_entry(object) - eval "#{object.class}_build_entry(object)" - end - - def self.StatusMessage_build_entry(status_message) - <<-XML - - #{status_message.message} - - #{status_message.id} - #{status_message.created_at} - #{status_message.updated_at} - - XML - end - - - def self.generate_footer - <<-XML - - XML - end - - end - end diff --git a/spec/lib/xml_spec.rb b/spec/lib/xml_spec.rb index 6676ac9be..5c1714d73 100644 --- a/spec/lib/xml_spec.rb +++ b/spec/lib/xml_spec.rb @@ -1,30 +1,31 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe "XML generation" do - - describe "header" do - it 'should generate an OStatus compliant header' do - user = Factory.create(:user) - Diaspora::XML::generate_headers.should include user.url - end +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 "status message entry" do - before do - @status_message = Factory.build(:status_message) + describe "header" do + it 'should generate an OStatus compliant header' do + Diaspora::XML::Generate::headers(:current_url => @user.url).should include @user.url + end end - it "should encode to activity stream xml" do - Factory.create(:user) - sm_entry = Diaspora::XML::generate(:objects => @status_message) - sm_entry.should include(@status_message.message) - sm_entry.should include('title') + describe "status message entry" do + before do + @status_message = Factory.create(:status_message, :message => "feed me") + end + + it "should encode to activity stream xml" do + sm_entry = Diaspora::XML::generate(:objects => @status_message, :current_url => "http://diaspora.com/") + sm_entry.should include(@status_message.message) + sm_entry.should include('title') + end - puts sm_entry end - end - end