spreadsheet 1.3.3 → 1.3.5

data/lib/spreadsheet/excel/writer.rb

@@ -1 +1 @@
-require 'spreadsheet/excel/writer/workbook'
+require "spreadsheet/excel/writer/workbook"

data/lib/spreadsheet/excel.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet'
+require "spreadsheet"
 
 ##
 # Spreadsheet::Excel Compatibility Layer.
@@ -7,38 +7,42 @@ module Spreadsheet
   module Excel
     class ExcelCompatibleWorkbook < Workbook
       def initialize file_path, *args
-        super *args
+        super(*args)
         @file_path = file_path
       end
+
       def close
         write @file_path
       end
     end
-    def Excel.new file_path
+
+    def self.new file_path
       ExcelCompatibleWorkbook.new file_path
     end
+
     class Workbook
       def add_worksheet name
         if name.is_a? String
-          create_worksheet :name => name
+          create_worksheet name: name
         else
           super
         end
       end
     end
   end
+
   class Worksheet
-    unless instance_methods.include? "new_format_column"
-      alias :new_format_column :format_column
-      def format_column column, width=nil, format=nil
+    unless method_defined?(:new_format_column)
+      alias_method :new_format_column, :format_column
+      def format_column column, width = nil, format = nil
         if width.is_a? Format
           new_format_column column, width, format
         else
-          new_format_column column, format, :width => width
+          new_format_column column, format, width: width
         end
       end
     end
-    def write row, col, data=nil, format=nil
+    def write row, col, data = nil, format = nil
       if data.is_a? Array
         write_row row, col, data, format
       else
@@ -47,7 +51,8 @@ module Spreadsheet
         row.set_format col, format
       end
     end
-    def write_column row, col, data=nil, format=nil
+
+    def write_column row, col, data = nil, format = nil
       if data.is_a? Array
         data.each do |token|
           if token.is_a? Array
@@ -61,7 +66,8 @@ module Spreadsheet
         write row, col, data, format
       end
     end
-    def write_row row, col, data=nil, format=nil
+
+    def write_row row, col, data = nil, format = nil
       if data.is_a? Array
         data.each do |token|
           if token.is_a? Array
@@ -75,7 +81,8 @@ module Spreadsheet
         write row, col, data, format
       end
     end
-    def write_url row, col, url, string=url, format=nil
+
+    def write_url row, col, url, string = url, format = nil
       row(row)[col] = Link.new url, string
     end
   end

data/lib/spreadsheet/font.rb

@@ -1,6 +1,5 @@
-# encoding: utf-8
-require 'spreadsheet/datatypes'
-require 'spreadsheet/encodings'
+require "spreadsheet/datatypes"
+require "spreadsheet/encodings"
 
 module Spreadsheet
   ##
@@ -8,6 +7,7 @@ module Spreadsheet
   class Font
     include Spreadsheet::Datatypes
     include Spreadsheet::Encodings
+
     attr_accessor :name
     ##
     # You can set the following boolean Font attributes
@@ -27,14 +27,14 @@ module Spreadsheet
     #  :bold   => 700
     #  :normal => 400
     # Default:      :normal
-    enum :weight, :normal, :bold, Integer, :bold => :b
+    enum :weight, :normal, :bold, Integer, bold: :b
     ##
     # Escapement
     # Valid values: :normal, :superscript or :subscript.
     # Default:      :normal
     enum :escapement, :normal, :superscript, :subscript,
-         :subscript   => :sub,
-         :superscript => :super
+      subscript: :sub,
+      superscript: :super
     # Font size
     # Valid values: Any positive Integer.
     # Default:      10
@@ -44,8 +44,8 @@ module Spreadsheet
     #               :double_accounting.
     # Default:      :none
     enum :underline, :none, :single, :double,
-                     :single_accounting, :double_accounting,
-         :single => true
+      :single_accounting, :double_accounting,
+      single: true
     # Font Family
     # Valid values: :none, :roman, :swiss, :modern, :script, :decorative
     # Default:      :none
