From ed6df7d1bf9fbf04e720fb1dd2ba30ff7fa03723 Mon Sep 17 00:00:00 2001
From: Raphael <raphael@joindiaspora.com>
Date: Thu, 23 Sep 2010 10:24:10 -0700
Subject: [PATCH] Delete user.terse_url
---
app/models/user.rb | 7 +------
spec/models/person_spec.rb | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 8f74e2233a..2b74f437b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -259,14 +259,9 @@ class User
aspect(:name => "Work")
end
- def terse_url
- terse = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
- terse = terse.chop! if terse[-1, 1] == '/'
- terse
- end
def diaspora_handle
- "#{self.username}@#{self.terse_url}"
+ "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"
end
def downcase_username
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 3275d92452..721310409c 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -24,7 +24,7 @@ describe Person do
context 'remote people' do
it 'stores the diaspora_handle in the database' do
- @person.diaspora_handle.include?(@user.terse_url).should be false
+ @person.diaspora_handle.include?(APP_CONFIG[:terse_pod_url]).should be false
end
end
end
--
GitLab