write_xlsx 1.12.2 → 1.13.0

data/lib/write_xlsx/zip_file_utils.rb

@@ -16,7 +16,7 @@ module ZipFileUtils
     src = File.expand_path(src)
     dest = File.expand_path(dest)
     FileUtils.rm_f(dest)
-    Zip::File.open(dest, Zip::File::CREATE) do |zf|
+    Zip::File.open(dest, create: true) do |zf|
       if File.file?(src)
         zf.add(encode_path(File.basename(src), options[:fs_encoding]), src)
         break

data/write_xlsx.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
   gem.add_dependency 'nkf'
-  gem.add_dependency 'rubyzip', '~> 2.4.0'
+  gem.add_dependency 'rubyzip', '>= 2.4.0', '< 4.0'
   gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'mutex_m'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.12.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
@@ -27,16 +27,22 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -258,6 +264,7 @@ files:
 - lib/write_xlsx/image.rb
 - lib/write_xlsx/image_property.rb
 - lib/write_xlsx/inserted_chart.rb
+- lib/write_xlsx/object_positioning.rb
 - lib/write_xlsx/package/app.rb
 - lib/write_xlsx/package/button.rb
 - lib/write_xlsx/package/comments.rb
@@ -278,6 +285,7 @@ files:
 - lib/write_xlsx/package/theme.rb
 - lib/write_xlsx/package/vml.rb
 - lib/write_xlsx/package/xml_writer_simple.rb
+- lib/write_xlsx/page_setup.rb
 - lib/write_xlsx/shape.rb
 - lib/write_xlsx/sheets.rb
 - lib/write_xlsx/sparkline.rb
@@ -285,10 +293,31 @@ files:
 - lib/write_xlsx/version.rb
 - lib/write_xlsx/workbook.rb
 - lib/write_xlsx/worksheet.rb
+- lib/write_xlsx/worksheet/asset_manager.rb
+- lib/write_xlsx/worksheet/autofilter.rb
 - lib/write_xlsx/worksheet/cell_data.rb
+- lib/write_xlsx/worksheet/cell_data_manager.rb
+- lib/write_xlsx/worksheet/cell_data_store.rb
+- lib/write_xlsx/worksheet/columns.rb
+- lib/write_xlsx/worksheet/comments_support.rb
+- lib/write_xlsx/worksheet/conditional_formats.rb
 - lib/write_xlsx/worksheet/data_validation.rb
+- lib/write_xlsx/worksheet/data_writing.rb
+- lib/write_xlsx/worksheet/drawing_methods.rb
+- lib/write_xlsx/worksheet/drawing_preparation.rb
+- lib/write_xlsx/worksheet/drawing_relations.rb
+- lib/write_xlsx/worksheet/drawing_xml_writer.rb
+- lib/write_xlsx/worksheet/formatting.rb
 - lib/write_xlsx/worksheet/hyperlink.rb
-- lib/write_xlsx/worksheet/page_setup.rb
+- lib/write_xlsx/worksheet/initialization.rb
+- lib/write_xlsx/worksheet/panes.rb
+- lib/write_xlsx/worksheet/print_options.rb
+- lib/write_xlsx/worksheet/protection.rb
+- lib/write_xlsx/worksheet/rich_text_helpers.rb
+- lib/write_xlsx/worksheet/row_col_sizing.rb
+- lib/write_xlsx/worksheet/rows.rb
+- lib/write_xlsx/worksheet/selection.rb
+- lib/write_xlsx/worksheet/xml_writer.rb
 - lib/write_xlsx/zip_file_utils.rb
 - write_xlsx.gemspec
 homepage: https://github.com/cxn03651/write_xlsx#readme