@@ -57,11 +57,11 @@ module Spreadsheet
     #               :hebrew, :arabic, :cyrillic, :thai, :iso_latin2, :oem_latin1
     # Default:      :default
     enum :encoding, :default, :iso_latin1, :symbol, :apple_roman, :shift_jis,
-                    :korean_hangul, :korean_johab, :chinese_simplified,
-                    :chinese_traditional, :greek, :turkish, :vietnamese,
-                    :hebrew, :arabic, :baltic, :cyrillic, :thai, :iso_latin2,
-                    :oem_latin1
-    def initialize name, opts={}
+      :korean_hangul, :korean_johab, :chinese_simplified,
+      :chinese_traditional, :greek, :turkish, :vietnamese,
+      :hebrew, :arabic, :baltic, :cyrillic, :thai, :iso_latin2,
+      :oem_latin1
+    def initialize name, opts = {}
       self.name = name
       @color = :text
       @previous_fast_key = nil
@@ -76,38 +76,43 @@ module Spreadsheet
       @family = nil
       @encoding = nil
       opts.each do |key, val|
-        self.send "#{key}=", val
+        send :"#{key}=", val
       end
     end
+
     ##
     # Sets #weight to :bold if(_bool_), :normal otherwise.
     def bold= bool
       self.weight = bool ? :bold : nil
     end
+
     def key # :nodoc:
       fk = fast_key
       return @key if @previous_fast_key == fk
       @previous_fast_key = fk
       @key = build_key
     end
+
     private
+
     def build_key # :nodoc:
-      underscore = client('_', 'UTF-8')
+      underscore = client("_", "UTF-8")
       key = []
       key << @name
-      key << underscore << client(size.to_s, 'US-ASCII')
-      key << underscore << client(weight.to_s, 'US-ASCII')
-      key << client('_italic', 'UTF-8')    if italic?
-      key << client('_strikeout', 'UTF-8') if strikeout?
-      key << client('_outline', 'UTF-8')   if outline?
-      key << client('_shadow', 'UTF-8')    if shadow?
-      key << underscore << client(escapement.to_s, 'US-ASCII')
-      key << underscore << client(underline.to_s, 'US-ASCII')
-      key << underscore << client(color.to_s, 'US-ASCII')
-      key << underscore << client(family.to_s, 'US-ASCII')
-      key << underscore << client(encoding.to_s, 'US-ASCII')
+      key << underscore << client(size.to_s, "US-ASCII")
+      key << underscore << client(weight.to_s, "US-ASCII")
+      key << client("_italic", "UTF-8") if italic?
+      key << client("_strikeout", "UTF-8") if strikeout?
+      key << client("_outline", "UTF-8") if outline?
+      key << client("_shadow", "UTF-8") if shadow?
+      key << underscore << client(escapement.to_s, "US-ASCII")
+      key << underscore << client(underline.to_s, "US-ASCII")
+      key << underscore << client(color.to_s, "US-ASCII")
+      key << underscore << client(family.to_s, "US-ASCII")
+      key << underscore << client(encoding.to_s, "US-ASCII")
       key.join("")
     end
+
     def fast_key
       [@name, @size, @weight, @italic, @strikeout, @outline, @shadow, @escapement, @underline, @color, @family, @encoding]
     end

data/lib/spreadsheet/format.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
-require 'spreadsheet/datatypes'
-require 'spreadsheet/encodings'
-require 'spreadsheet/font'
+require "spreadsheet/datatypes"
+require "spreadsheet/encodings"
+require "spreadsheet/font"
 
 module Spreadsheet
   ##
@@ -9,6 +8,7 @@ module Spreadsheet
   class Format
     include Spreadsheet::Datatypes
     include Spreadsheet::Encodings
+
     ##
     # You can set the following boolean attributes:
     # #cross_down::       Draws a Line from the top-left to the bottom-right
@@ -29,84 +29,84 @@ module Spreadsheet
     #                     other. Excel will ignore other rotation values if
     #                     this is set.
     boolean :cross_down, :cross_up, :hidden, :locked,
