writeexcel 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e036ee78c56e41a25c0c346a2cbc93b579e4f54d
-  data.tar.gz: 20f79a79efa1699803e993ee52aa70665baabcea
+SHA256:
+  metadata.gz: aef741d4929e644f22197dc922a779d1049e686bcda4458f8fdd07a1dc6d45a0
+  data.tar.gz: 7431195b6609b5220f0a72cab8df664594c2ad1a1f2124187fe13515c2dd9d16
 SHA512:
-  metadata.gz: 1bb714fcc9f5a3ce118732cce6e4b21623237831ee25d5ab90970320140bc716cb88907ef3326f758f2a909fbdee8f45f1b9d926a72081361cd57d5fc11333a5
-  data.tar.gz: 8b89087c85738f136750da5673e3e0fb4bf95158053dbb9d8d00345715c30d22d8372e68d7c1efddc6674a6a9537ed89b46c9d37ca0d4ca0e15e8a188b2b900a
+  metadata.gz: ced7ba9cea632a819acd69fd242a03939abd331eca99f3ff2604ea8429998fd467ee795bbbbef5a6ce1b3f66ed970b57583f6d0c85f9aefc311247aaba39c5ae
+  data.tar.gz: 38955288d47faa5dc1ec3b8aad5960b0bcac352b61c8503b975eb1c0446ae41785a306b84952797883621cc38f241a9e3343b364f5b8060abee869221fbff1aa

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+- 2.2.0
+- 2.1.5
+- 2.1.2
+- 2.1.1
+- 2.0.0
+- 1.9.3

data/README.rdoc

@@ -3,6 +3,7 @@
 Write to a cross-platform Excel binary file.
 
 {<img src="https://badge.fury.io/rb/writeexcel.png" alt="Gem Version" />}[http://badge.fury.io/rb/writeexcel]
+{<img src="https://travis-ci.org/cxn03651/writeexcel.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/cxn03651/writeexcel]
 
 == Description
 
@@ -84,6 +85,10 @@ Example Code:
 * and ......
 
 == Recent Change
+v1.0.6
+* support Ruby 3.2
+* use minitest gem instead of test-unit.
+
 v1.0.5
 * use test-unit gem instead of test/unit.
 

data/lib/writeexcel/biffwriter.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #
 # BIFFwriter - An abstract base class for Excel workbooks and worksheets.
 #
@@ -187,7 +188,7 @@ class BIFFWriter < WriteFile       #:nodoc:
     # The header contains version and instance info packed into 2 bytes.
     header  = version | (instance << 4)
 
-    record  = [header, type, length].pack('vvV') + data
+    [header, type, length].pack('vvV') + data
   end
 
   def not_using_tmpfile

data/lib/writeexcel/chart.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 ###############################################################################
 #
 # Chart - A writer class for Excel Charts.
@@ -649,8 +650,6 @@ class Chart < Worksheet
   # information required for _store_series() and the SERIES record.
   #
   def parse_series_formula(formula)  # :nodoc:
-    encoding = 0
-    length   = 0
     count    = 0
     tokens = []
 
@@ -677,7 +676,7 @@ class Chart < Worksheet
 
     # Extract the range from the parse formula.
     if formula.ord == 0x3B
-        ptg, ext_ref, row_1, row_2, col_1, col_2 = formula.unpack('Cv5')
+        row_1, row_2 = formula.unpack('Cv5')[2, 2]
 
         # TODO. Remove high bit on relative references.
         count = row_2 - row_1 + 1

data/lib/writeexcel/charts/area.rb

@@ -13,7 +13,7 @@
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
 
-require 'writeexcel'
+require 'writeexcel/chart'
 
 module Writeexcel
 

data/lib/writeexcel/charts/pie.rb

@@ -13,7 +13,7 @@
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
 
-require 'writeexcel'
+require 'writeexcel/chart'
 
 module Writeexcel
 

data/lib/writeexcel/charts/scatter.rb

@@ -13,7 +13,7 @@
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
 
-require 'writeexcel'
+require 'writeexcel/chart'
 
 module Writeexcel
 

data/lib/writeexcel/charts/stock.rb

@@ -13,7 +13,7 @@
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
 
-require 'writeexcel'
+require 'writeexcel/chart'
 
 module Writeexcel
 

data/lib/writeexcel/col_info.rb

@@ -54,9 +54,9 @@ class Worksheet < BIFFWriter
 
     def ixfe
       if @format && @format.respond_to?(:xf_index)
-        ixfe = @format.xf_index
+        @format.xf_index
       else
-        ixfe = 0x0F
+        0x0F
       end
     end
 

data/lib/writeexcel/comments.rb

@@ -252,7 +252,7 @@ class Worksheet < BIFFWriter
       when 65533 then 65529
       when 65534 then 65530
       when 65535 then 65531
-      else            @row -1
+      else            @row - 1
       end
     end
 

data/lib/writeexcel/convert_date_time.rb

@@ -81,7 +81,7 @@ module ConvertDateTime
     epoch   = date_1904 ? 1904 : 1900
     offset  = date_1904 ?    4 :    0
     norm    = 300
-    range   = year -epoch
+    range   = year - epoch
 
     # Set month days and check for leap year.
     mdays   = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
@@ -92,15 +92,15 @@ module ConvertDateTime
     # Some boundary checks
     return nil if year  < epoch or year  > 9999
     return nil if month < 1     or month > 12
-    return nil if day   < 1     or day   > mdays[month -1]
+    return nil if day   < 1     or day   > mdays[month - 1]
 
     # Accumulate the number of days since the epoch.
     days = mdays[0, month - 1].inject(day) {|result, mday| result + mday} # days from 1, Jan
-    days += range *365                       # Add days for past years
-    days += ((range)                /  4)    # Add leapdays
-    days -= ((range + offset)       /100)    # Subtract 100 year leapdays
-    days += ((range + offset + norm)/400)    # Add 400 year leapdays
-    days -= leap                             # Already counted above
+    days += range * 365                        # Add days for past years
+    days += ((range)                 /   4)    # Add leapdays
+    days -= ((range + offset)        / 100)    # Subtract 100 year leapdays
+    days += ((range + offset + norm) / 400)    # Add 400 year leapdays
+    days -= leap                               # Already counted above
 
     # Adjust for Excel erroneously treating 1900 as a leap year.
     days += 1 if !date_1904 and days > 59

data/lib/writeexcel/excelformulaparser.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.11
@@ -293,14 +294,14 @@ Racc_debug_parser = false
 
 module_eval(<<'.,.,', 'excelformula.y', 20)
   def _reduce_2(val, _values, result)
-     result = [] 
+     result = []
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 21)
   def _reduce_3(val, _values, result)
-     result.push val[1], '_arg', '1' 
+     result.push val[1], '_arg', '1'
     result
   end
 .,.,
@@ -309,84 +310,84 @@ module_eval(<<'.,.,', 'excelformula.y', 21)
 
 module_eval(<<'.,.,', 'excelformula.y', 24)
   def _reduce_5(val, _values, result)
-     result = [ val[0], val[2], 'ptgAdd' ] 
+     result = [ val[0], val[2], 'ptgAdd' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 25)
   def _reduce_6(val, _values, result)
-     result = [ val[0], val[2], 'ptgSub' ] 
+     result = [ val[0], val[2], 'ptgSub' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 26)
   def _reduce_7(val, _values, result)
-     result = [ val[0], val[2], 'ptgMul' ] 
+     result = [ val[0], val[2], 'ptgMul' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 27)
   def _reduce_8(val, _values, result)
-     result = [ val[0], val[2], 'ptgDiv' ] 
+     result = [ val[0], val[2], 'ptgDiv' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 28)
   def _reduce_9(val, _values, result)
-     result = [ val[0], val[2], 'ptgPower' ] 
+     result = [ val[0], val[2], 'ptgPower' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 29)
   def _reduce_10(val, _values, result)
-     result = [ val[0], val[2], 'ptgConcat' ] 
+     result = [ val[0], val[2], 'ptgConcat' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 30)
   def _reduce_11(val, _values, result)
-     result = [ val[0], val[2], 'ptgLT' ] 
+     result = [ val[0], val[2], 'ptgLT' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 31)
   def _reduce_12(val, _values, result)
-     result = [ val[0], val[2], 'ptgGT' ] 
+     result = [ val[0], val[2], 'ptgGT' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 32)
   def _reduce_13(val, _values, result)
-     result = [ val[0], val[2], 'ptgLE' ] 
+     result = [ val[0], val[2], 'ptgLE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 33)
   def _reduce_14(val, _values, result)
-     result = [ val[0], val[2], 'ptgGE' ] 
+     result = [ val[0], val[2], 'ptgGE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 34)
   def _reduce_15(val, _values, result)
-     result = [ val[0], val[2], 'ptgNE' ] 
+     result = [ val[0], val[2], 'ptgNE' ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 35)
   def _reduce_16(val, _values, result)
-     result = [ val[0], val[2], 'ptgEQ' ] 
+     result = [ val[0], val[2], 'ptgEQ' ]
     result
   end
 .,.,
@@ -395,14 +396,14 @@ module_eval(<<'.,.,', 'excelformula.y', 35)
 
 module_eval(<<'.,.,', 'excelformula.y', 38)
   def _reduce_18(val, _values, result)
-     result = [ val[1], '_arg', '1', 'ptgParen'] 
+     result = [ val[1], '_arg', '1', 'ptgParen']
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 39)
   def _reduce_19(val, _values, result)
-     result = [ '_num', '-1', val[1], 'ptgMul' ] 
+     result = [ '_num', '-1', val[1], 'ptgMul' ]
     result
   end
 .,.,
@@ -411,63 +412,63 @@ module_eval(<<'.,.,', 'excelformula.y', 39)
 
 module_eval(<<'.,.,', 'excelformula.y', 41)
   def _reduce_21(val, _values, result)
-     result = [ '_num',     val[0] ] 
+     result = [ '_num',     val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 42)
   def _reduce_22(val, _values, result)
-     result = [ '_str',     val[0] ] 
+     result = [ '_str',     val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 43)
   def _reduce_23(val, _values, result)
-     result = [ '_ref2d',   val[0] ] 
+     result = [ '_ref2d',   val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 44)
   def _reduce_24(val, _values, result)
-     result = [ '_ref3d',   val[0] ] 
+     result = [ '_ref3d',   val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 45)
   def _reduce_25(val, _values, result)
-     result = [ '_range2d', val[0] ] 
+     result = [ '_range2d', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 46)
   def _reduce_26(val, _values, result)
-     result = [ '_range3d', val[0] ] 
+     result = [ '_range3d', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 47)
   def _reduce_27(val, _values, result)
-     result = [ '_name',    val[0] ] 
+     result = [ '_name',    val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 48)
   def _reduce_28(val, _values, result)
-     result = [ 'ptgBool',  '1'    ] 
+     result = [ 'ptgBool',  '1'    ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 49)
   def _reduce_29(val, _values, result)
-     result = [ 'ptgBool',  '0'    ] 
+     result = [ 'ptgBool',  '0'    ]
     result
   end
 .,.,
@@ -476,28 +477,28 @@ module_eval(<<'.,.,', 'excelformula.y', 49)
 
 module_eval(<<'.,.,', 'excelformula.y', 52)
   def _reduce_31(val, _values, result)
-     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ] 
+     result = [ '_class', val[0], val[2], '_arg', val[2].size.to_s, '_func', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 53)
   def _reduce_32(val, _values, result)
-     result = [ '_func', val[0] ] 
+     result = [ '_func', val[0] ]
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 55)
   def _reduce_33(val, _values, result)
-     result = val 
+     result = val
     result
   end
 .,.,
 
 module_eval(<<'.,.,', 'excelformula.y', 56)
   def _reduce_34(val, _values, result)
-     result.push val[2] 
+     result.push val[2]
     result
   end
 .,.,
@@ -515,70 +516,69 @@ end
 module Writeexcel
 
    class Node  # :nodoc:
-   
+
       def exec_list(nodes)
          v = nil
          nodes.each { |i| v = i.evaluate }
          v
       end
-   
+
       def excelformulaparser_error(msg)
          raise ExcelFormulaParserError,
                   "in #{fname}:#{lineno}: #{msg}"
       end
-   
+
    end
-   
+
    class RootNode < Node  # :nodoc:
-   
+
       def initialize(tree)
          @tree = tree
       end
-   
+
       def evaluate
          exec_list @tree
       end
-   
+
    end
-   
-   
+
+
    class FuncallNode < Node  # :nodoc:
-   
+
       def initialize(func, args)
          @func = func
          @args = args
       end
-   
+
       def evaluate
          arg = @args.collect {|i| i.evaluate }
-         out = []
          arg.each { |i| o.push i }
          o.push @func
          p o
       end
-   
+
    end
-   
+
    class NumberNode < Node  # :nodoc:
-   
+
       def initialize(val)
          @val = val
       end
-   
+
       def evaluate
          p @val
       end
-   
+
    end
-   
+
    class OperateNode < Node  # :nodoc:
-   
+
       def initialize(op, left, right)
          @op = op
          @left = left
          @right = right
       end
-   
+
       def evaluate
          o = []
          o.push @left

data/lib/writeexcel/format.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 ##############################################################################
 #
 # Format - A class for defining Excel formatting.
@@ -1572,4 +1573,3 @@ class Format < Colors
 end  # class Format
 
 end  # module Writeexcel
-

data/lib/writeexcel/formula.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 ###############################################################################
 #
 # Formula - A class for generating Excel formulas.
@@ -62,7 +63,6 @@ class Formula < ExcelFormulaParser       #:nodoc:
   #
   def parse_tokens(tokens)
     parse_str   = ''
-    last_type   = ''
     modifier    = ''
     num_args    = 0
     _class      = 0

data/lib/writeexcel/helper.rb

@@ -42,9 +42,9 @@
   private :utf8_to_16le
 
   def ascii_to_16be(ascii)
