From f16c3a3f40749fa437dfd63634a309e48dda69dc Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Tue, 11 Sep 2018 13:26:39 -0700 Subject: [PATCH] fix nijie specs --- app/logical/sources/strategies/nijie.rb | 4 ++++ test/unit/artist_url_test.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/logical/sources/strategies/nijie.rb b/app/logical/sources/strategies/nijie.rb index 7aedf69a5..45591acea 100644 --- a/app/logical/sources/strategies/nijie.rb +++ b/app/logical/sources/strategies/nijie.rb @@ -41,6 +41,10 @@ module Sources if x =~ %r!https?://nijie\.info/view_popup\.php.+id=(\d+)! return "https://nijie.info/view.php?id=#{$1}" end + + if x =~ %r!\Ahttps?://pic\d+\.nijie\.info/nijie_picture/(\d+)! + return "https://nijie.info/view.php?id=#{$1}" + end end return super diff --git a/test/unit/artist_url_test.rb b/test/unit/artist_url_test.rb index 843a72c7f..c56539376 100644 --- a/test/unit/artist_url_test.rb +++ b/test/unit/artist_url_test.rb @@ -154,10 +154,10 @@ class ArtistUrlTest < ActiveSupport::TestCase should "normalize nijie urls" do url = FactoryBot.create(:artist_url, url: "https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png") - assert_equal("http://nijie.info/members.php?id=236014/", url.normalized_url) + assert_equal("http://nijie.info/members.php?id=161703/", url.normalized_url) - url = FactoryBot.create(:artist_url, url: "https://nijie.info/members.php?id=236014") - assert_equal("http://nijie.info/members.php?id=236014/", url.normalized_url) + url = FactoryBot.create(:artist_url, url: "https://nijie.info/members.php?id=161703") + assert_equal("http://nijie.info/members.php?id=161703/", url.normalized_url) end end end