-            :merge_range, :shrink, :text_justlast, :text_wrap,
-						:rotation_stacked
+      :merge_range, :shrink, :text_justlast, :text_wrap,
+      :rotation_stacked
     ##
     # Border line styles
-    # Valid values: :none, :thin, :medium, :dashed, :dotted, :thick, 
-		#               :double, :hair, :medium_dashed, :thin_dash_dotted,
-		#               :medium_dash_dotted, :thin_dash_dot_dotted,
-		#               :medium_dash_dot_dotted, :slanted_medium_dash_dotted
+    # Valid values: :none, :thin, :medium, :dashed, :dotted, :thick,
+    #               :double, :hair, :medium_dashed, :thin_dash_dotted,
+    #               :medium_dash_dotted, :thin_dash_dot_dotted,
+    #               :medium_dash_dot_dotted, :slanted_medium_dash_dotted
     # Default:			:none
-		styles = [ :thin, :medium, :dashed, :dotted, :thick, 
-							 :double, :hair, :medium_dashed, :thin_dash_dotted,
-							 :medium_dash_dotted, :thin_dash_dot_dotted,
-							 :medium_dash_dot_dotted, :slanted_medium_dash_dotted ]
-		enum :left,		:none, *styles
-		enum :right,	:none, *styles
-		enum :top,		:none, *styles
-		enum :bottom,	:none, *styles
+    styles = [:thin, :medium, :dashed, :dotted, :thick,
+      :double, :hair, :medium_dashed, :thin_dash_dotted,
+      :medium_dash_dotted, :thin_dash_dot_dotted,
+      :medium_dash_dot_dotted, :slanted_medium_dash_dotted]
+    enum :left,	:none, *styles
+    enum :right,	:none, *styles
+    enum :top,	:none, *styles
+    enum :bottom,	:none, *styles
 
     ##
     # Color attributes
-    colors  :bottom_color, :top_color, :left_color, :right_color,
-            :pattern_fg_color, :pattern_bg_color,
-            :diagonal_color
+    colors :bottom_color, :top_color, :left_color, :right_color,
+      :pattern_fg_color, :pattern_bg_color,
+      :diagonal_color
     ##
     # Text direction
     # Valid values: :context, :left_to_right, :right_to_left
     # Default:      :context
     enum :text_direction, :context, :left_to_right, :right_to_left,
-         :left_to_right => [:ltr, :l2r],
-         :right_to_left => [:rtl, :r2l]
-    alias :reading_order  :text_direction
-    alias :reading_order= :text_direction=
+      left_to_right: [:ltr, :l2r],
+      right_to_left: [:rtl, :r2l]
+    alias_method :reading_order, :text_direction
+    alias_method :reading_order=, :text_direction=
     ##
     # Indentation level
     enum :indent_level, 0, Integer
-    alias :indent  :indent_level
-    alias :indent= :indent_level=
+    alias_method :indent, :indent_level
+    alias_method :indent=, :indent_level=
     ##
     # Horizontal alignment
     # Valid values: :default, :left, :center, :right, :fill, :justify, :merge,
     #               :distributed
     # Default:      :default
     enum :horizontal_align, :default, :left, :center, :right, :fill, :justify,
-                            :merge, :distributed,
-         :center      => :centre,
-         :merge       => [ :center_across, :centre_across ],
-         :distributed => :equal_space
+      :merge, :distributed,
+      center: :centre,
+      merge: [:center_across, :centre_across],
+      distributed: :equal_space
     ##
     # Vertical alignment
     # Valid values: :bottom, :top, :middle, :justify, :distributed
     # Default:      :bottom
     enum :vertical_align, :bottom, :top, :middle, :justify, :distributed,
