codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Strip trailing slashes from ScreeningUrl records

Browse source
This commit is contained in:
Neil Lalonde 2013-09-17 10:25:45 -04:00
parent 6183e9bb6c
commit b15e629f46
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/screened_url.rb
View file

@ -11,13 +11,16 @@ class ScreenedUrl < ActiveRecord::Base
default_action :do_nothing
before_validation :strip_http
before_validation :normalize
validates :url, presence: true, uniqueness: true
validates :domain, presence: true
def strip_http
self.url.gsub!(/http(s?):\/\//i, '')
def normalize
if self.url
self.url.gsub!(/http(s?):\/\//i, '')
self.url.gsub!(/(\/)+$/, '') # trim trailing slashes
end
end
def self.watch(url, domain, opts={})

8
spec/models/screened_url_spec.rb
View file

@ -21,6 +21,14 @@ describe ScreenedUrl do
described_class.create(valid_params.merge(url: url.gsub('http://', prefix))).url.should == url.gsub('http://', '')
end
end
it "strips trailing slash" do
described_class.create(valid_params.merge(url: 'silverbullet.in/')).url.should == 'silverbullet.in'
end
it "strips trailing slashes" do
described_class.create(valid_params.merge(url: 'silverbullet.in/buy///')).url.should == 'silverbullet.in/buy'
end
end
describe '#watch' do