write_xlsx 0.72.1 → 0.72.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de6eeb2d6b82e5417227f68847d46833a756278
-  data.tar.gz: ba99703dc33f58f746635fdd545fe9e48810c26d
+  metadata.gz: 66ec26ddd5f837ef4d832d0efea345aaf5fdc524
+  data.tar.gz: e3e5c86594dd02a88a0dd3c18a018ff28b261ba2
 SHA512:
-  metadata.gz: 070f3836c9e3d9f04d13717a9ecb6a2e94b515fc0a6ec77900d48240e027c98e21e7ffb7ac96bf03e3efd8983a1e31a487698be0322c9b84048f9b10bd70cf2e
-  data.tar.gz: 07b570329c9156508eb3dc8b0ffe5127a6fc56b06e6853efdafd8fe0d51d8b24f126a210d6d4808db3eb910c807f21812e560a39c6707fd93027dac4f34d762a
+  metadata.gz: 5115cdfdcbfc75c4fdd51d14898b288ee0e17dde96156ce73319bd947683243e5ffb44ef7aaad674f3798f9f0b3dd9a2b3b4e74aa6e59248942464dd8ef8c28a
+  data.tar.gz: 3360712655ad5a43349666c8c7e7b9e76aafb0e5ea3cfec89785b5b3f7df087c485f6d463688a991855dfe486be3d1b810a77a86fec86f2e62b1dc985cf9230b

data/README.rdoc

@@ -77,6 +77,9 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
   workbook.close
 
 == Recent change
+2013-09-07 v0.72.2
+   work well with rubyzip 1.0.0
+
 2013-09-06 v0.72.1
    specify rubyzip version : <1.0.0
 

data/lib/write_xlsx/package/app.rb

@@ -21,20 +21,19 @@ module Writexlsx
 
       def assemble_xml_file
         write_xml_declaration
-        write_properties
-        write_application
-        write_doc_security
-        write_scale_crop
-        write_heading_pairs
-        write_titles_of_parts
-        write_manager
-        write_company
-        write_links_up_to_date
-        write_shared_doc
-        write_hyperlinks_changed
-        write_app_version
-
-        @writer.end_tag('Properties')
+        write_properties do
+          write_application
+          write_doc_security
+          write_scale_crop
+          write_heading_pairs
+          write_titles_of_parts
+          write_manager
+          write_company
+          write_links_up_to_date
+          write_shared_doc
+          write_hyperlinks_changed
+          write_app_version
+        end
         @writer.crlf
         @writer.close
       end
@@ -66,13 +65,15 @@ module Writexlsx
       # Write the <Properties> element.
       #
       def write_properties
+        tag = 'Properties'
+
         schema   = 'http://schemas.openxmlformats.org/officeDocument/2006/'
         attributes = [
             'xmlns',     "#{schema}extended-properties",
             'xmlns:vt',  "#{schema}docPropsVTypes"
         ]
 
-        @writer.start_tag('Properties', attributes)
+        @writer.tag_elements('Properties', attributes) { yield }
       end
 
       #
@@ -125,10 +126,8 @@ module Writexlsx
       # Write the <vt:vector> element.
       #
       def write_vt_vector(base_type, data)
-        size      = data.size
-
         attributes = [
-          'size',     size,
+          'size',     data.size,
           'baseType', base_type
         ]
 

data/lib/write_xlsx/package/comments.rb

@@ -137,8 +137,6 @@ module Writexlsx
         attributes = v_shape_attributes(id, z_index)
 
         @writer.tag_elements('v:shape', attributes) do
-          writer = @writer
-
           # Write the v:fill element.
           write_fill
           # Write the v:shadow element.

data/lib/write_xlsx/package/content_types.rb

@@ -32,11 +32,10 @@ module Writexlsx
 
       def assemble_xml_file
         write_xml_declaration
-        write_types
-        write_defaults
-        write_overrides
-
-        @writer.end_tag('Types')
+        write_types do
+          write_defaults
+          write_overrides
+        end
         @writer.crlf
         @writer.close
       end
@@ -185,7 +184,7 @@ module Writexlsx
         xmlns = 'http://schemas.openxmlformats.org/package/2006/content-types'
         attributes = ['xmlns', xmlns]
 
-        @writer.start_tag('Types', attributes)
+        @writer.tag_elements('Types', attributes) { yield }
       end
 
       #

data/lib/write_xlsx/package/core.rb

@@ -23,19 +23,18 @@ module Writexlsx
 
       def assemble_xml_file
         write_xml_declaration
-        write_cp_core_properties
-        write_dc_title
-        write_dc_subject
-        write_dc_creator
-        write_cp_keywords
-        write_dc_description
-        write_cp_last_modified_by
-        write_dcterms_created
-        write_dcterms_modified
-        write_cp_category
-        write_cp_content_status
-
-        @writer.end_tag('cp:coreProperties')
+        write_cp_core_properties do
+          write_dc_title
+          write_dc_subject
+          write_dc_creator
+          write_cp_keywords
+          write_dc_description
+          write_cp_last_modified_by
+          write_dcterms_created
+          write_dcterms_modified
+          write_cp_category
+          write_cp_content_status
+        end
         @writer.crlf
         @writer.close
       end
@@ -52,7 +51,7 @@ module Writexlsx
       def localtime_to_iso8601_date(local_time = nil)
         local_time ||= Time.now
 
-        date = local_time.strftime('%Y-%m-%dT%H:%M:%SZ')
+        local_time.strftime('%Y-%m-%dT%H:%M:%SZ')
       end
 
       def write_xml_declaration
@@ -77,7 +76,7 @@ module Writexlsx
             'xmlns:xsi',      xmlns_xsi
         ]
 
-        @writer.start_tag('cp:coreProperties', attributes)
+        @writer.tag_elements('cp:coreProperties', attributes) { yield }
       end
 
       #
@@ -98,28 +97,22 @@ module Writexlsx
       # Write the <dcterms:created> element.
       #
       def write_dcterms_created
-        date     = @properties[:created]
-        xsi_type = 'dcterms:W3CDTF'
-
-        date = localtime_to_iso8601_date(date)
-
-        attributes = ['xsi:type', xsi_type]
-
-        @writer.data_element('dcterms:created', date, attributes)
+        write_dcterms('dcterms:created')
       end
 
       #
       # Write the <dcterms:modified> element.
       #
       def write_dcterms_modified
-        date     = @properties[:created]
-        xsi_type = 'dcterms:W3CDTF'
-
-        date =  localtime_to_iso8601_date(date)
+        write_dcterms('dcterms:modified')
+      end
 
-        attributes = ['xsi:type', xsi_type]
+      def write_dcterms(tag)
+        @writer.data_element(tag, dcterms_date, ['xsi:type', 'dcterms:W3CDTF'])
+      end
 
-        @writer.data_element('dcterms:modified', date, attributes)
+      def dcterms_date
+        localtime_to_iso8601_date(@properties[:created])
       end
 
       #

data/lib/write_xlsx/package/shared_strings.rb

@@ -45,13 +45,9 @@ module Writexlsx
         write_xml_declaration
 
         # Write the sst table.
-        write_sst
-
-        # Write the sst strings.
-        write_sst_strings
+        write_sst { write_sst_strings }
 
         # Close the sst tag.
-        @writer.end_tag('sst')
         @writer.crlf
         @writer.close
       end
@@ -75,7 +71,7 @@ module Writexlsx
            'uniqueCount', unique_count
           ]
 
-        @writer.start_tag('sst', attributes)
+        @writer.tag_elements('sst', attributes) { yield }
       end
 
       #

data/lib/write_xlsx/package/styles.rb

@@ -26,18 +26,18 @@ module Writexlsx
 
       def assemble_xml_file
         write_xml_declaration
-        write_style_sheet
-        write_num_fmts
-        write_fonts
-        write_fills
-        write_borders
-        write_cell_style_xfs
-        write_cell_xfs
-        write_cell_styles
-        write_dxfs
-        write_table_styles
-        write_colors
-        @writer.end_tag('styleSheet')
+        write_style_sheet do
+          write_num_fmts
+          write_fonts
+          write_fills
+          write_borders
+          write_cell_style_xfs
+          write_cell_xfs
+          write_cell_styles
+          write_dxfs
+          write_table_styles
+          write_colors
+        end
         @writer.crlf
         @writer.close
       end
@@ -83,7 +83,7 @@ module Writexlsx
 
         attributes = ['xmlns', xmlns]
 
-        @writer.start_tag('styleSheet', attributes)
+        @writer.tag_elements('styleSheet', attributes) { yield }
       end
 
       #

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.72.1"
+  VERSION = "0.72.2"
 end

data/lib/write_xlsx/workbook.rb

@@ -9,10 +9,10 @@ require 'write_xlsx/format'
 require 'write_xlsx/shape'
 require 'write_xlsx/utility'
 require 'write_xlsx/chart'
-require 'write_xlsx/zip_file_utils'
 require 'tmpdir'
 require 'tempfile'
 require 'digest/md5'
+require 'zip'
 
 module Writexlsx
 
@@ -1223,11 +1223,33 @@ module Writexlsx
       packager = nil
 
       # Store the xlsx component files with the temp dir name removed.
-      ZipFileUtils.zip("#{@tempdir}", @filename)
+      # See https://github.com/randym/axlsx
+      Zip::OutputStream.open(@filename) do |zip|
+        write_parts(zip)
+      end
+
       IO.copy_stream(@filename, @fileobj) if @fileobj
       Writexlsx::Utility.delete_files(@tempdir)
     end
 
+    def write_parts(zip)
+      parts.each do |part|
+        zip.put_next_entry(zip_entry_for_part(part.sub(Regexp.new("#{@tempdir}/?"), '')))
+        zip.puts(File.read(part))
+      end
+    end
+
+    def zip_entry_for_part(part)
+      Zip::Entry.new("", part)
+    end
+
+    #
+    # files
+    #
+    def parts
+      Dir.glob(File.join(@tempdir, "**", "*"), File::FNM_DOTMATCH).select {|f| File.file?(f)}
+    end
+
     #
     # Prepare all of the format properties prior to passing them to Styles.rb.
     #

data/test/helper.rb

@@ -68,7 +68,7 @@ class Test::Unit::TestCase
 
   def entrys(xlsx)
     result = []
-    Zip::ZipFile.foreach(xlsx) { |entry| result << entry }
+    Zip::File.foreach(xlsx) { |entry| result << entry }
     result
   end
 

data/write_xlsx.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
     "README.rdoc"
   ]
 
-  gem.add_runtime_dependency(%q<rubyzip>, ["<1.0.0"])
+  gem.add_runtime_dependency(%q<rubyzip>, [">=1.0.0"])
   gem.add_development_dependency(%q<simplecov>) if RUBY_VERSION >= "1.9"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.72.1
+  version: 0.72.2
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -163,7 +163,6 @@ files:
 - lib/write_xlsx/worksheet/data_validation.rb
 - lib/write_xlsx/worksheet/hyperlink.rb
 - lib/write_xlsx/worksheet/page_setup.rb
-- lib/write_xlsx/zip_file_utils.rb
 - test/chart/test_add_series.rb
 - test/chart/test_process_names.rb
 - test/chart/test_write_a_latin.rb
@@ -236,7 +235,6 @@ files:
 - test/package/shared_strings/test_shared_strings01.rb
 - test/package/shared_strings/test_shared_strings02.rb
 - test/package/shared_strings/test_write_si.rb
-- test/package/shared_strings/test_write_sst.rb
 - test/package/styles/test_styles_01.rb
 - test/package/styles/test_styles_02.rb
 - test/package/styles/test_styles_03.rb
@@ -1376,7 +1374,6 @@ test_files:
 - test/package/shared_strings/test_shared_strings01.rb
 - test/package/shared_strings/test_shared_strings02.rb
 - test/package/shared_strings/test_write_si.rb
-- test/package/shared_strings/test_write_sst.rb
 - test/package/styles/test_styles_01.rb
 - test/package/styles/test_styles_02.rb
 - test/package/styles/test_styles_03.rb
@@ -2419,3 +2416,4 @@ test_files:
 - test/worksheet/test_write_tab_color.rb
 - test/worksheet/test_write_url.rb
 - test/worksheet/test_write_worksheet_attributes.rb
+has_rdoc: 

data/lib/write_xlsx/zip_file_utils.rb

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# from http://d.hatena.ne.jp/alunko/20071021
-#
-require 'kconv'
-require 'zip/zipfilesystem'
-require 'fileutils'
-
-module ZipFileUtils
-
-  # src  file or directory
-  # dest  zip filename
-  # options :fs_encoding=[UTF-8,Shift_JIS,EUC-JP]
-  def self.zip(src, dest, options = {})
-    src = File.expand_path(src)
-    dest = File.expand_path(dest)
-    File.unlink(dest) if File.exist?(dest)
-    Zip::ZipFile.open(dest, Zip::ZipFile::CREATE) {|zf|
-      if(File.file?(src))
-        zf.add(encode_path(File.basename(src), options[:fs_encoding]), src)
-        break
-      else
-        each_dir_for(src){ |path|
-          if File.file?(path)
-            zf.add(encode_path(relative(path, src), options[:fs_encoding]), path)
-          elsif File.directory?(path)
-            zf.mkdir(encode_path(relative(path, src), options[:fs_encoding]))
-          end
-        }
-      end
-    }
-  end
-
-  # src  zip filename
-  # dest  destination directory
-  # options :fs_encoding=[UTF-8,Shift_JIS,EUC-JP]
-  def self.unzip(src, dest, options = {})
-    FileUtils.makedirs(dest)
-    Zip::ZipInputStream.open(src){ |is|
-      loop do
-        entry = is.get_next_entry()
-        break if entry.nil?()
-        dir = File.dirname(entry.name)
-        FileUtils.makedirs(dest+ '/' + dir)
-        path = encode_path(dest + '/' + entry.name, options[:fs_encoding])
-        if(entry.file?())
-          File.open(path,
-                File::CREAT|File::WRONLY|File::BINARY) do |w|
-           w.puts(is.read())
-          end
-        else
-          FileUtils.makedirs(path)
-        end
-      end
-    }
-  end
-
-  private
-  def self.each_dir_for(dir_path, &block)
-    dir = Dir.open(dir_path)
-    each_file_for(dir_path){ |file_path|
-      yield(file_path)
-    }
-  end
-
-  def self.each_file_for(path, &block)
-    if File.file?(path)
-      yield(path)
-      return true
-    end
-    dir = Dir.open(path)
-    file_exist = false
-    dir.each(){ |file|
-      next if file == '.' || file == '..'
-      file_exist = true if each_file_for(path + "/" + file, &block)
-    }
-    yield(path) unless file_exist
-    return file_exist
-  end
-
-  def self.relative(path, base_dir)
-    path[base_dir.length() + 1 .. path.length()] if path.index(base_dir) == 0
-  end
-
-  def self.encode_path(path, encode_s)
-    return path if encode_s.nil?()
-    case(encode_s)
-    when('UTF-8')
-      return path.toutf8()
-    when('Shift_JIS')
-      return path.tosjis()
-    when('EUC-JP')
-      return path.toeuc()
-    else
-      return path
-    end
-  end
-end

data/test/package/shared_strings/test_write_sst.rb

@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'helper'
-require 'write_xlsx/package/shared_strings'
-
-class TestWriteSst < Test::Unit::TestCase
-  def test_write_sst
-    @obj = Writexlsx::Package::SharedStrings.new
-    @obj.index('1')
-    @obj.index('2')
-    5.times { @obj.index('3') }
-    @obj.__send__('write_sst')
-    result = @obj.instance_variable_get(:@writer).string
-    expected = '<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="7" uniqueCount="3">'
-    assert_equal(expected, result)
-  end
-end