xlsxrb 0.1.15 → 0.1.16

data/lib/xlsxrb/ooxml/reader/listeners/core_listeners.rb

@@ -24,12 +24,15 @@ module Xlsxrb
           @runs = []
           @current_font = {}
           @has_runs = false
+          @inside_rph = false
         end
 
         def start_element(_uri, local_name, qname, attributes)
           name = element_name(local_name, qname)
 
           case name
+          when "rPh"
+            @inside_rph = true
           when "si"
             @inside_si = true
             @text_buffer = +""
@@ -74,7 +77,7 @@ module Xlsxrb
           when "scheme"
             @current_font[:scheme] = attributes["val"] if @inside_rpr
           when "t"
-            @inside_t = @inside_si
+            @inside_t = @inside_si && !@inside_rph
             @text_buffer = +"" if @inside_r
           end
         end
@@ -87,12 +90,16 @@ module Xlsxrb
           name = element_name(local_name, qname)
 
           case name
+          when "rPh"
+            @inside_rph = false
           when "t"
             @inside_t = false
           when "rPr"
             @inside_rpr = false
           when "r"
-            run = { text: @text_buffer.dup }
+            decoded_text = XmlBuilder.unescape(@text_buffer)
+            decoded_text = decoded_text.gsub("\r\n", "\n").tr("\r", "\n") if decoded_text.include?("\r")
+            run = { text: decoded_text }
             run[:font] = @current_font.dup unless @current_font.empty?
             @runs << run
             @inside_r = false
@@ -100,7 +107,9 @@ module Xlsxrb
             @strings << if @has_runs
                           Xlsxrb::Elements::RichText.new(runs: @runs)
                         else
-                          @text_buffer.dup
+                          decoded_text = XmlBuilder.unescape(@text_buffer)
+                          decoded_text = decoded_text.gsub("\r\n", "\n").tr("\r", "\n") if decoded_text.include?("\r")
+                          decoded_text
                         end
             @inside_si = false
             @text_buffer = +""
@@ -145,18 +154,23 @@ module Xlsxrb
           @is_has_runs = false
           @is_current_font = {}
           @is_run_text = +""
+          @inside_rph = false
+          @has_inline_text = false
         end
 
         def start_element(_uri, local_name, qname, attributes)
           name = element_name(local_name, qname)
 
           case name
+          when "rPh"
+            @inside_rph = true
           when "row"
             parse_row_attributes(attributes)
           when "c"
             @current_cell_ref = attributes["r"]
             @current_cell_type = attributes["t"]
             @current_cell_ph = %w[1 true].include?(attributes["ph"])
+            @has_inline_text = false
             @value_buffer = +""
             @inline_text_buffer = +""
             @formula_buffer = +""
@@ -188,6 +202,7 @@ module Xlsxrb
             @formula_r1 = attributes["r1"] if attributes["r1"]
             @formula_r2 = attributes["r2"] if attributes["r2"]
           when "is"
+            @has_inline_text = true
             @inside_is = true if @current_cell_type == "inlineStr"
           when "r"
             if @inside_is
@@ -231,11 +246,15 @@ module Xlsxrb
           when "scheme"
             @is_current_font[:scheme] = attributes["val"] if @inside_is_rpr
           when "t"
-            if @inside_is_r
-              @is_run_text = +""
-              @inside_inline_text = true
-            elsif @inside_is || (@current_cell_type == "inlineStr" && !@current_cell_ref.nil?)
-              @inside_inline_text = true
+            unless @inside_rph
+              if @inside_is_r
+                @is_run_text = +""
+                @inside_inline_text = true
+                @has_inline_text = true
+              elsif @inside_is || (@current_cell_type == "inlineStr" && !@current_cell_ref.nil?)
+                @inside_inline_text = true
+                @has_inline_text = true
+              end
             end
           end
         end
@@ -256,6 +275,8 @@ module Xlsxrb
           name = element_name(local_name, qname)
 
           case name
+          when "rPh"
+            @inside_rph = false
           when "v"
             @inside_value = false
           when "f"
@@ -309,7 +330,14 @@ module Xlsxrb
           return if @current_cell_ref.nil?
 
           unless @formula_buffer.empty? && @formula_type.nil?
