write_xlsx 1.11.2 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dae4b31e210af6cea2f7df87d92e29d48e8b36d7408cfc0c542b4aa0fe4ea22
-  data.tar.gz: 3c1be9afcd157d1c7a4aabf6f0688b049a80699133e6a3d31d17874bce453b5a
+  metadata.gz: b8f704b9674f7d6de467d512cea780114dccc51ed88d99ad4d57727fdafd32b4
+  data.tar.gz: 54df4aec8346b1935bb3b0ba283c11b04f415b3b644308ab8f4cce2f0595d14d
 SHA512:
-  metadata.gz: 7975e43767efe81a4d32819a62ce805d88c51c879e7456f9ea653be43521501bf79612d61ea95ab065efcf5bf7c43fa7f4c2e657a0ab09e211310200237faceb
-  data.tar.gz: 03f711b7f01ba88e9e84676ce442737bf8c7cd14db67cd04bdd50aa30eddaad850133d476e11b7a0c0ed25f485740810d6724e0449f7343cc10345bc67ba9c5c
+  metadata.gz: ecbd4957e8b5ee4d9c77e46da68ddfa0f877dd94166551a20c1b76a782209db761a43a86bae340657181ec8993bdc277ee67b66c4c889bc5ad418e6fe2b953c5
+  data.tar.gz: c2a9f0b209de183bbb87ddceb0897dca8708b372d7bb8a5fb7953595440fdaceac60fe4500dafe2ed74585208c6f17b03c554e20c4b5d05af2ec019854b0a259

data/.rubocop.yml

@@ -82,6 +82,9 @@ Naming/HeredocDelimiterNaming:
 Naming/MethodName:
   Enabled: false
 
+Naming/MethodParameterName:
+  Enabled: false
+
 Naming/VariableNumber:
   Enabled: false
 

data/README.md

@@ -85,7 +85,7 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
 Original Perl module was written by John McNamara(jmcnamara@cpan.org).
 
 Converted to ruby by Hideo NAKAMURA(nakamrua.hideo@gmail.com)
-Copyright (c) 2012-2023 Hideo NAKAMURA.
+Copyright (c) 2012-2024 Hideo NAKAMURA.
 
 See LICENSE.txt for further details.
 

data/lib/write_xlsx/format.rb

@@ -146,10 +146,10 @@ module Writexlsx
         return
       end
 
-      # Indent is only allowed for horizontal left, right and distributed. If it
-      # is defined for any other alignment or no alignment has been set then
-      # default to left alignment.
-      @text_h_align = 1 if @indent != 0 && ![1, 3, 7].include?(@text_h_align)
+      # Indent is only allowed for some alignment properties. If it is defined
+      # for any other alignment or no alignment has been set then default to
+      # left alignment.
+      @text_h_align = 1 if @indent != 0 && ![1, 3, 7].include?(@text_h_align) && ![1, 3, 5].include?(@text_v_align)
 
       # Check for properties that are mutually exclusive.
       @shrink       = 0 if @text_wrap != 0
@@ -178,8 +178,8 @@ module Writexlsx
       align << %w[vertical justify]     if @text_v_align == 4
       align << %w[vertical distributed] if @text_v_align == 5
 
-      align << ['indent',       @indent]   if @indent   != 0
       align << ['textRotation', @rotation] if @rotation != 0
+      align << ['indent',       @indent]   if @indent   != 0
 
       align << ['wrapText',     1] if @text_wrap != 0
       align << ['shrinkToFit',  1] if @shrink    != 0

data/lib/write_xlsx/package/content_types.rb

@@ -199,6 +199,28 @@ module Writexlsx
         )
       end
 
+      def add_richvalue
+        add_override(
+          '/xl/richData/rdRichValueTypes.xml',
+          'application/vnd.ms-excel.rdrichvaluetypes+xml'
+        )
+
+        add_override(
+          '/xl/richData/rdrichvalue.xml',
+          'application/vnd.ms-excel.rdrichvalue+xml'
+        )
+
+        add_override(
+          '/xl/richData/rdrichvaluestructure.xml',
+          'application/vnd.ms-excel.rdrichvaluestructure+xml'
+        )
+
+        add_override(
+          '/xl/richData/richValueRel.xml',
+          'application/vnd.ms-excel.richvaluerel+xml'
+        )
+      end
+
       private
 
       def change_the_workbook_xml_content_type_from_xlsx_to_xlsm

