spreadsheet 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1985e7bfda006e29f36e9ccce2df3374c88a04e3ac606bf62208de1cd15a3525
-  data.tar.gz: df643d0506f09bc2ac1b7e2c533a1ddd3c989aa7da565b2b9fa9df5fca52136e
+  metadata.gz: 992768cae61da12d700181640e3968fd5e10110bc04d0cc575820b0f63d6030e
+  data.tar.gz: 682b9a07e067b830c9f78889c15f8c8d70c0f94caa2e91d5e5743beed731cb01
 SHA512:
-  metadata.gz: 50dccecf6a5293f572ce3e7083ead295dd5611779a440e5ca82b28426bc7258141ea70b66fae1976b7dd690a32bdc03b90996fd27a20c11d7b074b6412c7089f
-  data.tar.gz: a723371de4c218625d69ee8ef53940fd903f6713f414ff7ce30ce66bebae05c98a0215469159a579f2d8d061739f04d8118a0f2dff9136f8710b1da447963376
+  metadata.gz: aad8b496a030e98f5e7493c98f80ae090f15a7b2f80925217d189ec045fdd0bb61881bd8780c913a21e4eb3c481a477119d7a639a2253bc7ca918f5c48bee21e
+  data.tar.gz: 96c1b47b1cb6bafdc0afd57e10e84df7d2aaf2eb5859f1557ffedfee135450d009db1f3805cf3c0fbf7c7bd2c1a1e2ab91cfc15b5af5e3445d315faa889ae5aa

data/lib/parseexcel/parseexcel.rb

@@ -1,11 +1,11 @@
-require 'spreadsheet'
+require "spreadsheet"
 
-warn <<-EOS
-[DEPRECATED] By requiring 'parseexcel', 'parseexcel/parseexcel' and/or
-             'parseexcel/parser' you are loading a Compatibility layer which
-             provides a drop-in replacement for the ParseExcel library. This
-             code makes the reading of Spreadsheet documents less efficient and
-             will be removed in Spreadsheet version 1.0.0
+warn <<~EOS
+  [DEPRECATED] By requiring 'parseexcel', 'parseexcel/parseexcel' and/or
+               'parseexcel/parser' you are loading a Compatibility layer which
+               provides a drop-in replacement for the ParseExcel library. This
+               code makes the reading of Spreadsheet documents less efficient and
+               will be removed in Spreadsheet version 1.0.0
 EOS
 
 module Spreadsheet
@@ -14,62 +14,70 @@ module Spreadsheet
   # ParseExcel library. This code is deprecated and will be removed in
   # Spreadsheet version 1.0.0
   module ParseExcel
-def ParseExcel.parse path
-  Spreadsheet.open path
-end
-class Worksheet
-  class Cell
-    attr_accessor :value, :kind, :numeric, :code, :book,
-      :format, :rich, :encoding, :annotation
-    def initialize value, format, row, idx
-      @format = format
-      @idx = idx
-      @row = row
-      @value = value
-      @encoding = Spreadsheet.client_encoding
-    end
-    def date
-      @row.date @idx
-    end
-    def datetime
-      @row.datetime @idx
-    end
-    def to_i
-      @value.to_i
+    def self.parse path
+      Spreadsheet.open path
     end
-    def to_f
-      @value.to_f
-    end
-    def to_s(target_encoding=nil)
-      if(target_encoding)
-        begin
-          Iconv.new(target_encoding, @encoding).iconv(@value)
-        rescue
-          Iconv.new(target_encoding, 'ascii').iconv(@value.to_s)
+
+    class Worksheet
+      class Cell
+        attr_accessor :value, :kind, :numeric, :code, :book,
+          :format, :rich, :encoding, :annotation
+        def initialize value, format, row, idx
+          @format = format
+          @idx = idx
+          @row = row
+          @value = value
+          @encoding = Spreadsheet.client_encoding
+        end
+
+        def date
+          @row.date @idx
+        end
+
+        def datetime
+          @row.datetime @idx
+        end
+
+        def to_i
+          @value.to_i
+        end
+
+        def to_f
+          @value.to_f
+        end
+
+        def to_s(target_encoding = nil)
+          if target_encoding
+            begin
+              Iconv.new(target_encoding, @encoding).iconv(@value)
+            rescue
+              Iconv.new(target_encoding, "ascii").iconv(@value.to_s)
+            end
+          else
+            @value.to_s
+          end
+        end
+
+        def type
+          if @format && (@format.date? || @format.time?)
+            :date
+          elsif @value.is_a?(Numeric)
+            :numeric
+          else
+            :text
+          end
         end
-      else
-        @value.to_s
-      end
-    end
-    def type
-      if @format && (@format.date? || @format.time?)
-        :date
-      elsif @value.is_a?(Numeric)
-        :numeric
-      else
-        :text
       end
     end
   end
-end
-  end
+
   module Excel
-class Reader # :nodoc: all
-  def set_cell worksheet, row, column, xf, value=nil
-    cells = @current_row_block[row] ||= Row.new(nil, row)
-    cells.formats[column] = xf = @workbook.format(xf)
-    cells[column] = ParseExcel::Worksheet::Cell.new(value, xf, cells, column)
-  end
-end
+    class Reader # :nodoc: all
+      def set_cell worksheet, row, column, xf, value = nil
+        cells = @current_row_block[row] ||= Row.new(nil, row)
+        cells.formats[column] = xf = @workbook.format(xf)
+        cells[column] = ParseExcel::Worksheet::Cell.new(value, xf, cells, column)
+      end
+    end
   end
 end

data/lib/parseexcel/parser.rb

@@ -1,4 +1,4 @@
-require 'parseexcel'
+require "parseexcel"
 
 module Spreadsheet
   module ParseExcel # :nodoc: all

data/lib/parseexcel.rb

@@ -24,4 +24,4 @@
 #             8006 Zürich
 ###           Switzerland
 
-require 'parseexcel/parseexcel'
+require "parseexcel/parseexcel"

data/lib/spreadsheet/column.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet/datatypes'
+require "spreadsheet/datatypes"
 
 module Spreadsheet
   ##
@@ -22,9 +22,9 @@ module Spreadsheet
         keys.each do |key|
           unless instance_methods.include? "unupdated_#{key}="
             alias_method :"unupdated_#{key}=", :"#{key}="
-            define_method "#{key}=" do |value|
-              send "unupdated_#{key}=", value
-              @worksheet.column_updated @idx, self if @worksheet
+            define_method :"#{key}=" do |value|
+              send :"unupdated_#{key}=", value
+              @worksheet&.column_updated @idx, self
               value
             end
           end
@@ -38,23 +38,24 @@ module Spreadsheet
     boolean :hidden, :collapsed
     enum :outline_level, 0, Integer
     updater :collapsed, :hidden, :outline_level, :width
-    def initialize idx, format, opts={}
+    def initialize idx, format, opts = {}
       @worksheet = nil
       @idx = idx
       opts[:width] ||= 10
       opts.each do |key, value|
-        self.send "#{key}=", value
+        send :"#{key}=", value
       end
       self.default_format = format
     end
+
     ##
     # Set the default Format for Cells in this Column.
     def default_format= format
-      @worksheet.add_format format if @worksheet
+      @worksheet&.add_format format
       @default_format = format
-      @worksheet.column_updated @idx, self if @worksheet
-      format
+      @worksheet&.column_updated @idx, self
     end
+
     ##
     # Iterate over all cells in this column.
     def each
@@ -62,6 +63,7 @@ module Spreadsheet
         yield row[idx]
       end
     end
+
     def == other # :nodoc:
       other.is_a?(Column) && default_format == other.default_format \
         && width == other.width && hidden == other.hidden \

data/lib/spreadsheet/compatibility.rb

@@ -4,10 +4,11 @@ module Spreadsheet
     # One of the most incisive changes in terms of meta-programming in Ruby 1.9
     # is the switch from representing instance-variable names as Strings to
     # presenting them as Symbols. ivar_name provides compatibility.
-    if RUBY_VERSION >= '1.9'
+    if RUBY_VERSION >= "1.9"
       def ivar_name symbol
         :"@#{symbol}"
       end
+
       def method_name symbol
         symbol.to_sym
       end
@@ -15,6 +16,7 @@ module Spreadsheet
       def ivar_name symbol
         "@#{symbol}"
       end
+
       def method_name symbol
         symbol.to_s
       end

data/lib/spreadsheet/datatypes.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet/compatibility'
+require "spreadsheet/compatibility"
 
 module Spreadsheet
   ##
@@ -6,155 +6,157 @@ module Spreadsheet
   # attributes (boolean, colors and enumerations)
   module Datatypes
     include Compatibility
-    def Datatypes.append_features mod
+    def self.append_features mod
       super
       mod.module_eval do
-class << self
-  ##
-  # Valid colors for color attributes.
-  COLORS = [ :builtin_black, :builtin_white, :builtin_red, :builtin_green,
-             :builtin_blue, :builtin_yellow, :builtin_magenta, :builtin_cyan,
-             :text, :border, :pattern_bg, :dialog_bg, :chart_text, :chart_bg,
-             :chart_border, :tooltip_bg, :tooltip_text, :aqua,
-             :black, :blue, :cyan, :brown, :fuchsia, :gray, :grey, :green,
-             :lime, :magenta, :navy, :orange, :purple, :red, :silver, :white,
-             :yellow,
-             :xls_color_0,
-             :xls_color_1,
-             :xls_color_2,
-             :xls_color_3,
-             :xls_color_4,
-             :xls_color_5,
-             :xls_color_6,
-             :xls_color_7,
-             :xls_color_8,
-             :xls_color_9,
-             :xls_color_10,
-             :xls_color_11,
-             :xls_color_12,
-             :xls_color_13,
-             :xls_color_14,
-             :xls_color_15,
-             :xls_color_16,
-             :xls_color_17,
-             :xls_color_18,
-             :xls_color_19,
-             :xls_color_20,
-             :xls_color_21,
-             :xls_color_22,
-             :xls_color_23,
-             :xls_color_24,
-             :xls_color_25,
-             :xls_color_26,
-             :xls_color_27,
-             :xls_color_28,
-             :xls_color_29,
-             :xls_color_30,
-             :xls_color_31,
-             :xls_color_32,
-             :xls_color_33,
-             :xls_color_34,
-             :xls_color_35,
-             :xls_color_36,
-             :xls_color_37,
-             :xls_color_38,
-             :xls_color_39,
-             :xls_color_40,
-             :xls_color_41,
-             :xls_color_42,
-             :xls_color_43,
-             :xls_color_44,
-             :xls_color_45,
-             :xls_color_46,
-             :xls_color_47,
-             :xls_color_48,
-             :xls_color_49,
-             :xls_color_50,
-             :xls_color_51,
-             :xls_color_52,
-             :xls_color_53,
-             :xls_color_54,
-             :xls_color_55 ]
-  ##
-  # Define instance methods to read and write boolean attributes.
-  def boolean *args
-    args.each do |key|
-      define_method key do
-        name = ivar_name key
-        !!(instance_variable_get(name) if instance_variables.include?(name))
-      end
-      define_method "#{key}?" do
-        send key
-      end
-      define_method "#{key}=" do |arg|
-        arg = false if arg == 0
-        instance_variable_set(ivar_name(key), !!arg)
-      end
-      define_method "#{key}!" do
-        send "#{key}=", true
-      end
-    end
-  end
-  ##
-  # Define instance methods to read and write color attributes.
-  # For valid colors see COLORS
-  def colors *args
-    args.each do |key|
-      attr_reader key
-      define_method "#{key}=" do |name|
-        name = name.to_s.downcase.to_sym
-        if COLORS.include?(name)
-          instance_variable_set ivar_name(key), name
-        else
-          raise ArgumentError, "unknown color '#{name}'"
-        end
-      end
-    end
-  end
-  ##
-  # Define instance methods to read and write enumeration attributes.
-  # * The first argument designates the attribute name.
-  # * The second argument designates the default value.
-  # * All subsequent attributes are possible values.
-  # * If the last attribute is a Hash, each value in the Hash designates
-  #   aliases for the corresponding key.
-  def enum key, *values
-    aliases = {}
-    if values.last.is_a? Hash
-      values.pop.each do |value, synonyms|
-        if synonyms.is_a? Array
-          synonyms.each do |synonym| aliases.store synonym, value end
-        else
-          aliases.store synonyms, value
-        end
-      end
-    end
-    values.each do |value|
-      aliases.store value, value
-    end
-    define_method key do
-      name = ivar_name key
-      value = instance_variable_get(name) if instance_variables.include? name
-      value || values.first
-    end
-    define_method "#{key}=" do |arg|
-      if arg
-        arg = aliases.fetch arg do
-          aliases.fetch arg.to_s.downcase.gsub(/[ \-]/, '_').to_sym, arg
-        end
-        if values.any? do |val| val === arg end
-          instance_variable_set(ivar_name(key), arg)
-        else
-          valid = values.collect do |val| val.inspect end.join ', '
-          raise ArgumentError,
-            "Invalid value '#{arg.inspect}' for #{key}. Valid values are: #{valid}"
+        class << self
+          ##
+          # Valid colors for color attributes.
+          COLORS = [:builtin_black, :builtin_white, :builtin_red, :builtin_green,
+            :builtin_blue, :builtin_yellow, :builtin_magenta, :builtin_cyan,
+            :text, :border, :pattern_bg, :dialog_bg, :chart_text, :chart_bg,
+            :chart_border, :tooltip_bg, :tooltip_text, :aqua,
+            :black, :blue, :cyan, :brown, :fuchsia, :gray, :grey, :green,
+            :lime, :magenta, :navy, :orange, :purple, :red, :silver, :white,
+            :yellow,
+            :xls_color_0,
+            :xls_color_1,
+            :xls_color_2,
+            :xls_color_3,
+            :xls_color_4,
+            :xls_color_5,
+            :xls_color_6,
+            :xls_color_7,
+            :xls_color_8,
+            :xls_color_9,
+            :xls_color_10,
+            :xls_color_11,
+            :xls_color_12,
+            :xls_color_13,
+            :xls_color_14,
+            :xls_color_15,
+            :xls_color_16,
+            :xls_color_17,
+            :xls_color_18,
+            :xls_color_19,
+            :xls_color_20,
+            :xls_color_21,
+            :xls_color_22,
+            :xls_color_23,
+            :xls_color_24,
+            :xls_color_25,
+            :xls_color_26,
+            :xls_color_27,
+            :xls_color_28,
+            :xls_color_29,
+            :xls_color_30,
+            :xls_color_31,
+            :xls_color_32,
+            :xls_color_33,
+            :xls_color_34,
+            :xls_color_35,
+            :xls_color_36,
+            :xls_color_37,
+            :xls_color_38,
+            :xls_color_39,
+            :xls_color_40,
+            :xls_color_41,
+            :xls_color_42,
+            :xls_color_43,
+            :xls_color_44,
+            :xls_color_45,
+            :xls_color_46,
+            :xls_color_47,
+            :xls_color_48,
+            :xls_color_49,
+            :xls_color_50,
+            :xls_color_51,
+            :xls_color_52,
+            :xls_color_53,
+            :xls_color_54,
+            :xls_color_55]
+          ##
+          # Define instance methods to read and write boolean attributes.
+          def boolean *args
+            args.each do |key|
+              define_method key do
+                name = ivar_name key
+                !!(instance_variable_get(name) if instance_variables.include?(name))
+              end
+              define_method :"#{key}?" do
+                send key
+              end
+              define_method :"#{key}=" do |arg|
+                arg = false if arg == 0
+                instance_variable_set(ivar_name(key), !!arg)
+              end
+              define_method :"#{key}!" do
+                send :"#{key}=", true
+              end
+            end
+          end
+
+          ##
+          # Define instance methods to read and write color attributes.
+          # For valid colors see COLORS
+          def colors *args
+            args.each do |key|
+              attr_reader key
+              define_method :"#{key}=" do |name|
+                name = name.to_s.downcase.to_sym
+                if COLORS.include?(name)
+                  instance_variable_set ivar_name(key), name
+                else
+                  raise ArgumentError, "unknown color '#{name}'"
+                end
+              end
+            end
+          end
+
+          ##
+          # Define instance methods to read and write enumeration attributes.
+          # * The first argument designates the attribute name.
+          # * The second argument designates the default value.
+          # * All subsequent attributes are possible values.
+          # * If the last attribute is a Hash, each value in the Hash designates
+          #   aliases for the corresponding key.
+          def enum key, *values
+            aliases = {}
+            if values.last.is_a? Hash
+              values.pop.each do |value, synonyms|
+                if synonyms.is_a? Array
+                  synonyms.each { |synonym| aliases.store synonym, value }
+                else
+                  aliases.store synonyms, value
+                end
+              end
+            end
+            values.each do |value|
+              aliases.store value, value
+            end
+            define_method key do
+              name = ivar_name key
+              value = instance_variable_get(name) if instance_variables.include? name
+              value || values.first
+            end
+            define_method :"#{key}=" do |arg|
+              if arg
+                arg = aliases.fetch arg do
+                  aliases.fetch arg.to_s.downcase.gsub(/[ \-]/, "_").to_sym, arg
+                end
+                if values.any? { |val| val === arg }
+                  instance_variable_set(ivar_name(key), arg)
+                else
+                  valid = values.collect { |val| val.inspect }.join ", "
+                  raise ArgumentError,
+                    "Invalid value '#{arg.inspect}' for #{key}. Valid values are: #{valid}"
+                end
+              else
+                instance_variable_set ivar_name(key), values.first
+              end
+            end
+          end
         end
-      else
-        instance_variable_set ivar_name(key), values.first
-      end
-    end
-  end
-end
       end
     end
   end

data/lib/spreadsheet/encodings.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
+
 # Spreadsheet::Encoding -- spreadheet -- 07.09.2011 -- mhatakeyama@ywesee.com
 # Spreadsheet::Encoding -- spreadheet -- 03.07.2009 -- hwyss@ywesee.com
 
@@ -7,43 +7,47 @@ module Spreadsheet
   ##
   # Methods for Encoding-conversions. You should not need to use any of these.
   module Encodings
-    if RUBY_VERSION >= '1.9'
-      def client string, internal='UTF-16LE'
+    if RUBY_VERSION >= "1.9"
+      def client string, internal = "UTF-16LE"
         string = string.dup
         string.force_encoding internal
         string.encode Spreadsheet.client_encoding
       end
-      def internal string, client=Spreadsheet.client_encoding
+
+      def internal string, client = Spreadsheet.client_encoding
         string = string.dup
         string.force_encoding client
-        string.encode('UTF-16LE').force_encoding('ASCII-8BIT')
+        string.encode("UTF-16LE").force_encoding("ASCII-8BIT")
       end
-      def utf8 string, client=Spreadsheet.client_encoding
+
+      def utf8 string, client = Spreadsheet.client_encoding
         string = string.dup
         string.force_encoding client
-        string.encode('UTF-8')
+        string.encode("UTF-8")
       end
     else
-      require 'iconv'
+      require "iconv"
       @@iconvs = {}
 
       def build_output_encoding(to_encoding)
-        [to_encoding, Spreadsheet.enc_translit, Spreadsheet.enc_ignore].compact.join('//')
+        [to_encoding, Spreadsheet.enc_translit, Spreadsheet.enc_ignore].compact.join("//")
       end
 
-      def client string, internal='UTF-16LE'
+      def client string, internal = "UTF-16LE"
         string = string.dup
         key = [Spreadsheet.client_encoding, internal]
         iconv = @@iconvs[key] ||= Iconv.new(Spreadsheet.client_encoding, internal)
         iconv.iconv string
       end
-      def internal string, client=Spreadsheet.client_encoding, to_encoding = 'UTF-16LE'
+
+      def internal string, client = Spreadsheet.client_encoding, to_encoding = "UTF-16LE"
         string = string.dup
         key = [to_encoding, client]
         iconv = @@iconvs[key] ||= Iconv.new(build_output_encoding(to_encoding), client)
         iconv.iconv string
       end
-      def utf8 string, client=Spreadsheet.client_encoding, to_encoding = 'UTF-8'
+
+      def utf8 string, client = Spreadsheet.client_encoding, to_encoding = "UTF-8"
         string = string.dup
         key = [to_encoding, client]
         iconv = @@iconvs[key] ||= Iconv.new(build_output_encoding(to_encoding), client)
@@ -52,12 +56,12 @@ module Spreadsheet
     end
   rescue LoadError
     warn "You don't have Iconv support compiled in your Ruby. Spreadsheet may not work as expected"
-    def client string, internal='UTF-16LE'
+    def client string, internal = "UTF-16LE"
       string.delete "\0"
     end
-    def internal string, internal='UTF-16LE'
-      string.split('').zip(Array.new(string.size, 0.chr)).join
+
+    def internal string, internal = "UTF-16LE"
+      string.chars.zip(Array.new(string.size, 0.chr)).join
     end
   end
 end
-

data/lib/spreadsheet/errors.rb

@@ -1,10 +1,10 @@
 module Spreadsheet
   # Custom errors raised by this gem, not errors from Excel
   module Errors
-    BaseError           = Class.new(StandardError)
+    BaseError = Class.new(StandardError)
 
     # A codepage not stored in Spreadsheet::Internals::CODEPAGES
-    UnknownCodepage     = Class.new(BaseError)
+    UnknownCodepage = Class.new(BaseError)
     # The encoding can be known, but not supported by Ruby
     UnsupportedEncoding = Class.new(BaseError)
   end