RubyGems - fontist - Versions diffs - 3.0.2 → 3.0.3 - Mend

fontist 3.0.2 → 3.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml +4 -4
data/lib/fontist/import/sil_importer.rb +2 -2
data/lib/fontist/macos/catalog/catalog_manager.rb +1 -1
data/lib/fontist/utils/downloader.rb +1 -5
data/lib/fontist/utils/user_agent.rb +95 -0
data/lib/fontist/utils.rb +1 -0
data/lib/fontist/version.rb +1 -1
metadata +2 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b68f4d4d083a0e2f73df389c0698800b4a4d519428cbf59ddd98f493630a3342
-  data.tar.gz: 76cc6dd8420deb15d8b5fd872e17550c4b31dc31585834f2290a0e3f36d130ba
+  metadata.gz: ef31ff4d5c017fd86187db92ab8eb9c428e694731d9bb7eb9be4dadbcb7ac210
+  data.tar.gz: 87f038f05b151bb64f31fc0592d2b2b6e883414852623232c23e2cff12d37df3
 SHA512:
-  metadata.gz: 72c687e0c3c81823d1e0edf131f9af115564e5d7b60b296d84dad7c297e5ea6e8f5fd6995f18961b6a6d048fb630eeba1e74d7beb942bad0abf97b9922112435
-  data.tar.gz: 57c8dde9259414c129e83c5fea0b7d50b2970c0062a756ffd9f8dbf91738508c154e0372f7b4a9d30139abb17d650a98954db0cc8764bd8871c7c5611221e4f9
+  metadata.gz: bad74c88e0eeb2d2cd12fb8e7c0f9e09663c9fc98ddbebdf0ab54b8f3eb90895414fa7fc5fb699356ff590f7f1ea1cb66cce11917415ecbe9d70112bc5f312e0
+  data.tar.gz: 4c843a8d911ce97ff680fb3ac85d440e80f617982a77c82e6bc8cc6c40b32a050ff2daf50a109c73b174c7ec851e0999f4a6df77148546b9f44838b80205e83d

data/lib/fontist/import/sil_importer.rb CHANGED Viewed

@@ -272,7 +272,7 @@ module Fontist
       end
       def font_links
-        html = URI.parse(ROOT).open.read
+        html = URI.parse(ROOT).open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent).read
         document = Nokogiri::HTML.parse(html)
         document.css("table.products div.title > a")
       end
@@ -392,7 +392,7 @@ module Fontist
       end
       def find_archive_url_by_page_uri(uri)
-        response = uri.open
+        response = uri.open("User-Agent" => Fontist::Utils::UserAgent.random_user_agent)
         current_url = response.base_uri
         html = response.read
         document = Nokogiri::HTML.parse(html)

data/lib/fontist/macos/catalog/catalog_manager.rb CHANGED Viewed

@@ -55,7 +55,7 @@ module Fontist
             Fontist.ui.say("Downloading Font#{version} catalog from #{url}...") if Fontist.ui.respond_to?(:say)
             URI(url).open(
-              "User-Agent" => "Fontist/#{Fontist::VERSION}",
+              "User-Agent" => Fontist::Utils::UserAgent.random_user_agent,
             ) do |response|
               File.write(catalog_file, response.read)
             end

data/lib/fontist/utils/downloader.rb CHANGED Viewed

@@ -1,10 +1,6 @@
 module Fontist
   module Utils
     class Downloader
-      DEFAULT_USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) " \
-                           "AppleWebKit/537.36 (KHTML, like Gecko) " \
-                           "Chrome/131.0.0.0 Safari/537.36".freeze
       class << self
         def download(*args)
           new(*args).download
@@ -143,7 +139,7 @@ module Fontist
           obj.headers &&
           obj.headers.to_h.to_h { |k, v| [k.to_s, v] }) || {} # rubocop:disable Style/HashTransformKeys, Metrics/LineLength
-        { "User-Agent" => DEFAULT_USER_AGENT }.merge(formula_headers)
+        Utils::UserAgent.browser_headers.merge(formula_headers)
       end
       def extract_raw_url

