From a7b3fc48ec6ce39a7444469d84899a960b7537f9 Mon Sep 17 00:00:00 2001 From: maxwell Date: Fri, 29 Oct 2010 12:30:38 -0700 Subject: [PATCH] https is now a valid url for people. thx grippi --- app/models/person.rb | 4 ++-- spec/models/person_spec.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 936573069..c3f8a5a99 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -148,10 +148,11 @@ class Person end protected + def clean_url self.url ||= "http://localhost:3000/" if self.class == User if self.url - self.url = 'http://' + self.url unless self.url.match('http://' || 'https://') + self.url = 'http://' + self.url unless self.url.match(/https?:\/\//) self.url = self.url + '/' if self.url[-1, 1] != '/' end end @@ -160,5 +161,4 @@ class Person def remove_all_traces Post.all(:person_id => id).each { |p| p.delete } end - end diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index b2bfa0ab0..7abf977cd 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -13,6 +13,14 @@ describe Person do @aspect2 = @user2.aspect(:name => "Abscence of Babes") end + describe "vaild url" do + it 'should allow for https urls' do + person = Factory.create(:person, :url => "https://example.com") + person.valid?.should == true + end + end + + describe '#diaspora_handle' do context 'local people' do it 'uses the pod config url to set the diaspora_handle' do