spreadsheet 0.7.5 → 0.7.6

data/History.txt

@@ -1,3 +1,15 @@
+=== 0.7.6 / 15.01.2013
+
+Author: Kenichi Kamiya <kachick1@gmail.com>
+Date:   Tue Jan 15 15:52:58 2013 +0900
+
+* Remove warnings "method redefined; discarding old default_format"
+* Remove warnings "`*' interpreted as argument prefix"
+* Remove warnings "instance variable @{ivar} not initialized"
+* Remove warnings "assigned but unused variable"
+
+also see: https://github.com/zdavatz/spreadsheet/pull/21
+
 === 0.7.5 / 06.12.2012
 
 * Add error tolerant values for Iconv when writing spreadsheet

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/excel/reader.rb

@@ -145,7 +145,7 @@ class Reader
     #      6     2  Build year
     #      8     4  File history flags
     #     12     4  Lowest Excel version that can read all records in this file
-    pos, @bof, len, work = get_next_chunk
+    _, @bof, _, work = get_next_chunk
     ## version and datatype are common to all Excel-Versions. Later versions
     #  have additional information such as build-id and -year (from BIFF5).
     #  These are ignored for the time being.
@@ -178,7 +178,7 @@ class Reader
     #      6  var.  Sheet name: BIFF5/BIFF7: Byte string,
     #                           8-bit string length (➜ 3.3)
     #                           BIFF8: Unicode string, 8-bit string length (➜ 3.4)
-    offset, visibility, type = work.unpack("VC2")
+    offset, _, _ = work.unpack("VC2")
     name = client read_string(work[6..-1]), @workbook.encoding
     if @boundsheets
       @boundsheets[0] += 1
@@ -442,15 +442,14 @@ class Reader
     # [var.]  2∙tl  (optional, see option flags) Character array of the text
     #               mark without “#” sign, no Unicode string header, always
     #               16-bit characters, zero-terminated
-    firstrow, lastrow, firstcol, lastcol, guid, opts = work.unpack 'v4H32x4V'
+    firstrow, lastrow, firstcol, lastcol, _, opts = work.unpack 'v4H32x4V'
     has_link = opts & 0x0001
-    absolute = opts & 0x0002
     desc     = opts & 0x0014
     textmark = opts & 0x0008
     target   = opts & 0x0080
     unc      = opts & 0x0100
     link = Link.new
-    url, description = nil
+    _, description = nil
     pos = 32
     if desc > 0
       description, pos = read_hlink_string work, pos
@@ -610,7 +609,7 @@ class Reader
     #      4  2∙nc  List of nc=lc-fc+1 16-bit indexes to XF records (➜ 6.115)
     # 4+2∙nc     2  Index to last column (lc)
     row, column, *xfs = work.unpack 'v*'
-    last_column = xfs.pop # unused
+    xfs.pop #=> last_column
     xfs.each_with_index do |xf, idx| set_cell worksheet, row, column + idx, xf end
   end
   def read_mulrk worksheet, addr, work
@@ -655,7 +654,7 @@ class Reader
       @pos = addr[:offset]
       found = false
       while tuple = get_next_chunk
-        pos, op, len, work = tuple
+        pos, op, _, work = tuple
         case op
         when :eof      # ●  EOF ➜ 6.36 - we should only get here if there is just
                        #                 one Row-Block
@@ -771,7 +770,7 @@ class Reader
     # but another self-contained MERGEDCELLS record is started. The limit of 8224 bytes
     # per record results in a maximum number of 1027 merged ranges.
 
-    worksheet.merged_cells.push *read_range_address_list(work, len)
+    worksheet.merged_cells.push(*read_range_address_list(work, len))
     #
     # A cell range address list consists of a field with the number of ranges and the list
     # of the range addresses.
@@ -783,7 +782,6 @@ class Reader
   end
 
   def read_workbook
