xlsxrb 0.1.16 → 0.1.17

data/lib/xlsxrb/ooxml/reader.rb

@@ -323,6 +323,18 @@ module Xlsxrb
         parse_worksheet_properties(worksheet_xml)
       end
 
+      # Returns outline and grouping properties (<outlinePr>) for the given sheet.
+      def outline_properties(sheet: nil)
+        props = sheet_properties(sheet: sheet)
+        props[:outline_properties] || {
+          apply_styles: props[:apply_styles],
+          summary_below: props[:summary_below],
+          summary_right: props[:summary_right],
+          show_outline_symbols: props[:show_outline_symbols]
+        }.compact
+      end
+      alias outline_pr outline_properties
+
       # Returns phonetic properties for the given sheet, or nil if not present.
       def phonetic_properties(sheet: nil)
         worksheet_xml = load_worksheet_xml(sheet)
@@ -709,6 +721,7 @@ module Xlsxrb
           cp.listen(cl)
           cp.parse
           chart[:chart_type] = cl.chart_type
+          chart[:type] = cl.chart_type
           chart[:title] = cl.title
           chart[:title_overlay] = cl.title_overlay unless cl.title_overlay.nil?
           chart[:title_font] = cl.title_font if cl.title_font
@@ -855,6 +868,30 @@ module Xlsxrb
           chart[:protection] = cl.protection if cl.protection
           chart[:print_settings] = cl.print_settings if cl.print_settings
           chart[:chart_font] = cl.chart_font if cl.chart_font
+          chart[:sec_val_axis_title] = cl.sec_val_axis_title if cl.sec_val_axis_title
+          chart[:sec_val_axis_major_gridlines] = cl.sec_val_axis_major_gridlines if cl.sec_val_axis_major_gridlines
+          chart[:sec_val_axis_minor_gridlines] = cl.sec_val_axis_minor_gridlines if cl.sec_val_axis_minor_gridlines
+          chart[:sec_val_axis_num_fmt] = cl.sec_val_axis_num_fmt if cl.sec_val_axis_num_fmt
+          chart[:sec_val_axis_pos] = cl.sec_val_axis_pos if cl.sec_val_axis_pos
+          chart[:sec_val_axis_scaling_max] = cl.sec_val_axis_scaling_max if cl.sec_val_axis_scaling_max
+          chart[:sec_val_axis_scaling_min] = cl.sec_val_axis_scaling_min if cl.sec_val_axis_scaling_min
+          chart[:sec_val_axis_major_unit] = cl.sec_val_axis_major_unit if cl.sec_val_axis_major_unit
+          chart[:sec_val_axis_minor_unit] = cl.sec_val_axis_minor_unit if cl.sec_val_axis_minor_unit
+          next unless cl.sec_val_axis_title || cl.sec_val_axis_major_gridlines || cl.sec_val_axis_scaling_max ||
+                      cl.sec_val_axis_scaling_min || cl.sec_val_axis_num_fmt || cl.sec_val_axis_pos
+
+          sva = {
+            title: cl.sec_val_axis_title,
+            major_gridlines: cl.sec_val_axis_major_gridlines,
+            minor_gridlines: cl.sec_val_axis_minor_gridlines,
+            num_fmt: cl.sec_val_axis_num_fmt,
+            pos: cl.sec_val_axis_pos,
+            max: cl.sec_val_axis_scaling_max,
+            min: cl.sec_val_axis_scaling_min,
+            major_unit: cl.sec_val_axis_major_unit,
+            minor_unit: cl.sec_val_axis_minor_unit
+          }.compact
+          chart[:secondary_value_axis] = sva unless sva.empty?
         end
         listener.charts
       end
@@ -889,6 +926,57 @@ module Xlsxrb
         listener.comments
       end
 
