liquid_xlsx 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2962349e5fe1197bffc9c0d28d21be73e83b97f71cf3e8ce86579c07246e5072
-  data.tar.gz: 67d36e10dfaf54790ffd949e175ba80b24940d331eb9e9b826661158b32c08ee
+  metadata.gz: 405eceeb12cbc1b76e2bb0fa1ef24f351f544551268799cffd3f1265fa3bda7f
+  data.tar.gz: 13f0be15c97eaf8f21c8e4b4b1c4a2665032f8a8b7fc0ae885a1c1a2fb2cb126
 SHA512:
-  metadata.gz: 5f9379732f56d318bb9dba0a0fbf5a9c82e2ec782a97109043eaf6e5272aeb4a2a5eb3b7fa592dbab1d059543ba5dc3dbf3f9fdbc1637bf7c9df42ecacec88ce
-  data.tar.gz: '080cdb56014357ece810afd62e5e42271f7eb403cdcd62cb63697f894b4814b67b6c2959f11dd911dc98099b5be18e715b0cdc1c27b16cbe95c3b92e6862450f'
+  metadata.gz: 1677f21ae1c65f95cf62fe1728cdeadef70e96a051ed33a1ed7acf57eb2b9067e00f3f4d1901caf20d9d23f37edbec601cef7115704404e75eaaca160d1d6405
+  data.tar.gz: 9eda27bf7211ffc329af17e9ddf9992dcda7e551ff9526d62afb8df870e56d88381cd369acf120704ede782e10ded1650c410e97d71ebbf5159bff46b311e630

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 # Changelog
 
+## 0.2.2 (2026-08-14)
+
+### Fixed
+
+- Templates whose relationship targets are absolute are rendered again. OPC
+  allows a `Target` to be relative to the declaring part
+  (`worksheets/sheet1.xml`) or absolute from the package root
+  (`/xl/worksheets/sheet1.xml`); Excel writes the first form, 1C exports and
+  some other generators write the second. The package layer joined every target
+  to its base folder, so an absolute one resolved to
+  `xl/xl/worksheets/sheet1.xml`, the lookup found nothing, and the sheet was
+  skipped — the caller received a copy of the template with `{{ tags }}` still
+  in it and no error anywhere. Targets are now resolved with a single helper
+  that honours both forms.
+- A sheet listed in `workbook.xml` whose worksheet part cannot be found now
+  raises `InvalidXlsxError` instead of being skipped silently. Skipping turned
+  a broken package into an unrendered output file, which is far harder to
+  diagnose than a failed render.
+
 ## 0.2.1 (2026-08-09)
 
 ### Fixed

data/lib/liquid_xlsx/package.rb

@@ -161,33 +161,18 @@ module LiquidXlsx
     # @param r_id [String]
     # @return [String, nil]
     def worksheet_xml(r_id)
-      # Find relationship target in workbook.xml.rels
-      rels = parse_xml(@files["xl/_rels/workbook.xml.rels"])
-      rel = rels.at_xpath("//xmlns:Relationship[@Id='#{r_id}']")
-      return nil unless rel
-
-      target = rel["Target"]
-      path = "xl/#{target}"
-
-      # Handle paths like xl/worksheets/sheet1.xml vs xl/../xl/worksheets/sheet1.xml
-      # Normalize the path
-      normalized = Pathname.new(path).cleanpath.to_s
-      normalized = normalized.sub(%r{\A/?}, "")
-      @files[normalized]
+      path = worksheet_path_for_r_id(r_id)
+      path && @files[path]
     end
 
     # Save worksheet XML back.
     # @param r_id [String]
     # @param xml [String]
     def save_worksheet_xml(r_id, xml)
-      rels = parse_xml(@files["xl/_rels/workbook.xml.rels"])
-      rel = rels.at_xpath("//xmlns:Relationship[@Id='#{r_id}']")
-      return unless rel
+      path = worksheet_path_for_r_id(r_id)
+      return unless path
 
-      target = rel["Target"]
-      path = "xl/#{target}"
-      normalized = Pathname.new(path).cleanpath.to_s.sub(%r{\A/?}, "")
-      @files[normalized] = xml
+      @files[path] = xml
     end
 
     # Get calc chain XML.
@@ -442,8 +427,7 @@ module LiquidXlsx
       rel = rels.at_xpath("//xmlns:Relationship[@Id='#{r_id}']")
       return nil unless rel
 