-    worksheet = nil
     previous_op = nil
     while tuple = get_next_chunk
       pos, op, len, work = tuple
@@ -1029,7 +1027,7 @@ class Reader
     #                13-7  0x3f80      Colour index (➜ 6.70)
     #                                  for pattern background
     fmt = Format.new
-    font_idx, numfmt, xf_type, xf_align, xf_rotation, xf_indent, xf_used_attr,
+    font_idx, numfmt, _, xf_align, xf_rotation, xf_indent, _,
       xf_borders, xf_brdcolors, xf_pattern = work.unpack binfmt(:xf)
     fmt.number_format = @formats[numfmt]
     ## this appears to be undocumented: the first 4 fonts seem to be accessed
@@ -1084,7 +1082,7 @@ class Reader
     # Offset  Size  Contents
     #      0     2  Index of this row
     #      2     2  Index to this column
-    row_index, column_index = work.unpack 'v2'
+    row_index, _ = work.unpack 'v2'
     unless worksheet.offsets[row_index]
       @current_row_block_offset ||= [pos]
       data = {

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -193,7 +193,7 @@ class Workbook < Spreadsheet::Writer
         reader.seek lastpos = 0
         workbook.offsets.select do |key, pair|
           workbook.changes.include? key
-        end.sort_by do |key, (pos, len)|
+        end.sort_by do |key, (pos, _)|
           pos
         end.each do |key, (pos, len)|
           data = reader.read(pos - lastpos)
@@ -538,7 +538,7 @@ class Workbook < Spreadsheet::Writer
     ## if we're writing wide characters, we need to make sure we don't cut
     #  characters in half
     if wide > 0 && data.size > @recordsize_limit
-      remove = @recordsize_limit - data.size
+      remove = @recordsize_limit - bef
       remove -= remove % 2
       rest = data.slice!(remove..-1)
       write_op writer, op, data

data/lib/spreadsheet/excel/writer/worksheet.rb

@@ -291,7 +291,7 @@ Please contact the author (hannes dot wyss at gmail dot com) with a sample file
 and minimal code that generates this warning. Thanks!
       EOS
     end
-    work = work.sort_by do |key, (pos, len)|
+    work = work.sort_by do |key, (pos, _)|
       [pos, key.is_a?(Integer) ? key : -1]
     end
     work.each do |key, (pos, len)|
@@ -598,7 +598,6 @@ and minimal code that generates this warning. Thanks!
   def write_hyperlink_table
     # TODO: theoretically it's possible to write fewer records by combining
     #       identical neighboring links in cell-ranges
-    links = []
     @worksheet.each do |row|
       row.each_with_index do |cell, idx|
         if cell.is_a? Link

data/lib/spreadsheet/font.rb

@@ -64,6 +64,17 @@ module Spreadsheet
     def initialize name, opts={}
       self.name = name
       @color = :text
+      @previous_fast_key = nil
+      @size = nil
+      @weight = nil
+      @italic = nil
+      @strikeout = nil
+      @outline = nil
+      @shadow = nil
+      @escapement = nil
+      @underline = nil
+      @family = nil
+      @encoding = nil
       opts.each do |key, val|
         self.send "#{key}=", val
       end

data/lib/spreadsheet/row.rb

@@ -48,7 +48,7 @@ module Spreadsheet
         end
       end
     end
-    attr_reader :formats, :default_format
+    attr_reader :formats
     attr_accessor :idx, :height, :worksheet
     boolean :hidden, :collapsed
     enum :outline_level, 0, Integer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
-  requirement: &24058540 !ruby/object:Gem::Requirement
+  requirement: &5739340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *24058540
+  version_requirements: *5739340
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24131440 !ruby/object:Gem::Requirement
+  requirement: &5732180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *24131440
+  version_requirements: *5732180
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &24130840 !ruby/object:Gem::Requirement
+  requirement: &5726660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *24130840
+  version_requirements: *5726660
 description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
   Documents.