write_xlsx 0.76.1 → 0.76.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ba1d56f0cd30c6747b137108d02434ae6fdf84
-  data.tar.gz: d02196b910a6f24fbbdd580fd00b7bb3f368c6e8
+  metadata.gz: e7aabc5b9b76521cb33ca17c3629ca680d6ca136
+  data.tar.gz: c60ba8d9f38b048ef457c1b976ade92c5233056e
 SHA512:
-  metadata.gz: a834e0b9894e75fddb5e2ba2c07c624f8fb46fbadff053cc4d67e6eae59d7b397b57db4662f5cfb2a92d0f2f6fe178864227935fd985c988827b5e1133df97d4
-  data.tar.gz: c22ff45ba70aa8d207e77994737b1ecde714c69fafe02d32de6580aaeafa3b72e84ccc4baac3b74dc90a2e12c01c941a63f089bd113b595c50c07cd8400f1319
+  metadata.gz: 577e6314798672d271d5f76c199f30659f879269d551892d6bf2c6de216ca9fd68e7d496bf7056ada2c153066402920c475285cbea8924eb9fe2cc44b7bf0083
+  data.tar.gz: 92dd97c1be7dd8a4a89422c23edcde232538a784bd04cccfdb7df4eca5d0756f4b8bcc3f35de2d18b3ece8b183ec7c73f6a21bb07b88e8a97a23b165253a33a7

data/Changes

@@ -1,4 +1,8 @@
 Change history of write_xlsx rubygem.
+2014-04-10 v0.76.2
+   Fix for issue #8
+   use same rubyzip routine both in ruby-2+, 1.9+ and 1.8
+
 2014-03-21 v0.76.1
    Fix for issue #7
 

data/Gemfile

@@ -1,10 +1,4 @@
 source 'https://rubygems.org'
 
-if RUBY_VERSION >= "1.9"
-  gem 'rubyzip'
-  group :development do
-    gem 'simplecov'
-  end
-else
-  gem 'rubyzip', '0.9.9'
-end
+gem 'rubyzip', '>= 1.0.0'
+gem 'zip-zip'

data/lib/write_xlsx/col_name.rb

@@ -17,7 +17,7 @@ def col_str(col)
 
   def col_str_build(col)
     # Change from 0-indexed to 1 indexed.
-    col += 1
+    col = col.to_i + 1
     col_str = ''
 
     while col > 0

data/lib/write_xlsx/version.rb

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

data/lib/write_xlsx/workbook.rb

@@ -9,8 +9,7 @@
 require 'write_xlsx/shape'
 require 'write_xlsx/utility'
 require 'write_xlsx/chart'
-ruby_18 { require 'write_xlsx/zip_file_utils' }
-ruby_19 { require 'zip' }
+require 'write_xlsx/zip_file_utils'
 require 'tmpdir'
 require 'tempfile'
 require 'digest/md5'
@@ -1232,13 +1231,7 @@ def store_workbook #:nodoc:
       packager = nil
 
       # Store the xlsx component files with the temp dir name removed.
-      ruby_19 do
-        # See https://github.com/randym/axlsx
-        Zip::OutputStream.open(@filename) do |zip|
-          write_parts(zip)
-        end
-      end ||
-      ruby_18 { ZipFileUtils.zip("#{@tempdir}", @filename) }
+      ZipFileUtils.zip("#{@tempdir}", @filename)
 
       IO.copy_stream(@filename, @fileobj) if @fileobj
       Writexlsx::Utility.delete_files(@tempdir)

data/test/helper.rb

@@ -1,10 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
-require 'simplecov' if RUBY_VERSION >= "1.9"
 require 'bundler'
 
-SimpleCov.start if RUBY_VERSION >= "1.9"
-
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -68,8 +65,7 @@ def vml_str_to_array(vml_str)
 
   def entrys(xlsx)
     result = []
-    ruby_19 { Zip::File.foreach(xlsx) { |entry| result << entry } } ||
-    ruby_18 { Zip::ZipFile.foreach(xlsx) { |entry| result << entry } }
+    Zip::ZipFile.foreach(xlsx) { |entry| result << entry }
     result
   end
 

data/test/test_col_name.rb

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'write_xlsx'
+
+class TestColName < Test::Unit::TestCase
+  def test_col_str_with_rational
+    obj = ColName.instance
+    col = Rational(10, 3)
+    assert_nothing_raised do
+      obj.col_str(col)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.76.1
+  version: 0.76.2
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies: []
 description: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 email:
@@ -1223,6 +1223,7 @@ files:
 - test/regression/xlsx_files/vml03.xlsx
 - test/regression/xlsx_files/vml04.xlsx
 - test/republic.png
+- test/test_col_name.rb
 - test/test_delete_files.rb
 - test/test_example_match.rb
 - test/test_xml_writer_simple.rb
@@ -2439,6 +2440,7 @@ test_files:
 - test/regression/xlsx_files/vml03.xlsx
 - test/regression/xlsx_files/vml04.xlsx
 - test/republic.png
+- test/test_col_name.rb
 - test/test_delete_files.rb
 - test/test_example_match.rb
 - test/test_xml_writer_simple.rb