rubyXL 3.4.12 → 3.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae14d573700ba305fed8fe1ba9d6904925f208a287778688c2ada36a962c487b
-  data.tar.gz: cf22ac527c3e73ac4f7c46fbb2c47a526b66b60096fc882c8997bf128498880f
+  metadata.gz: 69ceee765ae742ca18903f3db0a368782e581e8324941fd9671e6642fb8ba5d9
+  data.tar.gz: 0bed16ef2323e2bd91e33d395a66c9a13b902e5e03cad2de415f4bafcbcb8b3b
 SHA512:
-  metadata.gz: 6d1b2afb2726592bca0dfc7b6eede69a5fade6d4deb4b12683ea9853c437057399d5c0f296b15bd05de74f8125087b0ff7a02bb590c2c68d0ae6890a7dc66a9b
-  data.tar.gz: cb38390c003ff232c568166ece77852936b2f75eaec838f23ceed012471eb1654a0c06f2fd28d5991353788180e94745f3c456abc4214b7abb2b1c160b5bd0e6
+  metadata.gz: d30a855437e79b15c975ad5e13148cfb72e4f2956449dcbc95d6ff691e60a668d729432e80909318010d473e75323c3c4f75c17b57f80c59f22f41bac43bfc35
+  data.tar.gz: fe740718fd69d6a8131383d8b5b326df918820d67c08c708e8e80959a9a04ad3f0f18c2d0efb02e6e660dc66456578a8008e98781ee094658ac78fee9319d90b

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/ruby:2.4.1-node-browsers
+      - image: circleci/ruby:2.6.6-buster
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -29,6 +29,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            gem install bundler
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
       - save_cache:

data/Gemfile

@@ -1,16 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Dependencies required to run this gem.
-gem "nokogiri", ">= 1.4.4"
-gem "rubyzip", ">= 1.3.0" , :require => 'zip'
+gem 'nokogiri', '>= 1.10.8'
+gem 'rubyzip', '>= 1.3.0' , :require => 'zip'
 
 # Development dependencies.
 group :development, :test do
-  gem "bundler"
-  gem "rake"
-  gem "jeweler"
-  gem "rspec"
-  gem "simplecov"
+  gem 'bundler'
+  gem 'rake'
+  gem 'juwelier'
+  gem 'rspec'
+  gem 'simplecov'
 
 #  gem 'stackprof'
   gem 'ruby-prof'

data/Gemfile.lock

@@ -1,77 +1,109 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.4.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
     builder (3.2.4)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    faraday (0.9.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       multipart-post (>= 1.2, < 3)
-    git (1.5.0)
-    github_api (0.16.0)
-      addressable (~> 2.4.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.11.0)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
+      addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8, < 0.10)
-      hashie (>= 3.4)
-      mime-types (>= 1.16, < 3.0)
+      faraday (>= 0.8, < 2)
+      hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    hashie (4.0.0)
+    hashie (3.6.0)
     highline (2.0.3)
-    jeweler (2.3.9)
+    juwelier (2.4.9)
       builder
       bundler
-      git (>= 1.2.5)
-      github_api (~> 0.16.0)
-      highline (>= 1.6.15)
-      nokogiri (>= 1.5.10)
+      git
+      github_api
+      highline
+      kamelcase (~> 0)
+      nokogiri
       psych
       rake
       rdoc
       semver2
-    json (2.3.0)
-    jwt (2.2.1)
-    mime-types (2.99.3)
-    mini_portile2 (2.4.0)
-    multi_json (1.14.1)
+    jwt (2.3.0)
+    kamelcase (0.0.2)
+      semver2 (~> 3)
+    mini_portile2 (2.8.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.7)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.2)
-      faraday (>= 0.8, < 2.0)
+    nokogiri (1.13.6)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.1.0)
-    rack (2.0.8)
-    rake (13.0.1)
-    rdoc (6.2.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    psych (4.0.4)
+      stringio
+    public_suffix (4.0.7)
+    racc (1.6.0)
+    rack (2.2.3)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rspec_junit_formatter (0.4.1)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    ruby-prof (1.1.0)
-    rubyzip (2.0.0)
+    ruby-prof (1.4.3)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     semver2 (3.4.2)
-    simplecov (0.17.1)
+    simplecov (0.21.2)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringio (3.0.2)
     thread_safe (0.3.6)
 
 PLATFORMS
@@ -79,8 +111,8 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  jeweler
-  nokogiri (>= 1.4.4)
+  juwelier
+  nokogiri (>= 1.10.8)
   rake
   rspec
   rspec_junit_formatter
@@ -89,4 +121,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.17.3
+   2.3.5

data/README.rdoc

@@ -55,6 +55,14 @@ Please note that row is a _sparse_ array of cells. Your code *must* expect that
   worksheet.sheet_data[0][0] # Returns cell A1 in the worksheet
   worksheet[0][0]            # Returns cell A1 in the worksheet
 
+  cell = worksheet[0][0]
+  cell.value                 # Returns a properly converted value in the cell (if the file claims that the cell
+                             # is holding a number, returns a respective Integer or Float, and so on).
+
+Or, if you prefer Excel-style references (single-cell only!)
+
+  cell = worksheet.cell_at('B11')
+
 ==== Wrappers for accessing Cell properties
   cell = workbook[0][0][0]
   cell.is_struckthrough  # Returns +true+ if the cell is struckthrough, other boolean properties have same syntax
@@ -134,26 +142,25 @@ Please note: these methods are being phased out in favor of the OOXML object mod
 
 ==== Changing Alignment
 ===== Horizontal
-center, distributed, justify, left, right
+  # Possible alignments: center, distributed, justify, left, right
   worksheet.sheet_data[0][0].change_horizontal_alignment('center') # Sets A1 to be centered
   worksheet.change_row_horizontal_alignment(0, 'justify')          # Sets first row to be justified
   worksheet.change_column_horizontal_alignment(0, 'right')         # Sets first column to be right-aligned
 
 ===== Vertical
-bottom, center, distributed, top
+  # Possible alignments: bottom, center, distributed, top
   worksheet.sheet_data[0][0].change_vertical_alignment('bottom')  # Sets A1 to be bottom aligned
   worksheet.change_row_vertical_alignment(0, 'distributed')       # Sets first row to be distributed vertically
   worksheet.change_column_vertical_alignment(0, 'top')            # Sets first column to be top aligned
   
 ===== Rotation
+  # Possible values:
+  # * 0-90 - degrees counterclockwise, around the bottom LEFT corner of the cell;
+  # * 91-179 - degrees clockwise, around the bottom RIGHT corner of the cell;
+  # * 180-254 - degrees clockwise, around the bottom LEFT corner of the cell, text becomes progressively invisible
+  # * 255 - text is in normal rotation but displayed vertically (one letter under another), line feed starts new line to the right of the previous.
   worksheet.sheet_data[0][0].change_text_rotation(90)  # Sets A1 to be rotated by 90 degrees
 
-Values:
-* 0-90 - degrees counterclockwise, around the bottom LEFT corner of the cell;
-* 91-179 - degrees clockwise, around the bottom RIGHT corner of the cell;
-* 180-254 - degrees clockwise, around the bottom LEFT corner of the cell, text becomes progressively invisible
-* 255 - text is in normal rotation but displayed vertically (one letter under another), line feed starts new line to the right of the previous.
-
 ==== Changing Row Height
   worksheet.change_row_height(0, 30)  # Sets first row height to 30
 
@@ -207,8 +214,14 @@ WARNING: Use of this method WILL break formulas referencing cells which have bee
   cell = worksheet[0][0]
   cell.set_number_format '0.0000%'    # For formats, see https://support.office.com/en-us/article/5026bbd6-04bc-48cd-bf33-80f18b4eae68
   cell.change_text_wrap(true)         # Makes the text in the cell to wrap.
+  cell.change_shrink_to_fit(true)     # Makes the text in the cell to shrink to fit.
   cell.change_text_indent(1)          # Indents the text in the cell by 1 level
 
+==== Add hyperlink to a Cell
+  cell.add_hyperlink('http://example.com')
+  cell.add_hyperlink('http://example.com', 'Some tooltip text')
+
+
 == I/O
 
 By default, the gem operates with files on the local filesystem:
@@ -229,6 +242,10 @@ It can also operate on +StringIO+ objects, thus eliminating the need to save the
 
   RubyXL.class_variable_set(:@@suppress_warnings, true)
 
+== Data validation (colloquially referred to as "dropdown list")
+
+  worksheet.add_validation_list("A1", [ "value1", "value2" ])
+
 == For more information
 Take a look at the files in spec/lib/ for rspecs on most methods
 
@@ -244,5 +261,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2022 Wesha.
 See LICENSE.txt for further details.

data/Rakefile

@@ -1,29 +1,28 @@
-# encoding: utf-8
 require 'rubygems'
 
 require 'bundler'
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  warn e.message
+  warn 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "rubyXL"
-  gem.homepage = "http://github.com/gilt/rubyXL"
-  gem.license = "MIT"
-  gem.summary = %Q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
-  gem.description = %Q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
-  gem.email = "bhagwat.vivek@gmail.com"
-  gem.authors = ["Vivek Bhagwat", 'Wesha']
+  gem.name = 'rubyXL'
+  gem.homepage = 'http://github.com/gilt/rubyXL'
+  gem.license = 'MIT'
+  gem.summary = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
+  gem.description = %q{rubyXL is a gem which allows the parsing, creation, and manipulation of Microsoft Excel (.xlsx/.xlsm) Documents}
+  gem.email = 'bhagwat.vivek@gmail.com'
+  gem.authors = ['Vivek Bhagwat', 'Wesha']
 #  gem.required_ruby_version = '>2.1'
   # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new 
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -39,7 +38,7 @@ task :default => :rspec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?('VERSION') ? File.read('VERSION') : ''
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "rubyXL #{version}"
@@ -47,42 +46,42 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc "Dump profiling data with stackprof"
+desc 'Dump profiling data with stackprof'
 task :stackprof do
   require 'benchmark'
   require 'stackprof'
 
-  $:.unshift File.dirname(__FILE__) + '/lib'  # Make Ruby aware of load path
+  $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'  # Make Ruby aware of load path
   require './lib/rubyXL'
 
-  spreadsheets = Dir.glob(File.join("test", "input", "*.xls?")).sort!
+  spreadsheets = Dir.glob(File.join('test', 'input', '*.xls?')).sort!
 
   spreadsheets.each { |input|
     puts "<<<--- Profiling parsing of #{input}..."
     doc = nil
-    StackProf.run(:mode => :cpu, :interval => 100, 
-                  :out  => "tmp/stackprof-cpu-parse-#{File.basename(input)}.dump") { 
+    StackProf.run(:mode => :cpu, :interval => 100,
+                  :out  => "tmp/stackprof-cpu-parse-#{File.basename(input)}.dump") {
       doc = RubyXL::Parser.parse(input)
     }
 
-    output = File.join("test", "output", File.basename(input))
-    puts  "--->>> Profiling writing of #{output}..."
-    StackProf.run(:mode => :cpu, :interval => 100, 
+    output = File.join('test', 'output', File.basename(input))
+    puts "--->>> Profiling writing of #{output}..."
+    StackProf.run(:mode => :cpu, :interval => 100,
                   :out  => "tmp/stackprof-cpu-write-#{File.basename(input)}.dump") {
       doc.write(output)
     }
   }
 end
 
-desc "Dump profiling data with ruby-prof"
+desc 'Dump profiling data with ruby-prof'
 task :rubyprof do
   require 'benchmark'
   require 'ruby-prof'
 
-  $:.unshift File.dirname(__FILE__) + '/lib'  # Make Ruby aware of load path
+  $LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'  # Make Ruby aware of load path
   require './lib/rubyXL'
 
-  spreadsheets = Dir.glob(File.join("test", "input", "*.xls?")).sort!
+  spreadsheets = Dir.glob(File.join('test', 'input', '*.xls?')).sort!
 
   spreadsheets.each { |input|
     puts "<<<--- Profiling parsing of #{input}..."
@@ -93,8 +92,8 @@ task :rubyprof do
     printer = RubyProf::CallStackPrinter.new(result)
     File.open("tmp/ruby-prof-parse-#{File.basename(input)}.html", 'w') { |f| printer.print(f, {}) }
 
-    output = File.join("test", "output", File.basename(input))
-    puts  "--->>> Profiling writing of #{output}..."
+    output = File.join('test', 'output', File.basename(input))
+    puts "--->>> Profiling writing of #{output}..."
     result = RubyProf.profile {
       doc.write(output)
     }

data/VERSION

@@ -1 +1 @@
-3.4.12
+3.4.25

data/lib/rubyXL/cell.rb

@@ -1,5 +1,4 @@
 module RubyXL
-
   module LegacyCell
     def workbook
       @worksheet.workbook
@@ -7,7 +6,7 @@ module RubyXL
 
     private
 
-    def validate_workbook()
+    def validate_workbook
       unless workbook.nil? || workbook.worksheets.nil?
         workbook.worksheets.each { |sheet|
           unless sheet.nil? || sheet.sheet_data.nil? || sheet.sheet_data[row].nil?
@@ -20,10 +19,9 @@ module RubyXL
       raise "This cell #{self} is not in workbook #{workbook}"
     end
 
-    def validate_worksheet()
+    def validate_worksheet
       return if @worksheet && @worksheet[row] && @worksheet[row][column].equal?(self)
       raise "Cell #{self} is not in worksheet #{worksheet}"
     end
-
   end
 end

data/lib/rubyXL/convenience_methods/cell.rb

@@ -1,6 +1,5 @@
 module RubyXL
   module CellConvenienceMethods
-
     def change_contents(data, formula_expression = nil)
       validate_worksheet
 
@@ -9,12 +8,12 @@ module RubyXL
         self.formula = RubyXL::Formula.new(:expression => formula_expression)
       else
         self.datatype = case data
-                        when Date, Numeric then nil
+                        when Date, Time, Numeric then nil
                         else RubyXL::DataType::RAW_STRING
                         end
       end
 
-      data = workbook.date_to_num(data) if data.is_a?(Date)
+      data = workbook.date_to_num(data) if data.is_a?(Date) || data.is_a?(Time)
 
       self.raw_value = data
     end
@@ -54,6 +53,11 @@ module RubyXL
       self.style_index = workbook.modify_alignment(self.style_index) { |a| a.wrap_text = wrap }
     end
 
+    def change_shrink_to_fit(shrink_to_fit = false)
+      validate_worksheet
+      self.style_index = workbook.modify_alignment(self.style_index) { |a| a.shrink_to_fit = shrink_to_fit }
+    end
+
     def change_text_rotation(rot)
       validate_worksheet
       self.style_index = workbook.modify_alignment(self.style_index) { |a| a.text_rotation = rot }
@@ -75,75 +79,75 @@ module RubyXL
       self.style_index = workbook.modify_border_color(self.style_index, direction, color)
     end
 
-    def is_italicized()
+    def is_italicized
       validate_worksheet
       get_cell_font.is_italic
     end
 
-    def is_bolded()
+    def is_bolded
       validate_worksheet
       get_cell_font.is_bold
     end
 
-    def is_underlined()
+    def is_underlined
       validate_worksheet
       get_cell_font.is_underlined
     end
 
-    def is_struckthrough()
+    def is_struckthrough
       validate_worksheet
       get_cell_font.is_strikethrough
     end
 
-    def font_name()
+    def font_name
       validate_worksheet
       get_cell_font.get_name
     end
 
-    def font_size()
+    def font_size
       validate_worksheet
       get_cell_font.get_size
     end
 
-    def font_color()
+    def font_color
       validate_worksheet
       get_cell_font.get_rgb_color || '000000'
     end
 
-    def fill_color()
+    def fill_color
       validate_worksheet
       return workbook.get_fill_color(get_cell_xf)
     end
 
-    def horizontal_alignment()
+    def horizontal_alignment
       validate_worksheet
       xf_obj = get_cell_xf
       return nil if xf_obj.alignment.nil?
       xf_obj.alignment.horizontal
     end
 
-    def vertical_alignment()
+    def vertical_alignment
       validate_worksheet
       xf_obj = get_cell_xf
       return nil if xf_obj.alignment.nil?
       xf_obj.alignment.vertical
     end
 
-    def text_wrap()
+    def text_wrap
       validate_worksheet
       xf_obj = get_cell_xf
       return nil if xf_obj.alignment.nil?
       xf_obj.alignment.wrap_text
     end
-    
+
     def text_rotation
       validate_worksheet
       xf_obj = get_cell_xf
       return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.text_rotation    
+      xf_obj.alignment.text_rotation
     end
 
-    def text_indent()
+    def text_indent
       validate_worksheet
       xf_obj = get_cell_xf
       return nil if xf_obj.alignment.nil?
@@ -249,23 +253,23 @@ module RubyXL
       end
     end
 
-=begin
-    def add_hyperlink(l)
-      worksheet.hyperlinks ||= RubyXL::Hyperlinks.new
-      worksheet.hyperlinks << RubyXL::Hyperlink.new(:ref => self.r, :location => l)
-#    define_attribute(:'r:id',   :string)
-#    define_attribute(:location, :string)
-#    define_attribute(:tooltip,  :string)
-#    define_attribute(:display,  :string)
-
-    end
+    def add_hyperlink(url, tooltip = nil)
+      worksheet.relationship_container ||= RubyXL::OOXMLRelationshipsFile.new
+      relationships = worksheet.relationship_container.relationships
+      r_id = "rId#{relationships.size + 1}"
+      relationships << RubyXL::Relationship.new(:id => r_id, :target => url, :target_mode => 'External',
+                                                :type => RubyXL::HyperlinkRelFile::REL_TYPE)
 
-    def add_shared_string(str)
-      self.datatype = RubyXL::DataType::SHARED_STRING
-      self.raw_value = @workbook.shared_strings_container.add(str)
+      hyperlink = RubyXL::Hyperlink.new(:ref => self.r, :r_id => r_id)
+      hyperlink.tooltip = tooltip if tooltip
+      worksheet.hyperlinks ||= RubyXL::Hyperlinks.new
+      worksheet.hyperlinks << hyperlink
     end
-=end
 
+#     def add_shared_string(str)
+#       self.datatype = RubyXL::DataType::SHARED_STRING
+#       self.raw_value = @workbook.shared_strings_container.add(str)
+#     end
   end
 
   RubyXL::Cell.send(:include, RubyXL::CellConvenienceMethods) # ruby 2.1 compat

data/lib/rubyXL/convenience_methods/color.rb

@@ -1,6 +1,5 @@
 module RubyXL
   module ColorConvenienceMethods
-
     def get_rgb(workbook)
       if rgb then
         return rgb
@@ -13,7 +12,6 @@ module RubyXL
         RubyXL::RgbColor.parse(color_value).to_hls.apply_tint(tint).to_rgb.to_s
       end
     end
-
   end
 
   module ColorConvenienceClasses
@@ -60,7 +58,7 @@ module RubyXL
       end
 
       def self.parse(str)
-        r, g, b, a = str.unpack("A2A2A2A2")
+        r, g, b, a = str.unpack('A2A2A2A2')
 
         rgb_color = RgbColor.new
         rgb_color.r = r && r.to_i(16)
@@ -72,11 +70,12 @@ module RubyXL
       end
 
       def to_s
-        str = r.to_s(16) + g.to_s(16) + b.to_s(16)
-        str += a.to_s(16) if a && a != 0
-        str
+        if a && a != 0 then
+          format('%02x%02x%02x%02x', r, g, b, a)
+        else
+          format('%02x%02x%02x', r, g, b)
+        end
       end
-
     end
 
     class HlsColor
@@ -149,7 +148,6 @@ module RubyXL
 
         self
       end
-
     end
   end