xlsxrb 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 985967acd75137e7175ca5ed93493f4fcc001696499e1afdfe0c9d4e5fbaad97
-  data.tar.gz: f59bddd81cc312ecda261ef6875daffdfeff6571650298aa0cd56956318db07a
+  metadata.gz: 87ffb5143d51491cc1a7389a3aa673c40cc02e4e5ee69c554b795754f707c3cd
+  data.tar.gz: 1581c2a99238745d5e6cf65700cd3defbe8b3a3afadb55e74a44b647294407b2
 SHA512:
-  metadata.gz: c88eb2065c70cf4d0fab24508fc168601483fdade7e81593a186272d7fd11de72f9898f178ff591f466d4d3abd14c885c6193238572256a3a08eee56073355d1
-  data.tar.gz: a7c80be810fb05b948680492fb917f38f362460f1c095962fc090ed3d399317f83466c47f8b7ad3229c8a3bfa013a6ed23daaa174ef5d9278ef7ccf3ab36f6d8
+  metadata.gz: 2d994013d341f16ab98f33a190f58fd401247813a9451254eaa46809610e45a2840dc13d9e66b2b5d8c8edf0af6207eab38c9a3d0a2184fa781ff8a80dc63ed2
+  data.tar.gz: 9e92cd503f6a64dcdcf804996e85af09e2a11b4ceebb4586a6d0a688af81ec4cf66f7be0c86fced3acc90f76ca60dd26123aa1440b49740b1bc9522399877974

data/.devcontainer/Dockerfile

@@ -40,6 +40,7 @@ RUN apt-get update && apt-get install -y \
     imagemagick \
     fonts-liberation \
     fonts-noto-cjk \
+    brotli \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Pre-create the workspace folder and assign ownership to the vscode user

data/Rakefile

@@ -192,11 +192,13 @@ task :wasm do
     require "open-uri"
     wasm_url = "https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.9.3-2.9.4/dist/ruby.wasm"
     FileUtils.mkdir_p(File.dirname(original_wasm_cache))
+    # rubocop:disable Security/Open
     URI.open(wasm_url) do |stream|
       File.open(original_wasm_cache, "wb") do |file|
         IO.copy_stream(stream, file)
       end
     end
+    # rubocop:enable Security/Open
     puts "Original ruby.wasm cached successfully."
   end
 
@@ -231,9 +233,7 @@ task :wasm do
 
   # Resolve and copy host's rexml files
   rexml_spec_path = $LOAD_PATH.find { |p| File.exist?(File.join(p, "rexml/rexml.rb")) }
-  if rexml_spec_path
-    FileUtils.cp_r(File.join(rexml_spec_path, "rexml"), bundle_assets_dir)
-  end
+  FileUtils.cp_r(File.join(rexml_spec_path, "rexml"), bundle_assets_dir) if rexml_spec_path
 
   # Gateway for strscan
   File.write(File.join(bundle_assets_dir, "strscan.rb"), <<~RUBY)
@@ -259,11 +259,11 @@ task :wasm do
   ]
   stdlib_files.each do |name|
     path = $LOAD_PATH.find { |p| File.exist?(File.join(p, name)) }
-    if path
-      dest_path = File.join(bundle_assets_dir, name)
-      FileUtils.mkdir_p(File.dirname(dest_path))
-      FileUtils.cp(File.join(path, name), dest_path)
-    end
+    next unless path
+
+    dest_path = File.join(bundle_assets_dir, name)
+    FileUtils.mkdir_p(File.dirname(dest_path))
+    FileUtils.cp(File.join(path, name), dest_path)
   end
 
   # C. Patch tmpdir.rb to automatically create /tmp in Wasm virtual filesystem (since Wasm has no writable /tmp by default)
@@ -286,92 +286,104 @@ task :wasm do
   puts "Building packed ruby.wasm from staging bundle..."
   cmd = "bundle exec rbwasm pack #{original_wasm_cache} --dir #{wasm_bundle_dir}::/usr/local/lib/ruby/site_ruby -o #{packed_wasm_path}"
   puts "Executing: #{cmd}"
-  unless system(cmd)
-    raise "Failed to build packed ruby.wasm using rbwasm pack!"
-  end
+  raise "Failed to build packed ruby.wasm using rbwasm pack!" unless system(cmd)
 end
 
-desc "Fetch required external assets for offline usage"
-task :fetch_assets do
-  require 'open-uri'
-  require 'fileutils'
+def download_file(url, dest)
+  # Check if the file exists and is not a tiny placeholder/error document
+  return if File.exist?(dest) && File.size(dest) > 1024
 
-  def download_file(url, dest)
-    # Check if the file exists and is not a tiny placeholder/error document
-    return if File.exist?(dest) && File.size(dest) > 1024
+  puts "Downloading #{url} to #{dest}..."
+  FileUtils.mkdir_p(File.dirname(dest))
 
-    puts "Downloading #{url} to #{dest}..."
-    FileUtils.mkdir_p(File.dirname(dest))
+  require "net/http"
+  uri = URI.parse(url)
+  temp_dest = "#{dest}.tmp"
 
