spreadsheet 1.3.3 → 1.3.5

data/lib/spreadsheet/datatypes.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet/compatibility'
+require "spreadsheet/compatibility"
 
 module Spreadsheet
   ##
@@ -6,155 +6,158 @@ 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

data/lib/spreadsheet/excel/error.rb

@@ -1,26 +1,27 @@
 module Spreadsheet
   module Excel
-##
-# This class encapsulates Excel Error-Codes
-class Error
-  attr_reader :code
-  ERROR_VALUES = {
-    0x00 => '#NULL!',  # Intersection of two cell ranges is empty
-    0x07 => '#DIV/0!', # Division by zero
-    0x0F => '#VALUE!', # Wrong type of operand
-    0x17 => '#REF!',   # Illegal or deleted cell reference
-    0x1D => '#NAME?',  # Wrong function or range name
-    0x24 => '#NUM!',   # Value range overflow
-    0x2A => '#N/A!',   # Argument or function not available
-  }
-  def initialize code
-    @code = code
-  end
-  ##
-  # The String value Excel associates with an Error code
-  def value
-    ERROR_VALUES.fetch @code, '#UNKNOWN'
-  end
-end
+    ##
+    # This class encapsulates Excel Error-Codes
+    class Error
+      attr_reader :code
+      ERROR_VALUES = {
+        0x00 => "#NULL!",  # Intersection of two cell ranges is empty
+        0x07 => "#DIV/0!", # Division by zero
+        0x0F => "#VALUE!", # Wrong type of operand
+        0x17 => "#REF!",   # Illegal or deleted cell reference
+        0x1D => "#NAME?",  # Wrong function or range name
+        0x24 => "#NUM!",   # Value range overflow
+        0x2A => "#N/A!"   # Argument or function not available
+      }
+      def initialize code
+        @code = code
+      end
+
+      ##
+      # The String value Excel associates with an Error code
+      def value
+        ERROR_VALUES.fetch @code, "#UNKNOWN"
+      end
+    end
   end
 end

data/lib/spreadsheet/excel/internals/biff5.rb

@@ -1,17 +1,17 @@
 module Spreadsheet
   module Excel
     module Internals
-##
-# Binary Formats and other configurations internal to Biff5. This Module is
-# likely to be expanded as Support for older Versions of Excel grows.
-module Biff5
-  BINARY_FORMATS = {
-    :dimensions => 'v5',
-  }
-  def binfmt key # :nodoc:
-    BINARY_FORMATS.fetch key do super end
-  end
-end
+      ##
+      # Binary Formats and other configurations internal to Biff5. This Module is
+      # likely to be expanded as Support for older Versions of Excel grows.
+      module Biff5
+        BINARY_FORMATS = {
+          dimensions: "v5"
+        }
+        def binfmt key # :nodoc:
+          BINARY_FORMATS.fetch key do super end # standard:disable BlockSingleLineBraces
+        end
+      end
     end
   end
 end

data/lib/spreadsheet/excel/internals/biff8.rb

@@ -1,19 +1,19 @@
 module Spreadsheet
   module Excel
     module Internals
-##
-# Binary Formats and other configurations internal to Biff8. This Module is
-# likely to be expanded as Support for older Versions of Excel grows and more
-# Binary formats are moved here for disambiguation.
-module Biff8
-  BINARY_FORMATS = {
-    :bof        => 'v4V2',
-    :dimensions => 'V2v2x2',
-  }
-  def binfmt key # :nodoc:
-    BINARY_FORMATS.fetch key do super end
-  end
-end
+      ##
+      # Binary Formats and other configurations internal to Biff8. This Module is
+      # likely to be expanded as Support for older Versions of Excel grows and more
+      # Binary formats are moved here for disambiguation.
+      module Biff8
+        BINARY_FORMATS = {
+          bof: "v4V2",
+          dimensions: "V2v2x2"
+        }
+        def binfmt key # :nodoc:
+          BINARY_FORMATS.fetch key do super end # standard:disable BlockSingleLineBraces
+        end
+      end
     end
   end
 end