sources: factor out Source::URL::Lofter.

app/logical/source/url.rb

@@ -20,6 +20,7 @@ module Source
     SUBCLASSES = [
       Source::URL::Twitter,
       Source::URL::HentaiFoundry,
+      Source::URL::Lofter,
       Source::URL::Newgrounds,
       Source::URL::Plurk,
       Source::URL::Skeb,

app/logical/source/url/lofter.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Image URLs
+#
+# # sample
+# * https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png?imageView&thumbnail=1680x0&quality=96&stripmeta=0
+#
+# # full size
+# * https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png
+# * http://imglf0.nosdn.127.net/img/cHl3bXNZdDRaaHBnNWJuN1Y4OXBqR01CeVBZSVNmU2FWZWtHc1h4ZTZiUGxlRzMwZnFDM1JnPT0.jpg (404)
+#
+# Page URLs
+#
+# * https://gengar563.lofter.com/post/1e82da8c_1c98dae1b
+# * https://yuli031458.lofter.com/post/3163d871_1cbdc5f6d (different theme/css selectors)
+# * https://ssucrose.lofter.com/post/1d30f3e4_1cc58e9f0 (another different theme)
+# * https://zuodaoxing.lofter.com/post/30b9c9c3_1cd15b686 (another theme)
+#
+# Profile URLs
+#
+# * http://gengar563.lofter.com
+#
+# Non-profile URLs
+#
+# * https://i.lofter.com
+# * https://www.lofter.com
+#
+class Source::URL::Lofter < Source::URL
+  RESERVED_SUBDOMAINS = %w[www.lofter.com i.lofter.com]
+
+  attr_reader :username, :work_id
+
+  def self.match?(url)
+    url.domain.in?(%w[lofter.com 127.net lf127.net])
+  end
+
+  def parse
+    case [host, *path_segments]
+
+    # https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png?imageView&thumbnail=1680x0&quality=96&stripmeta=0
+    # https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png
+    # http://imglf0.nosdn.127.net/img/cHl3bXNZdDRaaHBnNWJuN1Y4OXBqR01CeVBZSVNmU2FWZWtHc1h4ZTZiUGxlRzMwZnFDM1JnPT0.jpg (404)
+    in /127\.net$/, "img", filename
+      @filename = filename
+
+    # https://gengar563.lofter.com/post/1e82da8c_1c98dae1b
+    in /^([a-z0-9-]+)\.lofter\.com$/, "post", work_id unless host.in?(RESERVED_SUBDOMAINS)
+      @username = $1
+      @work_id = work_id
+
+    # http://gengar563.lofter.com
+    in /^([a-z0-9-]+)\.lofter\.com$/, *rest unless host.in?(RESERVED_SUBDOMAINS)
+      @username = $1
+
+    else
+    end
+  end
+
+  def image_url?
+    url.domain.in?(%w[lf127.net 127.net])
+  end
+
+  def full_image_url
+    "#{site}#{path}" if image_url?
+  end
+end

app/logical/sources/strategies/lofter.rb

@@ -1,59 +1,28 @@
 # frozen_string_literal: true
 
-# Image URLs
-#
-# # sample
-# * https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png?imageView&thumbnail=1680x0&quality=96&stripmeta=0
-#
-# # full size
-# * https://imglf3.lf127.net/img/S1d2QlVsWkJhSW1qcnpIS0ZSa3ZJSzFCWFlnUWgzb01DcUdpT1lreG5yQjJVMkhGS09HNGR3PT0.png
-# * http://imglf0.nosdn.127.net/img/cHl3bXNZdDRaaHBnNWJuN1Y4OXBqR01CeVBZSVNmU2FWZWtHc1h4ZTZiUGxlRzMwZnFDM1JnPT0.jpg (404)
-#
-# Page URLs
-#
-# * https://gengar563.lofter.com/post/1e82da8c_1c98dae1b
-# * https://yuli031458.lofter.com/post/3163d871_1cbdc5f6d (different theme/css selectors)
-# * https://ssucrose.lofter.com/post/1d30f3e4_1cc58e9f0 (another different theme)
-# * https://zuodaoxing.lofter.com/post/30b9c9c3_1cd15b686 (another theme)
-#
-# Profile URLs
-#
-# * http://gengar563.lofter.com/
-
+# @see Source::URL::Lofter
 module Sources
   module Strategies
     class Lofter < Base
-      PROFILE_URL = %r{\Ahttps?://(?<artist_name>[\w-]+).lofter.com}i
-      PAGE_URL =    %r{#{PROFILE_URL}/post/(?<illust_id>[\w-]+)}i
-      IMAGE_HOST =  %r{\Ahttps?://imglf\d\.(?:nosdn\d?\.12\d|lf127)\.net}i
+      extend Memoist
 
-      def domains
-        ["lofter.com", "lf127.net"]
+      def match?
+        parsed_url&.site_name == "Lofter"
       end
 
       def site_name
-        "Lofter"
-      end
-
-      def match?
-        return false if parsed_url.nil?
-        parsed_url.domain.in?(domains) || parsed_url.host =~ IMAGE_HOST
+        parsed_url.site_name
       end
 
       def image_urls
-        if url =~ IMAGE_HOST
-          [get_full_version(url)]
+        if parsed_url.image_url?
+          [parsed_url.full_image_url]
         else
           images = page&.search(".imgclasstag img")
-          images.to_a.map { |img| get_full_version(img["src"]) }
+          images.to_a.pluck("src").map { |url| Source::URL.parse(url).full_image_url }
         end
       end
 
-      def get_full_version(url)
-        parsed = URI.parse(url)
-        "https://#{parsed.host}#{parsed.path}"
-      end
-
       def profile_url
         return nil if artist_name.blank?
         "https://#{artist_name}.lofter.com"
@@ -97,12 +66,14 @@ module Sources
       end
 
       def illust_id
-        urls.map { |u| u[PAGE_URL, :illust_id] }.compact.first
+        parsed_url.work_id || parsed_referer&.work_id
       end
 
       def artist_name
-        urls.map { |u| u[PROFILE_URL, :artist_name] || u[PAGE_URL, :artist_name] }.compact.first
+        parsed_url.username || parsed_referer&.username
       end
+
+      memoize :page
     end
   end
 end

test/functional/uploads_controller_test.rb

@@ -345,6 +345,8 @@ class UploadsControllerTest < ActionDispatch::IntegrationTest
 
         should_upload_successfully("https://www.plurk.com/p/omc64y")
         should_upload_successfully("https://www.plurk.com/p/om6zv4")
+
+        should_upload_successfully("https://gengar563.lofter.com/post/1e82da8c_1c98dae1b")
       end
     end
   end