diff --git a/Gemfile.lock b/Gemfile.lock index 5ae63f097..44d386e33 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,6 +116,7 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) selenium-webdriver (>= 0.0.3) + columnize (0.3.1) crack (0.1.8) cucumber (0.9.0) builder (~> 2.1.2) @@ -151,6 +152,7 @@ GEM i18n (0.4.1) json (1.4.6) json_pure (1.4.6) + linecache (0.43) mail (2.2.6.1) activesupport (>= 2.3.6) mime-types @@ -199,6 +201,7 @@ GEM rake (>= 0.8.4) thor (~> 0.14.0) rake (0.8.7) + redgreen (1.2.2) rest-client (1.6.1) mime-types (>= 1.16) rspec (2.0.0.beta.22) @@ -214,6 +217,11 @@ GEM rspec-rails (2.0.0.beta.17) rspec (>= 2.0.0.beta.14) webrat (>= 0.7.0) + ruby-debug (0.10.3) + columnize (>= 0.1) + ruby-debug-base (~> 0.10.3.0) + ruby-debug-base (0.10.3) + linecache (>= 0.3) rubyzip (0.9.4) selenium-webdriver (0.0.28) ffi (>= 0.6.1) @@ -270,9 +278,11 @@ DEPENDENCIES pubsubhubbub rails (= 3.0.0) redfinger! + redgreen roxml! rspec (>= 2.0.0.beta.17) rspec-rails (= 2.0.0.beta.17) + ruby-debug sprinkle! thin webmock diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb index 17b0ebdb7..6b8ab3209 100644 --- a/app/views/publics/hcard.erb +++ b/app/views/publics/hcard.erb @@ -36,7 +36,7 @@
Photo
- <%= @person.profile.image_url%> +
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb index f75495ad2..e95604402 100644 --- a/lib/diaspora/ostatus_builder.rb +++ b/lib/diaspora/ostatus_builder.rb @@ -30,7 +30,7 @@ module Diaspora Diaspora #{@user.public_url}.atom #{@user.real_name}'s Public Feed -its a stream +Posts from Diaspora #{Time.now.xmlschema} #{@user.real_name} diff --git a/lib/hcard.rb b/lib/hcard.rb index e6baa49fd..d43326b56 100644 --- a/lib/hcard.rb +++ b/lib/hcard.rb @@ -8,6 +8,6 @@ module HCard {:given_name => doc.css(".given_name").text, :family_name => doc.css(".family_name").text, :url => doc.css("#pod_location").text, - :photo => doc.css(".photo")} + :photo => doc.css(".photo").src} end end