uniword 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d06b448460972e577f4d1f22b11441d07949397a06fbe9002db6c4e71d091cc
-  data.tar.gz: ae04c58467dd36288a5fdf08662496c5d99d2b2da1a7c8fa648fbedd234d9ad2
+  metadata.gz: f2355e85fc7e7ec5d55ada1d7f832ef323334131cc5d4573df06ff5db1f08b1d
+  data.tar.gz: 3ce0b3e201390c160c09513e85baebf3c1603f70fec278b6b90e8990710212d1
 SHA512:
-  metadata.gz: 4d3146558aaf9df9228b7d54064b31aa5c050b3262542aae4075dbeddedea6c53b864c5bc41b065d26289f9c2196e8ee331ca24893b26bea0212f32b39c3fe34
-  data.tar.gz: fcfa682da31b88784fd3ccabd152f5271f307f6046e5572093bc04789777c1dac23008ad8794d664282128301671c33b411660d5b12cdd5562773481e2adcc48
+  metadata.gz: 0c168e086f836c6c1f0120e7d654082c7cc159509db621b584de0e04eb042d0b48f976c63485566bdee5d0c10e367ca568d80cd5f864bca5b0b88940711400a7
+  data.tar.gz: 00dedb5f4183d03688a6765d95a550ec117e26325f0e2dfe0262ff77a4ff3b7473d6c816548e18ba46d70ebacd93274feb84d00c81ae280992fc40a061796e5c

data/lib/uniword/builder/image_builder.rb

@@ -302,7 +302,7 @@ alt_text: nil)
 
           # Non-visual properties
           pic.nv_pic_pr = Picture::NonVisualPictureProperties.new
