rubyXL 3.3.21 → 3.4.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f94fc6b7b6d611cb2eecd1874bd470d5bade0f3c
-  data.tar.gz: 98008cf42d8e16856682e9dfcd60c740c1205c2c
+SHA256:
+  metadata.gz: 51db2d850a23f726d765f58fdaad378dd910becb0e468216095a1473a5770b9c
+  data.tar.gz: 56fbd84fb09a54fe29dcdb6f734c6ade11737d11dbe2130633dccc35999e85cd
 SHA512:
-  metadata.gz: 6daeb64ab265ad3f575b2da82fc110f2a5eff40b4f0e85b45135ecdbb220d9524242c1df14da1062b9463fe53cd7129efd342f5c1d5aec69f6cb4f14dd2283d3
-  data.tar.gz: 50bc7566f9399a1d2b4c74128a56dc36fd4b9f7c941346e3bbb731d96a64bf4634e76b606c17ea81f4c13fa77bf163589dd1dabedfe1cb5610877ad1f07c24cc
+  metadata.gz: e8a733f1ba635667d621ae7f02990c0ac4aeac8554b554ed9474c0b28b0e265c2a5e1071be43d6cc968911da58887a78dcedbe6fbae18d79be0fddc9093e1c4c
+  data.tar.gz: 4ac723e0a0508a9f6235e57c702c453dfa01a7941a1a27fe072f4a411bd186cfc76de15150f8a4a4cf80779885e7623012f2d9c3ba6fa30e48bedff262f94bbf

data/.circleci/config.yml

@@ -0,0 +1,60 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.6.6-buster
+
+      # Specify service dependencies here if necessary
+      # CircleCI maintains a library of pre-built images
+      # documented at https://circleci.com/docs/2.0/circleci-images/
+      # - image: circleci/postgres:9.4
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+            - v1-dependencies-{{ checksum "Gemfile.lock" }}
+            # fallback to using the latest cache if no exact match is found
+            - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            gem install bundler
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | \
+              circleci tests split --split-by=timings)"
+
+            bundle exec rspec \
+              --format progress \
+              --format RspecJunitFormatter \
+              --out /tmp/test-results/rspec.xml \
+              --format progress \
+              $TEST_FILES
+
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/.codeclimate.yml

@@ -0,0 +1,3 @@
+exclude_patterns:
+- "rdoc/*"
+- "spec/*"

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
 # Dependencies required to run this gem.
-gem "nokogiri", ">= 1.4.4"
-gem "rubyzip", ">= 1.1.6" , :require => 'zip'
+gem "nokogiri", ">= 1.10.8"
+gem "rubyzip", ">= 1.3.0" , :require => 'zip'
 
 # Development dependencies.
 group :development, :test do
@@ -14,4 +14,5 @@ group :development, :test do
 
 #  gem 'stackprof'
   gem 'ruby-prof'
+  gem 'rspec_junit_formatter'
 end

data/Gemfile.lock