@@ -309,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 test_files: []

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -1,192 +0,0 @@
-# -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-
-module Writexlsx
-  class Worksheet
-    class PageSetup # :nodoc:
-      include Writexlsx::Utility
-
-      attr_accessor :margin_left, :margin_right, :margin_top, :margin_bottom  # :nodoc:
-      attr_accessor :margin_header, :margin_footer                            # :nodoc:
-      attr_accessor :repeat_rows, :repeat_cols, :print_area                   # :nodoc:
-      attr_accessor :hbreaks, :vbreaks, :scale                                # :nodoc:
-      attr_accessor :fit_page, :fit_width, :fit_height, :page_setup_changed   # :nodoc:
-      attr_writer :across                                                   # :nodoc:
-      attr_accessor :orientation, :print_options_changed, :black_white  # :nodoc:
-      attr_accessor :header, :footer, :header_footer_changed, :header_footer_aligns, :header_footer_scales
-      attr_writer :page_start
-      attr_writer :horizontal_dpi, :vertical_dpi
-
-      def initialize # :nodoc:
-        @margin_left = 0.7
-        @margin_right = 0.7
-        @margin_top = 0.75
-        @margin_bottom = 0.75
-        @margin_header = 0.3
-        @margin_footer = 0.3
-        @repeat_rows   = ''
-        @repeat_cols   = ''
-        @print_area    = ''
-        @hbreaks = []
-        @vbreaks = []
-        @scale = 100
-        @fit_page = false
-        @fit_width  = nil
-        @fit_height = nil
-        @page_setup_changed = false
-        @across = false
-        @orientation = true
-        @header_footer_aligns = true
-        @header_footer_scales = true
-      end
-
-      def paper=(paper_size)
-        if paper_size
-          @paper_size = paper_size
-          @page_setup_changed = true
-        end
-      end
-
-      def center_horizontally
-        @print_options_changed = true
-        @hcenter               = true
-      end
-
-      def center_vertically
-        @print_options_changed = true
-        @vcenter               = true
-      end
-
-      def print_row_col_headers(headers)
-        if headers
-          @print_headers         = true
-          @print_options_changed = true
-        else
-          @print_headers         = false
-        end
-      end
-
-      def hide_gridlines(option)
-        if option == 0 || !option
-          @print_gridlines = true
-          @print_options_changed = true
-        else
-          @print_gridlines  = false
-        end
-      end
-
-      #
-      # Write the <pageSetup> element.
-      #
-      # The following is an example taken from Excel.
-      #
-      # <pageSetup
-      #     paperSize="9"
-      #     scale="110"
-      #     fitToWidth="2"
-      #     fitToHeight="2"
-      #     pageOrder="overThenDown"
-      #     orientation="portrait"
-      #     useFirstPageNumber="1"
-      #     blackAndWhite="1"
-      #     draft="1"
-      #     horizontalDpi="200"
-      #     verticalDpi="200"
-      #     r:id="rId1"
-      # />
-      #
-      def write_page_setup(writer) # :nodoc:
-        return unless @page_setup_changed
-
-        attributes = []
-        attributes << ['paperSize',       @paper_size]    if @paper_size
-        attributes << ['scale',           @scale]         if @scale != 100
-        attributes << ['fitToWidth',      @fit_width]     if @fit_page && @fit_width != 1
-        attributes << ['fitToHeight',     @fit_height]    if @fit_page && @fit_height != 1
-        attributes << %w[pageOrder overThenDown] if @across
-        attributes << ['firstPageNumber', @page_start]    if @page_start && @page_start > 1
-        attributes << ['orientation',
-                       if @orientation
-                         'portrait'
-                       else
-                         'landscape'
-                       end]
-        attributes << ['blackAndWhite', 1]      if @black_white
-        attributes << ['useFirstPageNumber', 1] if ptrue?(@page_start)
-
-        # Set the DPI. Mainly only for testing.
-        attributes << ['horizontalDpi',  @horizontal_dpi] if @horizontal_dpi
-        attributes << ['verticalDpi',    @vertical_dpi]   if @vertical_dpi
-
-        writer.empty_tag('pageSetup', attributes)
-      end
-
-      #
-      # Write the <pageMargins> element.
-      #
-      def write_page_margins(writer) # :nodoc:
-        writer.empty_tag('pageMargins', margin_attributes)
-      end
-
-      #
-      # Write the <printOptions> element.
-      #
-      def write_print_options(writer) # :nodoc:
-        return unless @print_options_changed
-
-        attributes = []
-        attributes << ['horizontalCentered', 1] if @hcenter
-        attributes << ['verticalCentered',   1] if @vcenter
-        attributes << ['headings',           1] if @print_headers
-        attributes << ['gridLines',          1] if @print_gridlines
-        writer.empty_tag('printOptions', attributes)
-      end
-
-      #
-      # Write the <headerFooter> element.
-      #
-      def write_header_footer(writer, excel2003_style) # :nodoc:
-        tag = 'headerFooter'
-        attributes = []
-        attributes << ['scaleWithDoc', 0]     unless ptrue?(@header_footer_scales)
-        attributes << ['alignWithMargins', 0] unless ptrue?(@header_footer_aligns)
-
-        if @header_footer_changed
-          writer.tag_elements(tag, attributes) do
-            write_odd_header(writer) if @header && @header != ''
-            write_odd_footer(writer) if @footer && @footer != ''
-          end
-        elsif excel2003_style
-          writer.empty_tag(tag, attributes)
-        end
-      end
-
-      private
-
-      #
-      # Write the <oddHeader> element.
-      #
-      def write_odd_header(writer) # :nodoc:
-        writer.data_element('oddHeader', @header)
-      end
-
-      #
-      # Write the <oddFooter> element.
-      #
-      def write_odd_footer(writer) # :nodoc:
-        writer.data_element('oddFooter', @footer)
-      end
-
-      def margin_attributes    # :nodoc:
-        [
-          ['left',   @margin_left],
-          ['right',  @margin_right],
-          ['top',    @margin_top],
-          ['bottom', @margin_bottom],
-          ['header', @margin_header],
-          ['footer', @margin_footer]
-        ]
-      end
-    end
-  end
-end