nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed merge

Browse source
This commit is contained in:
maxwell 2010-06-20 11:13:21 -07:00
commit 1610e72de9
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -2,6 +2,7 @@ source 'http://rubygems.org'
source 'http://gemcutter.org' source 'http://gemcutter.org'
gem 'rails', '3.0.0.beta4' gem 'rails', '3.0.0.beta4'
gem "mongoid", :git => "git://github.com/durran/mongoid.git" gem "mongoid", :git => "git://github.com/durran/mongoid.git"
gem "bson_ext", "1.0.1" gem "bson_ext", "1.0.1"
gem "haml" gem "haml"

2
app/controllers/status_messages_controller.rb
View file

@ -39,7 +39,7 @@ class StatusMessagesController < ApplicationController
respond_to do |format| respond_to do |format|
format.html format.html
format.xml { render :xml => @status_message } format.xml { render :xml => Post.build_xml_for(@status_message) }
format.json { render :json => @status_message } format.json { render :json => @status_message }
end end
end end

6
app/models/status_message.rb
View file

@ -1,6 +1,5 @@
class StatusMessage < Post class StatusMessage < Post
include StatusMessagesHelper #include StatusMessagesHelper
require_relative '../../lib/net/curl'
xml_name :status_message xml_name :status_message
@ -19,9 +18,6 @@ class StatusMessage < Post
StatusMessage.newest(User.first.email) StatusMessage.newest(User.first.email)
end end
def self.retrieve_from_friend(friend)
StatusMessages.from_xml Curl.get(friend.url+"status_messages.xml")
end
def ==(other) def ==(other)
(self.message == other.message) && (self.owner == other.owner) (self.message == other.message) && (self.owner == other.owner)

4
config/environments/test.rb
View file

@ -31,10 +31,6 @@ Diaspora::Application.configure do
# This is necessary if your schema can't be completely dumped by the schema dumper, # This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types # like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql # config.active_record.schema_format = :sql
#
#
#
begin begin