Merge remote branch 'upstream/master'

app/models/photo.rb

@@ -34,15 +34,11 @@ class Photo < Post
   before_destroy :ensure_user_picture
 
   def self.instantiate(params = {})
+    photo = super(params)
     image_file = params.delete(:user_file)
-    person = params.delete(:person)
-
-    photo = Photo.new(params)
-    photo.diaspora_handle = params[:diaspora_handle]
 
+    photo.album_id = params[:album_id]
     photo.image.store! image_file
-    photo.person = person
-    photo.save
     photo
   end
 

app/models/user.rb

@@ -138,30 +138,44 @@ class User
   end
 
   ######## Posting ########
-  def post(class_name, options = {})
+  def post(class_name, opts = {})
-    if class_name == :photo && !options[:album_id].to_s.empty?
+    post = build_post(class_name, opts)
-      aspect_ids = aspects_with_post(options[:album_id])
+
+    if post.save
+      raise 'MongoMapper failed to catch a failed save' unless post.id
+      dispatch_post(post, :to => opts[:to])
+    end
+    post
+  end
+
+  def build_post(class_name, opts = {})
+    opts[:person] = self.person
+    opts[:diaspora_handle] = self.person.diaspora_handle
+
+    model_class = class_name.to_s.camelize.constantize
+    model_class.instantiate(opts)
+  end
+
+  def dispatch_post(post, opts = {})
+    if post.is_a?(Photo) && post.album_id
+      aspect_ids = aspects_with_post(post.album_id)
       aspect_ids.map! { |aspect| aspect.id }
     else
-      aspect_ids = options.delete(:to)
+      aspect_ids = opts.delete(:to)
     end
 
     aspect_ids = validate_aspect_permissions(aspect_ids)
-
+    self.raw_visible_posts << post
-    post = build_post(class_name, options)
+    self.save
-
-    if post.persisted?
     Rails.logger.info("Pushing: #{post.inspect} out to aspects")
     push_to_aspects(post, aspect_ids)
     post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
-      if options[:public] == true
+    if post.public
       self.services.each do |service|
         self.send("post_to_#{service.provider}".to_sym, service, post.message)
       end
     end
   end
-    post
-  end
 
   def post_to_facebook(service, message)
     Rails.logger.info("Sending a message: #{message} to Facebook")
@@ -178,6 +192,8 @@ class User
   def update_post(post, post_hash = {})
     if self.owns? post
       post.update_attributes(post_hash)
+      aspects = aspects_with_post(post.id)
+      self.push_to_aspects(post, aspects)
     end
   end
 
@@ -201,20 +217,6 @@ class User
     aspect_ids
   end
 
-  def build_post(class_name, options = {})
-    options[:person] = self.person
-    options[:diaspora_handle] = self.person.diaspora_handle
-
-    model_class = class_name.to_s.camelize.constantize
-    post = model_class.instantiate(options)
-    if post.save
-      raise 'MongoMapper failed to catch a failed save' unless post.id
-      self.raw_visible_posts << post
-      self.save
-    end
-    post
-  end
-
   def push_to_aspects(post, aspect_ids)
     if aspect_ids == :all || aspect_ids == "all"
       aspects = self.aspects

lib/em-webfinger.rb

@@ -6,6 +6,7 @@ class EMWebfinger
   def initialize(account)
     @account = account.strip.gsub('acct:','').to_s
     @callbacks = []
+    @ssl = true 
     # Raise an error if identifier has a port number 
     raise "Identifier is invalid" if(@account.strip.match(/\:\d+$/))
     # Raise an error if identifier is not a valid email (generous regexp)
@@ -34,12 +35,21 @@ class EMWebfinger
       profile_url = webfinger_profile_url(http.response)
       if profile_url 
         get_webfinger_profile(profile_url) 
+      elsif @ssl
+        @ssl = false
+        get_xrd
       else
         process_callbacks  "webfinger does not seem to be enabled for #{@account}'s host"
       end
     }
 
-    http.errback { process_callbacks "there was an error getting the xrd from account#{@account}" }
+    http.errback {
+      if @ssl
+        @ssl = false
+        get_xrd
+      else
+        process_callbacks "there was an error getting the xrd from account#{@account}" 
+      end }
   end
 
 
@@ -73,25 +83,18 @@ class EMWebfinger
   ##helpers
   private
 
-  def check_nil_response(html)
-
-  end
-
-
-
   def webfinger_profile_url(xrd_response)
     doc = Nokogiri::XML::Document.parse(xrd_response)  
     return nil if doc.namespaces["xmlns"] != "http://docs.oasis-open.org/ns/xri/xrd-1.0" 
     swizzle doc.at('Link[rel=lrdd]').attribute('template').value
   end
 
-  def xrd_url(ssl = false)
+  def xrd_url
     domain = @account.split('@')[1]
-    "http#{'s' if ssl}://#{domain}/.well-known/host-meta"
+    "http#{'s' if @ssl}://#{domain}/.well-known/host-meta"
   end
   
   def swizzle(template)
     template.gsub '{uri}', @account
   end
-
 end

lib/tasks/cruise.rake

@@ -1,10 +1,13 @@
 namespace :cruise do
   desc "Run all specs and features"
   task :cruise => :environment do
-    system('/etc/init.d/xvfb start')
+    puts "Starting virtual display..."
+    `sh -e /etc/init.d/xvfb start`
+    puts "Starting specs..."
     system('export DISPLAY=:99.0 && export SELENIUM_SERVER_PORT=53809 && bundle exec rake')
     exit_status = $?.exitstatus
-    system('/etc/init.d/xvfb stop')
+    puts "Stopping virtual display..."
+    `sh -e /etc/init.d/xvfb stop`
     raise "tests failed!" unless exit_status == 0
   end
 end