-          pic.nv_pic_pr.c_nv_pr = Drawingml::NonVisualDrawingProperties.new(
+          pic.nv_pic_pr.c_nv_pr = Picture::NonVisualDrawingProperties.new(
             id: deterministic_id("pic", r_id),
             name: "Picture",
           )

data/lib/uniword/docx/package_defaults.rb

@@ -112,7 +112,7 @@ module Uniword
           rels = Ooxml::Relationships::PackageRelationships.new
           rels.relationships = part_keys.each_with_index.map do |key, idx|
             defn = Ooxml::PartRegistry.find_by_key(key)
-            Ooxml::Relationships::Relationship.new(
+            Ooxml::Relationships::PackageRelationship.new(
               id: "rId#{idx + 1}",
               type: defn.rel_type,
               target: defn.target,

data/lib/uniword/docx/package_serialization.rb

@@ -260,7 +260,7 @@ document_rels)
 
         # The reconciler runs before injection; register the rId with
         # the allocator (single authority) and append the rel here.
-        package_rels.relationships << Ooxml::Relationships::Relationship.new(
+        package_rels.relationships << Ooxml::Relationships::PackageRelationship.new(
           id: allocator.alloc_rid(target: definition.target,
                                   type: definition.rel_type,
                                   scope: :package),

data/lib/uniword/docx/reconciler/helpers.rb

@@ -236,7 +236,7 @@ module Uniword
         def build_rel(id, type, target, target_mode: nil)
           attrs = { id: id, type: type, target: target }
           attrs[:target_mode] = target_mode if target_mode
-          Ooxml::Relationships::Relationship.new(**attrs)
+          Ooxml::Relationships::PackageRelationship.new(**attrs)
         end
 
         def run_properties_match?(a, b)

data/lib/uniword/docx/reconciler/referential_integrity.rb

@@ -317,7 +317,7 @@ module Uniword
           new_rid = allocator.alloc_rid(target: url, type: rel_type,
                                         target_mode: "External")
           unless valid_rids.include?(new_rid)
-            rels.relationships << Ooxml::Relationships::Relationship.new(
+            rels.relationships << Ooxml::Relationships::PackageRelationship.new(
               id: new_rid,
               type: rel_type,
               target: url,

data/lib/uniword/find_replace/scope.rb

@@ -38,9 +38,8 @@ module Uniword
       protected
 
       # Yield every Text element inside a run. A run carries its
-      # `<w:t>` Text element on the `text` accessor (lutaml-model
-      # returns the instance directly even when the attribute is
-      # declared as a collection).
+      # `<w:t>` Text elements on the `text` accessor (declared as a
+      # collection; lutaml-model 0.8.32+ returns an Array).
       #
       # @param run [Wordprocessingml::Run, nil]
       # @yieldparam text_element [Wordprocessingml::Text]
@@ -49,14 +48,13 @@ module Uniword
       def each_text_in_run(run)
         return unless run
 
-        text_element = run.text
-        return unless text_element
-
-        accessor = TextAccessor.new(
-          -> { text_element.content },
-          ->(value) { text_element.content = value },
-        )
-        yield text_element, accessor
+        run.text&.each do |text_element|
+          accessor = TextAccessor.new(
+            -> { text_element.content },
+            ->(value) { text_element.content = value },
+          )
+          yield text_element, accessor
+        end
       end
 
       # Walk every paragraph in `containers` and yield each run's

data/lib/uniword/ooxml/package_file.rb

@@ -86,7 +86,7 @@ module Uniword
         # Ensure output directory exists
         FileUtils.mkdir_p(File.dirname(output_path))
 
-        Zip::File.open(output_path, Zip::File::CREATE) do |zipfile|
+        Zip::File.open(output_path, create: true) do |zipfile|
           Dir.glob(File.join(@extracted_dir, "**", "*")).each do |file_path|
             next if File.directory?(file_path)
 

data/lib/uniword/picture/fill_rect.rb

@@ -7,7 +7,7 @@ module Uniword
     # Fill rectangle insets
     #
     # Generated from OOXML schema: picture.yml
-    # Element: <pic:fillRect>
+    # Element: <a:fillRect> (child of a:stretch in CT_BlipFillProperties)
     class FillRect < Lutaml::Model::Serializable
       attribute :l, :integer
       attribute :t, :integer
@@ -16,7 +16,7 @@ module Uniword
 
       xml do
         element "fillRect"
-        namespace Uniword::Ooxml::Namespaces::Picture
+        namespace Uniword::Ooxml::Namespaces::DrawingML
 
         map_attribute "l", to: :l
         map_attribute "t", to: :t

data/lib/uniword/picture/picture_source_rect.rb

@@ -7,7 +7,8 @@ module Uniword
     # Source rectangle for picture cropping
     #
     # Generated from OOXML schema: picture.yml
-    # Element: <pic:srcRect>
+    # Element: <a:srcRect> (CT_BlipFillProperties reuses DrawingML
+    # children inside pic:blipFill)
     class PictureSourceRect < Lutaml::Model::Serializable
       attribute :l, :integer
       attribute :t, :integer
@@ -16,7 +17,7 @@ module Uniword
 
       xml do
         element "srcRect"
-        namespace Uniword::Ooxml::Namespaces::Picture
+        namespace Uniword::Ooxml::Namespaces::DrawingML
 
         map_attribute "l", to: :l
         map_attribute "t", to: :t

data/lib/uniword/picture/picture_stretch.rb

@@ -7,13 +7,14 @@ module Uniword
     # Stretch fill properties
     #
     # Generated from OOXML schema: picture.yml
-    # Element: <pic:stretch>
+    # Element: <a:stretch> (CT_BlipFillProperties reuses DrawingML
+    # children inside pic:blipFill)
     class PictureStretch < Lutaml::Model::Serializable
       attribute :fill_rect, FillRect
 
       xml do
         element "stretch"
-        namespace Uniword::Ooxml::Namespaces::Picture
+        namespace Uniword::Ooxml::Namespaces::DrawingML
         mixed_content
 
         map_element "fillRect", to: :fill_rect, render_nil: false

data/lib/uniword/picture/tile.rb

@@ -7,7 +7,8 @@ module Uniword
     # Tile properties for picture fill
     #
     # Generated from OOXML schema: picture.yml
-    # Element: <pic:tile>
+    # Element: <a:tile> (CT_BlipFillProperties reuses DrawingML
+    # children inside pic:blipFill)
     class Tile < Lutaml::Model::Serializable
       attribute :tx, :integer
       attribute :ty, :integer
@@ -17,7 +18,7 @@ module Uniword
 
       xml do
         element "tile"
-        namespace Uniword::Ooxml::Namespaces::Picture
+        namespace Uniword::Ooxml::Namespaces::DrawingML
 
         map_attribute "tx", to: :tx
         map_attribute "ty", to: :ty

data/lib/uniword/properties/word2010_id_value.rb

@@ -4,13 +4,13 @@ require "lutaml/model"
 
 module Uniword
   module Properties
-    # Namespaced custom type for Word 2010 (wp14) attributes
+    # Namespaced custom type for Word 2010 Drawing (wp14) attributes
     # Used for wp14:anchorId and wp14:editId attributes
     class Word2010IdValue < Lutaml::Model::Type::String
       include Lutaml::Xml::Type::Configurable
 
       xml do
-        namespace Uniword::Ooxml::Namespaces::Word2010
+        namespace Uniword::Ooxml::Namespaces::Word2010Drawing
       end
     end
   end

data/lib/uniword/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uniword
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

data/lib/uniword/wordprocessingml/body.rb

@@ -32,15 +32,54 @@ module Uniword
         map_element "bookmarkEnd", to: :bookmark_ends, render_nil: false
       end
 
-      # Get all elements in body
+      # Get all elements in body, in document order.
       #
-      # @return [Array<Paragraph, Table, SectionProperties, StructuredDocumentTag>] All block-level content
+      # Walks `element_order` (populated by lutaml-model when mixed_content
+      # is parsed) and dispatches each tag to its typed collection —
+      # `p` -> paragraphs, `tbl` -> tables, `sdt` -> structured_document_tags,
+      # `bookmarkStart` -> bookmark_starts, `bookmarkEnd` -> bookmark_ends,
+      # `sectPr` -> section_properties. Whitespace/comment entries are
+      # skipped. Elements not represented in `element_order` are appended
+      # at the end in collection order (the only order available when
+      # `element_order` is empty or nil).
+      #
+      # @return [Array] Block-level content in document order
       def elements
+        return concatenate_typed_collections if element_order.nil? || element_order.empty?
+
         result = []
-        result.concat(paragraphs || [])
-        result.concat(structured_document_tags || [])
-        result.concat(tables || [])
-        result << section_properties if section_properties
+        counters = Hash.new(0)
+        sectpr_seen = false
+        collections = {
+          "p" => paragraphs,
+          "tbl" => tables,
+          "sdt" => structured_document_tags,
+          "bookmarkStart" => bookmark_starts,
+          "bookmarkEnd" => bookmark_ends,
+        }
+
+        element_order.each do |entry|
+          name = entry.name
+          if collections.key?(name)
+            collection = collections[name]
+            index = counters[name]
+            if collection && index < collection.size
+              result << collection[index]
+              counters[name] = index + 1
+            end
+          elsif name == "sectPr"
+            sectpr_seen = true
+            result << section_properties if section_properties
+          end
+        end
+
+        collections.each do |name, collection|
+          next unless collection && counters[name] < collection.size
+
+          result.concat(collection[counters[name]..])
+        end
+
+        result << section_properties if section_properties && !sectpr_seen
         result
       end
 
@@ -80,6 +119,15 @@ module Uniword
 
       private
 
+      def concatenate_typed_collections
+        result = []
+        result.concat(paragraphs || [])
+        result.concat(structured_document_tags || [])
+        result.concat(tables || [])
+        result << section_properties if section_properties
+        result
+      end
+
       def sync_element_order
         return if element_order.nil? || element_order.empty?
 

data/lib/uniword/wordprocessingml/styles_configuration.rb

@@ -157,7 +157,7 @@ module Uniword
       #
       # @return [Array<Style>] Custom styles
       def custom_styles
-        styles.select(&:custom)
+        styles.select(&:custom?)
       end
 
       # Get the number of styles

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniword
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-08-01 00:00:00.000000000 Z
+date: 2026-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement