caxlsx 3.4.1 → 4.1.0

data/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A worksheet hyperlink object. Note that this is not the same as a drawing hyperlink object.
   class WorksheetHyperlink
@@ -39,7 +41,7 @@ module Axlsx
     # @param [String|Cell] cell_reference The string reference or cell that defines where this hyperlink shows in the worksheet.
     def ref=(cell_reference)
       cell_reference = cell_reference.r if cell_reference.is_a?(Cell)
-      Axlsx::validate_string cell_reference
+      Axlsx.validate_string cell_reference
       @ref = cell_reference
     end
 
@@ -50,15 +52,15 @@ module Axlsx
     def relationship
       return unless @target == :external
 
-      Relationship.new(self, HYPERLINK_R, location, :target_mode => :External)
+      Relationship.new(self, HYPERLINK_R, location, target_mode: :External)
     end
 
     # Seralize the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<hyperlink '
-      serialized_attributes str, location_or_id
+      serialized_attributes str, location_or_id, false
       str << '/>'
     end
 
@@ -67,7 +69,7 @@ module Axlsx
     # r:id should only be specified for external targets.
     # @return [Hash]
     def location_or_id
-      @target == :external ? { :"r:id" => relationship.Id } : { :location => Axlsx::coder.encode(location) }
+      @target == :external ? { "r:id": relationship.Id } : { location: Axlsx.coder.encode(location) }
     end
   end
 end

data/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A collection of hyperlink objects for a worksheet
   class WorksheetHyperlinks < SimpleTypedList
@@ -6,7 +8,7 @@ module Axlsx
     def initialize(worksheet)
       DataTypeValidator.validate "Hyperlinks.worksheet", [Worksheet], worksheet
       @worksheet = worksheet
-      super WorksheetHyperlink
+      super(WorksheetHyperlink)
     end
 
     # Creates and adds a new hyperlink based on the options provided
@@ -22,12 +24,12 @@ module Axlsx
     def relationships
       return [] if empty?
 
-      map { |hyperlink| hyperlink.relationship }
+      map(&:relationship)
     end
 
     # seralize the collection of hyperlinks
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return if empty?
 
       str << '<hyperlinks>'

data/lib/axlsx.rb

@@ -1,41 +1,41 @@
+# frozen_string_literal: true
+
 require 'htmlentities'
-require 'axlsx/version.rb'
+require 'axlsx/version'
 require 'marcel'
 
-require 'axlsx/util/simple_typed_list.rb'
-require 'axlsx/util/constants.rb'
-require 'axlsx/util/validators.rb'
-require 'axlsx/util/accessors.rb'
+require 'axlsx/util/simple_typed_list'
+require 'axlsx/util/constants'
+require 'axlsx/util/validators'
+require 'axlsx/util/accessors'
 require 'axlsx/util/serialized_attributes'
 require 'axlsx/util/options_parser'
 require 'axlsx/util/mime_type_utils'
+require 'axlsx/util/buffered_zip_output_stream'
 require 'axlsx/util/zip_command'
 
-require 'axlsx/stylesheet/styles.rb'
+require 'axlsx/stylesheet/styles'
 
-require 'axlsx/doc_props/app.rb'
-require 'axlsx/doc_props/core.rb'
-require 'axlsx/content_type/content_type.rb'
-require 'axlsx/rels/relationships.rb'
+require 'axlsx/doc_props/app'
+require 'axlsx/doc_props/core'
+require 'axlsx/content_type/content_type'
+require 'axlsx/rels/relationships'
 
-require 'axlsx/drawing/drawing.rb'
-require 'axlsx/workbook/workbook.rb'
-require 'axlsx/package.rb'
+require 'axlsx/drawing/drawing'
+require 'axlsx/workbook/workbook'
+require 'axlsx/package'
 # required gems
 require 'nokogiri'
 require 'zip'
 
 # core dependencies
 require 'bigdecimal'
+require 'cgi'
 require 'set'
 require 'time'
 
-begin
-  if Gem.loaded_specs.has_key?("axlsx_styler")
-    raise StandardError.new("Please remove `axlsx_styler` from your Gemfile, the associated functionality is now built-in to `caxlsx` directly.")
-  end
-rescue
-  # Do nothing
+if Gem.loaded_specs.key?("axlsx_styler")
+  raise StandardError, "Please remove `axlsx_styler` from your Gemfile, the associated functionality is now built-in to `caxlsx` directly."
 end
 
 # xlsx generation with charts, images, automated column width, customizable styles
@@ -50,7 +50,7 @@ module Axlsx
   #
   # Defining as a class method on Axlsx to refrain from monkeypatching Object for all users of this gem.
   def self.instance_values_for(object)
-    Hash[object.instance_variables.map { |name| [name.to_s[1..-1], object.instance_variable_get(name)] }]
+    object.instance_variables.to_h { |name| [name.to_s[1..], object.instance_variable_get(name)] }
   end
 
   # determines the cell range for the items provided
@@ -88,7 +88,7 @@ module Axlsx
     letters_str = name[/[A-Z]+/]
 
     # capitalization?!?
-    v = letters_str.reverse.chars.reduce({ :base => 1, :i => 0 }) do |val, c|
+    v = letters_str.reverse.chars.reduce({ base: 1, i: 0 }) do |val, c|
       val[:i] += ((c.bytes.first - 64) * val[:base])
 
       val[:base] *= 26
@@ -102,37 +102,51 @@ module Axlsx
 
     row_index = (numbers_str.to_i - 1)
 
-    return [col_index, row_index]
+    [col_index, row_index]
   end
 
   # converts the column index into alphabetical values.
   # @note This follows the standard spreadsheet convention of naming columns A to Z, followed by AA to AZ etc.
   # @return [String]
   def self.col_ref(index)
-    chars = ''
-    while index >= 26 do
-      index, char = index.divmod(26)
-      chars.prepend((char + 65).chr)
-      index -= 1
+    # Every row will call this for each column / cell and so we can cache result and avoid lots of small object
+    # allocations.
+    @col_ref ||= {}
+    @col_ref[index] ||= begin
+      i = index
+      chars = +''
+      while i >= 26
+        i, char = i.divmod(26)
+        chars.prepend((char + 65).chr)
+        i -= 1
+      end
+      chars.prepend((i + 65).chr)
+      chars.freeze
     end
-    chars.prepend((index + 65).chr)
-    chars
+  end
+
+  # converts the row index into string values.
+  # @note The spreadsheet rows are 1-based and the passed in index is 0-based, so we add 1.
+  # @return [String]
+  def self.row_ref(index)
+    @row_ref ||= {}
+    @row_ref[index] ||= (index + 1).to_s.freeze
   end
 
   # @return [String] The alpha(column)numeric(row) reference for this sell.
   # @example Relative Cell Reference
   #   ws.rows.first.cells.first.r #=> "A1"
   def self.cell_r(c_index, r_index)
-    col_ref(c_index) << (r_index + 1).to_s
+    col_ref(c_index) + row_ref(r_index)
   end
 
-  # Creates an array of individual cell references based on an excel reference range.
+  # Creates an array of individual cell references based on an Excel reference range.
   # @param [String] range A cell range, for example A1:D5
   # @return [Array]
   def self.range_to_a(range)
-    range.match(/^(\w+?\d+)\:(\w+?\d+)$/)
-    start_col, start_row = name_to_indices($1)
-    end_col,   end_row   = name_to_indices($2)
+    range =~ /^(\w+?\d+):(\w+?\d+)$/
+    start_col, start_row = name_to_indices(::Regexp.last_match(1))
+    end_col,   end_row   = name_to_indices(::Regexp.last_match(2))
     (start_row..end_row).to_a.map do |row_num|
       (start_col..end_col).to_a.map do |col_num|
         cell_r(col_num, row_num)
@@ -146,7 +160,7 @@ module Axlsx
   def self.camel(s = "", all_caps = true)
     s = s.to_s
     s = s.capitalize if all_caps
-    s.gsub(/_(.)/) { $1.upcase }
+    s.gsub(/_(.)/) { ::Regexp.last_match(1).upcase }
   end
 
   # returns the provided string with all invalid control charaters
@@ -167,18 +181,18 @@ module Axlsx
   # @param [Object] value The value to process
   # @return [Object]
   def self.booleanize(value)
-    if value == true || value == false
-      value ? 1 : 0
+    if BOOLEAN_VALUES.include?(value)
+      value ? '1' : '0'
     else
       value
     end
   end
 
   # utility method for performing a deep merge on a Hash
-  # @param [Hash] Hash to merge into
-  # @param [Hash] Hash to be added
+  # @param [Hash] first_hash Hash to merge into
+  # @param [Hash] second_hash Hash to be added
   def self.hash_deep_merge(first_hash, second_hash)
-    first_hash.merge(second_hash) do |key, this_val, other_val|
+    first_hash.merge(second_hash) do |_key, this_val, other_val|
       if this_val.is_a?(Hash) && other_val.is_a?(Hash)
         Axlsx.hash_deep_merge(this_val, other_val)
       else
@@ -189,7 +203,7 @@ module Axlsx
 
   # Instructs the serializer to not try to escape cell value input.
   # This will give you a huge speed bonus, but if you content has <, > or other xml character data
-  # the workbook will be invalid and excel will complain.
+  # the workbook will be invalid and Excel will complain.
   def self.trust_input
     @trust_input ||= false
   end
@@ -206,7 +220,7 @@ module Axlsx
   # See https://www.owasp.org/index.php/CSV_Injection for details.
   # @return [Boolean]
   def self.escape_formulas
-    !defined?(@escape_formulas) || @escape_formulas.nil? ? false : @escape_formulas
+    !defined?(@escape_formulas) || @escape_formulas.nil? ? true : @escape_formulas
   end
 
   # Sets whether to treat values starting with an equals sign as formulas or as literal strings.

data/lib/caxlsx.rb

@@ -1 +1,3 @@
-require 'axlsx.rb'
+# frozen_string_literal: true
+
+require 'axlsx'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caxlsx
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Randy Morgan
@@ -9,48 +9,8 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.10.4
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -86,54 +46,54 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
+        version: 1.10.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
+        version: '3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
-description: "    xlsx spreadsheet generation with charts, images, automated column
-  width, customizable styles and full schema validation. Axlsx helps you create beautiful
-  Office Open XML Spreadsheet documents ( Excel, Google Spreadsheets, Numbers, LibreOffice)
+        version: 1.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+description: 'xlsx spreadsheet generation with charts, images, automated column width,
+  customizable styles and full schema validation. Axlsx helps you create beautiful
+  Office Open XML Spreadsheet documents (Excel, Google Spreadsheets, Numbers, LibreOffice)
   without having to understand the entire ECMA specification. Check out the README
   for some examples of how easy it is. Best of all, you can validate your xlsx file
   before serialization so you know for sure that anything generated is going to load
-  on your client's machine.\n"
+  on your client''s machine.
+
+  '
 email: noel@peden.biz
 executables: []
 extensions: []
@@ -181,6 +141,7 @@ files:
 - lib/axlsx/drawing/pic.rb
 - lib/axlsx/drawing/picture_locking.rb
 - lib/axlsx/drawing/pie_3D_chart.rb
+- lib/axlsx/drawing/pie_chart.rb
 - lib/axlsx/drawing/pie_series.rb
 - lib/axlsx/drawing/scaling.rb
 - lib/axlsx/drawing/scatter_chart.rb
@@ -218,6 +179,7 @@ files:
 - lib/axlsx/stylesheet/table_styles.rb
 - lib/axlsx/stylesheet/xf.rb
 - lib/axlsx/util/accessors.rb
+- lib/axlsx/util/buffered_zip_output_stream.rb
 - lib/axlsx/util/constants.rb
 - lib/axlsx/util/mime_type_utils.rb
 - lib/axlsx/util/options_parser.rb
@@ -236,6 +198,8 @@ files:
 - lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filter_column.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filters.rb
+- lib/axlsx/workbook/worksheet/auto_filter/sort_condition.rb
+- lib/axlsx/workbook/worksheet/auto_filter/sort_state.rb
 - lib/axlsx/workbook/worksheet/border_creator.rb
 - lib/axlsx/workbook/worksheet/break.rb
 - lib/axlsx/workbook/worksheet/cell.rb
@@ -328,7 +292,11 @@ files:
 homepage: https://github.com/caxlsx/caxlsx
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/caxlsx/caxlsx/issues
+  changelog_uri: https://github.com/caxlsx/caxlsx/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/caxlsx/caxlsx
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -337,7 +305,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="