From de48efcf2a6b5fb096fd209b1efea482f743c19c Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 22 Jan 2013 12:02:18 +0100 Subject: some basic webfinger routes, controller, presenters, views --- users/app/controllers/webfinger_controller.rb | 15 +++++++++ users/app/helpers/users_helper.rb.orig | 47 +++++++++++++++++++++++++++ users/app/models/user.rb | 2 ++ users/app/views/emails/_email.html.haml.orig | 12 +++++++ users/app/views/webfinger/host_meta.erb | 11 +++++++ users/app/views/webfinger/search.erb | 6 ++++ 6 files changed, 93 insertions(+) create mode 100644 users/app/controllers/webfinger_controller.rb create mode 100644 users/app/helpers/users_helper.rb.orig create mode 100644 users/app/views/emails/_email.html.haml.orig create mode 100644 users/app/views/webfinger/host_meta.erb create mode 100644 users/app/views/webfinger/search.erb (limited to 'users/app') diff --git a/users/app/controllers/webfinger_controller.rb b/users/app/controllers/webfinger_controller.rb new file mode 100644 index 0000000..e86cd2d --- /dev/null +++ b/users/app/controllers/webfinger_controller.rb @@ -0,0 +1,15 @@ +class WebfingerController < ApplicationController + + layout false + + def host_meta + @host_meta = Webfinger::HostMetaPresenter.new(request) + end + + def search + username = params[:q].split('@')[0].to_s.downcase + + user = User.find_by_login(username) + @subject = Webfinger::UserPresenter.new(user, request) + end +end diff --git a/users/app/helpers/users_helper.rb.orig b/users/app/helpers/users_helper.rb.orig new file mode 100644 index 0000000..ed027d3 --- /dev/null +++ b/users/app/helpers/users_helper.rb.orig @@ -0,0 +1,47 @@ +module UsersHelper + + def user_form_with(partial, options = {}) + user_form(options) do |f| + options[:f] = f + render :partial => partial, + :layout => 'legend_and_submit', + :locals => options + end + end + + def user_form(options = {}) + simple_form_for @user, + :html => user_form_html_options(options), + :validate => true do |f| + yield f + end + end + + def user_form_html_options(options) + { :class => user_form_html_classes(options).join(" "), + :id => dom_id(@user, options[:legend]) + } + end + + def user_form_html_classes(options) + classes = %W/form-horizontal user form/ + classes << options[:legend] + classes << (@user.new_record? ? 'new' : 'edit') + classes.compact + end + +<<<<<<< HEAD + def user_field(field) + value = @user.send(field) + value = value.to_s(:long) if field.end_with? '_at' + value || 'not set' +======= + def wrapped(item, options = {}) + options[:as] ||= :div + content_tag options[:as], :class => dom_class(item), :id => dom_id(item) do + yield + end +>>>>>>> more flexible email partial + end + +end diff --git a/users/app/models/user.rb b/users/app/models/user.rb index 292fb13..eff7abd 100644 --- a/users/app/models/user.rb +++ b/users/app/models/user.rb @@ -9,6 +9,8 @@ class User < CouchRest::Model::Base property :email_forward, String, :accessible => true property :email_aliases, [LocalEmail] + property :public_key + validates :login, :password_salt, :password_verifier, :presence => true diff --git a/users/app/views/emails/_email.html.haml.orig b/users/app/views/emails/_email.html.haml.orig new file mode 100644 index 0000000..440870d --- /dev/null +++ b/users/app/views/emails/_email.html.haml.orig @@ -0,0 +1,12 @@ +<<<<<<< HEAD +%li.pull-right + %code= email + - if params[:action] == 'edit' +======= += wrapped(email, local_assigns) do + = email + - if local_assigns[:with].try(:include?, :delete) +>>>>>>> more flexible email partial + = link_to(user_email_alias_path(@user, email), :method => :delete) do + %i.icon-remove +.clearfix diff --git a/users/app/views/webfinger/host_meta.erb b/users/app/views/webfinger/host_meta.erb new file mode 100644 index 0000000..23b4039 --- /dev/null +++ b/users/app/views/webfinger/host_meta.erb @@ -0,0 +1,11 @@ + + + + <%= @host_meta.subject %> + + + + + diff --git a/users/app/views/webfinger/search.erb b/users/app/views/webfinger/search.erb new file mode 100644 index 0000000..0bcb7e5 --- /dev/null +++ b/users/app/views/webfinger/search.erb @@ -0,0 +1,6 @@ + + + acct:<%= @subject.email_identifier %> + "<%= user_url(@subject.subject) %>" + + -- cgit v1.2.3