From 48f2a79d13948b6a9dbf3831aa7923c310d7cf8c Mon Sep 17 00:00:00 2001 From: Albert Yi Date: Wed, 29 Aug 2018 17:14:36 -0700 Subject: [PATCH] fix artist url spec and bug with nicoseiga strategy not recognizing urls --- app/logical/sources/strategies/nico_seiga.rb | 7 ++++--- test/unit/artist_url_test.rb | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/logical/sources/strategies/nico_seiga.rb b/app/logical/sources/strategies/nico_seiga.rb index 13f957cb0..831987ebf 100644 --- a/app/logical/sources/strategies/nico_seiga.rb +++ b/app/logical/sources/strategies/nico_seiga.rb @@ -2,7 +2,8 @@ module Sources module Strategies class NicoSeiga < Base URL = %r!\Ahttps?://(?:\w+\.)?nico(?:seiga|video)\.jp! - DIRECT = %r!\Ahttps?://lohas\.nicoseiga\.jp/priv/[0-9a-f]+! + DIRECT1 = %r!\Ahttps?://lohas\.nicoseiga\.jp/priv/[0-9a-f]+! + DIRECT2 = %r!\Ahttps?://lohas\.nicoseiga\.jp/o/[0-9a-f]+/\d+/\d+! PAGE = %r!\Ahttps?://seiga\.nicovideo\.jp/seiga/im(\d+)!i PROFILE = %r!\Ahttps?://seiga\.nicovideo\.jp/user/illust/(\d+)!i @@ -15,7 +16,7 @@ module Sources end def image_urls - if url =~ DIRECT + if url =~ DIRECT1 return [url] end @@ -100,7 +101,7 @@ module Sources end def normalizable_for_artist_finder? - url =~ PAGE || url =~ PROFILE + url =~ PAGE || url =~ PROFILE || url =~ DIRECT1 || url =~ DIRECT2 end def normalize_for_artist_finder diff --git a/test/unit/artist_url_test.rb b/test/unit/artist_url_test.rb index 437fa6900..a3432e89a 100644 --- a/test/unit/artist_url_test.rb +++ b/test/unit/artist_url_test.rb @@ -89,9 +89,9 @@ class ArtistUrlTest < ActiveSupport::TestCase end should "normalize" do - assert_equal("http://seiga.nicovideo.jp/user/illust/7017777", @urls[0].normalized_url) - assert_equal("http://seiga.nicovideo.jp/user/illust/7017777", @urls[1].normalized_url) - assert_equal("http://seiga.nicovideo.jp/user/illust/7017777", @urls[2].normalized_url) + assert_equal("http://seiga.nicovideo.jp/user/illust/7017777/", @urls[0].normalized_url) + assert_equal("http://seiga.nicovideo.jp/user/illust/7017777/", @urls[1].normalized_url) + assert_equal("http://seiga.nicovideo.jp/user/illust/7017777/", @urls[2].normalized_url) end end