kabosu 0.6.11.1-aarch64-linux → 0.6.11.3-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c7cc03641802c2a17cad952e91f1d028119480c1d19543bf842a10f8d5ebae6
-  data.tar.gz: c1ed95738feb9ab1acfa34b07756408537cce9d065a4c78411439065a734b12f
+  metadata.gz: 462efa031fdd677b5cec78e45b23b5826e55987ed178c713fd9cd5ec15cea976
+  data.tar.gz: 7f2abe0539c31985ca7b021327151e87055319a807ca326ae076a23d64a49703
 SHA512:
-  metadata.gz: 634c923333d1898f4d52f9da0d6b1d8de49f4bcfba1a140906c00f30880765bb8f5099388d7f58002f9e3b6af01b273e240569e2b03f5cc5b149beeb48b26407
-  data.tar.gz: f20088ee2e5e2982efefedd4d8c7ae52f7ff66dd0f021a7df313e2a0e6905bf6c2b4271aa9fc7dd124c1370564faa8e233e277d616b7dbb489a169fe96a02a81
+  metadata.gz: af5c6416171b22c0a3c4533061c2cfd5d256696f4bd31fe1cb200094401e7ba2cf767924eea8d8f643fa46e3b48257076bde0db427f834ff1e1ebf2ba166c388
+  data.tar.gz: 9ce86eca4e2f3def2d4eec240a62acb3f34c0196dd4ef41ca84f78d0f4c351ec29fdc5813872aba8e97006ee9d73bfe4a22794fdd74b1cf6816a4ceb2c79f380

data/lib/kabosu/dict_manager.rb

@@ -46,13 +46,32 @@ module Kabosu
         return dic_path
       end
 
-      url = release_asset_url(version, edition)
-      zip_path = File.join(@dir, "sudachi-dictionary-#{version}-#{edition}.zip")
-
       FileUtils.mkdir_p(@dir)
-      download(url, zip_path)
-      extract(zip_path, @dir)
-      FileUtils.rm_f(zip_path)
+
+      # SudachiDict switched to Python-only release assets in v20260723:
+      # https://github.com/WorksApplications/SudachiDict/releases/tag/v20260723
+      # The legacy `sudachi-dictionary-{version}-{edition}.zip` is gone; the
+      # new releases ship `sudachidict_{edition}-{version}-py3-none-any.whl`
+      # (a PEP 427 wheel). Pick whichever exists, preferring the legacy zip
+      # when both are present (older releases kept both formats in flight).
+      sources = pick_release_sources(version, edition)
+      raise DownloadError, "No downloadable assets for #{version}/#{edition}" if sources.empty?
+
+      sources.each do |source|
+        begin
+          download(source.fetch(:url), source.fetch(:archive_path))
+          extract(source.fetch(:archive_path), dest_dir, edition: edition)
+          FileUtils.rm_f(source.fetch(:archive_path))
+          break
+        rescue DownloadError => e
+          FileUtils.rm_f(source.fetch(:archive_path)) if File.exist?(source.fetch(:archive_path))
+          # Try the next candidate (e.g. wheel if the zip 404s). If this was
+          # the last one, surface the original error.
+          raise if sources.last.equal?(source)
+
+          warn "  falling back: #{e.message}"
+        end
+      end
 
       raise DownloadError, "Expected #{dic_path} after extraction, but file not found" unless File.exist?(dic_path)
 
@@ -181,6 +200,51 @@ module Kabosu
       edition
     end
 