-      target = rel["Target"]
-      Pathname.new("xl/#{target}").cleanpath.to_s.sub(%r{\A/?}, "")
+      resolve_target("xl", rel["Target"])
     end
 
     # Get all sheet names from workbook.xml.
@@ -454,6 +438,26 @@ module LiquidXlsx
 
     private
 
+    # Turn a relationship Target into a package path.
+    #
+    # OPC allows a Target to be either relative to the folder of the part that
+    # declares it ("worksheets/sheet1.xml", "../drawings/drawing1.xml") or
+    # absolute from the package root ("/xl/worksheets/sheet1.xml"). Excel writes
+    # the relative form, but 1C and some other generators write the absolute one.
+    # Joining an absolute target to the base gave "xl/xl/worksheets/sheet1.xml":
+    # the lookup returned nil, `Workbook#render_existing_sheets` skipped the
+    # sheet, and the template came back copied instead of rendered.
+    #
+    # @param base_dir [String] folder of the declaring part, e.g. "xl"
+    # @param target [String, nil] the Target attribute value
+    # @return [String, nil] normalized package path
+    def resolve_target(base_dir, target)
+      return nil if target.nil? || target.empty?
+
+      path = target.start_with?("/") ? target : "#{base_dir}/#{target}"
+      Pathname.new(path).cleanpath.to_s.sub(%r{\A/+}, "")
+    end
+
     # The size is declared in bytes: String#size counts characters, so on UTF-8
     # content it would disagree with what actually gets written.
     # See ZIP_SIZE_KEYWORD — rubyzip 2.x has no such keyword and needs none.
@@ -534,8 +538,7 @@ module LiquidXlsx
     # Merge freshly built drawing anchors and their relationships into the
     # drawing part already attached to the worksheet, remapping rIds.
     def merge_into_existing_drawing(ws_drawing_rel, new_drawing_xml, new_rels_xml)
-      target = ws_drawing_rel["Target"]
-      drawing_path = Pathname.new("xl/worksheets/#{target}").cleanpath.to_s.sub(%r{\A/?}, "")
+      drawing_path = resolve_target("xl/worksheets", ws_drawing_rel["Target"])
       drawing_rels_path = "#{drawing_path.sub('xl/drawings/', 'xl/drawings/_rels/')}.rels"
 
       existing_doc = parse_xml(@files[drawing_path])

data/lib/liquid_xlsx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LiquidXlsx
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/liquid_xlsx/workbook.rb

@@ -47,10 +47,25 @@ module LiquidXlsx
 
     private
 
+    # Worksheet part behind a <sheet> entry of workbook.xml.
+    #
+    # A workbook that lists a sheet whose part cannot be resolved is broken, and
+    # skipping it silently used to hand the caller an untouched copy of the
+    # template: no error anywhere, just `{{ tags }}` left in the "rendered"
+    # file. Fail loudly instead — the usual cause is a rels Target the package
+    # layer could not resolve.
+    def worksheet_xml!(sheet_info)
+      xml = package.worksheet_xml(sheet_info[:r_id])
+      return xml if xml
+
+      raise InvalidXlsxError,
+            "Worksheet part for sheet '#{sheet_info[:name]}' (#{sheet_info[:r_id]}) " \
+            "is missing from the package"
+    end
+
     def render_existing_sheets(data, all_image_ops = [])
       package.sheets.each do |sheet_info|
-        xml = package.worksheet_xml(sheet_info[:r_id])
-        next unless xml
+        xml = worksheet_xml!(sheet_info)
 
         image_ops = []
 
@@ -68,8 +83,7 @@ module LiquidXlsx
       # Phase 0: Save original sheet XMLs before rendering mutates them
       original_xmls = {}
       package.sheets.each do |sheet_info|
-        xml = package.worksheet_xml(sheet_info[:r_id])
-        original_xmls[sheet_info[:name]] = xml if xml
+        original_xmls[sheet_info[:name]] = worksheet_xml!(sheet_info)
       end
 
       # Phase 0.5: Identify control and template sheets
@@ -86,7 +100,6 @@ module LiquidXlsx
         next if template_names_from_tags.include?(sheet_info[:name])
 
         xml = original_xmls[sheet_info[:name]]
-        next unless xml
 
         image_ops = []
         worksheet = Worksheet.new(xml, sheet_info[:name], @shared_strings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquid_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ivan Khlipitkin