From 2dc6b5f46a17cc8d7d749cb799dc13878de8f972 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 15 Jul 2010 17:02:36 -0700 Subject: [PATCH 1/4] MS IZ small webfinger bug fixes --- app/views/publics/host_meta.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/publics/host_meta.erb b/app/views/publics/host_meta.erb index ad8a3671c..3b6280e5c 100644 --- a/app/views/publics/host_meta.erb +++ b/app/views/publics/host_meta.erb @@ -3,7 +3,7 @@ xmlns:hm='http://host-meta.net/xrd/1.0'> <%=@user.url%> + template='<%=@user.url%>webfinger/?q={uri}'> Resource Descriptor From 6bab2fedc8eb1fc94e775f7c146d71c1134ab5af Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 15 Jul 2010 17:06:48 -0700 Subject: [PATCH 2/4] MS IZ small webfinger bug fixes --- app/views/publics/webfinger.erb | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb index ebc8cbf02..4a6ea3eb3 100644 --- a/app/views/publics/webfinger.erb +++ b/app/views/publics/webfinger.erb @@ -5,9 +5,6 @@ - // - // - // From 45abeb2346bd26f94035b9fdf25b2c079f696a9b Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 15 Jul 2010 17:11:20 -0700 Subject: [PATCH 3/4] MS IZ small webfinger bug fixes --- app/views/publics/webfinger.erb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb index 4a6ea3eb3..98a149c55 100644 --- a/app/views/publics/webfinger.erb +++ b/app/views/publics/webfinger.erb @@ -2,9 +2,10 @@ acct:<%=@user.email%> <%=@user.url%> - + + From 65deaba558f68115199a4bbf0ff42468dbd90fb6 Mon Sep 17 00:00:00 2001 From: maxwell Date: Thu, 15 Jul 2010 18:36:07 -0700 Subject: [PATCH 4/4] MS IZ hcard, emptyfiles, routesw --- Rakefile | 3 ++- app/controllers/publics_controller.rb | 2 ++ app/views/publics/hcard.erb | 39 +++++++++++++++++++++++++++ app/views/publics/webfinger.erb | 11 +++++--- config/routes.rb | 1 + db/seeds/backer.rb | 3 ++- db/seeds/dev.rb | 5 ++-- db/seeds/tom.rb | 3 ++- gpg/diaspora-development/EMPTY | 0 gpg/diaspora-production/EMPTY | 0 gpg/diaspora-test/EMPTY | 0 11 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 app/views/publics/hcard.erb create mode 100644 gpg/diaspora-development/EMPTY create mode 100644 gpg/diaspora-production/EMPTY create mode 100644 gpg/diaspora-test/EMPTY diff --git a/Rakefile b/Rakefile index 13f1f9fa4..3cf92aae4 100644 --- a/Rakefile +++ b/Rakefile @@ -3,5 +3,6 @@ require File.expand_path('../config/application', __FILE__) require 'rake' - +ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__) +GPGME::check_version({}) Rails::Application.load_tasks diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index f4ec0d6f2..454b614ff 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -3,6 +3,8 @@ class PublicsController < ApplicationController include PublicsHelper def hcard + @user = User.owner + render 'hcard' end def host_meta diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb new file mode 100644 index 000000000..e544a8592 --- /dev/null +++ b/app/views/publics/hcard.erb @@ -0,0 +1,39 @@ + +
+
+ +
+

<%=@user.real_name%>

+
+
+

User profile

+
+
Nickname
+
+ <%= @user.real_name%> +
+
+
+
Full name
+
+ <%= @user.real_name %> +
+
+
+
URL
+
+ <%= @user.url%> +
+
+
+
Note
+
Diaspora is awesome! vi is better than emacs!
+
+
+
+
+
+ diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb index 98a149c55..b2228a3f0 100644 --- a/app/views/publics/webfinger.erb +++ b/app/views/publics/webfinger.erb @@ -1,11 +1,14 @@ acct:<%=@user.email%> - <%=@user.url%> - - --!> + + diff --git a/config/routes.rb b/config/routes.rb index 47f98ed93..9117e42e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -22,6 +22,7 @@ Diaspora::Application.routes.draw do |map| match 'hubbub', :to => 'publics#hubbub' match '.well-known/host-meta', :to => 'publics#host_meta' match 'webfinger', :to => 'publics#webfinger' + match 'hcard', :to => 'publics#hcard' root :to => 'dashboards#index' end diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb index d06379762..66952e098 100644 --- a/db/seeds/backer.rb +++ b/db/seeds/backer.rb @@ -7,7 +7,8 @@ # Mayor.create(:name => 'Daley', :city => citie require 'config/environment' - +ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__) +GPGME::check_version({}) def create(backer_number) diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb index 1c285c59b..8605f63f4 100644 --- a/db/seeds/dev.rb +++ b/db/seeds/dev.rb @@ -7,9 +7,10 @@ # Mayor.create(:name => 'Daley', :city => citie require 'config/environment' - +ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__) +GPGME::check_version({}) # Create seed user -user = User.create( :email => "robert@joindiaspora.com", :password => "monkey", :profile => Profile.new( :first_name => "bobert", :last_name => "brin" )) +user = User.create( :email => "robert@joindiaspora.com", :password => "evankorth", :profile => Profile.new( :first_name => "bobert", :last_name => "brin" )) names = [ ["George", "Washington"], ["John", "Adams"], diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb index 364580fed..03ca0a286 100644 --- a/db/seeds/tom.rb +++ b/db/seeds/tom.rb @@ -7,7 +7,8 @@ # Mayor.create(:name => 'Daley', :city => citie require 'config/environment' - +ENV['GNUPGHOME'] = File.expand_path("../../../gpg/diaspora-#{Rails.env}/", __FILE__) +GPGME::check_version({}) # Create seed user user = User.create( :email => "tom@tom.joindiaspora.com", :password => "evankorth", :url => "http://tom.joindiaspora.com/", :profile => Profile.new( :first_name => "Alexander", :last_name => "Hamiltom" )) diff --git a/gpg/diaspora-development/EMPTY b/gpg/diaspora-development/EMPTY new file mode 100644 index 000000000..e69de29bb diff --git a/gpg/diaspora-production/EMPTY b/gpg/diaspora-production/EMPTY new file mode 100644 index 000000000..e69de29bb diff --git a/gpg/diaspora-test/EMPTY b/gpg/diaspora-test/EMPTY new file mode 100644 index 000000000..e69de29bb