@@ -0,0 +1,96 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    builder (3.2.4)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    docile (1.3.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    github_api (0.16.0)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      mime-types (>= 1.16, < 3.0)
+      oauth2 (~> 1.0)
+    hashie (4.1.0)
+    highline (2.0.3)
+    jeweler (2.3.9)
+      builder
+      bundler
+      git (>= 1.2.5)
+      github_api (~> 0.16.0)
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      psych
+      rake
+      rdoc
+      semver2
+    jwt (2.2.2)
+    mime-types (2.99.3)
+    mini_portile2 (2.5.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    psych (3.3.0)
+    racc (1.5.2)
+    rack (2.2.3)
+    rake (13.0.3)
+    rchardet (1.8.0)
+    rdoc (6.3.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rspec_junit_formatter (0.4.1)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    ruby-prof (1.4.2)
+    rubyzip (2.3.0)
+    semver2 (3.4.2)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    thread_safe (0.3.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  jeweler
+  nokogiri (>= 1.10.8)
+  rake
+  rspec
+  rspec_junit_formatter
+  ruby-prof
+  rubyzip (>= 1.3.0)
+  simplecov
+
+BUNDLED WITH
+   2.1.4

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Vivek Bhagwat, 2013-2014 Wesha
+Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,13 +1,14 @@
 = rubyXL
 {<img src="https://badge.fury.io/rb/rubyXL.svg" alt="Gem Version" />}[http://badge.fury.io/rb/rubyXL]
 {<img src="https://codeclimate.com/github/weshatheleopard/rubyXL.png" alt="Code Climate" />}[https://codeclimate.com/github/weshatheleopard/rubyXL]
+{<img src="https://circleci.com/gh/weshatheleopard/rubyXL.svg?style=svg" alt="CircleCI" />}[https://circleci.com/gh/weshatheleopard/rubyXL]
 
 This gem supports operating on +xlsx+ files (Open XML format). While it is capable
 of properly parsing the entire OOXML structure, its current main emphasis is on
 reading files produced by MS Excel, making minor modifications to them and saving
 them to be opened again, while preserving as much of the structure as possible.
 
-Please note that proprietary binary +xls+ format is *not* supported.
+Please note that proprietary binary +xls+ format is *not* supported by this gem. If you need to parse those files, try {spreadsheet}[https://github.com/zdavatz/spreadsheet] gem.
 
 == To Install:
   gem install rubyXL
@@ -15,6 +16,18 @@ Please note that proprietary binary +xls+ format is *not* supported.
 == To Use:
   require 'rubyXL' # Assuming rubygems is already required
 
+=== Convenience methods
+
+Starting with version 3.4.0, the main data structure has been separated from the convenience methods that provide access to individual features of the +xlsx+ format, in order to decrease the memory footprint. If you intend to use these features, you will need to additionally include the respective files:
+  require 'rubyXL/convenience_methods/cell'
+  require 'rubyXL/convenience_methods/color'
+  require 'rubyXL/convenience_methods/font'
+  require 'rubyXL/convenience_methods/workbook'
+  require 'rubyXL/convenience_methods/worksheet'
+
+If you do not care about your RAM usage, just include them all at once by adding the following line to your code so it can continue operating just as before:
+  require 'rubyXL/convenience_methods'
+
 === Parsing an existing workbook
   workbook = RubyXL::Parser.parse("path/to/Excel/file.xlsx")
 
@@ -26,7 +39,7 @@ Please note that proprietary binary +xls+ format is *not* supported.
 ==== Accessing a Worksheet
   workbook.worksheets[0] # Returns first worksheet
   workbook[0]            # Returns first worksheet
-  workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1"
+  workbook['Sheet1']     # Finds and returns worksheet titled "Sheet1". Note that sheet names in Excel are limited to 31 character.
 
 ==== Accessing a Row (Array of Cells)
 Please note that worksheet is a _sparse_ array of rows. Your code *must* expect that any row it plucks from the array may be <tt>nil</tt>.
@@ -52,6 +65,8 @@ Please note that row is a _sparse_ array of cells. Your code *must* expect that
   cell.horizontal_alignment
   cell.vertical_alignment
   cell.get_border(:top)
+  cell.get_border_color(:top)
+  cell.text_rotation
 
 ==== Wrappers for accessing Row properties 
 Please note: these methods are being phased out in favor of the OOXML object model.
@@ -65,6 +80,7 @@ Please note: these methods are being phased out in favor of the OOXML object mod
   worksheet.get_row_alignment(0, true)
   worksheet.get_row_alignment(0, false)
   worksheet.get_row_border(0, :right)
+  worksheet.get_row_border_color(0, :right)
 
 ==== Accessing column properties
 Please note: these methods are being phased out in favor of the OOXML object model.
@@ -78,16 +94,7 @@ Please note: these methods are being phased out in favor of the OOXML object mod
   worksheet.get_column_alignment(0, :horizontal)
   worksheet.get_column_alignment(0, :vertical)
   worksheet.get_column_border(0, :right)
-
-==== Table reading
-In order to discourage unnecessary reshuffling of data in memory, methods +extract_data+ and +get_table+ are being deprecated. You should access and iterate through rows and cells directly:
-
-  worksheet.each { |row|
-     row && row.cells.each { |cell|
-       val = cell && cell.value
-       do_whatever_you_want(val)
-     }
-  }
+  worksheet.get_column_border_color(0, :right)
 
 === Modifying
 
@@ -95,7 +102,7 @@ In order to discourage unnecessary reshuffling of data in memory, methods +extra
   worksheet = workbook.add_worksheet('Sheet2')
 
 ==== Renaming Worksheets
-  worksheet.sheet_name = 'Cool New Name'
+  worksheet.sheet_name = 'Cool New Name' # Note that sheet name is limited to 31 characters by Excel.
 
 ==== Adding Cells
   worksheet.add_cell(0, 0, 'A1')      # Sets cell A1 to string "A1"
@@ -121,6 +128,10 @@ In order to discourage unnecessary reshuffling of data in memory, methods +extra
   worksheet.change_row_border(0, :left, 'hairline')       # Sets first row to have a left, hairline border
   worksheet.change_column_border(0, :diagonal, 'medium')  # Sets first column to have diagonal, medium border
 
+  # Set the border style first so there's something to color.
+  worksheet.change_row_border_color(0, :top, '0ba53d')    # Sets first row to have a green top border
+  worksheet.change_column_border_color(0, :top, '0ba53d') # Sets first column to have a green top border
+
 ==== Changing Alignment
 ===== Horizontal
 center, distributed, justify, left, right
@@ -133,6 +144,15 @@ 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
+  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
@@ -186,6 +206,8 @@ WARNING: Use of this method WILL break formulas referencing cells which have bee
 ==== Modifying Cell Format
   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_text_indent(1)          # Indents the text in the cell by 1 level
 
 == I/O
 
@@ -200,8 +222,17 @@ It can also operate on +StringIO+ objects, thus eliminating the need to save the
   workbook.stream
 
 == Miscellaneous
-  Reference.ind2ref(0,0) == 'A1'    # Converts row and column index to Excel-style cell reference
-  Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row and column index
+  RubyXL::Reference.ind2ref(0,0) == 'A1'    # Converts row and column index to Excel-style cell reference
+  RubyXL::Reference.ref2ind('A1') == [0, 0] # Converts Excel-style cell reference to row and column index
+
+=== Suppress warnings about malformed input files
+
+  RubyXL.class_variable_set(:@@suppress_warnings, true)
+
+== Data validation ("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
@@ -218,5 +249,5 @@ Take a look at the files in spec/lib/ for rspecs on most methods
 
 == Copyright
 
-Copyright (c) 2011 Vivek Bhagwat, 2013-2016 Wesha.
+Copyright (c) 2011 Vivek Bhagwat, 2013-2020 Wesha.
 See LICENSE.txt for further details.

data/Rakefile

@@ -20,6 +20,7 @@ Jeweler::Tasks.new do |gem|
   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 
@@ -33,8 +34,8 @@ Rake::TestTask.new(:test) do |test|
 end
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :default => :spec
+RSpec::Core::RakeTask.new(:rspec)
+task :default => :rspec
 
 require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-3.3.21
+3.4.17

data/lib/rubyXL.rb

@@ -2,6 +2,7 @@ require 'rubyXL/objects/root'
 require 'rubyXL/parser'
 
 module RubyXL
+  @@suppress_warnings = false
 
   # Convert any path passed to absolute path (within the XLSX file).
   def self.from_root(path)

data/lib/rubyXL/cell.rb

@@ -1,19 +1,6 @@
 module RubyXL
 
-  # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.cellvalues(v=office.14).aspx
-  module DataType
-    SHARED_STRING = 's'
-    RAW_STRING    = 'str'
-    INLINE_STRING = 'inlineStr'
-    ERROR         = 'e'
-    BOOLEAN       = 'b'
-    NUMBER        = 'n'
-    DATE          = 'd'  # Only available in Office2010.
-  end
-
   module LegacyCell
-    attr_accessor :formula, :worksheet
-
     def workbook
       @worksheet.workbook
     end
@@ -34,21 +21,9 @@ module RubyXL
     end
 
     def validate_worksheet()
-      return if @worksheet && @worksheet[row] && @worksheet[row][column] == self
+      return if @worksheet && @worksheet[row] && @worksheet[row][column].equal?(self)
       raise "Cell #{self} is not in worksheet #{worksheet}"
     end
 
-    def get_cell_xf
-      workbook.cell_xfs[self.style_index || 0]
-    end
-
-    def get_cell_font
-      workbook.fonts[get_cell_xf.font_id]
-    end
-
-    def get_cell_border
-      workbook.borders[get_cell_xf.border_id]
-    end
-
   end
 end

data/lib/rubyXL/convenience_methods.rb

@@ -1,982 +1,5 @@
-module RubyXL
-
-  module WorkbookConvenienceMethods
-    SHEET_NAME_TEMPLATE = 'Sheet%d'
-
-    # Finds worksheet by its name or numerical index
-    def [](ind)
-      case ind
-      when Integer then worksheets[ind]
-      when String  then worksheets.find { |ws| ws.sheet_name == ind }
-      end
-    end
-
-    # Create new simple worksheet and add it to the workbook worksheets
-    #
-    # @param [String] The name for the new worksheet
-    def add_worksheet(name = nil)
-      if name.nil? then
-        n = 0
-
-        begin
-          name = SHEET_NAME_TEMPLATE % (n += 1)
-        end until self[name].nil?
-      end
-
-      new_worksheet = Worksheet.new(:workbook => self, :sheet_name => name)
-      worksheets << new_worksheet
-      new_worksheet
-    end
-
-    def each
-      worksheets.each{ |i| yield i }
-    end
-
-    def date1904
-      workbook_properties && workbook_properties.date1904
-    end
-
-    def date1904=(v)
-      self.workbook_properties ||= RubyXL::WorkbookProperties.new
-      workbook_properties.date1904 = v
-    end
-
-    def company
-      root.document_properties.company && root.document_properties.company.value
-    end
-
-    def company=(v)
-      root.document_properties.company ||= StringNode.new
-      root.document_properties.company.value = v
-    end
-
-    def application
-      root.document_properties.application && root.document_properties.application.value
-    end
-
-    def application=(v)
-      root.document_properties.application ||= StringNode.new
-      root.document_properties.application.value = v
-    end
-
-    def appversion
-      root.document_properties.app_version && root.document_properties.app_version.value
-    end
-
-    def appversion=(v)
-      root.document_properties.app_version ||= StringNode.new
-      root.document_properties.app_version.value = v
-    end
-
-    def creator
-      root.core_properties.creator
-    end
-
-    def creator=(v)
-      root.core_properties.creator = v
-    end
-
-    def modifier
-      root.core_properties.modifier
-    end
-
-    def modifier=(v)
-      root.core_properties.modifier = v
-    end
-
-    def created_at
-      root.core_properties.created_at
-    end
-
-    def created_at=(v)
-      root.core_properties.created_at = v
-    end
-
-    def modified_at
-      root.core_properties.modified_at
-    end
-
-    def modified_at=(v)
-      root.core_properties.modified_at = v
-    end
-
-    def cell_xfs # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.cell_xfs
-    end
-
-    def fonts # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.fonts
-    end
-
-    def fills # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.fills
-    end
-
-    def borders # Stylesheet should be pre-filled with defaults on initialize()
-      stylesheet.borders
-    end
-
-    def get_fill_color(xf)
-      fill = fills[xf.fill_id]
-      pattern = fill && fill.pattern_fill
-      color = pattern && pattern.fg_color
-      color && color.rgb || 'ffffff'
-    end
-
-    def register_new_fill(new_fill, old_xf)
-      new_xf = old_xf.dup
-      new_xf.apply_fill = true
-      new_xf.fill_id = fills.find_index { |x| x == new_fill } # Reuse existing fill, if it exists
-      new_xf.fill_id ||= fills.size # If this fill has never existed before, add it to collection.
-      fills[new_xf.fill_id] = new_fill
-      new_xf
-    end
-
-    def register_new_font(new_font, old_xf)
-      new_xf = old_xf.dup
-      new_xf.font_id = fonts.find_index { |x| x == new_font } # Reuse existing font, if it exists
-      new_xf.font_id ||= fonts.size # If this font has never existed before, add it to collection.
-      fonts[new_xf.font_id] = new_font
-      new_xf.apply_font = true
-      new_xf
-    end
-
-    def register_new_xf(new_xf)
-      new_xf_id = cell_xfs.find_index { |xf| xf == new_xf } # Reuse existing XF, if it exists
-      new_xf_id ||= cell_xfs.size # If this XF has never existed before, add it to collection.
-      cell_xfs[new_xf_id] = new_xf
-      new_xf_id
-    end
-
-    def modify_alignment(style_index, &block)
-      xf = cell_xfs[style_index || 0].dup
-      xf.alignment ||= RubyXL::Alignment.new
-      yield(xf.alignment)
-      xf.apply_alignment = true
-
-      register_new_xf(xf)
-    end
-
-    def modify_fill(style_index, rgb)
-      xf = cell_xfs[style_index || 0].dup
-      new_fill = RubyXL::Fill.new(:pattern_fill =>
-                   RubyXL::PatternFill.new(:pattern_type => 'solid',
-                                           :fg_color => RubyXL::Color.new(:rgb => rgb)))
-      register_new_xf(register_new_fill(new_fill, xf))
-    end
-
-    def modify_border(style_index, direction, weight)
-      xf = cell_xfs[style_index || 0].dup
-      new_border = borders[xf.border_id || 0].dup
-      new_border.set_edge_style(direction, weight)
-
-      xf.border_id = borders.find_index { |x| x == new_border } # Reuse existing border, if it exists
-      xf.border_id ||= borders.size # If this border has never existed before, add it to collection.
-      borders[xf.border_id] = new_border
-      xf.apply_border = true
-
-      register_new_xf(xf)
-    end
-
-  end
-
-
-  module WorksheetConvenienceMethods
-    NAME = 0
-    SIZE = 1
-    COLOR = 2
-    ITALICS = 3
-    BOLD = 4
-    UNDERLINE = 5
-    STRIKETHROUGH = 6
-
-    def insert_cell(row = 0, col = 0, data = nil, formula = nil, shift = nil)
-      validate_workbook
-      ensure_cell_exists(row, col)
-
-      case shift
-      when nil then # No shifting at all
-      when :right then
-        sheet_data.rows[row].insert_cell_shift_right(nil, col)
-      when :down then
-        add_row(sheet_data.size, :cells => Array.new(sheet_data.rows[row].size))
-        (sheet_data.size - 1).downto(row+1) { |index|
-          sheet_data.rows[index].cells[col] = sheet_data.rows[index-1].cells[col]
-        }
-      else
-        raise 'invalid shift option'
-      end
-
-      return add_cell(row, col, data, formula)
-    end
-
-    # by default, only sets cell to nil
-    # if :left is specified, method will shift row contents to the right of the deleted cell to the left
-    # if :up is specified, method will shift column contents below the deleted cell upward
-    def delete_cell(row_index = 0, column_index=0, shift=nil)
-      validate_workbook
-      validate_nonnegative(row_index)
-      validate_nonnegative(column_index)
-
-      row = sheet_data[row_index]
-      old_cell = row && row[column_index]
-
-      case shift
-      when nil then
-        row.cells[column_index] = nil if row
-      when :left then
-        row.delete_cell_shift_left(column_index) if row
-      when :up then
-        (row_index...(sheet_data.size - 1)).each { |index|
-          c = sheet_data.rows[index].cells[column_index] = sheet_data.rows[index + 1].cells[column_index]
-          c.row -= 1 if c.is_a?(Cell)
-        }
-      else
-        raise 'invalid shift option'
-      end
-
-      return old_cell
-    end
-
-    # Inserts row at row_index, pushes down, copies style from the row above (that's what Excel 2013 does!)
-    # NOTE: use of this method will break formulas which reference cells which are being "pushed down"
-    def insert_row(row_index = 0)
-      validate_workbook
-      ensure_cell_exists(row_index)
-
-      old_row = new_cells = nil
-
-      if row_index > 0 then
-        old_row = sheet_data.rows[row_index - 1]
-        if old_row then
-          new_cells = old_row.cells.collect { |c|
-                        if c.nil? then nil
-                        else nc = RubyXL::Cell.new(:style_index => c.style_index)
-                             nc.worksheet = self
-                             nc
-                        end
-                      }
-        end
-      end
-
-      row0 = sheet_data.rows[0]
-      new_cells ||= Array.new((row0 && row0.cells.size) || 0)
-
-      sheet_data.rows.insert(row_index, nil)
-      new_row = add_row(row_index, :cells => new_cells, :style_index => old_row && old_row.style_index)
-
-      # Update row values for all rows below
-      row_index.upto(sheet_data.rows.size - 1) { |r|
-        row = sheet_data.rows[r]
-        next if row.nil?
-        row.cells.each_with_index { |cell, c|
-          next if cell.nil?
-          cell.r = RubyXL::Reference.new(r, c)
-        }
-      }
-
-      return new_row
-    end
-
-    def delete_row(row_index=0)
-      validate_workbook
-      validate_nonnegative(row_index)
-
-      deleted = sheet_data.rows.delete_at(row_index)
-
-      # Update row number of each cell
-      row_index.upto(sheet_data.size - 1) { |index|
-        row = sheet_data[index]
-        row && row.cells.each{ |c| c.row -= 1 unless c.nil? }
-      }
-
-      return deleted
-    end
-
-    # Inserts column at +column_index+, pushes everything right, takes styles from column to left
-    # NOTE: use of this method will break formulas which reference cells which are being "pushed right"
-    def insert_column(column_index = 0)
-      validate_workbook
-      ensure_cell_exists(0, column_index)
-
-      old_range = cols.get_range(column_index)
-
-      #go through each cell in column
-      sheet_data.rows.each_with_index { |row, row_index|
-        old_cell = row[column_index]
-        c = nil
-
-        if old_cell && old_cell.style_index != 0 &&
-             old_range && old_range.style_index != old_cell.style_index then
-
-          c = RubyXL::Cell.new(:style_index => old_cell.style_index, :worksheet => self,
-                               :row => row_index, :column => column_index,
-                               :datatype => RubyXL::DataType::SHARED_STRING)
-        end
-
-        row.insert_cell_shift_right(c, column_index)
-      }
-
-      cols.insert_column(column_index)
-
-      # TODO: update column numbers
-    end
-
-    def delete_column(column_index = 0)
-      validate_workbook
-      validate_nonnegative(column_index)
-
-      # Delete column
-      sheet_data.rows.each { |row| row.cells.delete_at(column_index) }
-
-      # Update column numbers for cells to the right of the deleted column
-      sheet_data.rows.each_with_index { |row, row_index|
-        row.cells.each_with_index { |c, ci|
-          c.column = ci if c.is_a?(Cell)
-        }
-      }
-
-      cols.each { |range| range.delete_column(column_index) }
-    end
-
-    def get_row_style(row_index)
-      row = sheet_data.rows[row_index]
-      (row && row.style_index) || 0
-    end
-
-    def get_row_fill(row = 0)
-      (row = sheet_data.rows[row]) && row.get_fill_color
-    end
-
-    def get_row_font_name(row = 0)
-      (font = row_font(row)) && font.get_name
-    end
-
-    def get_row_font_size(row = 0)
-      (font = row_font(row)) && font.get_size
-    end
-
-    def get_row_font_color(row = 0)
-      font = row_font(row)
-      color = font && font.color
-      color && (color.rgb || '000000')
-    end
-
-    def is_row_italicized(row = 0)
-      (font = row_font(row)) && font.is_italic
-    end
-
-    def is_row_bolded(row = 0)
-      (font = row_font(row)) && font.is_bold
-    end
-
-    def is_row_underlined(row = 0)
-      (font = row_font(row)) && font.is_underlined
-    end
-
-    def is_row_struckthrough(row = 0)
-      (font = row_font(row)) && font.is_strikethrough
-    end
-
-    def get_row_height(row = 0)
-      validate_workbook
-      validate_nonnegative(row)
-      row = sheet_data.rows[row]
-      row && row.ht || RubyXL::Row::DEFAULT_HEIGHT
-    end
-
-    def get_row_border(row, border_direction)
-      validate_workbook
-
-      border = @workbook.borders[get_row_xf(row).border_id]
-      border && border.get_edge_style(border_direction)
-    end
-
-    def row_font(row)
-      (row = sheet_data.rows[row]) && row.get_font
-    end
-
-    def get_row_alignment(row, is_horizontal)
-      validate_workbook
-
-      xf_obj = get_row_xf(row)
-      return nil if xf_obj.alignment.nil?
-
-      if is_horizontal then return xf_obj.alignment.horizontal
-      else                  return xf_obj.alignment.vertical
-      end
-    end
-
-    def get_cols_style_index(column_index)
-      validate_nonnegative(column_index)
-      range = cols.locate_range(column_index)
-      (range && range.style_index) || 0
-    end
-
-    def get_column_font_name(col = 0)
-      font = column_font(col)
-      font && font.get_name
-    end
-
-    def get_column_font_size(col = 0)
-      font = column_font(col)
-      font && font.get_size
-    end
-
-    def get_column_font_color(col = 0)
-      font = column_font(col)
-      font && (font.get_rgb_color || '000000')
-    end
-
-    def is_column_italicized(col = 0)
-      font = column_font(col)
-      font && font.is_italic
-    end
-
-    def is_column_bolded(col = 0)
-      font = column_font(col)
-      font && font.is_bold
-    end
-
-    def is_column_underlined(col = 0)
-      font = column_font(col)
-      font && font.is_underlined
-    end
-
-    def is_column_struckthrough(col = 0)
-      font = column_font(col)
-      font && font.is_strikethrough
-    end
-
-    # Get raw column width value as stored in the file
-    def get_column_width_raw(column_index = 0)
-      validate_workbook
-      validate_nonnegative(column_index)
-
-      range = cols.locate_range(column_index)
-      range && range.width
-    end
-
-    # Get column width measured in number of digits, as per
-    # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.column%28v=office.14%29.aspx
-    def get_column_width(column_index = 0)
-      width = get_column_width_raw(column_index)
-      return RubyXL::ColumnRange::DEFAULT_WIDTH if width.nil?
-      (width - (5.0 / RubyXL::Font::MAX_DIGIT_WIDTH)).round
-    end
-
-    # Set raw column width value
-    def change_column_width_raw(column_index, width)
-      validate_workbook
-      ensure_cell_exists(0, column_index)
-      range = cols.get_range(column_index)
-      range.width = width
-      range.custom_width = true
-    end
-
-    # Get column width measured in number of digits, as per
-    # http://msdn.microsoft.com/en-us/library/documentformat.openxml.spreadsheet.column%28v=office.14%29.aspx
-    def change_column_width(column_index, width_in_chars = RubyXL::ColumnRange::DEFAULT_WIDTH)
-      change_column_width_raw(column_index, ((width_in_chars + (5.0 / RubyXL::Font::MAX_DIGIT_WIDTH)) * 256).to_i / 256.0)
-    end
-
-    # Helper method to get the style index for a column
-    def get_col_style(column_index)
-      range = cols.locate_range(column_index)
-      (range && range.style_index) || 0
-    end
-
-    def get_column_fill(col=0)
-      validate_workbook
-      validate_nonnegative(col)
-
-      @workbook.get_fill_color(get_col_xf(col))
-    end
-
-    def change_column_fill(column_index, color_code = 'ffffff')
-      validate_workbook
-      RubyXL::Color.validate_color(color_code)
-      ensure_cell_exists(0, column_index)
-
-      cols.get_range(column_index).style_index = @workbook.modify_fill(get_col_style(column_index), color_code)
-
-      sheet_data.rows.each { |row|
-        c = row[column_index]
-        c.change_fill(color_code) if c
-      }
-    end
-
-    def get_column_border(col, border_direction)
-      validate_workbook
-
-      xf = @workbook.cell_xfs[get_cols_style_index(col)]
-      border = @workbook.borders[xf.border_id]
-      border && border.get_edge_style(border_direction)
-    end
-
-    def column_font(col)
-      validate_workbook
-
-      @workbook.fonts[@workbook.cell_xfs[get_cols_style_index(col)].font_id]
-    end
-
-    def get_column_alignment(col, type)
-      validate_workbook
-
-      xf = @workbook.cell_xfs[get_cols_style_index(col)]
-      xf.alignment && xf.alignment.send(type)
-    end
-
-    def change_row_horizontal_alignment(row = 0, alignment = 'center')
-      validate_workbook
-      validate_nonnegative(row)
-      change_row_alignment(row) { |a| a.horizontal = alignment }
-    end
-
-    def change_row_vertical_alignment(row = 0, alignment = 'center')
-      validate_workbook
-      validate_nonnegative(row)
-      change_row_alignment(row) { |a| a.vertical = alignment }
-    end
-
-    def change_row_border(row, direction, weight)
-      validate_workbook
-      ensure_cell_exists(row)
-
-      sheet_data.rows[row].style_index = @workbook.modify_border(get_row_style(row), direction, weight)
-
-      sheet_data[row].cells.each { |c|
-        c.change_border(direction, weight) unless c.nil?
-      }
-    end
-
-    def change_row_fill(row_index = 0, rgb = 'ffffff')
-      validate_workbook
-      ensure_cell_exists(row_index)
-      Color.validate_color(rgb)
-
-      sheet_data.rows[row_index].style_index = @workbook.modify_fill(get_row_style(row_index), rgb)
-      sheet_data[row_index].cells.each { |c| c.change_fill(rgb) unless c.nil? }
-    end
-
-    # Helper method to update the row styles array
-    # change_type - NAME or SIZE or COLOR etc
-    # main method to change font, called from each separate font mutator method
-    def change_row_font(row_index, change_type, arg, font)
-      validate_workbook
-      ensure_cell_exists(row_index)
-
-      xf = workbook.register_new_font(font, get_row_xf(row_index))
-      row = sheet_data[row_index]
-      row.style_index = workbook.register_new_xf(xf)
-      row.cells.each { |c| c.font_switch(change_type, arg) unless c.nil? }
-    end
-
-    def change_row_font_name(row = 0, font_name = 'Verdana')
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_name(font_name)
-      change_row_font(row, Worksheet::NAME, font_name, font)
-    end
-
-    def change_row_font_size(row = 0, font_size=10)
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_size(font_size)
-      change_row_font(row, Worksheet::SIZE, font_size, font)
-    end
-
-    def change_row_font_color(row = 0, font_color = '000000')
-      ensure_cell_exists(row)
-      Color.validate_color(font_color)
-      font = row_font(row).dup
-      font.set_rgb_color(font_color)
-      change_row_font(row, Worksheet::COLOR, font_color, font)
-    end
-
-    def change_row_italics(row = 0, italicized = false)
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_italic(italicized)
-      change_row_font(row, Worksheet::ITALICS, italicized, font)
-    end
-
-    def change_row_bold(row = 0, bolded = false)
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_bold(bolded)
-      change_row_font(row, Worksheet::BOLD, bolded, font)
-    end
-
-    def change_row_underline(row = 0, underlined=false)
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_underline(underlined)
-      change_row_font(row, Worksheet::UNDERLINE, underlined, font)
-    end
-
-    def change_row_strikethrough(row = 0, struckthrough=false)
-      ensure_cell_exists(row)
-      font = row_font(row).dup
-      font.set_strikethrough(struckthrough)
-      change_row_font(row, Worksheet::STRIKETHROUGH, struckthrough, font)
-    end
-
-    def change_row_height(row = 0, height = 10)
-      validate_workbook
-      ensure_cell_exists(row)
-
-      c = sheet_data.rows[row]
-      c.ht = height
-      c.custom_height = true
-    end
-
-    # Helper method to update the fonts and cell styles array
-    # main method to change font, called from each separate font mutator method
-    def change_column_font(column_index, change_type, arg, font, xf)
-      validate_workbook
-      ensure_cell_exists(0, column_index)
-
-      xf = workbook.register_new_font(font, xf)
-      cols.get_range(column_index).style_index = workbook.register_new_xf(xf)
-
-      sheet_data.rows.each { |row|
-        c = row && row[column_index]
-        c.font_switch(change_type, arg) unless c.nil?
-      }
-    end
-
-    def change_column_font_name(column_index = 0, font_name = 'Verdana')
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_name(font_name)
-      change_column_font(column_index, Worksheet::NAME, font_name, font, xf)
-    end
-
-    def change_column_font_size(column_index, font_size=10)
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_size(font_size)
-      change_column_font(column_index, Worksheet::SIZE, font_size, font, xf)
-    end
-
-    def change_column_font_color(column_index, font_color='000000')
-      Color.validate_color(font_color)
-
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_rgb_color(font_color)
-      change_column_font(column_index, Worksheet::COLOR, font_color, font, xf)
-    end
-
-    def change_column_italics(column_index, italicized = false)
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_italic(italicized)
-      change_column_font(column_index, Worksheet::ITALICS, italicized, font, xf)
-    end
-
-    def change_column_bold(column_index, bolded = false)
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_bold(bolded)
-      change_column_font(column_index, Worksheet::BOLD, bolded, font, xf)
-    end
-
-    def change_column_underline(column_index, underlined = false)
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_underline(underlined)
-      change_column_font(column_index, Worksheet::UNDERLINE, underlined, font, xf)
-    end
-
-    def change_column_strikethrough(column_index, struckthrough=false)
-      xf = get_col_xf(column_index)
-      font = @workbook.fonts[xf.font_id].dup
-      font.set_strikethrough(struckthrough)
-      change_column_font(column_index, Worksheet::STRIKETHROUGH, struckthrough, font, xf)
-    end
-
-    def change_column_horizontal_alignment(column_index, alignment = 'center')
-      change_column_alignment(column_index) { |a| a.horizontal = alignment }
-    end
-
-    def change_column_vertical_alignment(column_index, alignment = 'center')
-      change_column_alignment(column_index) { |a| a.vertical = alignment }
-    end
-
-    def change_column_border(column_index, direction, weight)
-      validate_workbook
-      ensure_cell_exists(0, column_index)
-
-      cols.get_range(column_index).style_index = @workbook.modify_border(get_col_style(column_index), direction, weight)
-
-      sheet_data.rows.each { |row|
-        c = row.cells[column_index]
-        c.change_border(direction, weight) unless c.nil?
-      }
-    end
-
-    def change_row_alignment(row, &block)
-      validate_workbook
-      validate_nonnegative(row)
-      ensure_cell_exists(row)
-
-      sheet_data.rows[row].style_index = @workbook.modify_alignment(get_row_style(row), &block)
-
-      sheet_data[row].cells.each { |c|
-        next if c.nil?
-        c.style_index = @workbook.modify_alignment(c.style_index, &block)
-      }
-    end
-
-    def change_column_alignment(column_index, &block)
-      validate_workbook
-      ensure_cell_exists(0, column_index)
-
-      cols.get_range(column_index).style_index = @workbook.modify_alignment(get_col_style(column_index), &block)
-      # Excel gets confused if width is not explicitly set for a column that had alignment changes
-      change_column_width(column_index) if get_column_width_raw(column_index).nil?
-
-      sheet_data.rows.each { |row|
-        c = row[column_index]
-        next if c.nil?
-        c.style_index = @workbook.modify_alignment(c.style_index, &block)
-      }
-    end
-
-    # Merges cells within a rectangular area
-    def merge_cells(start_row, start_col, end_row, end_col)
-      validate_workbook
-
-      self.merged_cells ||= RubyXL::MergedCells.new
-      # TODO: add validation to make sure ranges are not intersecting with existing ones
-      merged_cells << RubyXL::MergedCell.new(:ref => RubyXL::Reference.new(start_row, end_row, start_col, end_col))
-    end
-  end
-
-  module CellConvenienceMethods
-
-    def change_contents(data, formula_expression = nil)
-      validate_worksheet
-
-      if formula_expression then
-        self.datatype = nil
-        self.formula = RubyXL::Formula.new(:expression => formula_expression)
-      else
-        self.datatype = case data
-                        when Date, Numeric then nil
-                        else RubyXL::DataType::RAW_STRING
-                        end
-      end
-
-      data = workbook.date_to_num(data) if data.is_a?(Date)
-
-      self.raw_value = data
-    end
-
-    def get_border(direction)
-      validate_worksheet
-      get_cell_border.get_edge_style(direction)
-    end
-
-    def change_horizontal_alignment(alignment = 'center')
-      validate_worksheet
-      self.style_index = workbook.modify_alignment(self.style_index) { |a| a.horizontal = alignment }
-    end
-
-    def change_vertical_alignment(alignment = 'center')
-      validate_worksheet
-      self.style_index = workbook.modify_alignment(self.style_index) { |a| a.vertical = alignment }
-    end
-
-    def change_text_wrap(wrap = false)
-      validate_worksheet
-      self.style_index = workbook.modify_alignment(self.style_index) { |a| a.wrap_text = wrap }
-    end
-
-    def change_border(direction, weight)
-      validate_worksheet
-      self.style_index = workbook.modify_border(self.style_index, direction, weight)
-    end
-
-    def is_italicized()
-      validate_worksheet
-      get_cell_font.is_italic
-    end
-
-    def is_bolded()
-      validate_worksheet
-      get_cell_font.is_bold
-    end
-
-    def is_underlined()
-      validate_worksheet
-      get_cell_font.is_underlined
-    end
-
-    def is_struckthrough()
-      validate_worksheet
-      get_cell_font.is_strikethrough
-    end
-
-    def font_name()
-      validate_worksheet
-      get_cell_font.get_name
-    end
-
-    def font_size()
-      validate_worksheet
-      get_cell_font.get_size
-    end
-
-    def font_color()
-      validate_worksheet
-      get_cell_font.get_rgb_color || '000000'
-    end
-
-    def fill_color()
-      validate_worksheet
-      return workbook.get_fill_color(get_cell_xf)
-    end
-
-    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()
-      validate_worksheet
-      xf_obj = get_cell_xf
-      return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.vertical
-    end
-
-    def text_wrap()
-      validate_worksheet
-      xf_obj = get_cell_xf
-      return nil if xf_obj.alignment.nil?
-      xf_obj.alignment.wrap_text
-    end
-
-    def set_number_format(format_code)
-      new_xf = get_cell_xf.dup
-      new_xf.num_fmt_id = workbook.stylesheet.register_number_format(format_code)
-      new_xf.apply_number_format = true
-      self.style_index = workbook.register_new_xf(new_xf)
-    end
-
-    # Changes fill color of cell
-    def change_fill(rgb = 'ffffff')
-      validate_worksheet
-      Color.validate_color(rgb)
-      self.style_index = workbook.modify_fill(self.style_index, rgb)
-    end
-
-    # Changes font name of cell
-    def change_font_name(new_font_name = 'Verdana')
-      validate_worksheet
-
-      font = get_cell_font.dup
-      font.set_name(new_font_name)
-      update_font_references(font)
-    end
-
-    # Changes font size of cell
-    def change_font_size(font_size = 10)
-      validate_worksheet
-      raise 'Argument must be a number' unless font_size.is_a?(Integer) || font_size.is_a?(Float)
-
-      font = get_cell_font.dup
-      font.set_size(font_size)
-      update_font_references(font)
-    end
-
-    # Changes font color of cell
-    def change_font_color(font_color = '000000')
-      validate_worksheet
-      Color.validate_color(font_color)
-
-      font = get_cell_font.dup
-      font.set_rgb_color(font_color)
-      update_font_references(font)
-    end
-
-    # Changes font italics settings of cell
-    def change_font_italics(italicized = false)
-      validate_worksheet
-
-      font = get_cell_font.dup
-      font.set_italic(italicized)
-      update_font_references(font)
-    end
-
-    # Changes font bold settings of cell
-    def change_font_bold(bolded = false)
-      validate_worksheet
-
-      font = get_cell_font.dup
-      font.set_bold(bolded)
-      update_font_references(font)
-    end
-
-    # Changes font underline settings of cell
-    def change_font_underline(underlined = false)
-      validate_worksheet
-
-      font = get_cell_font.dup
-      font.set_underline(underlined)
-      update_font_references(font)
-    end
-
-    def change_font_strikethrough(struckthrough = false)
-      validate_worksheet
-
-      font = get_cell_font.dup
-      font.set_strikethrough(struckthrough)
-      update_font_references(font)
-    end
-
-    # Helper method to update the font array and xf array
-    def update_font_references(modified_font)
-      xf = workbook.register_new_font(modified_font, get_cell_xf)
-      self.style_index = workbook.register_new_xf(xf)
-    end
-    private :update_font_references
-
-    # Performs correct modification based on what type of change_type is specified
-    def font_switch(change_type, arg)
-      case change_type
-      when Worksheet::NAME          then change_font_name(arg)
-      when Worksheet::SIZE          then change_font_size(arg)
-      when Worksheet::COLOR         then change_font_color(arg)
-      when Worksheet::ITALICS       then change_font_italics(arg)
-      when Worksheet::BOLD          then change_font_bold(arg)
-      when Worksheet::UNDERLINE     then change_font_underline(arg)
-      when Worksheet::STRIKETHROUGH then change_font_strikethrough(arg)
-      else raise 'Invalid change_type'
-      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_shared_string(str)
-      self.datatype = RubyXL::DataType::SHARED_STRING
-      self.raw_value = @workbook.shared_strings_container.add(str)
-    end
-=end
-
-  end
-
-end
+require 'rubyXL/convenience_methods/workbook'
+require 'rubyXL/convenience_methods/worksheet'
+require 'rubyXL/convenience_methods/cell'
+require 'rubyXL/convenience_methods/font'
+require 'rubyXL/convenience_methods/color'