+    # Look up the GitHub release for `version` and return an ordered list of
+    # candidate download sources. The legacy `sudachi-dictionary-{version}-{edition}.zip`
+    # is preferred when present (matches the layout every other consumer
+    # assumes); otherwise we fall back to the SudachiDict Python wheel,
+    # which is what v20260723+ ship and which carries `system.dic` inside
+    # `sudachidict_{edition}/resources/`.
+    #
+    # On GitHub API failure we degrade to the legacy zip URL alone: an old
+    # release that 404s on the zip *also* 404s on the wheel, so falling back
+    # to "guessed" candidates costs nothing and keeps the code path simple
+    # for offline / no-network callers.
+    def pick_release_sources(version, edition)
+      candidates = []
+      zip = release_asset_url(version, edition)
+      candidates << { url: zip, archive_path: File.join(@dir, "sudachi-dictionary-#{version}-#{edition}.zip"), format: :zip }
+
+      begin
+        release = fetch_release(version)
+        if release
+          wheel_name = "sudachidict_#{edition}-#{version}-py3-none-any.whl"
+          wheel = release["assets"].to_a.find { |a| a["name"] == wheel_name }
+          if wheel && wheel["browser_download_url"]
+            candidates << {
+              url: wheel.fetch("browser_download_url"),
+              archive_path: File.join(@dir, wheel_name),
+              format: :wheel
+            }
+          end
+        end
+      rescue DownloadError
+        # API failure is fine: keep the legacy-zip candidate; the user will
+        # see a clean 404 if neither asset actually exists on disk.
+      end
+
+      candidates
+    end
+
+    def fetch_release(version)
+      uri = URI("#{GITHUB_API}/repos/#{GITHUB_REPO}/releases/tags/v#{version}")
+      response = http_get(uri, headers: { "Accept" => "application/json" })
+      return nil unless response.is_a?(Net::HTTPSuccess)
+
+      JSON.parse(response.body)
+    end
+
     def release_asset_url(version, edition)
       "https://github.com/#{GITHUB_REPO}/releases/download/v#{version}/sudachi-dictionary-#{version}-#{edition}.zip"
     end
@@ -249,17 +313,37 @@ module Kabosu
       end
     end
 
-    def extract(zip_path, dest_dir)
+    def extract(zip_path, dest_dir, edition: nil)
       warn "Extracting..."
       Zip::File.open(zip_path) do |archive|
         archive.each do |entry|
-          target = File.join(dest_dir, entry.name)
+          # Both layouts are flattened into dest_dir, which is already
+          # `sudachi-dictionary-{version}`.
+          #
+          # Legacy zips nest their contents under a `sudachi-dictionary-{version}/`
+          # directory of their own, so joining the entry name to dest_dir landed
+          # the dictionary at `sudachi-dictionary-{version}/sudachi-dictionary-{version}/system_core.dic`
+          # and every install of a pre-v20260723 release failed with "expected
+          # ... after extraction, but file not found". It went unnoticed because a
+          # machine that already had a dictionary never re-installs one.
+          #
+          # Wheels nest differently again (`sudachidict_{edition}/resources/system.dic`)
+          # and name the file `system.dic`, so that one is renamed to carry the
+          # edition. Taking the basename handles both, and there is nothing in
+          # these archives whose structure is worth keeping: a `.dic`, a LEGAL and
+          # a licence.
+          target_name = File.basename(entry.name)
+          target_name = "system_#{edition}.dic" if edition && target_name == "system.dic"
+
+          next if entry.directory?
+
+          target = File.join(dest_dir, target_name)
           # Guard against zip-slip — refuse entries that escape dest_dir.
           unless File.expand_path(target).start_with?(File.expand_path(dest_dir) + File::SEPARATOR)
             raise DownloadError, "Refusing to extract entry outside dest_dir: #{entry.name}"
           end
 
-          FileUtils.mkdir_p(File.dirname(target))
+          FileUtils.mkdir_p(dest_dir)
           entry.extract(target) { true } # overwrite existing
         end
       end

data/lib/kabosu/version.rb

@@ -1,3 +1,3 @@
 module Kabosu
-  VERSION = "0.6.11.1".freeze
+  VERSION = "0.6.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kabosu
 version: !ruby/object:Gem::Version
-  version: 0.6.11.1
+  version: 0.6.11.3
 platform: aarch64-linux
 authors:
 - davafons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-30 00:00:00.000000000 Z
+date: 2026-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip