spreadsheet 1.3.3 → 1.3.4

data/lib/spreadsheet/excel/rgb.rb

@@ -1,5 +1,5 @@
 # A quick and dirty class for converting color palette values to RGB values.
-# The values below have the form 0xRRGGBB, where RR is the red level, GG the 
+# The values below have the form 0xRRGGBB, where RR is the red level, GG the
 # green level, and BB the blue level. Each level is a value from 0 to 255,
 # just as one would expect in HTML markup.
 
@@ -13,109 +13,109 @@ module Spreadsheet
     class Rgb
       attr_accessor :r, :g, :b
 
-      @@RGB_MAP = {
-        :xls_color_0     => 0x000000,
-        :xls_color_1     => 0xffffff,
-        :xls_color_2     => 0xff0000,
-        :xls_color_3     => 0x00ff00,
-        :xls_color_4     => 0x0000ff,
-        :xls_color_5     => 0xffff00,
-        :xls_color_6     => 0xff00ff,
-        :xls_color_7     => 0x00ffff,
-        :xls_color_8     => 0x800000,
-        :xls_color_9     => 0x008000,
-        :xls_color_10    => 0x008000,
-        :xls_color_11    => 0x000080,
-        :xls_color_12    => 0x808080,
-        :xls_color_13    => 0x008080,
-        :xls_color_14    => 0xc0c0c0,
-        :xls_color_15    => 0x808080,
-        :xls_color_16    => 0x9999ff,
-        :xls_color_17    => 0x993366,
-        :xls_color_18    => 0xffffcc,
-        :xls_color_19    => 0xccffff,
-        :xls_color_20    => 0x660066,
-        :xls_color_21    => 0xff8080,
-        :xls_color_22    => 0x0066cc,
-        :xls_color_23    => 0xccccff,
-        :xls_color_24    => 0x000080,
-        :xls_color_25    => 0xff00ff,
-        :xls_color_26    => 0xffff00,
-        :xls_color_27    => 0x00ffff,
-        :xls_color_28    => 0x800080,
-        :xls_color_29    => 0x800000,
-        :xls_color_30    => 0x008080,
-        :xls_color_31    => 0x0000ff,
-        :xls_color_32    => 0x00ccff,
-        :xls_color_33    => 0xccffff,
-        :xls_color_34    => 0xccffcc,
-        :xls_color_35    => 0xffff99,
-        :xls_color_36    => 0x99ccff,
-        :xls_color_37    => 0xff99cc,
-        :xls_color_38    => 0xcc99ff,
-        :xls_color_39    => 0xffcc99,
-        :xls_color_40    => 0x3366ff,
-        :xls_color_41    => 0x33cccc,
-        :xls_color_42    => 0x99cc00,
-        :xls_color_43    => 0xffcc00,
-        :xls_color_44    => 0xff9900,
-        :xls_color_45    => 0xff6600,
-        :xls_color_46    => 0x666699,
-        :xls_color_47    => 0x969696,
-        :xls_color_48    => 0x003366,
-        :xls_color_49    => 0x339966,
-        :xls_color_50    => 0x003300,
-        :xls_color_51    => 0x333300,
-        :xls_color_52    => 0x993300,
-        :xls_color_53    => 0x993366,
-        :xls_color_54    => 0x333399,
-        :xls_color_55    => 0x333333,
-        :builtin_black   => 0x000000,
-        :builtin_white   => 0xffffff,
-        :builtin_red     => 0xff0000,
-        :builtin_green   => 0x00ff00,
-        :builtin_blue    => 0x0000ff,
-        :builtin_yellow  => 0xffff00,
-        :builtin_magenta => 0xff00ff,
-        :builtin_cyan    => 0x00ffff,
-        :aqua            => 0x00ffff,
-        :black           => 0x000000,
-        :blue            => 0x0000ff,
-        :cyan            => 0x00ffff,
-        :brown           => 0x800000,
-        :fuchsia         => 0xff00ff,
-        :gray            => 0x808080,
-        :grey            => 0x808080,
-        :green           => 0x008000,
-        :lime            => 0x00ff00,
-        :magenta         => 0xff00ff,
-        :navy            => 0x000080,
-        :orange          => 0xff9900,
-        :purple          => 0x800080,
-        :red             => 0xff0000,
-        :silver          => 0xc0c0c0,
-        :white           => 0xffffff,
-        :yellow          => 0xffff00
+      @@rgb_map = {
+        xls_color_0: 0x000000,
+        xls_color_1: 0xffffff,
+        xls_color_2: 0xff0000,
+        xls_color_3: 0x00ff00,
+        xls_color_4: 0x0000ff,
+        xls_color_5: 0xffff00,
+        xls_color_6: 0xff00ff,
+        xls_color_7: 0x00ffff,
+        xls_color_8: 0x800000,
+        xls_color_9: 0x008000,
+        xls_color_10: 0x008000,
+        xls_color_11: 0x000080,
+        xls_color_12: 0x808080,
+        xls_color_13: 0x008080,
+        xls_color_14: 0xc0c0c0,
+        xls_color_15: 0x808080,
+        xls_color_16: 0x9999ff,
+        xls_color_17: 0x993366,
+        xls_color_18: 0xffffcc,
+        xls_color_19: 0xccffff,
+        xls_color_20: 0x660066,
+        xls_color_21: 0xff8080,
+        xls_color_22: 0x0066cc,
+        xls_color_23: 0xccccff,
+        xls_color_24: 0x000080,
+        xls_color_25: 0xff00ff,
+        xls_color_26: 0xffff00,
+        xls_color_27: 0x00ffff,
+        xls_color_28: 0x800080,
+        xls_color_29: 0x800000,
+        xls_color_30: 0x008080,
+        xls_color_31: 0x0000ff,
+        xls_color_32: 0x00ccff,
+        xls_color_33: 0xccffff,
+        xls_color_34: 0xccffcc,
+        xls_color_35: 0xffff99,
+        xls_color_36: 0x99ccff,
+        xls_color_37: 0xff99cc,
+        xls_color_38: 0xcc99ff,
+        xls_color_39: 0xffcc99,
+        xls_color_40: 0x3366ff,
+        xls_color_41: 0x33cccc,
+        xls_color_42: 0x99cc00,
+        xls_color_43: 0xffcc00,
+        xls_color_44: 0xff9900,
+        xls_color_45: 0xff6600,
+        xls_color_46: 0x666699,
+        xls_color_47: 0x969696,
+        xls_color_48: 0x003366,
+        xls_color_49: 0x339966,
+        xls_color_50: 0x003300,
+        xls_color_51: 0x333300,
+        xls_color_52: 0x993300,
+        xls_color_53: 0x993366,
+        xls_color_54: 0x333399,
+        xls_color_55: 0x333333,
+        builtin_black: 0x000000,
+        builtin_white: 0xffffff,
+        builtin_red: 0xff0000,
+        builtin_green: 0x00ff00,
+        builtin_blue: 0x0000ff,
+        builtin_yellow: 0xffff00,
+        builtin_magenta: 0xff00ff,
+        builtin_cyan: 0x00ffff,
+        aqua: 0x00ffff,
+        black: 0x000000,
+        blue: 0x0000ff,
+        cyan: 0x00ffff,
+        brown: 0x800000,
+        fuchsia: 0xff00ff,
+        gray: 0x808080,
+        grey: 0x808080,
+        green: 0x008000,
+        lime: 0x00ff00,
+        magenta: 0xff00ff,
+        navy: 0x000080,
+        orange: 0xff9900,
+        purple: 0x800080,
+        red: 0xff0000,
+        silver: 0xc0c0c0,
+        white: 0xffffff,
+        yellow: 0xffff00
       }
 
       def self.to_rgb color_symbol
-        col = @@RGB_MAP[color_symbol]
+        col = @@rgb_map[color_symbol]
         return Rgb.new(col >> 16, (col & 0xff00) >> 8, col & 0xff) if col
         nil
       end
 
-      def initialize(r,g,b)
-         @r = r & 0xff
-         @g = g & 0xff
-         @b = b & 0xff
+      def initialize(r, g, b)
+        @r = r & 0xff
+        @g = g & 0xff
+        @b = b & 0xff
       end
 
       def to_i
-         (r * (256 * 256)) + (g * 256) + b
+        (r * (256 * 256)) + (g * 256) + b
       end
 
       def as_hex
-         to_i.to_s(16)
+        to_i.to_s(16)
       end
     end
   end

data/lib/spreadsheet/excel/row.rb

@@ -1,98 +1,106 @@
-require 'date'
-require 'spreadsheet/row'
+require "date"
+require "spreadsheet/row"
 
 module Spreadsheet
   module Excel
-##
-# Excel-specific Row methods
-class Row < Spreadsheet::Row
-  ##
-  # The Excel date calculation erroneously assumes that 1900 is a leap-year. All
-  # Dates after 28.2.1900 are off by one.
-  LEAP_ERROR = Date.new 1900, 2, 28
-  ##
-  # Force convert the cell at _idx_ to a Date
-  def date idx
-    _date at(idx)
-  end
-  ##
-  # Force convert the cell at _idx_ to a DateTime
-  def datetime idx
-    _datetime at(idx)
-  end
-  def each
-    size.times do |idx|
-      yield self[idx]
-    end
-  end
-  ##
-  # Access data in this Row like you would in an Array. If a cell is formatted
-  # as a Date or DateTime, the decoded Date or DateTime value is returned.
-  def [] idx, len=nil
-    if len
-      idx = idx...(idx+len)
-    end
-    if idx.is_a? Range
-      data = []
-      idx.each do |i|
-        data.push enriched_data(i, at(i))
+    ##
+    # Excel-specific Row methods
+    class Row < Spreadsheet::Row
+      ##
+      # The Excel date calculation erroneously assumes that 1900 is a leap-year. All
+      # Dates after 28.2.1900 are off by one.
+      LEAP_ERROR = Date.new 1900, 2, 28
+      ##
+      # Force convert the cell at _idx_ to a Date
+      def date idx
+        set_date at(idx)
+      end
+
+      ##
+      # Force convert the cell at _idx_ to a DateTime
+      def datetime idx
+        set_datetime at(idx)
+      end
+
+      def each
+        size.times do |idx|
+          yield self[idx]
+        end
+      end
+
+      ##
+      # Access data in this Row like you would in an Array. If a cell is formatted
+      # as a Date or DateTime, the decoded Date or DateTime value is returned.
+      def [] idx, len = nil
+        if len
+          idx = idx...(idx + len)
+        end
+        if idx.is_a? Range
+          data = []
+          idx.each do |i|
+            data.push enriched_data(i, at(i))
+          end
+          data
+        else
+          enriched_data idx, at(idx)
+        end
+      end
+
+      ##
+      # Returns data as an array. If a cell is formatted as a Date or DateTime, the
+      # decoded Date or DateTime value is returned.
+      def to_a
+        self[0...length]
+      end
+
+      private
+
+      def set_date data # :nodoc:
+        return data if data.is_a?(Date)
+        datetime = set_datetime data
+        Date.new datetime.year, datetime.month, datetime.day
+      end
+
+      def set_datetime data # :nodoc:
+        return data if data.is_a?(DateTime)
+        base = @worksheet.date_base
+        date = base + data.to_f
+        hour = (data.to_f % 1) * 24
+        min = (hour % 1) * 60
+        sec = ((min % 1) * 60).round
+        min = min.floor
+        hour = hour.floor
+        if sec > 59
+          sec = 0
+          min += 1
+        end
+        if min > 59
+          min = 0
+          hour += 1
+        end
+        if hour > 23
+          hour = 0
+          date += 1
+        end
+        if base < LEAP_ERROR
+          date -= 1
+        end
+        DateTime.new(date.year, date.month, date.day, hour, min, sec)
+      end
+
+      def enriched_data idx, data # :nodoc:
+        res = nil
+        if (link = @worksheet.links[[@idx, idx]])
+          res = link
+        elsif data.is_a?(Numeric) && (fmt = format(idx))
+          res = if fmt.datetime? || fmt.time?
+            set_datetime data
+          elsif fmt.date?
+            set_date data
+          end
+        end
+        res || data
       end
-      data
-    else
-      enriched_data idx, at(idx)
-    end
-  end
-  ##
-  # Returns data as an array. If a cell is formatted as a Date or DateTime, the
-  # decoded Date or DateTime value is returned.
-  def to_a
-    self[0...length]
-  end
-  private
-  def _date data # :nodoc:
-    return data if data.is_a?(Date)
-    datetime = _datetime data
-    Date.new datetime.year, datetime.month, datetime.day
-  end
-  def _datetime data # :nodoc:
-    return data if data.is_a?(DateTime)
-    base = @worksheet.date_base
-    date = base + data.to_f
-    hour = (data.to_f % 1) * 24
-    min  = (hour % 1) * 60
-    sec  = ((min % 1) * 60).round
-    min = min.floor
-    hour = hour.floor
-    if sec > 59
-      sec = 0
-      min += 1
-    end
-    if min > 59
-      min = 0
-      hour += 1
-    end
-    if hour > 23
-      hour = 0
-      date += 1
-    end
-    if LEAP_ERROR > base
-      date -= 1
-    end
-    DateTime.new(date.year, date.month, date.day, hour, min, sec)
-  end
-  def enriched_data idx, data # :nodoc:
-    res = nil
-    if link = @worksheet.links[[@idx, idx]]
-      res = link
-    elsif data.is_a?(Numeric) && fmt = format(idx)
-      res = if fmt.datetime? || fmt.time?
-              _datetime data
-            elsif fmt.date?
-              _date data
-            end
     end
-    res || data
-  end
-end
   end
 end

data/lib/spreadsheet/excel/sst_entry.rb

@@ -1,46 +1,48 @@
-require 'spreadsheet/encodings'
+require "spreadsheet/encodings"
 
 module Spreadsheet
   module Excel
-##
-# Shared String Table Entry
-class SstEntry
-  include Spreadsheet::Encodings
-  attr_accessor :chars, :phonetic, :richtext, :flags, :available,
-                :continued_chars, :wide
-  def initialize opts = {}
-    @content = nil
-    @offset = opts[:offset]
-    @ole    = opts[:ole]
-    @reader = opts[:reader]
-    @continuations = []
-  end
-  ##
-  # Access the contents of this Shared String
-  def content
-    @content or begin
-      data = nil
-      data = @ole[@offset, @available]
-      content, _ = @reader.read_string_body data, @flags, @available, @wide
-      @continuations.each do |offset, len|
-        @reader.continue_string(@ole[offset,len], [content, @chars])
+    ##
+    # Shared String Table Entry
+    class SstEntry
+      include Spreadsheet::Encodings
+      attr_accessor :chars, :phonetic, :richtext, :flags, :available,
+        :continued_chars, :wide
+      def initialize opts = {}
+        @content = nil
+        @offset = opts[:offset]
+        @ole = opts[:ole]
+        @reader = opts[:reader]
+        @continuations = []
+      end
+
+      ##
+      # Access the contents of this Shared String
+      def content
+        @content or begin
+          data = @ole[@offset, @available]
+          content, _ = @reader.read_string_body data, @flags, @available, @wide
+          @continuations.each do |offset, len|
+            @reader.continue_string(@ole[offset, len], [content, @chars])
+          end
+          content = client content, "UTF-16LE"
+          if @reader.memoize?
+            @content = content
+          end
+          content
+        end
+      end
+
+      ##
+      # Register the offset of a String continuation
+      def continue offset, size, chars
+        @continued_chars -= chars
+        @continuations.push [offset, size]
       end
-      content = client content, 'UTF-16LE'
-      if @reader.memoize?
-        @content = content
+
+      def continued? # :nodoc:
+        @continued_chars > 0
       end
-      content
     end
   end
-  ##
-  # Register the offset of a String continuation
-  def continue offset, size, chars
-    @continued_chars -= chars
-    @continuations.push [offset, size]
-  end
-  def continued? # :nodoc:
-    @continued_chars > 0
-  end
-end
-  end
 end

data/lib/spreadsheet/excel/workbook.rb

@@ -1,82 +1,92 @@
-require 'spreadsheet/workbook'
-require 'spreadsheet/excel/offset'
-require 'spreadsheet/excel/writer'
-require 'ole/storage'
+require "spreadsheet/workbook"
+require "spreadsheet/excel/offset"
+require "spreadsheet/excel/writer"
+require "ole/storage"
 
 module Spreadsheet
   module Excel
-##
-# Excel-specific Workbook methods. These are mostly pertinent to the Excel
-# reader. You should have no reason to use any of these.
-class Workbook < Spreadsheet::Workbook
-  include Spreadsheet::Encodings
-  include Spreadsheet::Excel::Offset
-  BIFF_VERSIONS = {
-    0x000 => 2,
-    0x007 => 2,
-    0x200 => 2,
-    0x300 => 3,
-    0x400 => 4,
-    0x500 => 5,
-    0x600 => 8,
-  }
-  VERSION_STRINGS = {
-    0x600 => 'Microsoft Excel 97/2000/XP',
-    0x500 => 'Microsoft Excel 95',
-  }
-  offset :encoding, :boundsheets, :sst
-  attr_accessor :bof, :ole
-  attr_writer :date_base
-  def Workbook.open io, opts = {}
-    Reader.new(opts).read(io)    
-  end
-  def initialize *args
-    super
-    enc = 'UTF-16LE'
-    if RUBY_VERSION >= '1.9'
-      enc = Encoding.find enc
-    end
-    @encoding = enc
-    @version = 0x600
-    @sst = []
-  end
-  def add_shared_string str
-    @sst.push str
-  end
-  def add_worksheet worksheet
-    @changes.store :boundsheets, true
-    super
-  end
-  def biff_version
-    case @bof
-    when 0x009
-      2
-    when 0x209
-      3
-    when 0x409
-      4
-    else
-      BIFF_VERSIONS.fetch(@version) { raise "Unkown BIFF_VERSION '#@version'" }
+    ##
+    # Excel-specific Workbook methods. These are mostly pertinent to the Excel
+    # reader. You should have no reason to use any of these.
+    class Workbook < Spreadsheet::Workbook
+      include Spreadsheet::Encodings
+      include Spreadsheet::Excel::Offset
+      BIFF_VERSIONS = {
+        0x000 => 2,
+        0x007 => 2,
+        0x200 => 2,
+        0x300 => 3,
+        0x400 => 4,
+        0x500 => 5,
+        0x600 => 8
+      }
+      VERSION_STRINGS = {
+        0x600 => "Microsoft Excel 97/2000/XP",
+        0x500 => "Microsoft Excel 95"
+      }
+      offset :encoding, :boundsheets, :sst
+      attr_accessor :bof, :ole
+      attr_writer :date_base
+      def self.open io, opts = {}
+        Reader.new(opts).read(io)
+      end
+
+      def initialize *args
+        super
+        enc = "UTF-16LE"
+        if RUBY_VERSION >= "1.9"
+          enc = Encoding.find enc
+        end
+        @encoding = enc
+        @version = 0x600
+        @sst = []
+      end
+
+      def add_shared_string str
+        @sst.push str
+      end
+
+      def add_worksheet worksheet
+        @changes.store :boundsheets, true
+        super
+      end
+
+      def biff_version
+        case @bof
+        when 0x009
+          2
+        when 0x209
+          3
+        when 0x409
+          4
+        else
+          BIFF_VERSIONS.fetch(@version) { raise "Unkown BIFF_VERSION '#{@version}'" }
+        end
+      end
+
+      def date_base
+        @date_base ||= DateTime.new 1899, 12, 31
+      end
+
+      def inspect
+        worksheets
+      end
+
+      def shared_string idx
+        @sst[idx.to_i].content
+      end
+
+      def sst_size
+        @sst.size
+      end
+
+      def uninspect_variables
+        super.push "@sst", "@offsets", "@changes"
+      end
+
+      def version_string
+        client VERSION_STRINGS.fetch(@version, "Unknown"), "UTF-8"
+      end
     end
   end
-  def date_base
-    @date_base ||= DateTime.new 1899, 12, 31
-  end
-  def inspect
-    self.worksheets
-  end
-  def shared_string idx
-    @sst[idx.to_i].content
-  end
-  def sst_size
-    @sst.size
-  end
-  def uninspect_variables
-    super.push '@sst', '@offsets', '@changes'
-  end
-  def version_string
-    client VERSION_STRINGS.fetch(@version, "Unknown"), 'UTF-8'
-  end
-end
-  end
 end