-         :distributed => [:vdistributed, :vequal_space, :equal_space],
-         :justify     => :vjustify,
-         :middle      => [:vcenter, :vcentre, :center, :centre]
+      distributed: [:vdistributed, :vequal_space, :equal_space],
+      justify: :vjustify,
+      middle: [:vcenter, :vcentre, :center, :centre]
     attr_accessor :font, :number_format, :name, :pattern, :used_merge
     ##
     # Text rotation
     attr_reader :rotation
-    def initialize opts={}
-      @font             = Font.new client("Arial", 'UTF-8'), :family => :swiss
-      @number_format    = client 'GENERAL', 'UTF-8'
-      @rotation         = 0
-      @pattern          = 0
-      @bottom_color     = :black
-      @top_color        = :black
-      @left_color       = :black
-      @right_color      = :black
-      @diagonal_color   = :black
+    def initialize opts = {}
+      @font = Font.new client("Arial", "UTF-8"), family: :swiss
+      @number_format = client "GENERAL", "UTF-8"
+      @rotation = 0
+      @pattern = 0
+      @bottom_color = :black
+      @top_color = :black
+      @left_color = :black
+      @right_color = :black
+      @diagonal_color = :black
       @pattern_fg_color = :border
       @pattern_bg_color = :pattern_bg
       @regexes = {
-        :date         => Regexp.new(client("[YMD]|d{2}|m{3}|y{2}", 'UTF-8')),
-        :date_or_time => Regexp.new(client("[hmsYMD]", 'UTF-8')),
-        :datetime     => Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", 'UTF-8')),
-        :time         => Regexp.new(client("[hms]", 'UTF-8')),
-        :number       => Regexp.new(client("([\#]|0+)", 'UTF-8')),
-        :locale       => Regexp.new(client(/\A\[\$\-\S+\]/.to_s, 'UTF-8')),
+        date: Regexp.new(client("[YMD]|d{2}|m{3}|y{2}", "UTF-8")),
+        date_or_time: Regexp.new(client("[hmsYMD]", "UTF-8")),
+        datetime: Regexp.new(client("([YMD].*[HS])|([HS].*[YMD])", "UTF-8")),
+        time: Regexp.new(client("[hms]", "UTF-8")),
+        number: Regexp.new(client("([#]|0+)", "UTF-8")),
+        locale: Regexp.new(client(/\A\[\$-\S+\]/.to_s, "UTF-8"))
       }
 
       # Temp code to prevent merged formats in non-merged cells.
@@ -119,7 +119,7 @@ module Spreadsheet
     def update_format(opts = {})
       opts.each do |attribute, value|
         writer = "#{attribute}="
-        @font.respond_to?(writer) ? @font.send(writer,value) : self.send(writer, value) 
+        @font.respond_to?(writer) ? @font.send(writer, value) : send(writer, value)
       end
       self
     end
@@ -135,83 +135,99 @@ module Spreadsheet
     def align= location
       self.horizontal_align = location
     rescue ArgumentError
-      self.vertical_align = location rescue ArgumentError
+      self.vertical_align = begin
+        location
+      rescue
+        ArgumentError
+      end
     end
+
     ##
     # Returns an Array containing the line styles of the four borders:
     # bottom, top, right, left
     def border
       [bottom, top, right, left]
     end
+
     ##
     # Set same line style on all four borders at once (left, right, top, bottom)
     def border=(style)
-      [:bottom=, :top=, :right=, :left=].each do |writer| send writer, style end
+      [:bottom=, :top=, :right=, :left=].each { |writer| send writer, style }
     end
+
     ##
     # Returns an Array containing the colors of the four borders:
     # bottom, top, right, left
     def border_color
-      [@bottom_color,@top_color,@right_color,@left_color]
+      [@bottom_color, @top_color, @right_color, @left_color]
     end
+
     ##
     # Set all four border colors to _color_ (left, right, top, bottom)
     def border_color=(color)
       [:bottom_color=, :top_color=, :right_color=, :left_color=].each do |writer|
-        send writer, color end
+        send writer, color
+      end
     end
+
     ##
     # Set the Text rotation
     # Valid values: Integers from -90 to 90,
     # or :stacked (sets #rotation_stacked to true)
     def rotation=(rot)
-      if rot.to_s.downcase == 'stacked'
+      if rot.to_s.downcase == "stacked"
         @rotation_stacked = true
         @rotation = 0
-      elsif rot.kind_of?(Integer)
+      elsif rot.is_a?(Integer)
         @rotation_stacked = false
         @rotation = rot % 360
       else
         raise TypeError, "rotation value must be an Integer or the String 'stacked'"
       end
     end
+
     ##
     # Backward compatibility method. May disappear at some point in the future.
     def center_across!
       self.horizontal_align = :merge
     end
-    alias :merge! :center_across!
+    alias_method :merge!, :center_across!
     ##
     # Is the cell formatted as a Date?
     def date?
       !number? && matches_format?(:date)
     end
+
     ##
     # Is the cell formatted as a Date or Time?
     def date_or_time?
       !number? && matches_format?(:date_or_time)
     end
+
     ##
     # Is the cell formatted as a DateTime?
     def datetime?
       !number? && matches_format?(:datetime)
     end
+
     ##
     # Is the cell formatted as a Time?
     def time?
       !number? && matches_format?(:time)
     end
+
     ##
     # Is the cell formatted as a number?
     def number?
       matches_format?(:number)
     end
+
     ##
     # Does the cell match a particular preset format?
     def matches_format?(name)
       # Excel number formats may optionally include a locale identifier like this:
       #   [$-409]
-      format = @number_format.to_s.sub(@regexes[:locale], '')
+      format = @number_format.to_s.sub(@regexes[:locale], "")
       !!@regexes[name].match(format)
     end
   end

data/lib/spreadsheet/link.rb

@@ -1,5 +1,5 @@
-require 'uri'
-require 'spreadsheet/encodings'
+require "uri"
+require "spreadsheet/encodings"
 
 module Spreadsheet
   ##
@@ -19,21 +19,24 @@ module Spreadsheet
   #                  but if you do, here is where you can find it.
   class Link < String
     include Encodings
+
     attr_accessor :target_frame, :url, :dos, :fragment
-    def initialize url='', description=url, fragment=nil
-      super description
+    def initialize url = "", description = url, fragment = nil
+      super(description)
       @url = url
       @fragment = fragment
     end
+
     ##
     # The Url with the fragment appended if present.
     def href
       href = (@url || @dos).to_s.dup
       if @fragment
-        href << client('#', 'UTF-8') << @fragment
+        href << client("#", "UTF-8") << @fragment
       end
       href
     end
+
     ##
     # Attempts to parse the output of href. May raise a URI::InvalidURIError
     def to_uri

data/lib/spreadsheet/note.rb

@@ -1,4 +1,4 @@
-require 'spreadsheet/encodings'
+require "spreadsheet/encodings"
 
 module Spreadsheet
   ##
@@ -10,14 +10,15 @@ module Spreadsheet
   # #author  :: The name of the author who wrote the note
   class Note
     include Encodings
-    attr_accessor :author, :length, :objID, :row, :col, :text
+
+    attr_accessor :author, :length, :obj_id, :row, :col, :text
     def initialize
       @author = nil
       @length = 0
-      @objID  = nil
-      @row    = -1
-      @col    = -1
-      @text   = ""
+      @obj_id = nil
+      @row = -1
+      @col = -1
+      @text = ""
     end
   end
 end

data/lib/spreadsheet/noteObject.rb

@@ -1,17 +1,18 @@
-require 'spreadsheet/encodings'
+require "spreadsheet/encodings"
 
 module Spreadsheet
   ##
-  # The NoteObject class is made to handle the text output from the 
+  # The NoteObject class is made to handle the text output from the
   # object, txo, continue records which contain a comment's text record.
   #
   #
   class NoteObject
     include Encodings
-    attr_accessor :objID, :text
+
+    attr_accessor :obj_id, :text
     def initialize
-      @objID  = -1
-      @text   = ""
+      @obj_id = -1
+      @text = ""
     end
   end
 end