data/lib/write_xlsx/package/metadata.rb

@@ -12,9 +12,15 @@ module Writexlsx
     class Metadata
       include Writexlsx::Utility
 
+      attr_writer :has_dynamic_functions
+      attr_writer :num_embedded_images
+
       def initialize(workbook)
         @writer = Package::XMLWriterSimple.new
-        @workbook      = workbook
+        @workbook = workbook
+        @has_dynamic_functions = false
+        @has_embedded_images   = false
+        @num_embedded_images   = 0
       end
 
       def set_xml_writer(filename)
@@ -22,15 +28,23 @@ module Writexlsx
       end
 
       def assemble_xml_file
+        @has_embedded_images = true if @num_embedded_images > 0
+
         write_xml_declaration do
           # Write the metadata element.
           write_metadata
+
           # Write the metadataTypes element.
           write_metadata_types
+
           # Write the futureMetadata element.
-          write_future_metadata
+          write_cell_future_metadata  if @has_dynamic_functions
+          write_value_future_metadata if @has_embedded_images
+
           # Write the cellMetadata element.
-          write_cell_metadata
+          write_cell_metadata  if @has_dynamic_functions
+          write_value_metadata if @has_embedded_images
+
           @writer.end_tag('metadata')
         end
       end
@@ -42,14 +56,23 @@ module Writexlsx
       #
       def write_metadata
         xmlns = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'
-        xmlns_xda =
-          'http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray'
-
         attributes = [
-          ['xmlns',     xmlns],
-          ['xmlns:xda', xmlns_xda]
+          ['xmlns',     xmlns]
         ]
 
+        if @has_embedded_images
+          attributes << [
+            'xmlns:xlrd',
+            'http://schemas.microsoft.com/office/spreadsheetml/2017/richdata'
+          ]
+        end
+        if @has_dynamic_functions
+          attributes << [
+            'xmlns:xda',
+            'http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray'
+          ]
+        end
+
         @writer.start_tag('metadata', attributes)
       end
 
@@ -57,18 +80,23 @@ module Writexlsx
       # Write the <metadataTypes> element.
       #
       def write_metadata_types
-        attributes = [['count', 1]]
+        count =
+          (@has_dynamic_functions ? 1 : 0) +
+          (@has_embedded_images   ? 1 : 0)
+
+        attributes = [['count', count]]
 
         @writer.tag_elements('metadataTypes', attributes) do
           # Write the metadataType element.
-          write_metadata_type
+          write_cell_metadata_type  if @has_dynamic_functions
+          write_value_metadata_type if @has_embedded_images
         end
       end
 
       #
       # Write the <metadataType> element.
       #
