From 65deaba558f68115199a4bbf0ff42468dbd90fb6 Mon Sep 17 00:00:00 2001
From: maxwell <maxwell@joindiaspora.com>
Date: Thu, 15 Jul 2010 18:36:07 -0700
Subject: [PATCH] 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 13f1f9fa41..3cf92aae48 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 f4ec0d6f28..454b614ff1 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 0000000000..e544a85926
--- /dev/null
+++ b/app/views/publics/hcard.erb
@@ -0,0 +1,39 @@
+<body id="hcard">
+ <div id="wrap">
+ <div id="core">
+ <dl id="site_nav_local_views">
+ <dt>Local views</dt>
+ <dd></dd>
+</dl>
+ <div id="content">
+ <h1><%=@user.real_name%></h1>
+ <div id="content_inner">
+ <div id="i" class="entity_profile vcard author">
+ <h2>User profile</h2>
+ <dl class="entity_nickname">
+ <dt>Nickname</dt>
+ <dd>
+ <a href="<%=@user.url%>" rel="me" class="nickname url uid"><%= @user.real_name%></a>
+</dd>
+</dl>
+ <dl class="entity_fn">
+ <dt>Full name</dt>
+ <dd>
+ <span class="fn"><%= @user.real_name %></span>
+</dd>
+</dl>
+ <dl class="entity_url">
+ <dt>URL</dt>
+ <dd>
+ <a href="<%= @user.url%>" rel="me" class="url"><%= @user.url%></a>
+</dd>
+</dl>
+ <dl class="entity_note">
+ <dt>Note</dt>
+ <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
+</dl>
+</div>
+</div>
+</div>
+</div>
+
diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb
index 98a149c556..b2228a3f01 100644
--- a/app/views/publics/webfinger.erb
+++ b/app/views/publics/webfinger.erb
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
<Subject>acct:<%=@user.email%></Subject>
- <Alias><%=@user.url%></Alias>
- <!--<Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="<%=@user.url%>public/profile"/>
- <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@user.url%>status_messages.atom"/>
+ <Alias>http://www.identi.ca/user/169966</Alias>
+ <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="http://identi.ca/user/169966"/>
+ <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%@user.url%>hcard"/>
+ <!--<Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="<%=@user.url%>status_messages.atom"/>
<Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%@user.url%>public/hcard"/>
+ --!>
<Link rel="http://ostatus.org/schema/1.0/subscribe" template="http://identi.ca/main/ostatussub?profile={uri}"/>
- --!>
+
</XRD>
+
diff --git a/config/routes.rb b/config/routes.rb
index 47f98ed934..9117e42e18 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 d063797623..66952e0989 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 1c285c59b3..8605f63f46 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 364580feda..03ca0a2862 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 0000000000..e69de29bb2
diff --git a/gpg/diaspora-production/EMPTY b/gpg/diaspora-production/EMPTY
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gpg/diaspora-test/EMPTY b/gpg/diaspora-test/EMPTY
new file mode 100644
index 0000000000..e69de29bb2
--
GitLab