-    require 'net/http'
-    uri = URI.parse(url)
-    temp_dest = dest + ".tmp"
+  begin
+    Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https", open_timeout: 15, read_timeout: 90) do |http|
+      request = Net::HTTP::Get.new(uri)
+      # Specify User-Agent to bypass scraping prevention on CDNs and act as a normal browser
+      request["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
+      # Force raw (identity) encoding to prevent receiving Brotli-compressed (.br) data,
+      # which Ruby's Net::HTTP cannot decode automatically, leading to corrupted Wasm files.
+      request["Accept-Encoding"] = "identity"
 
-    begin
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https', open_timeout: 15, read_timeout: 90) do |http|
-        request = Net::HTTP::Get.new(uri)
-        # Specify User-Agent to bypass scraping prevention on CDNs and act as a normal browser
-        request['User-Agent'] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36"
-        # Force raw (identity) encoding to prevent receiving Brotli-compressed (.br) data,
-        # which Ruby's Net::HTTP cannot decode automatically, leading to corrupted Wasm files.
-        request['Accept-Encoding'] = 'identity'
-
-        http.request(request) do |response|
-          if response.code.to_i != 200
-            raise "HTTP error #{response.code}: #{response.message}"
-          end
+      http.request(request) do |response|
+        raise "HTTP error #{response.code}: #{response.message}" if response.code.to_i != 200
 
-          File.open(temp_dest, "wb") do |output|
-            response.read_body do |chunk|
-              output.write(chunk)
-            end
+        File.open(temp_dest, "wb") do |output|
+          response.read_body do |chunk|
+            output.write(chunk)
           end
         end
       end
-      # Atomic rename to prevent leaving incomplete files on failure
-      File.rename(temp_dest, dest)
-      puts "Downloaded successfully."
-    rescue => e
-      puts "Failed to download #{url}: #{e.message}"
-      File.delete(temp_dest) if File.exist?(temp_dest)
-      File.delete(dest) if File.exist?(dest)
-      raise "Required asset download failed. Build aborted."
     end
+    # Atomic rename to prevent leaving incomplete files on failure
+    File.rename(temp_dest, dest)
+    puts "Downloaded successfully."
+
+    # Dynamic Brotli Decompression if the server ignored identity encoding and sent Brotli (.br) data
+    if File.exist?(dest) && File.binread(dest, 4)&.bytes == [0xCF, 0xFF, 0xFF, 0x7F]
+      puts "Detected Brotli compression on #{dest}. Decompressing..."
+
+      unpacked = "#{dest}.unpacked"
+      if system("brotli -d -f -o #{unpacked} #{dest}")
+        File.rename(unpacked, dest)
+        puts "Decompressed #{dest} successfully."
+      else
+        FileUtils.rm_f(unpacked)
+        raise "Failed to decompress Brotli file: #{dest}"
+      end
+    end
+  rescue StandardError => e
+    puts "Failed to download #{url}: #{e.message}"
+    FileUtils.rm_f(temp_dest)
+    FileUtils.rm_f(dest)
+    raise "Required asset download failed. Build aborted."
   end
+end
 
-  def fetch_google_fonts
-    css_dest = "docs/fonts/fonts.css"
-    return if File.exist?(css_dest)
+def fetch_google_fonts
+  css_dest = "docs/fonts/fonts.css"
+  return if File.exist?(css_dest)
 
-    puts "Fetching and localizing Google Fonts..."
-    font_url = "https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
+  puts "Fetching and localizing Google Fonts..."
+  font_url = "https://fonts.googleapis.com/css2?family=Inter:wght@300;400;600;700&family=JetBrains+Mono:wght@400;500&display=swap"
 
-    css_content = nil
-    begin
-      # Specify Chrome User-Agent to ensure Google Fonts returns modern and lightweight .woff2 formats
-      # instead of legacy formats (like .ttf or .eot) designed for older browsers
-      URI.open(font_url, "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36") do |f|
-        css_content = f.read
-      end
-    rescue => e
-      puts "Failed to fetch Google Fonts CSS: #{e.message}"
-      return
+  css_content = nil
+  begin
+    # Specify Chrome User-Agent to ensure Google Fonts returns modern and lightweight .woff2 formats
+    # instead of legacy formats (like .ttf or .eot) designed for older browsers
+    # rubocop:disable Security/Open
+    URI.open(font_url, "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36") do |f|
+      css_content = f.read
     end
+    # rubocop:enable Security/Open
+  rescue StandardError => e
+    puts "Failed to fetch Google Fonts CSS: #{e.message}"
+    return
+  end
 
-    urls = css_content.scan(/url\((https:\/\/fonts\.gstatic\.com\/[^\)]+)\)/).flatten
-
-    urls.uniq.each do |url|
-      filename = url.split("/").last
-      local_path = "docs/fonts/#{filename}"
-      download_file(url, local_path)
-      css_content.gsub!(url, filename)
-    end
+  urls = css_content.scan(%r{url\((https://fonts\.gstatic\.com/[^)]+)\)}).flatten
 
-    FileUtils.mkdir_p("docs/fonts")
-    File.write(css_dest, css_content)
-    puts "Google Fonts localized successfully."
+  urls.uniq.each do |url|
+    filename = url.split("/").last
+    local_path = "docs/fonts/#{filename}"
+    download_file(url, local_path)
+    css_content.gsub!(url, filename)
   end
 
+  FileUtils.mkdir_p("docs/fonts")
+  File.write(css_dest, css_content)
+  puts "Google Fonts localized successfully."
+end
+
+desc "Fetch required external assets for offline usage"
+task :fetch_assets do
+  require "open-uri"
+  require "fileutils"
+
   # Fetch Ruby WASI JS
   download_file(
     "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.9.3-2.9.4/dist/browser.umd.js",
@@ -389,16 +401,16 @@ task :fetch_assets do
 end
 
 desc "Generate RDoc documentation including Visual Gallery"
-task doc: [:wasm, :fetch_assets] do
+task doc: %i[wasm fetch_assets] do
   FileUtils.rm_rf("doc")
 
   # RDoc コマンドを実行 (--exclude を指定して docs 配下のプレビュー用アセットの誤パースを回避)
-  sh "bundle exec rdoc --op doc" \
-     " --exclude 'docs/coi-serviceworker\\.js'" \
-     " --exclude 'docs/zeta\\.js'" \
-     " --exclude 'docs/office_thread\\.js'" \
-     " --exclude 'docs/preview\\.html'" \
-     " --title 'xlsxrb Documentation' --main README.md README.md \"docs/visual/VisualGallery.md\" lib/"
+  sh "bundle exec rdoc --op doc " \
+     "--exclude 'docs/coi-serviceworker\\.js' " \
+     "--exclude 'docs/zeta\\.js' " \
+     "--exclude 'docs/office_thread\\.js' " \
+     "--exclude 'docs/preview\\.html' " \
+     "--title 'xlsxrb Documentation' --main README.md README.md \"docs/visual/VisualGallery.md\" lib/"
 
   # Copy visual gallery images and files so they are available in RDoc output
   FileUtils.mkdir_p("doc/test/visual/baselines")
@@ -435,13 +447,14 @@ task doc: [:wasm, :fetch_assets] do
   # Inject stylesheet and javascript loading tags to all generated HTML docs
   Dir.glob("doc/**/*.html").each do |html_path|
     next if File.basename(html_path) == "preview.html"
+
     html_content = File.read(html_path)
     depth = html_path.sub(%r{\Adoc/}, "").count("/")
     rel_prefix = "../" * depth
 
-    coi_tag = %Q{<script src="#{rel_prefix}coi-serviceworker.js"></script>}
-    js_tag = %Q{<script src="#{rel_prefix}js/wasm_doc_helper.js" defer></script>}
-    css_tag = %Q{<link href="#{rel_prefix}css/wasm_doc_helper.css" rel="stylesheet">}
+    coi_tag = %(<script src="#{rel_prefix}coi-serviceworker.js"></script>)
+    js_tag = %(<script src="#{rel_prefix}js/wasm_doc_helper.js" defer></script>)
+    css_tag = %(<link href="#{rel_prefix}css/wasm_doc_helper.css" rel="stylesheet">)
 
     if html_content.include?("<body")
       modified = html_content.sub("<body", "#{coi_tag}\n#{js_tag}\n#{css_tag}\n<body")
@@ -467,15 +480,17 @@ namespace :doc do
       AccessLog: [],
       # If the file is a Brotli-compressed Wasm/Data asset (checked via magic bytes),
       # dynamically inject 'Content-Encoding: br' header so the browser decompresses it natively.
-      RequestCallback: ->(req, res) {
+      RequestCallback: lambda { |req, res|
         if req.path.end_with?(".wasm") || req.path.end_with?(".data")
           # Resolve physical file path from req.path manually since res.filename is nil at this stage
           local_path = File.join(File.expand_path("doc", __dir__), req.path)
           if File.exist?(local_path)
-            first_4 = File.binread(local_path, 4) rescue nil
-            if first_4 != "\x00asm"
-              res['Content-Encoding'] = 'br'
+            first_bytes = begin
+              File.binread(local_path, 4)
+            rescue StandardError
+              nil
             end
+            res["Content-Encoding"] = "br" if first_bytes != "\x00asm"
           end
         end
       }

data/benchmark.rb

@@ -194,6 +194,7 @@ end
 
 def median(array)
   return 0.0 if array.empty?
+
   sorted = array.sort
   len = sorted.length
   (sorted[(len - 1) / 2] + sorted[len / 2]) / 2.0

data/lib/xlsxrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Xlsxrb
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xlsxrb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - niku
@@ -37,34 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_wasm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A minimal dependency XLSX reading and writing library for Ruby, relying
   on standard libraries for core logic and opentelemetry-api for observability.
 email: