spreadsheet_architect 3.2.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0daa9bbc6079c0499134d8ea2d792ab8f6f91799166b30ceefe699c65ec9fe6f
-  data.tar.gz: dd3314fd91179084b18a2a5eac50b3678a1d753aab5a45e7a1c67b912ffaf2a5
+  metadata.gz: 95b2bc07a1b9ec12624af37fc7f5ddc5b62cc8823cdcae6b4b4cd0709ec40b46
+  data.tar.gz: 861e9ecc079045a5e211327272a07432d9308bc5b5a36748a29c124f4c7408c7
 SHA512:
-  metadata.gz: d23a6c6e4d0b0603f91bf7e3446ec580567ece472924a93891ee0f8a7de5e05f0afdda4501905f8d75657a2fc3679f40504a1f325dbc595e5f9224ae5608a581
-  data.tar.gz: d62fa1b23025a84b2a764deb2318d85f00c21b4984568d57cff8de1ab832b25875c4cf39eb789a39b64180e772d2dc81c1521a9dbcc54645d58f75c17a17dbb2
+  metadata.gz: ce89d002320a9d912efeea18725595d96759e960d6a84c549144664ac963bf1aa01e249c7edfce16db1eaffce8610e227c7dd4e613cd6bd2bea4af023d1b2556
+  data.tar.gz: 3dd3f8b345ebcc2a746aa95fb99f05e2951a28b78b3cb8c12bc7b9d8da768233f652d62a930d26d5ff8240ea23b930128c74e606383a6e6fd8fb804bb5951bf8

data/CHANGELOG.md

@@ -1,6 +1,28 @@
 CHANGELOG
 ---------
 
+- **Unreleased**
+  - Nothing yet
+- **4.0.1**
+  - Fix bug with `headers: false` where a blank header row is still added 
+  - Fix Bug for older version of `caxlsx` v2.0.2
+- **4.0.0**
+  - Switch to the `caxlsx` gem (Community Axlsx) from the legacy unmaintained `axlsx` gem. Axlsx has had a long history of being poorly maintained so this community gem improves the situation.
+  - Require Ruby 2.3+
+  - Ensure all options using Hash are automatically converted to symbol only hashes
+  - Add XLSX option `:freeze` to freeze custom sections of your spreadsheet
+  - Add XLSX option `:freeze_headers` to freeze the headers of your spreadsheet
+  - Remove old Axlsx patch for column width
+  - Backport new code for `string_width` calculations to Axlsx 3.0.1 and below.
+- **3.3.1**
+  - [Issue #30](https://github.com/westonganger/spreadsheet_architect/issues/30) - Fix duplicate constant warning for XLSX_COLUMN_TYPES
+- **3.3.0**
+  - Fix `:borders` option, was broken in v3.2.1
+  - Fix bug when passing `false` to `:headers` option
+  - Raise error when unsupported column type is passed
+  - Remove claimed support for `:currency` and `:percent` for ODS spreadsheets as they were not working. PR Wanted.
+- **3.2.1** - April 10, 2019
+  - Fix bug when using `column_style` option with `include_header: true` & letter based column numbering
 - **3.2.0** - September 14, 2018
   - Change implementation of `:column_styles` option to utilize `axlsx_styler` instead of the built-in axlsx `col_style` method. The reason for the switch is that `col_style` would overwrite all previously set styles. `axlsx_styler` already has the ability to add onto existing styles and is what is currently utilized by `range_styles`.
   - Date / Time formatting is now set per cell instead of on the entire column.

data/README.md

@@ -1,16 +1,16 @@
 # Spreadsheet Architect
 
 <a href="https://badge.fury.io/rb/spreadsheet_architect" target="_blank"><img height="21" style='border:0px;height:21px;' border='0' src="https://badge.fury.io/rb/spreadsheet_architect.svg" alt="Gem Version"></a>
-<a href='https://travis-ci.org/westonganger/spreadsheet_architect' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://api.travis-ci.org/westonganger/spreadsheet_architect.svg?branch=master' border='0' alt='Build Status' /></a>
+<a href='https://travis-ci.com/westonganger/spreadsheet_architect' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://api.travis-ci.org/westonganger/spreadsheet_architect.svg?branch=master' border='0' alt='Build Status' /></a>
 <a href='https://rubygems.org/gems/spreadsheet_architect' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://ruby-gem-downloads-badge.herokuapp.com/spreadsheet_architect?label=rubygems&type=total&total_label=downloads&color=brightgreen' border='0' alt='RubyGems Downloads' /></a>
-<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='22' style='border:0px;height:22px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a> 
+<a href='https://ko-fi.com/A5071NK' target='_blank'><img height='22' style='border:0px;height:22px;' src='https://az743702.vo.msecnd.net/cdn/kofi1.png?v=a' border='0' alt='Buy Me a Coffee' /></a>
 
 Spreadsheet Architect is a library that allows you to create XLSX, ODS, or CSV spreadsheets super easily from ActiveRecord relations, plain Ruby objects, or tabular data.
 
 Key Features:
 
 - Dead simple custom spreadsheets with custom data
-- Data Sources: ActiveRecord relations, array of plain Ruby object instances, or tabular 2D Array Data
+- Data Sources: Tabular Data from an Array, ActiveRecord relations, or array of plain Ruby object instances
 - Easily style and customize spreadsheets
 - Create multi sheet spreadsheets
 - Setting Class/Model or Project specific defaults
@@ -22,10 +22,12 @@ Key Features:
 gem 'spreadsheet_architect'
 ```
 
-# General Usage 
+# General Usage
 
 ### Tabular (Array) Data
 
+The simplest and preffered usage is to simply create the data array yourself.
+
 ```ruby
 headers = ['Col 1','Col 2','Col 3']
 data = [[1,2,3], [4,5,6], [7,8,9]]
@@ -34,50 +36,25 @@ SpreadsheetArchitect.to_ods(headers: headers, data: data)
 SpreadsheetArchitect.to_csv(headers: headers, data: data)
 ```
 
-### Rails relation or an array of plain Ruby object instances
-
-```ruby
-posts = Post.order(name: :asc).where(published: true)
-# OR
-posts = 10.times.map{|i| Post.new(number: i)}
+Using this style will allow you to utilize any custom performance optimizations during your data generation process. This will come in handy when the spreadsheets get large and things start to get slow. One of my favourites for Rails is [light_record](https://github.com/Paxa/light_record)
 
-SpreadsheetArchitect.to_xlsx(instances: posts)
-SpreadsheetArchitect.to_ods(instances: posts)
-SpreadsheetArchitect.to_csv(instances: posts)
-```
+### Rails Relations or an Array of plain Ruby object instances
 
-**(Optional)** If you would like to add the methods `to_xlsx`, `to_ods`, `to_csv`, `to_axlsx_package`, `to_rodf_spreadsheet` to some class, you can simply include the SpreadsheetArchitect module to whichever classes you choose. A good default strategy is to simply add it to the ApplicationRecord or another parent class to have it available on all appropriate classes. For example:
+If you would like to add the methods `to_xlsx`, `to_ods`, `to_csv`, `to_axlsx_package`, `to_rodf_spreadsheet` to some class, you can simply include the SpreadsheetArchitect module to whichever classes you choose. For example:
 
 ```ruby
-class ApplicationRecord < ActiveRecord::Base
+class Post < ApplicationRecord
   include SpreadsheetArchitect
 end
 ```
 
-Then use it on the class or ActiveRecord relations of the class
-
-```ruby
-posts = Post.order(name: :asc).where(published: true)
-posts.to_xlsx
-posts.to_ods
-posts.to_csv
-
-# Plain Ruby Objects
-posts_array = 10.times.map{|i| Post.new(number: i)}
-Post.to_xlsx(instances: posts_array)
-Post.to_ods(instances: posts_array)
-Post.to_csv(instances: posts_array)
-```
-
-# Usage with Instances / ActiveRecord Relations
-
-When NOT using the `:data` option, ie. on an AR Relation or using the `:instances` option, Spreadsheet Architect requires an instance method defined on the class to generate the data. It looks for the `spreadsheet_columns` method on the class. If you are using on an ActiveRecord model and that method is not defined, it would fallback to the models `column_names` method (not recommended). If using the `:data` option this is ignored.
+When using on an AR Relation or using the `:instances` option, SpreadsheetArchitect requires an instance method to be defined on the class to generate the data. By default it looks for the `spreadsheet_columns` method on the class. If you are using on an ActiveRecord model and that method is not defined, it would fallback to the models `column_names` method. If using the `:data` option this is completely ignored.
 
 ```ruby
 class Post
+  include SpreadsheetArchitect
 
   def spreadsheet_columns
-
     ### Column format is: [Header, Cell Data / Method (if symbol) to Call on each Instance, (optional) Cell Type]
     [
       ['Title', :title],
@@ -89,15 +66,30 @@ class Post
       ['Rating', :rating],
       ['Category/Tags', "#{category.name} - #{tags.collect(&:name).join(', ')}"]
     ]
+  end
+
 end
+```
+
+Then use it on the class or ActiveRecord relations of the class
 
-Post.to_xlsx(instances: posts)
+```ruby
+posts = Post.order(name: :asc).where(published: true)
+posts.to_xlsx
+posts.to_ods
+posts.to_csv
+
+# Plain Ruby Objects
+posts_array = 10.times.map{|i| Post.new(number: i)}
+Post.to_xlsx(instances: posts_array)
+Post.to_ods(instances: posts_array)
+Post.to_csv(instances: posts_array)
 ```
 
-If you want to use a different method name then `spreadsheet_columns` you can pass a method name as a Symbol or String to the `spreadsheet_columns` option. Feel free to utilize the model-wide/project-wide defaults features if desired necessary.
+If you want to use a different method name then `spreadsheet_columns` you can pass a method name to the `:spreadsheet_columns` option.
 
 ```ruby
-Post.to_xlsx(instances: posts, spreadsheet_columns: :my_special_columns)
+Post.to_xlsx(instances: posts, spreadsheet_columns: :my_special_method)
 ```
 
 Alternatively, you can pass a Proc/lambda to the `spreadsheet_columns` option. For those purists that really dont want to define any extra `spreadsheet_columns` instance method on your model, this option can help you work with that methodology.
@@ -119,10 +111,19 @@ Post.to_xlsx(instances: posts, spreadsheet_columns: Proc.new{|instance|
 
 # Sending & Saving Spreadsheets
 
-### Method 1: Send Data via Rails Controller
+### Method 1: Save to a file manually
 
 ```ruby
+file_data = SpreadsheetArchitect.to_xlsx(headers: headers, data: data)
 
+File.open('path/to/file.xlsx', 'w+b') do |f|
+  f.write file_data
+end
+```
+
+### Method 2: Send Data via Rails Controller
+
+```ruby
 class PostsController < ActionController::Base
   respond_to :html, :xlsx, :ods, :csv
 
@@ -176,44 +177,27 @@ class PostsController < ActionController::Base
 end
 ```
 
-### Method 2: Save to a file manually
+# Multi Sheet Spreadsheets
 
-```ruby
-### Ex. with ActiveRecord relation
-file_data = Post.order(published_at: :asc).to_xlsx
-File.open('path/to/file.xlsx', 'w+b') do |f|
-  f.write file_data
-end
+### XLSX
 
-file_data = Post.order(published_at: :asc).to_ods
-File.open('path/to/file.ods', 'w+b') do |f|
-  f.write file_data
-end
-
-file_data = Post.order(published_at: :asc).to_csv
-File.open('path/to/file.csv', 'w+b') do |f|
-  f.write file_data
-end
-```
-
-# Multi Sheet XLSX Spreadsheets
 ```ruby
 axlsx_package = SpreadsheetArchitect.to_axlsx_package({headers: headers, data: data})
-axlsx_package = SpreadsheetArchitect.to_axlsx_package({headers: headers, data: data}, package)
+axlsx_package = SpreadsheetArchitect.to_axlsx_package({headers: headers, data: data}, axlsx_package)
 
-File.open('path/to/file.xlsx', 'w+b') do |f|
+File.open('path/to/multi_sheet_file.xlsx', 'w+b') do |f|
   f.write axlsx_package.to_stream.read
 end
 ```
 
 See this file for more details: https://github.com/westonganger/spreadsheet_architect/blob/master/test/spreadsheet_architect/multi_sheet_test.rb
 
-### Multi Sheet ODS Spreadsheets
+### ODS
 ```ruby
 ods_spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({headers: headers, data: data})
-ods_spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({headers: headers, data: data}, spreadsheet)
+ods_spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({headers: headers, data: data}, ods_spreadsheet)
 
-File.open('path/to/file.ods', 'w+b') do |f|
+File.open('path/to/multi_sheet_file.ods', 'w+b') do |f|
   f.write ods_spreadsheet
 end
 ```
@@ -231,15 +215,17 @@ See this file for more details: https://github.com/westonganger/spreadsheet_arch
 |**spreadsheet_columns**<br>*Proc/Symbol/String*| Use this option to override or define the spreadsheet columns. Normally, if this option is not specified and are using the instances option/ActiveRecord relation, it uses the classes custom `spreadsheet_columns` method or any custom defaults defined.<br>If neither of those and is an ActiveRecord model, then it will falls back to the models `self.column_names` | Cannot be used with the `:data` option.<br><br>If a Proc value is passed it will be evaluated on the instance object.<br><br>If a Symbol or String value is passed then it will search the instance for a method name that matches and call it. |
 |**headers**<br>*Array / 2D Array*| |Data for the header row cells. If using on a class/relation, this defaults to the ones provided via `spreadsheet_columns`. Pass `false` to skip the header row. |
 |**sheet_name**<br>*String*|`Sheet1`||
-|**header_style**<br>*Hash*|`{background_color: "AAAAAA", color: "FFFFFF", align: :center, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`|See all available style options [here](https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_styles_reference.md)|
-|**row_style**<br>*Hash*|`{background_color: nil, color: "000000", align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false, format_code: nil}`|Styles for non-header rows. See all available style options [here](https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_styles_reference.md)|
+|**header_style**<br>*Hash*|`{background_color: "AAAAAA", color: "FFFFFF", align: :center, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false}`|See all available style options [here](https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_style_reference.md)|
+|**row_style**<br>*Hash*|`{background_color: nil, color: "000000", align: :left, font_name: 'Arial', font_size: 10, bold: false, italic: false, underline: false, format_code: nil}`|Styles for non-header rows. See all available style options [here](https://github.com/westonganger/spreadsheet_architect/blob/master/docs/axlsx_style_reference.md)|
 |**column_styles**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/test/unit/kitchen_sink_test.rb)|
 |**range_styles**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/test/unit/kitchen_sink_test.rb)|
 |**conditional_row_styles**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/test/unit/kitchen_sink_test.rb). The if/unless proc will called with the following args: `row_index`, `row_data`|
 |**merges**<br>*Array*||Merge cells. [See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/test/unit/kitchen_sink_test.rb). Warning merges cannot overlap eachother, if you attempt to do so Excel will claim your spreadsheet is corrupt and refuse to open your spreadsheet.|
 |**borders**<br>*Array*||[See this example for usage](https://github.com/westonganger/spreadsheet_architect/blob/master/test/unit/kitchen_sink_test.rb)|
-|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :boolean, nil = auto determine.|
+|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :date, :time, :boolean, nil = auto determine.|
 |**column_widths**<br>*Array*||Sometimes you may want explicit column widths. Use nil if you want a column to autofit again.|
+|**freeze_headers**<br>*Boolean*||Make all header rows frozen/fixed so they do not scroll.|
+|**freeze**<br>* Hash*|`{rows: (1..4), columns: :all}`|Make all specified rows and columns frozen/fixed so they do not scroll.|
 
 ## `to_axlsx_spreadsheet(options={}, axlsx_package_to_join=nil)`
 Same options as `to_xlsx`
@@ -255,7 +241,7 @@ Same options as `to_xlsx`
 |**sheet_name**<br>*String*|`Sheet1`||
 |**header_style**<br>*Hash*|`{background_color: "AAAAAA", color: "FFFFFF", align: :center, font_size: 10, bold: true}`|Note: Currently ODS only supports these options|
 |**row_style**<br>*Hash*|`{background_color: nil, color: "000000", align: :left, font_size: 10, bold: false}`|Styles for non-header rows. Currently ODS only supports these options|
-|**column_types**<br>*Array*||Valid types for ODS are :string, :float :percent, :currency, :date, :time,, nil = auto determine. Due to [RODF Issue #19](https://github.com/thiagoarrais/rodf/issues/19), :date/:time will be converted to :string |
+|**column_types**<br>*Array*||Valid types for ODS are :string, :float, :date, :time, :boolean, nil = auto determine. Due to [RODF Issue #19](https://github.com/thiagoarrais/rodf/issues/19), :date/:time will be converted to :string |
 
 ## `to_rodf_spreadsheet(options={}, spreadsheet_to_join=nil)`
 Same options as `to_ods`
@@ -273,7 +259,9 @@ Same options as `to_ods`
 # Change class-wide default method options
 
 ```ruby
-class Post
+class Post < ApplicationRecord
+  include SpreadsheetArchitect
+
   def spreadsheet_columns
     [:name, :content]
   end
@@ -335,7 +323,7 @@ We use the `appraisal` gem for testing multiple versions of `axlsx`. Please use
 1. `bundle exec appraisal install`
 2. `bundle exec appraisal rake test`
 
-At this time the spreadsheets generated by the test suite are manually inspected. After running the tests, the test output can be viewed at `test/dummy_app/tmp/#{alxsx_version}/*`
+At this time the spreadsheets generated by the test suite are manually inspected. After running the tests, the test output can be viewed at `tmp/#{alxsx_version}/*`
 
 # Credits
 

data/lib/spreadsheet_architect.rb

@@ -10,6 +10,7 @@ require 'spreadsheet_architect/class_methods/ods'
 require 'spreadsheet_architect/class_methods/xlsx'
 
 module SpreadsheetArchitect
+
   def self.included(base)
     base.send(:extend, ClassMethods)
   end
@@ -33,4 +34,8 @@ module SpreadsheetArchitect
   def self.default_options
     @default_options
   end
+
+  XLSX_COLUMN_TYPES = [:string, :integer, :float, :date, :time, :boolean].freeze
+  ODS_COLUMN_TYPES = [:string, :float, :date, :time, :boolean].freeze
+
 end

data/lib/spreadsheet_architect/axlsx_string_width_patch.rb

@@ -0,0 +1,23 @@
+if Axlsx::VERSION.to_f < 3.1
+
+  Axlsx::Cell.class_eval do
+    private
+
+    def string_width(string, font_size)
+      font_scale = font_size / 10.0
+      (string.to_s.size + 3) * font_scale
+    end
+  end
+
+  if defined?(Axlsx::RichTextRun)
+    Axlsx::RichTextRun.class_eval do
+      private
+
+      def string_width(string, font_size)
+        font_scale = font_size / 10.0
+        string.to_s.size * font_scale
+      end
+    end
+  end
+
+end

data/lib/spreadsheet_architect/class_methods/csv.rb

@@ -2,6 +2,7 @@ require 'csv'
 
 module SpreadsheetArchitect
   module ClassMethods
+
     def to_csv(opts={})
       opts = SpreadsheetArchitect::Utils.get_options(opts, self)
       options = SpreadsheetArchitect::Utils.get_cell_data(opts, self)
@@ -18,5 +19,6 @@ module SpreadsheetArchitect
         end
       end
     end
+
   end
 end

data/lib/spreadsheet_architect/class_methods/ods.rb

@@ -2,6 +2,7 @@ require 'rodf'
 
 module SpreadsheetArchitect
   module ClassMethods
+
     def to_ods(opts={})
       return to_rodf_spreadsheet(opts).bytes
     end
@@ -10,6 +11,10 @@ module SpreadsheetArchitect
       opts = SpreadsheetArchitect::Utils.get_options(opts, self)
       options = SpreadsheetArchitect::Utils.get_cell_data(opts, self)
 
+      if options[:column_types] && !(options[:column_types].compact.collect(&:to_sym) - SpreadsheetArchitect::ODS_COLUMN_TYPES).empty?
+        raise SpreadsheetArchitect::Exceptions::ArgumentError.new("Invalid column type. Valid ODS values are #{SpreadsheetArchitect::ODS_COLUMN_TYPES}")
+      end
+
       if !spreadsheet
         spreadsheet = RODF::Spreadsheet.new
       end
@@ -48,21 +53,16 @@ module SpreadsheetArchitect
         options[:data].each_with_index do |row_data, index|
           row do 
             row_data.each_with_index do |val, i|
-              if options[:types]
-                type = options[:types][i]
+              if options[:column_types]
+                type = options[:column_types][i]
               end
 
-              if type
-                if [:date, :time].include?(type)
-                  type = :string
-                  val = val.to_s
-                end
-              elsif val.respond_to?(:strftime)
+              if (type && [:date, :time].include?(type)) || val.respond_to?(:strftime)
                 type = :string
                 val = val.to_s 
               end
 
-              cell val, style: :row_style, type: (options[:types][i] if options[:types])
+              cell val, style: :row_style, type: type
             end
           end
         end

data/lib/spreadsheet_architect/class_methods/xlsx.rb

@@ -1,10 +1,11 @@
 require 'axlsx'
 require 'axlsx_styler'
 
-require 'spreadsheet_architect/monkey_patches/axlsx_column_width'
+require 'spreadsheet_architect/axlsx_string_width_patch'
 
 module SpreadsheetArchitect
   module ClassMethods
+
     def to_xlsx(opts={})
       return to_axlsx_package(opts).to_stream.read
     end
@@ -12,7 +13,11 @@ module SpreadsheetArchitect
     def to_axlsx_package(opts={}, package=nil)
       opts = SpreadsheetArchitect::Utils.get_options(opts, self)
       options = SpreadsheetArchitect::Utils.get_cell_data(opts, self)
-    
+
+      if options[:column_types] && !(options[:column_types].compact.collect(&:to_sym) - SpreadsheetArchitect::XLSX_COLUMN_TYPES).empty?
+        raise SpreadsheetArchitect::Exceptions::ArgumentError.new("Invalid column type. Valid XLSX values are #{SpreadsheetArchitect::XLSX_COLUMN_TYPES}")
+      end
+
       header_style = SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(options[:header_style])
       row_style = SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(options[:row_style])
 
@@ -42,10 +47,10 @@ module SpreadsheetArchitect
 
             if options[:conditional_row_styles]
               conditional_styles_for_row = SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(options[:conditional_row_styles], row_index, header_row)
-              
+
               unless conditional_styles_for_row.empty?
                 sheet.add_style(
-                  "#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES.first}#{row_index+1}:#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[max_row_length-1]}#{row_index+1}", 
+                  "#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES.first}#{row_index+1}:#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[max_row_length-1]}#{row_index+1}",
                   SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(conditional_styles_for_row)
                 )
               end
@@ -102,11 +107,13 @@ module SpreadsheetArchitect
           sheet.add_row row_data, style: styles, types: types
 
           if options[:conditional_row_styles]
+            options[:conditional_row_styles] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:conditional_row_styles])
+
             conditional_styles_for_row = SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(options[:conditional_row_styles], row_index, row_data)
-            
+
             unless conditional_styles_for_row.empty?
               sheet.add_style(
-                "#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES.first}#{row_index+1}:#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[max_row_length-1]}#{row_index+1}", 
+                "#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES.first}#{row_index+1}:#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[max_row_length-1]}#{row_index+1}",
                 SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(conditional_styles_for_row)
               )
             end
@@ -122,16 +129,22 @@ module SpreadsheetArchitect
         end
 
         if options[:borders]
+          options[:borders] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:borders])
+
           options[:borders].each do |x|
             if x[:range].is_a?(Hash)
               x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows)
             else
               SpreadsheetArchitect::Utils::XLSX.verify_range(x[:range], num_rows)
             end
+
+            sheet.add_border x[:range], (x[:border_styles] || x[:styles])
           end
         end
 
         if options[:column_styles]
+          options[:column_styles] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:column_styles])
+
           options[:column_styles].each do |x|
             start_row = (options[:headers] ? options[:headers].count : 0) + 1
 
@@ -144,7 +157,8 @@ module SpreadsheetArchitect
               sheet.add_style range_str, x[:styles]
 
               if x[:include_header] && start_row > 1
-                sheet.add_style("#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[col]}1:#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[col]}#{start_row-1}", x[:styles])
+                range_str = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str({rows: (1..start_row-1), columns: col}, max_row_length, num_rows)
+                sheet.add_style(range_str, x[:styles])
               end
             }
 
@@ -162,6 +176,8 @@ module SpreadsheetArchitect
         end
 
         if options[:range_styles]
+          options[:range_styles] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:range_styles])
+
           options[:range_styles].each do |x|
             styles = SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(x[:styles])
 
@@ -176,6 +192,8 @@ module SpreadsheetArchitect
         end
 
         if options[:merges]
+          options[:merges] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:merges])
+
           options[:merges].each do |x|
             if x[:range].is_a?(Hash)
               x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows)
@@ -186,9 +204,48 @@ module SpreadsheetArchitect
             sheet.merge_cells x[:range]
           end
         end
+
+        if options[:freeze_headers]
+          sheet.sheet_view.pane do |pane|
+            pane.state = :frozen
+            pane.y_split = options[:headers].count
+          end
+
+        elsif options[:freeze]
+          options[:freeze] = SpreadsheetArchitect::Utils.symbolize_keys(options[:freeze])
+
+          sheet.sheet_view.pane do |pane|
+            pane.state = :frozen
+
+            ### Currently not working
+            #if options[:freeze][:active_pane]
+            #  Axlsx.validate_pane_type(options[:freeze][:active_pane])
+            #  pane.active_pane = options[:freeze][:active_pane]
+            #else
+            #  pane.active_pane = :bottom_right
+            #end
+
+            if !options[:freeze][:rows]
+              raise SpreadsheetArchitect::Exceptions::ArgumentError.new("The :rows key must be specified in the :freeze option hash")
+            elsif options[:freeze][:rows].is_a?(Range)
+              pane.y_split = options[:freeze][:rows].count
+            else
+              pane.y_split = 1
+            end
+
+            if options[:freeze][:columns] && options[:freeze][:columns] != :all
+              if options[:freeze][:columns].is_a?(Range)
+                pane.x_split = options[:freeze][:columns].count
+              else
+                pane.x_split = 1
+              end
+            end
+          end
+        end
       end
 
       return package
     end
+
   end
 end