spreadsheet 1.3.3 → 1.3.5

data/lib/spreadsheet/row.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet/helpers'
+require "spreadsheet/helpers"
 
 module Spreadsheet
   ##
@@ -18,19 +18,21 @@ module Spreadsheet
   # #height::         The height of this Row in points (defaults to 12).
   class Row < Array
     include Datatypes
+
     class << self
       def format_updater *keys
         keys.each do |key|
-          unless instance_methods.include? "unupdated_#{key}="
+          unless method_defined?("unupdated_#{key}=")
             alias_method :"unupdated_#{key}=", :"#{key}="
-            define_method "#{key}=" do |value|
-              send "unupdated_#{key}=", value
-              @worksheet.row_updated @idx, self if @worksheet
+            define_method :"#{key}=" do |value|
+              send :"unupdated_#{key}=", value
+              @worksheet&.row_updated @idx, self
               value
             end
           end
         end
       end
+
       def updater *keys
         keys.each do |key|
           ## Passing blocks to methods defined with define_method is not possible
@@ -38,10 +40,10 @@ module Spreadsheet
           #  http://groups.google.com/group/ruby-talk-google/msg/778184912b769e5f
           #  use class_eval as suggested by someone else in
           #  http://rubyforge.org/tracker/index.php?func=detail&aid=25732&group_id=678&atid=2677
-          class_eval <<-SRC, __FILE__, __LINE__
+          class_eval <<-SRC, __FILE__, __LINE__ + 1
             def #{key}(*args)
               res = super(*args)
-              @worksheet.row_updated @idx, self if @worksheet
+              @worksheet&.row_updated @idx, self
               res
             end
           SRC
@@ -53,43 +55,49 @@ module Spreadsheet
     boolean :hidden, :collapsed
     enum :outline_level, 0, Integer
     updater :[]=, :clear, :concat, :delete, :delete_if, :fill, :insert, :map!,
-            :pop, :push, :reject!, :replace, :reverse!, :shift, :slice!,
-            :sort!, :uniq!, :unshift
+      :pop, :push, :reject!, :replace, :reverse!, :shift, :slice!,
+      :sort!, :uniq!, :unshift
     format_updater :collapsed, :height, :hidden, :outline_level
-    def initialize worksheet, idx, cells=[]
+    def initialize worksheet, idx, cells = []
       @default_format = nil
       @worksheet = worksheet
       @idx = idx
-      super cells
+      super(cells)
       @formats = []
       @height = 12.1
     end
+
     ##
     # The default Format of this Row, if you have set one.
     # Returns the Worksheet's default or the Workbook's default Format otherwise.
     def default_format
-      @default_format || @worksheet.default_format || @workbook.default_format
+      @default_format || @worksheet&.default_format || @workbook.default_format
     end
+
     ##
     # Set the default Format used when writing a Cell if no explicit Format is
     # stored for the cell.
     def default_format= format
-      @worksheet.add_format format if @worksheet
+      @worksheet&.add_format format
       @default_format = format
     end
     format_updater :default_format
     ##
     # #first_used the 0-based index of the first non-blank Cell.
     def first_used
-      [ index_of_first(self), index_of_first(@formats) ].compact.min
+      [index_of_first(self), index_of_first(@formats)].compact.min
     end
+
     ##
     # The Format for the Cell at _idx_ (0-based), or the first valid Format in
     # Row#default_format, Column#default_format and Worksheet#default_format.
     def format idx
-      @formats[idx] || @default_format \
-        || @worksheet.column(idx).default_format if @worksheet
+      if @worksheet
+        @formats[idx] || @default_format \
+          || @worksheet.column(idx).default_format
+      end
     end
+
     ##
     # Returns a copy of self with nil-values appended for empty cells that have
     # an associated Format.
@@ -102,30 +110,32 @@ module Spreadsheet
       end
       copy
     end
+
     ##
     # Same as Row#size, but takes into account formatted empty cells
     def formatted_size
       Helpers.rcompact(@formats)
       sz = size
       fs = @formats.size
-      fs > sz ? fs : sz
+      (fs > sz) ? fs : sz
     end
     ##
     # #first_unused (really last used + 1) - the 0-based index of the first of
     # all remaining contiguous blank Cells.
-    alias :first_unused :formatted_size
+    alias_method :first_unused, :formatted_size
     def inspect
       variables = instance_variables.collect do |name|
         "%s=%s" % [name, instance_variable_get(name)]
-      end.join(' ')
+      end.join(" ")
       sprintf "#<%s:0x%014x %s %s>", self.class, object_id, variables, super
     end
+
     ##
     # Set the Format for the Cell at _idx_ (0-based).
     def set_format idx, fmt
       @formats[idx] = fmt
-      @worksheet.add_format fmt
-      @worksheet.row_updated @idx, self if @worksheet
+      @worksheet&.add_format fmt
+      @worksheet&.row_updated @idx, self
       fmt
     end
 
@@ -137,13 +147,14 @@ module Spreadsheet
         fmt.font = fmt.font.clone
         @formats[idx] = fmt.update_format(opts)
       end
-      @worksheet.add_format @formats[idx]
-      @worksheet.row_updated @idx, self if @worksheet
+      @worksheet&.add_format @formats[idx]
+      @worksheet&.row_updated @idx, self
     end
 
     private
+
     def index_of_first ary # :nodoc:
-      if first = ary.find do |elm| !elm.nil? end
+      if (first = ary.find { |elm| !elm.nil? })
         ary.index first
       end
     end

data/lib/spreadsheet/version.rb

@@ -3,5 +3,5 @@
 module Spreadsheet
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.3.3'
+  VERSION = "1.3.5"
 end

data/lib/spreadsheet/workbook.rb

@@ -1,5 +1,5 @@
-require 'spreadsheet/format'
-require 'spreadsheet/encodings'
+require "spreadsheet/format"
+require "spreadsheet/encodings"
 
 module Spreadsheet
   ##
@@ -12,19 +12,21 @@ module Spreadsheet
   #                   Row#default_format or Worksheet#default_format.
   class Workbook
     include Spreadsheet::Encodings
+
     attr_reader :io, :worksheets, :formats, :fonts, :palette
     attr_accessor :active_worksheet, :encoding, :default_format, :version
-    def initialize io = nil, opts={:default_format => Format.new}
+    def initialize io = nil, opts = {default_format: Format.new}
       @worksheets = []
       @io = io
       @fonts = []
       @palette = {}
       @formats = []
       @formats_set = {}
-      if @default_format = opts[:default_format]
+      if (@default_format = opts[:default_format])
         add_format @default_format
       end
     end
+
     ##
     # Add a Font to the Workbook. Used by the parser. You should not need to
     # use this Method.
@@ -32,6 +34,7 @@ module Spreadsheet
       @fonts.push(font).uniq! if font
       font
     end
+
     ##
     # Add a Format to the Workbook. If you use Row#set_format, you should not
     # need to use this Method.
@@ -42,6 +45,7 @@ module Spreadsheet
       end
       format
     end
+
     ##
     # Add a Worksheet to the Workbook.
     def add_worksheet worksheet
@@ -49,18 +53,21 @@ module Spreadsheet
       @worksheets.push worksheet
       worksheet
     end
+
     ##
     # Delete a Worksheet from Workbook by it's index
     def delete_worksheet worksheet_index
       @worksheets.delete_at worksheet_index
     end
+
     ##
     # Change the RGB components of the elements in the colour palette.
     def set_custom_color idx, red, green, blue
-      raise 'Invalid format' if [red, green, blue].find { |c| ! (0..255).include?(c) }
+      raise "Invalid format" if [red, green, blue].find { |c| !(0..255).cover?(c) }
 
       @palette[idx] = [red, green, blue]
     end
+
     ##
     # Create a new Worksheet in this Workbook.
     # Used without options this creates a Worksheet with the name 'WorksheetN'
@@ -69,20 +76,23 @@ module Spreadsheet
     # Use the option <em>:name => 'My pretty Name'</em> to override this
     # behavior.
     def create_worksheet opts = {}
-      opts[:name] ||= client("Worksheet#{@worksheets.size.next}", 'UTF-8')
+      opts[:name] ||= client("Worksheet#{@worksheets.size.next}", "UTF-8")
       add_worksheet Worksheet.new(opts)
     end
+
     ##
     # Returns the count of total worksheets present.
     # Takes no arguments. Just returns the length of @worksheets array.
     def sheet_count
       @worksheets.length
     end
+
     ##
     # The Font at _idx_
     def font idx
       @fonts[idx]
     end
+
     ##
     # The Format at _idx_, or - if _idx_ is a String -
     # the Format with name == _idx_
@@ -91,23 +101,26 @@ module Spreadsheet
       when Integer
         @formats[idx] || @default_format || Format.new
       when String
-        @formats.find do |fmt| fmt.name == idx end
+        @formats.find { |fmt| fmt.name == idx }
       end
     end
+
     def inspect
       variables = (instance_variables - uninspect_variables).collect do |name|
         "%s=%s" % [name, instance_variable_get(name)]
-      end.join(' ')
+      end.join(" ")
       uninspect = uninspect_variables.collect do |name|
         var = instance_variable_get name
         "%s=%s[%i]" % [name, var.class, var.size]
-      end.join(' ')
+      end.join(" ")
       sprintf "#<%s:0x%014x %s %s>", self.class, object_id,
-                                     variables, uninspect
+        variables, uninspect
     end
+
     def uninspect_variables # :nodoc:
-      %w{@formats @fonts @worksheets}
+      %w[@formats @fonts @worksheets]
     end
+
     ##
     # The Worksheet at _idx_, or - if _idx_ is a String -
     # the Worksheet with name == _idx_
@@ -116,9 +129,10 @@ module Spreadsheet
       when Integer
         @worksheets[idx]
       when String
-        @worksheets.find do |sheet| sheet.name == idx end
+        @worksheets.find { |sheet| sheet.name == idx }
       end
     end
+
     ##
     # Write this Workbook to a File, IO Stream or Writer Object. The latter will
     # make more sense once there are more than just an Excel-Writer available.
@@ -129,10 +143,11 @@ module Spreadsheet
         writer(io_path_or_writer).write(self)
       end
     end
+
     ##
     # Returns a new instance of the default Writer class for this Workbook (can
     # only be an Excel::Writer::Workbook at this time)
-    def writer io_or_path, type=Excel, version=self.version
+    def writer io_or_path, type = Excel, version = self.version
       if type == Excel
         Excel::Writer::Workbook.new io_or_path
       else