+      # Returns all persons registered in xl/persons/person.xml.
+      # Each hash: { id:, display_name:, user_id:, provider_id: }
+      # : () -> Array[Hash[Symbol, untyped]]
+      def persons
+        @persons ||= begin
+          xml = extract_zip_entry("xl/persons/person.xml")
+          if xml.nil? || xml.empty?
+            wb_rels_xml = extract_zip_entry("xl/_rels/workbook.xml.rels")
+            if wb_rels_xml && !wb_rels_xml.empty?
+              rels = parse_rels_with_types(wb_rels_xml)
+              p_rel = rels.find { |r| r[:type]&.end_with?("person") }
+              xml = extract_zip_entry(normalize_xl_path(p_rel[:target], "xl")) if p_rel
+            end
+          end
+          if xml && !xml.empty?
+            parser = REXML::Parsers::SAX2Parser.new(xml)
+            listener = PersonListListener.new
+            parser.listen(listener)
+            parser.parse
+            listener.persons
+          else
+            []
+          end
+        end
+      end
+      alias person_list persons
+
+      # Returns threaded comments for the given sheet as an array of hashes.
+      # Each hash: { ref:, text:, author:, person_id:, id:, parent_id:, dt:, done: }
+      # : (?sheet: untyped?) -> Array[Hash[Symbol, untyped]]
+      def threaded_comments(sheet: nil)
+        sheet_index = resolve_sheet_index(sheet)
+        tc_path = find_sheet_rel_target(sheet_index, "threadedComment")
+        return [] unless tc_path
+
+        xml = extract_zip_entry(tc_path)
+        return [] if xml.nil? || xml.empty?
+
+        parser = REXML::Parsers::SAX2Parser.new(xml)
+        listener = ThreadedCommentsListener.new
+        parser.listen(listener)
+        parser.parse
+
+        persons_map = persons.to_h { |p| [p[:id], p[:display_name]] }
+        listener.threaded_comments.map do |tc|
+          tc_author = persons_map[tc[:person_id]]
+          tc[:author] = tc_author if tc_author
+          tc
+        end
+      end
+
       # Returns pivot tables for the given sheet as an array of hashes.
       # Each hash: { name:, ref:, cache_id:, fields:, row_fields:, col_fields:, data_fields:, cache: }
       def pivot_tables(sheet: nil)

data/lib/xlsxrb/ooxml/styles_parser.rb

@@ -80,6 +80,8 @@ module Xlsxrb
             @current_font[:extend] = truthy_val?(attrs) if @current_font
           when "u"
             @current_font[:underline] = attrs["val"] || "single" if @current_font
+          when "vertAlign"
+            @current_font[:vert_align] = attrs["val"] if @current_font && attrs["val"]
           when "sz"
             @current_font[:sz] = attrs["val"]&.to_f if @current_font
           when "color"
@@ -95,8 +97,8 @@ module Xlsxrb
           when "border"
             if parent_context?("borders") || (@current_dxf && parent_context?("dxf"))
               @current_border = {}
-              @current_border[:diagonal_up] = true if attrs["diagonalUp"] == "1"
-              @current_border[:diagonal_down] = true if attrs["diagonalDown"] == "1"
+              @current_border[:diagonal_up] = true if boolean_val(attrs["diagonalUp"])
+              @current_border[:diagonal_down] = true if boolean_val(attrs["diagonalDown"])
             end
           when "left", "right", "top", "bottom", "diagonal"
             handle_border_side(localname, attrs)
@@ -206,14 +208,20 @@ module Xlsxrb
             fill_id: attrs["fillId"]&.to_i,
             border_id: attrs["borderId"]&.to_i,
             xf_id: attrs["xfId"]&.to_i,
-            apply_number_format: attrs["applyNumberFormat"] == "1",
-            apply_font: attrs["applyFont"] == "1",
-            apply_fill: attrs["applyFill"] == "1",
-            apply_border: attrs["applyBorder"] == "1",
-            apply_alignment: attrs["applyAlignment"] == "1"
+            apply_number_format: boolean_val(attrs["applyNumberFormat"]),
+            apply_font: boolean_val(attrs["applyFont"]),
+            apply_fill: boolean_val(attrs["applyFill"]),
+            apply_border: boolean_val(attrs["applyBorder"]),
+            apply_alignment: boolean_val(attrs["applyAlignment"]),
+            apply_protection: boolean_val(attrs["applyProtection"])
           }
         end
 
+        #: (untyped val) -> bool
+        def boolean_val(val)
+          val == "1" || (val&.casecmp?("true") || false)
+        end
+
         def truthy_val?(attrs)
           val = attrs["val"]
           val.nil? || (val != "0" && val.downcase != "false")
@@ -226,10 +234,10 @@ module Xlsxrb
           alignment = {}
           alignment[:horizontal] = attrs["horizontal"] if attrs["horizontal"]
           alignment[:vertical] = attrs["vertical"] if attrs["vertical"]
-          alignment[:wrap_text] = true if attrs["wrapText"] == "1"
+          alignment[:wrap_text] = true if boolean_val(attrs["wrapText"])
           alignment[:text_rotation] = attrs["textRotation"]&.to_i if attrs["textRotation"]
           alignment[:indent] = attrs["indent"]&.to_i if attrs["indent"]
-          alignment[:shrink_to_fit] = true if attrs["shrinkToFit"] == "1"
+          alignment[:shrink_to_fit] = true if boolean_val(attrs["shrinkToFit"])
           target[:alignment] = alignment unless alignment.empty?
         end
 
@@ -238,8 +246,8 @@ module Xlsxrb
           return unless target
 
           protection = {}
-          protection[:locked] = attrs["locked"] == "1" unless attrs["locked"].nil?
-          protection[:hidden] = attrs["hidden"] == "1" unless attrs["hidden"].nil?
+          protection[:locked] = !%w[0 false].include?(attrs["locked"]&.downcase) unless attrs["locked"].nil?
+          protection[:hidden] = boolean_val(attrs["hidden"]) unless attrs["hidden"].nil?
           target[:protection] = protection unless protection.empty?
         end
 

data/lib/xlsxrb/ooxml/workbook_parser.rb

@@ -14,7 +14,7 @@ module Xlsxrb
       end
 
       def self.parse_with_properties(xml_string)
-        return { sheets: [], date1904: false, defined_names: [], active_tab: nil, full_calc_on_load: nil } if xml_string.nil? || xml_string.empty?
+        return { sheets: [], date1904: false, defined_names: [], active_tab: nil, full_calc_on_load: nil, first_sheet: nil, show_sheet_tabs: nil, tab_ratio: nil, code_name: nil } if xml_string.nil? || xml_string.empty?
 
         listener = Listener.new
         XmlParser.parse(xml_string, listener)
@@ -23,7 +23,11 @@ module Xlsxrb
           date1904: listener.date1904,
           defined_names: listener.defined_names,
           active_tab: listener.active_tab,
-          full_calc_on_load: listener.full_calc_on_load
+          full_calc_on_load: listener.full_calc_on_load,
+          first_sheet: listener.first_sheet,
+          show_sheet_tabs: listener.show_sheet_tabs,
+          tab_ratio: listener.tab_ratio,
+          code_name: listener.code_name
         }
       end
 
@@ -31,7 +35,7 @@ module Xlsxrb
       class Listener
         include REXML::SAX2Listener
 
-        attr_reader :sheets, :date1904, :defined_names, :active_tab, :full_calc_on_load
+        attr_reader :sheets, :date1904, :defined_names, :active_tab, :full_calc_on_load, :first_sheet, :show_sheet_tabs, :tab_ratio, :code_name
 
         def initialize
           @sheets = []
@@ -39,6 +43,10 @@ module Xlsxrb
           @defined_names = []
           @active_tab = nil
           @full_calc_on_load = nil
+          @first_sheet = nil
+          @show_sheet_tabs = nil
+          @tab_ratio = nil
+          @code_name = nil
           @in_defined_name = false
           @current_dn = nil
           @dn_text = +""
@@ -65,9 +73,16 @@ module Xlsxrb
           when "workbookPr"
             d1904 = attrs["date1904"]
             @date1904 = %w[1 true].include?(d1904) unless d1904.nil?
+            @code_name = attrs["codeName"] if attrs["codeName"]
           when "workbookView"
             at = attrs["activeTab"]
             @active_tab = at.to_i if at
+            fs = attrs["firstSheet"]
+            @first_sheet = fs.to_i if fs
+            sst = attrs["showSheetTabs"]
+            @show_sheet_tabs = %w[1 true].include?(sst) unless sst.nil?
+            tr = attrs["tabRatio"]
+            @tab_ratio = tr.to_i if tr
           when "calcPr"
             fcol = attrs["fullCalcOnLoad"]
             @full_calc_on_load = %w[1 true].include?(fcol) unless fcol.nil?