-            cached = @value_buffer.empty? ? nil : @value_buffer.dup
+            cached = if @value_buffer.empty?
+                       nil
+                     elsif @current_cell_type == "b"
+                       v = @value_buffer.strip
+                       v == "1" || v.casecmp?("true")
+                     else
+                       @value_buffer.dup
+                     end
             f_type = { "shared" => :shared, "array" => :array, "dataTable" => :data_table }[@formula_type]
             @cells[@current_cell_ref] = Xlsxrb::Elements::Formula.new(
               expression: @formula_buffer.dup,
@@ -328,39 +356,29 @@ module Xlsxrb
             return
           end
 
-          case @current_cell_type
-          when "inlineStr"
-            @cells[@current_cell_ref] = if @is_has_runs
-                                          Xlsxrb::Elements::RichText.new(runs: @is_runs.map(&:dup))
-                                        else
-                                          @inline_text_buffer.dup
-                                        end
-          when "s"
-            index = @value_buffer.to_i
-            @cells[@current_cell_ref] = @shared_strings[index] || ""
-          when "e"
-            code = @value_buffer.dup
-            @cells[@current_cell_ref] = if Xlsxrb::Elements::VALID_ERROR_CODES.include?(code)
-                                          Xlsxrb::Elements::CellError.new(code:)
-                                        else
-                                          code
-                                        end
-          when "b"
-            @cells[@current_cell_ref] = @value_buffer.strip == "1"
-          when nil, "", "n"
-            return if @value_buffer.empty?
-
-            raw = @value_buffer.dup
-            @cells[@current_cell_ref] = numeric_value(raw)
+          if @current_cell_type == "inlineStr" && @is_has_runs
+            @cells[@current_cell_ref] = Xlsxrb::Elements::RichText.new(runs: @is_runs.map(&:dup))
+            return
           end
+
+          v = if @current_cell_type == "inlineStr"
+                @has_inline_text ? @inline_text_buffer : nil
+              else
+                @value_buffer.empty? ? nil : @value_buffer
+              end
+
+          val = Xlsxrb::Ooxml::WorksheetParser.resolve_cell_value(@current_cell_type, v, nil, @shared_strings)
+          return if val.nil? && (@current_cell_type.nil? || @current_cell_type == "" || @current_cell_type == "n" || @current_cell_type == "s" || @current_cell_type == "inlineStr")
+
+          @cells[@current_cell_ref] = if @current_cell_type == "e" && val && Xlsxrb::Elements::VALID_ERROR_CODES.include?(val)
+                                        Xlsxrb::Elements::CellError.new(code: val)
+                                      else
+                                        val
+                                      end
         end
 
         def numeric_value(raw)
-          if raw.include?(".")
-            raw.to_f
-          else
-            raw.to_i
-          end
+          Xlsxrb::Ooxml::WorksheetParser.numeric_cell_value(raw)
         end
 
         def element_name(local_name, qname)

data/lib/xlsxrb/ooxml/reader/listeners/feature_listeners.rb

@@ -962,11 +962,14 @@ module Xlsxrb
           when "formula2"
             @inside_formula2 = true
             @text_buffer = +""
+          when "sqref"
+            @inside_sqref = true
+            @text_buffer = +""
           end
         end
 
         def characters(text)
-          @text_buffer << text if @inside_formula1 || @inside_formula2
+          @text_buffer << text if @inside_formula1 || @inside_formula2 || @inside_sqref
         end
 
         def end_element(_uri, local_name, qname)
@@ -978,6 +981,9 @@ module Xlsxrb
           when "formula2"
             @current_dv[:formula2] = @text_buffer.dup if @current_dv
             @inside_formula2 = false
+          when "sqref"
+            @current_dv[:sqref] = @text_buffer.strip if @current_dv && (@current_dv[:sqref].nil? || @current_dv[:sqref].empty?)
+            @inside_sqref = false
           when "dataValidation"
             @validations << @current_dv if @current_dv
             @current_dv = nil

data/lib/xlsxrb/ooxml/reader/listeners/style_listeners.rb

@@ -135,19 +135,19 @@ module Xlsxrb
           when "font"
             @current_font = {} if @inside_fonts || @inside_dxfs
           when "b"
-            @current_font[:bold] = true if @current_font
+            @current_font[:bold] = truthy_val?(attributes) if @current_font
           when "i"
-            @current_font[:italic] = true if @current_font
+            @current_font[:italic] = truthy_val?(attributes) if @current_font
           when "strike"
-            @current_font[:strike] = true if @current_font
+            @current_font[:strike] = truthy_val?(attributes) if @current_font
           when "shadow"
-            @current_font[:shadow] = true if @current_font
+            @current_font[:shadow] = truthy_val?(attributes) if @current_font
           when "outline"
-            @current_font[:outline] = true if @current_font
+            @current_font[:outline] = truthy_val?(attributes) if @current_font
           when "condense"
-            @current_font[:condense] = true if @current_font
+            @current_font[:condense] = truthy_val?(attributes) if @current_font
           when "extend"
-            @current_font[:extend] = true if @current_font
+            @current_font[:extend] = truthy_val?(attributes) if @current_font
           when "u"
             if @current_font
               val = attributes["val"]
@@ -303,6 +303,11 @@ module Xlsxrb
 
         private
 
+        def truthy_val?(attributes)
+          val = attributes["val"]
+          val.nil? || (val != "0" && val.downcase != "false")
+        end
+
         def parse_color(attributes)
           if @inside_mru_colors
             c = {}