data/lib/fontist/utils/user_agent.rb ADDED Viewed

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+module Fontist
+  module Utils
+    module UserAgent
+      PROFILES = [
+        {
+          user_agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) " \
+                      "AppleWebKit/537.36 (KHTML, like Gecko) " \
+                      "Chrome/131.0.0.0 Safari/537.36",
+          platform: '"macOS"',
+          chrome_version: "131",
+        },
+        {
+          user_agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " \
+                      "AppleWebKit/537.36 (KHTML, like Gecko) " \
+                      "Chrome/130.0.0.0 Safari/537.36",
+          platform: '"Windows"',
+          chrome_version: "130",
+        },
+        {
+          user_agent: "Mozilla/5.0 (X11; Linux x86_64) " \
+                      "AppleWebKit/537.36 (KHTML, like Gecko) " \
+                      "Chrome/132.0.0.0 Safari/537.36",
+          platform: '"Linux"',
+          chrome_version: "132",
+        },
+        {
+          user_agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) " \
+                      "AppleWebKit/537.36 (KHTML, like Gecko) " \
+                      "Chrome/130.0.0.0 Safari/537.36",
+          platform: '"macOS"',
+          chrome_version: "130",
+        },
+        {
+          user_agent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) " \
+                      "AppleWebKit/537.36 (KHTML, like Gecko) " \
+                      "Chrome/132.0.0.0 Safari/537.36",
+          platform: '"Windows"',
+          chrome_version: "132",
+        },
+      ].freeze
+      ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9," \
+               "image/avif,image/webp,image/apng,*/*;q=0.8," \
+               "application/signed-exchange;v=b3;q=0.7"
+      ACCEPT_LANGUAGE = "en-US,en;q=0.9"
+      STATIC_HEADERS = {
+        "Accept" => ACCEPT,
+        "Accept-Language" => ACCEPT_LANGUAGE,
+        "Cache-Control" => "no-cache",
+        "Pragma" => "no-cache",
+        "Sec-Ch-Ua-Mobile" => "?0",
+        "Sec-Fetch-Dest" => "document",
+        "Sec-Fetch-Mode" => "navigate",
+        "Sec-Fetch-Site" => "cross-site",
+        "Sec-Fetch-User" => "?1",
+        "Upgrade-Insecure-Requests" => "1",
+      }.freeze
+      class << self
+        def random_profile
+          PROFILES.sample
+        end
+        def browser_headers
+          profile = random_profile
+          build_headers(profile)
+        end
+        def random_user_agent
+          random_profile[:user_agent]
+        end
+        private
+        def build_headers(profile)
+          STATIC_HEADERS.merge(
+            "User-Agent" => profile[:user_agent],
+            "Sec-Ch-Ua" => build_sec_ch_ua(profile[:chrome_version]),
+            "Sec-Ch-Ua-Platform" => profile[:platform],
+          )
+        end
+        def build_sec_ch_ua(chrome_version)
+          "\"Google Chrome\";v=\"#{chrome_version}\", " \
+            "\"Chromium\";v=\"#{chrome_version}\", " \
+            "\"Not_A Brand\";v=\"24\""
+        end
+      end
+    end
+  end
+end

data/lib/fontist/utils.rb CHANGED Viewed

@@ -9,6 +9,7 @@ module Fontist
     autoload :Locking, "#{__dir__}/utils/locking"
     autoload :System, "#{__dir__}/utils/system"
     autoload :UI, "#{__dir__}/utils/ui"
+    autoload :UserAgent, "#{__dir__}/utils/user_agent"
     # Converts a glob pattern to case-insensitive by replacing each
     # alphabetic character with a character class [aA]

data/lib/fontist/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Fontist
-  VERSION = "3.0.2".freeze
+  VERSION = "3.0.3".freeze
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fontist
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Ribose Inc.
@@ -509,6 +509,7 @@ files:
 - lib/fontist/utils/locking.rb
 - lib/fontist/utils/system.rb
 - lib/fontist/utils/ui.rb
+- lib/fontist/utils/user_agent.rb
 - lib/fontist/validate_cli.rb
 - lib/fontist/validation.rb
 - lib/fontist/validator.rb