jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

for artist urls, normalize https

Browse Source
This commit is contained in:
albert
2013-02-21 16:13:06 -05:00
parent 19398df28e
commit d16a240eda
4 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/artist_url.rb
View File

@@ -7,6 +7,7 @@ class ArtistUrl < ActiveRecord::Base
if url.nil? if url.nil?
nil nil
else else
url = url.gsub(/^https:\/\//, "http://")
url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog.fc2")
url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog.fc2")
url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog.fc2")
@@ -22,6 +23,7 @@ class ArtistUrl < ActiveRecord::Base
url = File.dirname(url) url = File.dirname(url)
end end
url = url.gsub(/^https:\/\//, "http://")
url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog\d+\.fc2/, "http://blog*.fc2")
url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+\.fc2/, "http://blog*.fc2")
url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2") url = url.gsub(/^http:\/\/blog-imgs-\d+-\w+\.fc2/, "http://blog*.fc2")

2
app/views/admin/users/edit.html.erb
View File

@@ -15,6 +15,8 @@
</div> </div>
</div> </div>
<%= render "users/secondary_links" %>
<% content_for(:page_title) do %> <% content_for(:page_title) do %>
Edit User - <%= Danbooru.config.app_name %> Edit User - <%= Danbooru.config.app_name %>
<% end %> <% end %>

3
test/unit/artist_test.rb
View File

@@ -94,10 +94,13 @@ class ArtistTest < ActiveSupport::TestCase
should "find matches by url" do should "find matches by url" do
a1 = FactoryGirl.create(:artist, :name => "rembrandt", :url_string => "http://rembrandt.com/test.jpg") a1 = FactoryGirl.create(:artist, :name => "rembrandt", :url_string => "http://rembrandt.com/test.jpg")
a2 = FactoryGirl.create(:artist, :name => "subway", :url_string => "http://subway.com/test.jpg") a2 = FactoryGirl.create(:artist, :name => "subway", :url_string => "http://subway.com/test.jpg")
a3 = FactoryGirl.create(:artist, :name => "minko", :url_string => "https://minko.com/test.jpg")
assert_equal(["rembrandt"], Artist.find_all_by_url("http://rembrandt.com/test.jpg").map(&:name)) assert_equal(["rembrandt"], Artist.find_all_by_url("http://rembrandt.com/test.jpg").map(&:name))
assert_equal(["rembrandt"], Artist.find_all_by_url("http://rembrandt.com/another.jpg").map(&:name)) assert_equal(["rembrandt"], Artist.find_all_by_url("http://rembrandt.com/another.jpg").map(&:name))
assert_equal([], Artist.find_all_by_url("http://nonexistent.com/test.jpg").map(&:name)) assert_equal([], Artist.find_all_by_url("http://nonexistent.com/test.jpg").map(&:name))
assert_equal(["minko"], Artist.find_all_by_url("https://minko.com/test.jpg").map(&:name))
assert_equal(["minko"], Artist.find_all_by_url("http://minko.com/test.jpg").map(&:name))
end end
should "not allow duplicates" do should "not allow duplicates" do

6
test/unit/artist_url_test.rb
View File

@@ -23,6 +23,12 @@ class ArtistUrlTest < ActiveSupport::TestCase
assert_equal("http://monet.com/", url.normalized_url) assert_equal("http://monet.com/", url.normalized_url)
end end
should "normalise https" do
url = FactoryGirl.create(:artist_url, :url => "https://google.com")
assert_equal("https://google.com", url.url)
assert_equal("http://google.com/", url.normalized_url)
end
should "normalize fc2 urls" do should "normalize fc2 urls" do
url = FactoryGirl.create(:artist_url, :url => "http://blog55.fc2.com/monet") url = FactoryGirl.create(:artist_url, :url => "http://blog55.fc2.com/monet")
assert_equal("http://blog55.fc2.com/monet", url.url) assert_equal("http://blog55.fc2.com/monet", url.url)