-      def write_metadata_type
+      def write_cell_metadata_type
         attributes = [
           %w[name XLDAPR],
           ['minSupportedVersion', 120000],
@@ -88,10 +116,32 @@ module Writexlsx
         @writer.empty_tag('metadataType', attributes)
       end
 
+      #
+      # Write the <metadataType> element.
+      #
+      def write_value_metadata_type
+        attributes = [
+          %w[name XLRICHVALUE],
+          ['minSupportedVersion', 120000],
+          ['copy',                1],
+          ['pasteAll',            1],
+          ['pasteValues',         1],
+          ['merge',               1],
+          ['splitFirst',          1],
+          ['rowColShift',         1],
+          ['clearFormats',        1],
+          ['clearComments',       1],
+          ['assign',              1],
+          ['coerce',              1]
+        ]
+
+        @writer.empty_tag('metadataType', attributes)
+      end
+
       #
       # Write the <futureMetadata> element.
       #
-      def write_future_metadata
+      def write_cell_future_metadata
         attributes = [
           %w[name XLDAPR],
           ['count', 1]
@@ -101,7 +151,34 @@ module Writexlsx
           @writer.tag_elements('bk') do
             @writer.tag_elements('extLst') do
               # Write the ext element.
-              write_ext
+              write_cell_ext
+
+              @writer.end_tag('ext')
+            end
+          end
+        end
+      end
+
+      #
+      # Write the <futureMetadata> element.
+      #
+      def write_value_future_metadata
+        num_images = @num_embedded_images
+
+        attributes = [
+          %w[name XLRICHVALUE],
+          ['count', num_images]
+        ]
+
+        @writer.tag_elements('futureMetadata', attributes) do
+          (0..(num_images - 1)).each do |i|
+            @writer.tag_elements('bk') do
+              @writer.tag_elements('extLst') do
+                # Write the ext element.
+                write_value_ext(i)
+
+                @writer.end_tag('ext')
+              end
             end
           end
         end
@@ -110,12 +187,23 @@ module Writexlsx
       #
       # Write the <ext> element.
       #
-      def write_ext
+      def write_cell_ext
         attributes = [['uri', '{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}']]
-        @writer.tag_elements('ext', attributes) do
-          # Write the xda:dynamicArrayProperties element.
-          write_xda_dynamic_array_properties
-        end
+        @writer.start_tag('ext', attributes)
+
+        # Write the xda:dynamicArrayProperties element.
+        write_xda_dynamic_array_properties
+      end
+
+      #
+      # Write the <ext> element.
+      #
+      def write_value_ext(num)
+        attributes = [['uri', '{3e2802c4-a4d2-4d8b-9148-e3be6c30e623}']]
+        @writer.start_tag('ext', attributes)
+
+        # Write the <xlrd:rvb> element.
+        write_xlrd_rvb(num)
       end
 
       #
@@ -141,7 +229,27 @@ module Writexlsx
         @writer.tag_elements('cellMetadata', attributes) do
           @writer.tag_elements('bk') do
             # Write the rc element.
-            write_rc
+            write_rc(1, 0)
+          end
+        end
+      end
+
+      #
+      # Write the <valueMetadata> element.
+      #
+      def write_value_metadata
+        count = @num_embedded_images
+        type  = 1
+        type  = 2 if @has_dynamic_functions
+
+        attributes = [['count', count]]
+
+        @writer.tag_elements('valueMetadata', attributes) do
+          (0..(count - 1)).each do |i|
+            @writer.tag_elements('bk') do
+              # Write the rc element.
+              write_rc(type, i)
+            end
           end
         end
       end
@@ -149,13 +257,22 @@ module Writexlsx
       #
       # Write the <rc> element.
       #
-      def write_rc
+      def write_rc(type, value)
         attributes = [
-          ['t', 1],
-          ['v', 0]
+          ['t', type],
+          ['v', value]
         ]
         @writer.empty_tag('rc', attributes)
       end
+
+      #
+      # Write the <xlrd:rvb> element.
+      #
+      def write_xlrd_rvb(value)
+        attributes = [['i', value]]
+
+        @writer.empty_tag('xlrd:rvb', attributes)
+      end
     end
   end
 end

data/lib/write_xlsx/package/packager.rb

@@ -10,6 +10,10 @@ require 'write_xlsx/package/core'
 require 'write_xlsx/package/custom'
 require 'write_xlsx/package/metadata'
 require 'write_xlsx/package/relationships'
+require 'write_xlsx/package/rich_value'
+require 'write_xlsx/package/rich_value_rel'
+require 'write_xlsx/package/rich_value_structure'
+require 'write_xlsx/package/rich_value_types'
 require 'write_xlsx/package/shared_strings'
 require 'write_xlsx/package/styles'
 require 'write_xlsx/package/table'
@@ -56,9 +60,11 @@ module Writexlsx
         write_worksheet_rels_files
         write_chartsheet_rels_files
         write_drawing_rels_files
+        write_rich_value_rels_files
         add_image_files
         add_vba_project
         write_metadata_file
+        write_rich_value_files
       end
 
       private
@@ -184,12 +190,81 @@ module Writexlsx
 
         return unless @workbook.has_metadata?
 
+        metadata.has_dynamic_functions = @workbook.has_dynamic_functions?
+        metadata.num_embedded_images   = @workbook.embedded_images.size
+
         FileUtils.mkdir_p("#{@package_dir}/xl")
 
         metadata.set_xml_writer("#{@package_dir}/xl/metadata.xml")
         metadata.assemble_xml_file
       end
 
+      #
+      # Write the rdrichvalue(*).xml file.
+      #
+      def write_rich_value_files
+        dir = @package_dir
+
+        return unless @workbook.has_embedded_images?
+
+        FileUtils.mkdir_p("#{dir}/xl/richData")
+
+        write_rich_value_file
+        write_rich_value_structure_file
+        write_rich_value_types_file
+        write_rich_value_rel
+      end
+
+      #
+      # Write the rdrichvalue.xml file.
+      #
+      def write_rich_value_file
+        dir        = @package_dir
+        rich_value = Package::RichValue.new
+
+        rich_value.embedded_images = @workbook.embedded_images
+
+        rich_value.set_xml_writer("#{dir}/xl/richData/rdrichvalue.xml")
+        rich_value.assemble_xml_file
+      end
+
+      #
+      # Write the rdrichvaluestructure.xml file.
+      #
+      def write_rich_value_structure_file
+        dir        = @package_dir
+        rich_value = Package::RichValueStructure.new
+
+        rich_value.has_embedded_descriptions = @workbook.has_embedded_descriptions?
+
+        rich_value.set_xml_writer("#{dir}/xl/richData/rdrichvaluestructure.xml")
+        rich_value.assemble_xml_file
+      end
+
+      #
+      # Write the rdRichValueTypes.xml file.
+      #
+      def write_rich_value_types_file
+        rich_value = Package::RichValueTypes.new
+        dir        = @package_dir
+
+        rich_value.set_xml_writer("#{dir}/xl/richData/rdRichValueTypes.xml")
+        rich_value.assemble_xml_file
+      end
+
+      #
+      # Write the rdrichvalue.xml file.
+      #
+      def write_rich_value_rel
+        dir        = @package_dir
+        rich_value = Package::RichValueRel.new
+
+        rich_value.value_count = @workbook.embedded_images.size
+
+        rich_value.set_xml_writer("#{dir}/xl/richData/richValueRel.xml")
+        rich_value.assemble_xml_file
+      end
+
       #
       # Write the custom.xml file.
       #
@@ -226,8 +301,10 @@ module Writexlsx
         content.add_vba_project if @workbook.vba_project
         # Add the custom properties if present.
         content.add_custom_properties unless @workbook.custom_properties.empty?
-        # Add the metadata file if present.
+        # Add the RichValue file if present.
         content.add_metadata if @workbook.has_metadata?
+        # Add the metadata file if present.
+        content.add_richvalue if @workbook.has_embedded_images?
 
         content.set_xml_writer("#{@package_dir}/[Content_Types].xml")
         content.assemble_xml_file
@@ -340,6 +417,11 @@ module Writexlsx
           )
         end
 
+        # Add the RichValue files if present.
+        if @workbook.has_embedded_images?
+          rels.add_rich_value_relationships
+        end
+
         rels.set_xml_writer("#{@package_dir}/xl/_rels/workbook.xml.rels")
         rels.assemble_xml_file
       end
@@ -367,15 +449,50 @@ module Writexlsx
         @workbook.worksheets.write_drawing_rels_files(@package_dir)
       end
 
+      #
+      # Write the richValueRel.xml.rels files for worksheets that contain embedded
+      # images.
+      #
+      def write_rich_value_rels_files
+        return if @workbook.embedded_images.empty?
+
+        dir  = @package_dir
+
+        # Create the .rels dirs.
+        FileUtils.mkdir_p("#{dir}/xl/richData/_rels")
+
+        rels = Package::Relationships.new
+
+        @workbook.embedded_images.each_with_index do |image_data, index|
+          file_type  = image_data[1]
+          image_file = "../media/image#{index + 1}.#{file_type}"
+
+          rels.add_worksheet_relationship('/image', image_file)
+        end
+
+        # Create the .rels file.
+        rels.set_xml_writer("#{dir}/xl/richData/_rels/richValueRel.xml.rels")
+        rels.assemble_xml_file
+      end
+
       #
       # Write the /xl/media/image?.xml files.
       #
       def add_image_files
+        index = 1
+
         dir = "#{@package_dir}/xl/media"
 
-        @workbook.images.each_with_index do |image, index|
+        @workbook.embedded_images.each do |image|
+          FileUtils.mkdir_p(dir)
+          FileUtils.cp(image[0], "#{dir}/image#{index}.#{image[1]}")
+          index += 1
+        end
+
+        @workbook.images.each do |image|
           FileUtils.mkdir_p(dir)
-          FileUtils.cp(image[0], "#{dir}/image#{index + 1}.#{image[1]}")
+          FileUtils.cp(image[0], "#{dir}/image#{index}.#{image[1]}")
+          index += 1
         end
       end
 

data/lib/write_xlsx/package/relationships.rb

@@ -58,6 +58,31 @@ module Writexlsx
         @rels.push([Document_schema + type, target, target_mode])
       end
 
+      #
+      # Add relationships for RichValue files.
+      #
+      def add_rich_value_relationships
+        @rels << [
+          'http://schemas.microsoft.com/office/2022/10/relationships/richValueRel',
+          'richData/richValueRel.xml'
+        ]
+
+        @rels << [
+          'http://schemas.microsoft.com/office/2017/06/relationships/rdRichValue',
+          'richData/rdrichvalue.xml'
+        ]
+
+        @rels << [
+          'http://schemas.microsoft.com/office/2017/06/relationships/rdRichValueStructure',
+          'richData/rdrichvaluestructure.xml'
+        ]
+
+        @rels << [
+          'http://schemas.microsoft.com/office/2017/06/relationships/rdRichValueTypes',
+          'richData/rdRichValueTypes.xml'
+        ]
+      end
+
       private
 
       #

data/lib/write_xlsx/package/rich_value.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+require 'write_xlsx/package/xml_writer_simple'
+require 'write_xlsx/utility'
+
+module Writexlsx
+  module Package
+    class RichValue
+      include Writexlsx::Utility
+
+      attr_accessor :embedded_images
+
+      def initialize
+        @writer          = Package::XMLWriterSimple.new
+        @embedded_images = []
+      end
+
+      def set_xml_writer(filename)
+        @writer.set_xml_writer(filename)
+      end
+
+      def assemble_xml_file
+        write_xml_declaration do
+          write_rv_data
+        end
+      end
+
+      private
+
+      def write_rv_data
+        xmlns = 'http://schemas.microsoft.com/office/spreadsheetml/2017/richdata'
+
+        attributes = [
+          ['xmlns', xmlns],
+          ['count', @embedded_images.size]
+        ]
+
+        @writer.tag_elements('rvData', attributes) do
+          @embedded_images.each_with_index do |image, index|
+            write_rv(index, image[2], image[3])
+          end
+        end
+      end
+
+      #
+      # Write the <rv> element.
+      #
+      def write_rv(index, description, decorative)
+        value = 5
+        value = 6 if ptrue?(decorative)
+
+        attributes = [['s',  0]]
+
+        @writer.tag_elements('rv', attributes) do
+          write_v(index)
+          write_v(value)
+          write_v(description) if ptrue?(description)
+        end
+      end
+
+      #
+      # Write the <v> element.
+      #
+      def write_v(data)
+        @writer.data_element('v', data)
+      end
+    end
+  end
+end

data/lib/write_xlsx/package/rich_value_rel.rb

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+require 'write_xlsx/package/xml_writer_simple'
+require 'write_xlsx/utility'
+
+module Writexlsx
+  module Package
+    #
+    # RichValueRel - A class for writing the Excel XLSX richValueRel.xml file.
+    #
+    # Used in conjunction with Excel::Writer::XLSX
+    #
+    # Copyright 2000-2024, John McNamara, jmcnamara@cpan.org
+    #
+    # Convert to Ruby by Hideo Nakamura, nakamura.hideo@gmail.com
+    #
+    class RichValueRel
+      include Writexlsx::Utility
+
+      attr_writer :value_count
+
+      def initialize
+        @writer = Package::XMLWriterSimple.new
+        @value_count = 0
+      end
+
+      def set_xml_writer(filename)
+        @writer.set_xml_writer(filename)
+      end
+
+      def assemble_xml_file
+        write_xml_declaration do
+          write_rich_value_rels
+        end
+      end
+
+      private
+
+      #
+      # Write the <richValueRels> element.
+      #
+      def write_rich_value_rels
+        xmlns = 'http://schemas.microsoft.com/office/spreadsheetml/2022/richvaluerel'
+        xmlns_r = 'http://schemas.openxmlformats.org/officeDocument/2006/relationships'
+
+        attributes = [
+          ['xmlns',   xmlns],
+          ['xmlns:r', xmlns_r]
+        ]
+
+        @writer.tag_elements('richValueRels', attributes) do
+          (0..(@value_count - 1)).each do |index|
+            # Write the rel element.
+            write_rel(index + 1)
+          end
+        end
+      end
+
+      #
+      # Write the <rel> element.
+      #
+      def write_rel(id)
+        attributes = [['r:id',  "rId#{id}"]]
+
+        @writer.empty_tag('rel', attributes)
+      end
+    end
+  end
+end