spec/lib/em-webfinger_spec.rb

@@ -47,6 +47,11 @@ describe EMWebfinger do
           EMWebfinger.new('eviljoe@diaspora.local:3000')
         }.should raise_error(RuntimeError, "Identifier is invalid")
       end  
+
+      it 'should set ssl as the default' do
+        foo = EMWebfinger.new(account)
+        foo.instance_variable_get(:@ssl).should be true
+      end
     end
 
 
@@ -94,14 +99,14 @@ describe EMWebfinger do
       end
 
       describe '#xrd_url' do
-        it 'should return canonical host-meta url' do
+        it 'should return canonical host-meta url for http' do
+          finger.instance_variable_set(:@ssl, false)
           finger.send(:xrd_url).should == "http://tom.joindiaspora.com/.well-known/host-meta"
         end
 
         it 'can return the https version' do
-          finger.send(:xrd_url, true).should == "https://tom.joindiaspora.com/.well-known/host-meta"
+          finger.send(:xrd_url).should == "https://tom.joindiaspora.com/.well-known/host-meta"
         end
-
       end
     end
 
@@ -132,6 +137,57 @@ describe EMWebfinger do
           }
         }
       end
+      
+      it 'should retry with http if https fails' do
+        good_request.callbacks = [nil, diaspora_xrd, diaspora_finger, hcard_xml]
+
+        #new_person = Factory.build(:person, :diaspora_handle => "tom@tom.joindiaspora.com")
+        # http://tom.joindiaspora.com/.well-known/host-meta 
+        f = EMWebfinger.new("tom@tom.joindiaspora.com") 
+
+        EventMachine::HttpRequest.should_receive(:new).exactly(4).times.and_return(good_request)
+
+        f.should_receive(:xrd_url).twice
+
+        EM.run {
+          f.on_person{ |p| 
+            EM.stop
+          }
+        }
+      end
+
+      it 'must try https first' do
+        single_request = FakeHttpRequest.new(:success)
+        single_request.callbacks = [diaspora_xrd]
+        good_request.callbacks = [diaspora_finger, hcard_xml]
+        EventMachine::HttpRequest.should_receive(:new).with("https://tom.joindiaspora.com/.well-known/host-meta").and_return(single_request)
+        EventMachine::HttpRequest.should_receive(:new).exactly(2).and_return(good_request)
+
+        f = EMWebfinger.new("tom@tom.joindiaspora.com") 
+
+        EM.run {
+          f.on_person{ |p| 
+            EM.stop
+          }
+        }
+      end
+
+      it 'should retry with http if https fails with an http error code' do
+        bad_request = FakeHttpRequest.new(:failure)
+
+        good_request.callbacks = [diaspora_xrd, diaspora_finger, hcard_xml]
+
+        EventMachine::HttpRequest.should_receive(:new).with("https://tom.joindiaspora.com/.well-known/host-meta").and_return(bad_request)
+        EventMachine::HttpRequest.should_receive(:new).exactly(3).and_return(good_request)
+
+        f = EMWebfinger.new("tom@tom.joindiaspora.com") 
+
+        EM.run {
+          f.on_person{ |p| 
+          EM.stop
+        }
+        }
+      end
     end
   end
 end

spec/lib/websocket_spec.rb

@@ -9,6 +9,7 @@ describe Diaspora::WebSocket do
     @user = make_user
     @aspect = @user.aspects.create(:name => "losers")
     @post = @user.build_post(:status_message, :message => "hey", :to => @aspect.id)
+    @post.save
   end
 
   it 'should queue a job' do

spec/models/photo_spec.rb

@@ -42,16 +42,19 @@ describe Photo do
     it 'sets the persons diaspora handle' do
       @photo2.diaspora_handle.should == @user.person.diaspora_handle
     end
-  end
-
     it 'has a constructor' do
       image = File.open(@fixture_name)
       photo = Photo.instantiate(
                 :person => @user.person, :album => @album, :user_file => image)
-    photo.created_at.nil?.should be false
+      photo.created_at.nil?.should be true
       photo.image.read.nil?.should be false
+      photo.album.should == @album
     end
 
+  end
+
+
+
   it 'should save a photo' do
     @photo.image.store! File.open(@fixture_name)
     @photo.save.should == true

spec/models/user/posting_spec.rb

@@ -36,7 +36,19 @@ describe User do
     end
   end
 
-  describe '#post' do
+  describe '#build_post' do
+    it 'does not save a status_message' do
+      post = user.build_post(:status_message, :message => "hey", :to => aspect.id)
+      post.persisted?.should be_false
+    end
+
+    it 'does not save an album' do
+      post = user.build_post(:album, :name => "hey", :to => aspect.id)
+      post.persisted?.should be_false
+    end
+  end
+
+  describe '#dispatch_post' do
     it 'should put the post in the aspect post array' do
       post = user.post(:status_message, :message => "hey", :to => aspect.id)
       aspect.reload
@@ -67,7 +79,6 @@ describe User do
       user.should_receive(:post_to_facebook).exactly(0).times
       user.post :status_message, :message => "hi", :to => "all"
     end
-
   end
 
   describe '#update_post' do

spec/models/user_spec.rb

@@ -226,6 +226,15 @@ describe User do
     end
   end
 
+  describe '#update_post' do
+
+    it 'sends a notification to aspects' do
+      user.should_receive(:push_to_aspects).twice
+      album = user.post(:album, :name => "cat", :to => aspect.id)
+      user.update_post(album, :name => 'bat')
+    end
+  end
+
   describe 'account removal' do
     it 'should unfriend everyone' do
       user.should_receive(:unfriend_everyone)