-    ascii.unpack("C*").pack("n*")
-    ruby_19 { ascii.force_encoding('UTF-16BE') }
-    ascii
+    str_16be = ascii.unpack("C*").pack("n*")
+    ruby_19 { str_16be.force_encoding('UTF-16BE') }
+    str_16be
   end
   private :ascii_to_16be
 

data/lib/writeexcel/properties.rb

@@ -178,7 +178,7 @@ end
 #
 def pack_VT_I2(value)       #:nodoc:
     type    = 0x0002
-    data = [type, value].pack('VV')
+    [type, value].pack('VV')
 end
 
 ###############################################################################

data/lib/writeexcel/shared_string_table.rb

@@ -109,10 +109,10 @@ class Workbook < BIFFWriter
             written      += space_remaining
 
             # Reduce the current block length by the amount written
-            block_length -= continue_limit -continue -align
+            block_length -= continue_limit - continue - align
 
             # Store the max size for this block
-            block_sizes.push(continue_limit -align)
+            block_sizes.push(continue_limit - align)
 
             # If the current string was split then the next CONTINUE block
             # should have the string continue flag (grbit) set unless the
@@ -125,10 +125,10 @@ class Workbook < BIFFWriter
             end
           else
             # Store the max size for this block
-            block_sizes.push(written +continue)
+            block_sizes.push(written + continue)
 
             # Not enough space to start the string in the current block
-            block_length -= continue_limit -space_remaining -continue
+            block_length -= continue_limit - space_remaining - continue
             continue = 0
           end
 
@@ -145,7 +145,7 @@ class Workbook < BIFFWriter
       end
 
       # Store the max size for the last block unless it is empty
-      block_sizes.push(written +continue) if written +continue != 0
+      block_sizes.push(written + continue) if written + continue != 0
 
       block_sizes
     end

data/lib/writeexcel/storage_lite.rb

@@ -55,8 +55,6 @@ class OLEStorageLite       #:nodoc:
     end
     done << no
 
-    rootblock = info[:root_start]
-
     #1. Get Information about itself
     pps = _getNthPps(no, info, data)
 
@@ -76,7 +74,6 @@ class OLEStorageLite       #:nodoc:
   private :_getPpsTree
 
   def _getPpsSearch(no, info, name, data, icase, done = nil)
-    rootblock = info[:root_start]
     #1. Check it self
     if done
       return [] if done.include?(no)
@@ -589,7 +586,6 @@ class OLEStorageLitePPSRoot < OLEStorageLitePPS       #:nodoc:
       rh_info[:fileh] = sFile.binmode
     end
 
-    iBlk = 0
     #1. Make an array of PPS (for Save)
     aList=[]
     if bNoAs
@@ -728,7 +724,6 @@ class OLEStorageLitePPSRoot < OLEStorageLitePPS       #:nodoc:
   private :_saveHeader
 
   def _saveBigData(iStBlk, aList, rh_info)
-    iRes = 0
     file = rh_info[:fileh]
 
     #1.Write Big (ge 0x1000) Data into Block
@@ -810,7 +805,7 @@ class OLEStorageLitePPSRoot < OLEStorageLitePPS       #:nodoc:
       aPrev = aWk[0, iPos]
       aWk[0..iPos-1] = []
       aNext = aWk[1, iCnt - iPos - 1]
-      aWk[1..(1 + iCnt - iPos -1 -1)] = []
+      aWk[1..(1 + iCnt - iPos - 1 - 1)] = []
       pps_array[iPos].prev_pps = _savePpsSetPnt(aPrev, aList, rh_info)
       pps_array[iPos].next_pps = _savePpsSetPnt(aNext, aList, rh_info)
       pps_array[iPos].dir_pps  = _savePpsSetPnt(pps_array[iPos].child, aList, rh_info)
@@ -834,12 +829,10 @@ class OLEStorageLitePPSRoot < OLEStorageLitePPS       #:nodoc:
       return pps_array[0].no
     #1.3 Array
     else
-      iCnt = pps_array.size
       #1.3.1 Define Center
       iPos = 0  #int($iCnt/ 2);     #$iCnt
 
       aWk = pps_array.dup
-      aPrev = aWk[1, 1]
       aWk[1..1] = []
       aNext = aWk[1..aWk.size]      #, $iCnt - $iPos -1);
       pps_array[iPos].prev_pps = _savePpsSetPnt2(pps_array, aList, rh_info)
@@ -975,7 +968,7 @@ class OLEStorageLitePPSFile < OLEStorageLitePPS       #:nodoc:
     @pps_file.binmode
   end
 
-  def append (data)
+  def append(data)
     return if data.nil?
     if @pps_file
       @pps_file << data

data/lib/writeexcel/version.rb

@@ -1,5 +1,5 @@
 require 'writeexcel'
 
 class WriteExcel < Workbook
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end