writeexcel 1.0.4 → 1.0.6

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
@@ -680,13 +680,11 @@ class Formula < ExcelFormulaParser       #:nodoc:
       'ptgRefNV'          => 0x4C,
       'ptgAreaNV'         => 0x4D,
       'ptgMemAreaNV'      => 0x4E,
-      'ptgMemNoMemN'      => 0x4F,
       'ptgFuncCEV'        => 0x58,
       'ptgNameXV'         => 0x59,
       'ptgRef3dV'         => 0x5A,
       'ptgArea3dV'        => 0x5B,
       'ptgRefErr3dV'      => 0x5C,
-      'ptgAreaErr3d'      => 0x5D,
       'ptgArrayA'         => 0x60,
       'ptgFuncA'          => 0x61,
       'ptgFuncVarA'       => 0x62,
@@ -702,13 +700,11 @@ class Formula < ExcelFormulaParser       #:nodoc:
       'ptgRefNA'          => 0x6C,
       'ptgAreaNA'         => 0x6D,
       'ptgMemAreaNA'      => 0x6E,
-      'ptgMemNoMemN'      => 0x6F,
       'ptgFuncCEA'        => 0x78,
       'ptgNameXA'         => 0x79,
       'ptgRef3dA'         => 0x7A,
       'ptgArea3dA'        => 0x7B,
-      'ptgRefErr3dA'      => 0x7C,
-      'ptgAreaErr3d'      => 0x7D
+      'ptgRefErr3dA'      => 0x7C
     }
 
     # Thanks to Michael Meeks and Gnumeric for the initial arg values.

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.4"
+  VERSION = "1.0.6"
 end

data/lib/writeexcel/workbook.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 ###############################################################################
 #
 # Workbook - A writer class for Excel Workbooks.
@@ -652,7 +653,6 @@ class Workbook < BIFFWriter
   #
   def define_name(name, formula, encoding = 0)
     sheet_index = 0
-    full_name   = name.downcase
 
     if name =~ /^(.*)!(.*)$/
       sheetname   = $1
@@ -1266,7 +1266,7 @@ class Workbook < BIFFWriter
     # Add the length of the MSODRAWINGGROUP records including an extra 4 bytes
     # for any CONTINUE headers. See add_mso_drawing_group_continue().
     mso_size = @mso_size
-    mso_size += 4 * Integer((mso_size -1) / Float(@limit))
+    mso_size += 4 * Integer((mso_size - 1) / Float(@limit))
     offset   += mso_size
 
     @worksheets.each do |sheet|
@@ -1374,7 +1374,7 @@ class Workbook < BIFFWriter
           image_id += 1
         else
           # We've processed this file already.
-          index = images_seen[image.filename] -1
+          index = images_seen[image.filename] - 1
 
           # Increase image reference count.
           image_data[index].ref_count += 1
@@ -2053,7 +2053,6 @@ class Workbook < BIFFWriter
   def store_shared_strings       #:nodoc:
     record              = 0x00FC   # Record identifier
     length              = 0x0008   # Number of bytes to follow
-    total               = 0x0000
 
     # Iterate through the strings to calculate the CONTINUE block sizes
     continue_limit = 8208
@@ -2136,10 +2135,10 @@ class Workbook < BIFFWriter
           append(tmp)
 
           # The remainder will be written in the next block(s)
-          string = string[space_remaining .. string.length-1]
+          string = string[space_remaining .. string.length - 1]
 
           # Reduce the current block length by the amount written
-          block_length -= continue_limit -continue -align
+          block_length -= continue_limit - continue - align
 
           # If the current string was split then the next CONTINUE block
           # should have the string continue flag (grbit) set unless the
@@ -2152,7 +2151,7 @@ class Workbook < BIFFWriter
           end
         else
           # 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
 
@@ -2206,7 +2205,7 @@ class Workbook < BIFFWriter
       bucket_size = 1 + Integer(unique_strings / 128.0)
     end
 
-    buckets = Integer((unique_strings + bucket_size -1)  / Float(bucket_size))
+    buckets = Integer((unique_strings + bucket_size - 1) / Float(bucket_size))
 
     @extsst_buckets        = buckets
     @extsst_bucket_size    = bucket_size
@@ -2278,7 +2277,7 @@ class Workbook < BIFFWriter
   #     Case 3:  >  2*8224 bytes      2 MSODRAWINGGROUP + n CONTINUE
   #
   def add_mso_drawing_group_continue(data)       #:nodoc:
-    limit       = 8228 -4
+    limit       = 8228 - 4
     mso_group   = 0x00EB # Record identifier
     continue    = 0x003C # Record identifier
     block_count = 1
@@ -2334,7 +2333,7 @@ class Workbook < BIFFWriter
     version     = 15
     instance    = 0
     data        = ''
-    length      = @mso_size -12 # -4 (biff header) -8 (for this).
+    length      = @mso_size - 12 # -4 (biff header) -8 (for this).
 
     add_mso_generic(type, version, instance, data, length)
   end
@@ -2372,7 +2371,7 @@ class Workbook < BIFFWriter
     version     = 15
     instance    = @images_data.size          # Number of images.
     data        = ''
-    length      = @images_size +8 *instance
+    length      = @images_size + 8 * instance
 
     add_mso_generic(type, version, instance, data, length)
   end
@@ -2399,12 +2398,12 @@ class Workbook < BIFFWriter
     type        = 0xF007
     version     = 2
     instance    = image_type
-    length      = size +61
+    length      = size + 61
     data        = [image_type].pack('C')  +    # Win32
     [image_type].pack('C')  +    # Mac
     [checksum1].pack('H*')  +    # Uid checksum
     [0xFF].pack('v')        +    # Tag
-    [size +25].pack('V')    +    # Next Blip size
+    [size + 25].pack('V')   +    # Next Blip size
     [ref_count].pack('V')   +    # Image ref count
     [0x00000000].pack('V')  +    # File offset
     [0x00].pack('C')        +    # Usage
@@ -2430,7 +2429,7 @@ class Workbook < BIFFWriter
 
     type        = 0xF018 + image_type
     version     = 0x0000
-    length      = size +17
+    length      = size + 17
     data        = [checksum1].pack('H*')  +     # Uid checksum
     [0xFF].pack('C')        +     # Tag
     image_data                   # Image