Ignore embedded photos if invalid

For example if they're already present
Also refactor StatusMessage XML specs

app/models/status_message.rb

@@ -187,5 +187,10 @@ class StatusMessage < Post
   def self.tag_stream(tag_ids)
     joins(:taggings).where('taggings.tag_id IN (?)', tag_ids)
   end
+
+  def after_parse
+    # Make sure already received photos don't invalidate the model
+    self.photos = photos.select(&:valid?)
+  end
 end
 

lib/diaspora/guid.rb

@@ -4,7 +4,7 @@ module Diaspora::Guid
   # Creates a before_create callback which calls #set_guid and makes the guid serialize in to_xml
   def self.included(model)
     model.class_eval do
-      before_create :set_guid
+      after_initialize :set_guid
       xml_attr :guid
       validates :guid, :uniqueness => true
 

spec/factories.rb

@@ -113,6 +113,11 @@ FactoryGirl.define do
     end
   end
 
+  factory(:location) do
+    lat 1
+    lng 2
+  end
+
   factory(:poll) do
     sequence(:question) { |n| "What do you think about #{n} ninjas?" }
     after(:build) do |p|

spec/models/status_message_spec.rb

@@ -258,116 +258,104 @@ STR
   end
 
   describe "XML" do
-    before do
+    let(:message) { FactoryGirl.build(:status_message, text: "I hate WALRUSES!", author: @user.person) }
-      @message = FactoryGirl.build(:status_message, :text => "I hate WALRUSES!", :author => @user.person)
+    let(:xml) { message.to_xml.to_s }
-      @xml = @message.to_xml.to_s
+    let(:marshalled) { StatusMessage.from_xml(xml) }
-    end
+
     it 'serializes the escaped, unprocessed message' do
       text = "[url](http://example.org)<script> alert('xss should be federated');</script>"
-      @message.text = text
+      message.text = text
-      expect(@message.to_xml.to_s).to include Builder::XChar.encode(text)
+      expect(xml).to include Builder::XChar.encode(text)
     end
 
     it 'serializes the message' do
-      expect(@xml).to include "<raw_message>I hate WALRUSES!</raw_message>"
+      expect(xml).to include "<raw_message>I hate WALRUSES!</raw_message>"
     end
 
     it 'serializes the author address' do
-      expect(@xml).to include(@user.person.diaspora_handle)
+      expect(xml).to include(@user.person.diaspora_handle)
     end
 
     describe '.from_xml' do
-      before do
-        @marshalled = StatusMessage.from_xml(@xml)
-      end
       it 'marshals the message' do
-        expect(@marshalled.text).to eq("I hate WALRUSES!")
+        expect(marshalled.text).to eq("I hate WALRUSES!")
       end
+
       it 'marshals the guid' do
-        expect(@marshalled.guid).to eq(@message.guid)
+        expect(marshalled.guid).to eq(message.guid)
       end
+
       it 'marshals the author' do
-        expect(@marshalled.author).to eq(@message.author)
+        expect(marshalled.author).to eq(message.author)
       end
+
       it 'marshals the diaspora_handle' do
-        expect(@marshalled.diaspora_handle).to eq(@message.diaspora_handle)
+        expect(marshalled.diaspora_handle).to eq(message.diaspora_handle)
       end
     end
 
     context 'with some photos' do
       before do
-        @message.photos << FactoryGirl.build(:photo)
+        message.photos << FactoryGirl.build(:photo)
-        @message.photos << FactoryGirl.build(:photo)
+        message.photos << FactoryGirl.build(:photo)
-        @xml = @message.to_xml.to_s
       end
 
       it 'serializes the photos' do
-        expect(@xml).to include "photo"
+        expect(xml).to include "photo"
-        expect(@xml).to include @message.photos.first.remote_photo_path
+        expect(xml).to include message.photos.first.remote_photo_path
       end
 
       describe '.from_xml' do
-        before do
+        it 'marshals the photos' do
-          @marshalled = StatusMessage.from_xml(@xml)
+          expect(marshalled.photos.size).to eq(2)
         end
 
-        it 'marshals the photos' do
+        it 'handles existing photos' do
-          expect(@marshalled.photos.size).to eq(2)
+          message.photos.each(&:save!)
+          expect(marshalled).to be_valid
         end
       end
     end
 
     context 'with a location' do
       before do
-        @message.location = Location.new(coordinates: "1, 2").tap(&:save)
+        message.location = FactoryGirl.build(:location)
-        @xml = @message.to_xml.to_s
       end
 
       it 'serializes the location' do
-        expect(@xml).to include "location"
+        expect(xml).to include "location"
-        expect(@xml).to include "lat"
+        expect(xml).to include "lat"
-        expect(@xml).to include "lng"
+        expect(xml).to include "lng"
       end
 
       describe ".from_xml" do
-        before do
-          @marshalled = StatusMessage.from_xml(@xml)
-        end
-
         it 'marshals the location' do
-          expect(@marshalled.location).to be_present
+          expect(marshalled.location).to be_present
         end
       end
     end
 
     context 'with a poll' do
       before do
-        @message.poll = FactoryGirl.create(:poll, :status_message => @message)
+        message.poll = FactoryGirl.build(:poll)
-        @xml = @message.to_xml.to_s
       end
 
       it 'serializes the poll' do
-        expect(@xml).to include "poll"
+        expect(xml).to include "poll"
-        expect(@xml).to include "question"
+        expect(xml).to include "question"
-        expect(@xml).to include "poll_answer"
+        expect(xml).to include "poll_answer"
       end
 
       describe ".from_xml" do
-        before do
-          @marshalled = StatusMessage.from_xml(@xml)
-        end
-
         it 'marshals the poll' do
-          expect(@marshalled.poll).to be_present
+          expect(marshalled.poll).to be_present
         end
 
         it 'marshals the poll answers' do
-          expect(@marshalled.poll.poll_answers.size).to eq(2)
+          expect(marshalled.poll.poll_answers.size).to eq(2)
         end
       end
     end
-
-
   end
 
   describe '#after_dispatch' do