spreadsheet_architect 4.2.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f453f3bd541db38744f93c7803a473dea7f8dee0c9c45ab86523992c78bd6317
-  data.tar.gz: 5c92d3ac4e35db0c17bd4da1e4325d08700decf476546fde20a66aa6057dacdd
+  metadata.gz: c88ecaffa3abed6ef127dc13d42c612ebf224c6d8552590d68ae544af2713f93
+  data.tar.gz: d0e864c2f50e99040f932da595b7270dd0e9c0161fc1189e6d99cb43126f6b5a
 SHA512:
-  metadata.gz: e89d0f1f1968275084495fdd420af039b61d7033606be0d9b63428fc3aab944baf82377103057fbf1ec43c91c02a7c48210bd81617ba55893ef998c3848265c0
-  data.tar.gz: ddfdcd2c578a1aa10dd2839368cdf99b897a49abf1a888bae40dbd08ad310f4ee26a5bc93ce9fdd484092b5f32ee4d5195c7cb5bdb466fcdf5dec6250e79603e
+  metadata.gz: dfc0caea596d57bd5aa88cd3b5ff3cebfca8b1299d1660e9995ca93837746d21420a90e0f427df9b3f8e73c13914a24b137572c005ee16fafdeeb6ddaf18b95d
+  data.tar.gz: c31f408e271453d46454e4f85ad2437a2539e39973186a8889c917a338f9e5f57f9ef3f3f28797955d61f8daa6a7100ffb46624ab3974c4bfd9273cc5cacba29

data/CHANGELOG.md

@@ -1,9 +1,20 @@
 CHANGELOG
 ---------
 
-- **Unreleased** - [View Diff](https://github.com/westonganger/spreadsheet_architect/compare/v4.2.0...master)
+- **Unreleased** - [View Diff](https://github.com/westonganger/spreadsheet_architect/compare/v5.0.0...master)
   - Nothing yet
 
+- **5.0.0** - [View Diff](https://github.com/westonganger/spreadsheet_architect/compare/v4.2.0...v5.0.0)
+  - [#52](https://github.com/westonganger/spreadsheet_architect/pull/52) - Update to caxlsx v3.3.0+ which now contains the axlsx_styler code, so we drop the dependency on axlsx_styler
+  - [#38](https://github.com/westonganger/spreadsheet_architect/pull/38) - **Breaking Change**  - Add `escape_formulas` option for xlsx spreadsheets. This is a breaking change because we default to `escape_formulas: true` whereas before there was no formula escaping at all. The reasoning for this breaking change is that creating spreadsheets where many of the fields contain direct user input are a large majority compared to use cases that involve formulas.
+  - [#39](https://github.com/westonganger/spreadsheet_architect/pull/39) - Add option `use_zero_based_row_index: true` (Default `false`) which allows you to use zero-based row indexes instead of the default 1-based row indexes. Recomended to set this option for the whole project. The original reason it was designed to be 1-based is because spreadsheet row numbers literally start with 1. However this tends to be unituitive for the developer because columns use zero based indexes because they use letter-based notation instead.
+  - [#40](https://github.com/westonganger/spreadsheet_architect/pull/40) - Improve argument handling for freeze option and add support for all Axlsx supported options for panes using the `:freeze` hash. See test case for example (./test/unit/xlsx_freeze_test.rb)
+  - [#42](https://github.com/westonganger/spreadsheet_architect/pull/42) - Improve exceptions and messages regarding invalid ranges
+  - [#45](https://github.com/westonganger/spreadsheet_architect/pull/45) - For `to_xlsx`, dont add empty header row when `header: true`
+  - [#44](https://github.com/westonganger/spreadsheet_architect/pull/44) - Add support for hyperlinks in XLSX and ODS
+  - [#49](https://github.com/westonganger/spreadsheet_architect/pulls/49) - Extracted some ODS methods from `SpreadsheetArchitect::Utils` to `SpreadsheetArchitect::Utils::ODS`
+  - [#51](https://github.com/westonganger/spreadsheet_architect/pulls/51) - Add Proc support to `:column_types`
+
 - **4.2.0** - May 27, 2021 - [View Diff](https://github.com/westonganger/spreadsheet_architect/compare/v4.1.0...v4.2.0)
   - Add option `:skip_defaults` which removes the defaults and default styles. Particularily useful for heavily customized spreadsheets where the default styles get in the way.
   - Fix bug where styles werent being un-applied when using the `false` value.

data/README.md

@@ -91,7 +91,7 @@ If you want to use a different method name then `spreadsheet_columns` you can pa
 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.
+Alternatively, you can pass a Proc 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.
 
 ```ruby
 Post.to_xlsx(instances: posts, spreadsheet_columns: Proc.new{|instance|
@@ -103,7 +103,8 @@ Post.to_xlsx(instances: posts, spreadsheet_columns: Proc.new{|instance|
     :published_at, # uses the method name as header title Einstance. 'Published At'
     ['# of Views', :number_of_views, :float],
     ['Rating', :rating],
-    ['Category/Tags', "#{instance.category.name} - #{instance.tags.collect(&:name).join(', ')}"]
+    ['Category/Tags', "#{instance.category.name} - #{instance.tags.collect(&:name).join(', ')}"],
+    ['URL', :url, (val.start_with?("http") ? :hyperlink : :string)],
   ]
 })
 ```
@@ -189,20 +190,16 @@ File.open('path/to/multi_sheet_file.xlsx', 'w+b') do |f|
 end
 ```
 
-See this file for more details: [test/unit/multi_sheet_test.rb](./test/unit/multi_sheet_test.rb)
-
 ### ODS
 ```ruby
 ods_spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({headers: headers, data: data})
 ods_spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({headers: headers, data: data}, ods_spreadsheet)
 
 File.open('path/to/multi_sheet_file.ods', 'w+b') do |f|
-  f.write ods_spreadsheet
+  f.write ods_spreadsheet.bytes
 end
 ```
 
-See this file for more details: [test/unit/multi_sheet_test.rb](./test/unit/multi_sheet_test.rb)
-
 # Methods
 
 ## `to_xlsx(options={})`
@@ -221,11 +218,13 @@ See this file for more details: [test/unit/multi_sheet_test.rb](./test/unit/mult
 |**conditional_row_styles**<br>*Array*||[See this example for usage](./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](./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](./test/unit/kitchen_sink_test.rb)|
-|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :date, :time, :boolean, nil = auto determine.|
+|**column_types**<br>*Array*||Valid types for XLSX are :string, :integer, :float, :date, :time, :boolean, :hyperlink, nil = auto determine. You may also pass a Proc which evaluates to any of the valid types, for example `->(cell_val){ cell_val.start_with?('http') ? :hyperlink : :string }`|
 |**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.|
+|**freeze**<br>*Hash*||Make all specified row and/or column frozen/fixed so they do not scroll. See [example usage](./test/unit/xlsx_freeze_test.rb)|
 |**skip_defaults**<br>*Boolean*|`false`|Removes defaults and default styles. Particularily useful for heavily customized spreadsheets where the default styles get in the way.|
+|**escape_formulas**<br>*Boolean* or *Array*|`true`|Pass a single boolean to apply to all cells, or an array of booleans to control column-by-column. Advisable to be set true when involved with untrusted user input. See [an example of the underlying functionality](https://github.com/caxlsx/caxlsx/blob/master/examples/escape_formula_example.md). NOTE: Header row cells are not escaped. |
+|**use_zero_based_row_index**<br>*Boolean*|`false`|Allows you to use zero-based row indexes when defining `range_styles`, `merges`, etc. Recomended to set this option for the whole project rather than per call. The original reason it was designed to be 1-based is because spreadsheet row numbers actually start with 1.|
 
 ## `to_axlsx_spreadsheet(options={}, axlsx_package_to_join=nil)`
 Same options as `to_xlsx`
@@ -241,7 +240,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, :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 |
+|**column_types**<br>*Array*||Valid types for ODS are :string, :float, :date, :time, :boolean, :hyperlink, nil = auto determine. Due to [RODF Issue #19](https://github.com/thiagoarrais/rodf/issues/19), :date/:time will be converted to :string. You may also pass a Proc which evaluates to any of the valid types, for example `->(cell_val){ cell_val.start_with?('http') ? :hyperlink : :string }` |
 |**skip_defaults**<br>*Boolean*|`false`|Skip defaults and default styles. Particularily useful for heavily customized spreadsheets where the default styles get in the way.|
 
 ## `to_rodf_spreadsheet(options={}, spreadsheet_to_join=nil)`
@@ -303,6 +302,7 @@ SpreadsheetArchitect.default_options = {
   merges: [],
   borders: [],
   column_types: [],
+  use_zero_based_row_index: false,
 }
 ```
 
@@ -329,7 +329,3 @@ At this time the spreadsheets generated by the test suite are manually inspected
 # Credits
 
 Created & Maintained by [Weston Ganger](https://westonganger.com) - [@westonganger](https://github.com/westonganger)
-
-For any consulting or contract work please contact me via my company website: [Solid Foundation Web Development](https://solidfoundationwebdev.com)
-
-[![Solid Foundation Web Development Logo](https://solidfoundationwebdev.com/logo-sm.png)](https://solidfoundationwebdev.com)

data/lib/spreadsheet_architect/class_methods/ods.rb

@@ -11,7 +11,7 @@ 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?
+      if options[:column_types] && !(options[:column_types].compact.reject{|x| x.is_a?(Proc) }.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
 
@@ -21,7 +21,7 @@ module SpreadsheetArchitect
 
       spreadsheet.office_style :header_style, family: :cell do
         if options[:header_style]
-          SpreadsheetArchitect::Utils.convert_styles_to_ods(options[:header_style]).each do |prop, styles|
+          SpreadsheetArchitect::Utils::ODS.convert_styles(options[:header_style]).each do |prop, styles|
             styles.each do |k,v|
               property prop.to_sym, k => v
             end
@@ -31,7 +31,7 @@ module SpreadsheetArchitect
 
       spreadsheet.office_style :row_style, family: :cell do
         if options[:row_style]
-          SpreadsheetArchitect::Utils.convert_styles_to_ods(options[:row_style]).each do |prop, styles|
+          SpreadsheetArchitect::Utils::ODS.convert_styles(options[:row_style]).each do |prop, styles|
             styles.each do |k,v|
               property prop.to_sym, k => v
             end
@@ -54,15 +54,25 @@ module SpreadsheetArchitect
           row do 
             row_data.each_with_index do |val, i|
               if options[:column_types]
-                type = options[:column_types][i]
+                provided_column_type = options[:column_types][i]
+
+                if provided_column_type.is_a?(Proc)
+                  provided_column_type = provided_column_type.call(val)
+                end
               end
 
-              if (type && [:date, :time].include?(type)) || val.respond_to?(:strftime)
-                type = :string
-                val = val.to_s 
+              type = SpreadsheetArchitect::Utils::ODS.get_cell_type(val, provided_column_type) 
+
+              cell_opts = {
+                style: :row_style, 
+                type: type,
+              }
+
+              if provided_column_type == :hyperlink
+                cell_opts[:url] = val
               end
 
-              cell val, style: :row_style, type: type
+              cell(val, **cell_opts)
             end
           end
         end

data/lib/spreadsheet_architect/class_methods/xlsx.rb

@@ -1,5 +1,4 @@
 require 'axlsx'
-require 'axlsx_styler'
 
 require 'spreadsheet_architect/axlsx_string_width_patch'
 
@@ -14,7 +13,7 @@ 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::XLSX_COLUMN_TYPES).empty?
+      if options[:column_types] && !(options[:column_types].compact.reject{|x| x.is_a?(Proc) }.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
 
@@ -79,16 +78,27 @@ module SpreadsheetArchitect
 
           types = []
           styles = []
-          row_data.each_with_index do |x,i|
-            if (x.respond_to?(:empty) ? x.empty? : x.nil?)
+          hyperlink_cell_indexes = []
+
+          row_data.each_with_index do |val,i|
+            if (val.respond_to?(:empty) ? val.empty? : val.nil?)
               types[i] = nil
               styles[i] = row_style_index
             else
               if options[:column_types]
-                types[i] = options[:column_types][i]
+                provided_column_type = options[:column_types][i]
+
+                if provided_column_type.is_a?(Proc)
+                  provided_column_type = provided_column_type.call(val)
+                end
               end
 
-              types[i] ||= SpreadsheetArchitect::Utils::XLSX.get_type(x)
+              if provided_column_type == :hyperlink
+                hyperlink_cell_indexes << i
+                row_data[i] = val.to_s
+              end
+
+              types[i] = SpreadsheetArchitect::Utils::XLSX.get_type(val, provided_column_type)
 
               if [:date, :time].include?(types[i])
                 if types[i] == :date
@@ -104,7 +114,12 @@ module SpreadsheetArchitect
             end
           end
 
-          sheet.add_row row_data, style: styles, types: types
+          sheet.add_row row_data, style: styles, types: types, escape_formulas: options[:escape_formulas]
+
+          hyperlink_cell_indexes.each do |cell_index|
+            cell_ref = "#{SpreadsheetArchitect::Utils::XLSX::COL_NAMES[cell_index]}#{row_index+1}"
+            sheet.add_hyperlink location: row_data[cell_index], ref: cell_ref
+          end
 
           if options[:conditional_row_styles]
             options[:conditional_row_styles] = SpreadsheetArchitect::Utils.hash_array_symbolize_keys(options[:conditional_row_styles])
@@ -133,12 +148,12 @@ module SpreadsheetArchitect
 
           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)
+              x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows, use_zero_based_row_index: options[:use_zero_based_row_index])
             else
               SpreadsheetArchitect::Utils::XLSX.verify_range(x[:range], num_rows)
             end
 
-            sheet.add_border x[:range], (x[:border_styles] || x[:styles])
+            sheet.add_border x[:range], (x[:border_styles] || x[:styles] || Axlsx::Border::EDGES)
           end
         end
 
@@ -182,7 +197,7 @@ module SpreadsheetArchitect
             styles = SpreadsheetArchitect::Utils::XLSX.convert_styles_to_axlsx(x[:styles])
 
             if x[:range].is_a?(Hash)
-              x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows)
+              x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows, use_zero_based_row_index: options[:use_zero_based_row_index])
             else
               SpreadsheetArchitect::Utils::XLSX.verify_range(x[:range], num_rows)
             end
@@ -196,7 +211,7 @@ module SpreadsheetArchitect
 
           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)
+              x[:range] = SpreadsheetArchitect::Utils::XLSX.range_hash_to_str(x[:range], max_row_length, num_rows, use_zero_based_row_index: options[:use_zero_based_row_index])
             else
               SpreadsheetArchitect::Utils::XLSX.verify_range(x[:range], num_rows)
             end
@@ -212,33 +227,62 @@ module SpreadsheetArchitect
           end
 
         elsif options[:freeze]
-          options[:freeze] = SpreadsheetArchitect::Utils.symbolize_keys(options[:freeze])
+          case options[:freeze][:type].to_s
+          when "split_panes"
+            options[:freeze][:state] == "split"
+          when "frozen", "freeze"
+            options[:freeze][:state] == "frozen"
+          end
+
+          if options[:freeze][:rows]
+            options[:freeze][:row] ||= options[:freeze][:rows]
+          end
+
+          if options[:freeze][:columns]
+            options[:freeze][:column] ||= options[:freeze][:columns]
+          end
+
+          if options[:freeze][:row] == :all
+            options[:freeze][:row] = nil
+          elsif options[:freeze][:row].is_a?(Range)
+            options[:freeze][:row] = options[:freeze][:row].last
+          end
+
+          if options[:freeze][:column] == :all
+            options[:freeze][:column] = nil
+          elsif options[:freeze][:column].is_a?(Range)
+            options[:freeze][:column] = options[:freeze][:column].last
+          end
+
+          if !options[:freeze][:row] && !options[:freeze][:column]
+            raise SpreadsheetArchitect::Exceptions::ArgumentError.new("Missing required :row or :column value in the :freeze option hash")
+          elsif options[:freeze][:row] && !options[:freeze][:row].is_a?(Integer)
+            raise SpreadsheetArchitect::Exceptions::ArgumentError.new("Invalid :row value provided for in :freeze option hash, must be an Integer")
+          elsif options[:freeze][:column] && !options[:freeze][:column].is_a?(Integer)
+            raise SpreadsheetArchitect::Exceptions::ArgumentError.new("Invalid :column value provided for in :freeze option hash, must be an Integer")
+          end
 
           sheet.sheet_view.pane do |pane|
-            pane.state = :frozen
+            pane.state = (options[:freeze][:state] || :frozen).to_sym ### Other options are :split and :frozen_split
 
-            ### 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
+            if options[:freeze][:active_pane]
+              pane.active_pane = options[:freeze][:active_pane].to_sym
             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
+            if options[:freeze][:top_left_cell]
+              pane.top_left_cell = options[:freeze][:top_left_cell]
+            end
+
+            if options[:freeze][:row]
+              if options[:use_zero_based_row_index]
+                options[:freeze][:row] += 1
               end
+
+              pane.y_split = options[:freeze][:row]
+            end
+
+            if options[:freeze][:column]
+              pane.x_split = options[:freeze][:column]
             end
           end
         end

data/lib/spreadsheet_architect/exceptions.rb

@@ -14,17 +14,27 @@ module SpreadsheetArchitect
     end
 
     class InvalidRangeError < ArgumentError
-      def initialize(type, range)
-        case type
-        when :columns, :rows
-          super("Invalid range `#{range}` passed. Some of the #{type} specified were greater than the total number of #{type}")
-        when :format
-          super("Invalid range `#{range}` passed. Format must be as follows: A1:D4")
-        when :type
-          super("Invalid range type `#{range}`. Valid types are String and Hash")
-        else
-          super("Invalid range `#{range}` passed.")
+      def initialize(type, range, message: nil)
+        default_msg = "Invalid range `#{range}` passed"
+
+        if message.nil?
+          case type
+          when :missing_range_keys
+            message = "Missing :rows or :columns key"
+          when :format
+            message = "Format must be as follows: A1:D4"
+          when :type
+            message = "Valid types are Hash and String"
+          end
         end
+
+        super([default_msg, message].compact.join(". "))
+      end
+    end
+
+    class InvalidRangeValue < ArgumentError
+      def initialize(type, range)
+        super("Invalid range `#{range}` passed. Some of the :#{type} specified are either an invalid value or are greater than the total number of #{type}")
       end
     end
 
@@ -34,9 +44,16 @@ module SpreadsheetArchitect
       end
     end
 
-    class InvalidRangeStylesOptionError < ArgumentError
-      def initialize(type, opt)
-        super("Invalid or missing :#{type} option for `#{opt}`. :#{type} can be an integer, range, or :all")
+    class InvalidRangeOptionError < ArgumentError
+      def initialize(key, opt)
+        default_msg = "Invalid :#{key} option for `#{opt}`"
+
+        case key
+        when :columns, :rows
+          message = ":#{key} can be an integer, range, or :all"
+        end
+
+        super([default_msg, message].compact.join(". "))
       end
     end
 

data/lib/spreadsheet_architect/utils/ods.rb

@@ -0,0 +1,66 @@
+module SpreadsheetArchitect
+  module Utils
+    module ODS
+
+      def self.get_cell_type(value, type=nil)
+        if type && !type.empty?
+          case type
+          when :hyperlink
+            return :string
+          when :date, :time
+            return :string
+          end
+
+          return type unless (type.respond_to?(:empty?) ? type.empty? : type.nil?)
+        end
+        
+        if value.is_a?(Numeric)
+          type = :float
+        elsif value.respond_to?(:strftime)
+          type = :string
+        else
+          type = :string
+        end
+
+        return type
+      end
+
+      def self.convert_styles(styles={})
+        styles = {} unless styles.is_a?(Hash)
+        styles = SpreadsheetArchitect::Utils.stringify_keys(styles)
+
+        property_styles = {}
+
+        text_styles = {}
+        text_styles['font-weight'] = styles.delete('bold') ? 'bold' : styles.delete('font-weight')
+        text_styles['font-size'] = styles.delete('font_size') || styles.delete('font-size')
+        text_styles['font-style'] = styles.delete('italic') ? 'italic' : styles.delete('font-style')
+        if styles['underline']
+          styles.delete('underline')
+          text_styles['text-underline-style'] = 'solid'
+          text_styles['text-underline-type'] = 'single'
+        end
+        if styles['align']
+          text_styles['align'] = true
+        end 
+        if styles['color'].respond_to?(:sub) && !styles['color'].empty?
+          text_styles['color'] = "##{styles.delete('color').sub('#','')}"
+        end
+        text_styles.delete_if{|_,v| v.nil?}
+        property_styles['text'] = text_styles
+        
+        cell_styles = {}
+        styles['background_color'] ||= styles.delete('background-color')
+        if styles['background_color'].respond_to?(:sub) && !styles['background_color'].empty?
+          cell_styles['background-color'] = "##{styles.delete('background_color').sub('#','')}"
+        end
+
+        cell_styles.delete_if{|_,v| v.nil?}
+        property_styles['cell'] = cell_styles
+
+        return property_styles
+      end
+
+    end
+  end
+end

data/lib/spreadsheet_architect/utils/xlsx.rb

@@ -3,7 +3,14 @@ module SpreadsheetArchitect
     module XLSX
 
       def self.get_type(value, type=nil)
-        return type unless (type.respond_to?(:empty?) ? type.empty? : type.nil?)
+        if type && !type.empty?
+          case type
+          when :hyperlink
+            return :string
+          end
+
+          return type unless (type.respond_to?(:empty?) ? type.empty? : type.nil?)
+        end
         
         if value.is_a?(Numeric)
           if value.is_a?(Float) || value.is_a?(BigDecimal)
@@ -83,7 +90,11 @@ module SpreadsheetArchitect
         return styles
       end
 
-      def self.range_hash_to_str(hash, num_columns, num_rows)
+      def self.range_hash_to_str(hash, num_columns, num_rows, use_zero_based_row_index: false)
+        if !hash.has_key?(:rows) && !hash.has_key?(:columns)
+          raise SpreadsheetArchitect::Exceptions::InvalidRangeError.new(:missing_range_keys, hash)
+        end
+
         case hash[:columns]
         when Integer
           start_col = end_col = COL_NAMES[hash[:columns]]
@@ -100,24 +111,34 @@ module SpreadsheetArchitect
           unless end_col.is_a?(String)
             end_col = COL_NAMES[end_col]
           end
-        when :all
+        when :all, nil
           start_col = 'A'
           end_col = COL_NAMES[num_columns-1]
         else
-          raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError.new(:columns, hash)
+          raise SpreadsheetArchitect::Exceptions::InvalidRangeOptionError.new(:columns, hash)
         end
 
         case hash[:rows]
         when Integer
           start_row = end_row = hash[:rows]
+
+          if use_zero_based_row_index
+            start_row += 1
+            end_row += 1
+          end
         when Range
           start_row = hash[:rows].first
           end_row = hash[:rows].last
-        when :all
+
+          if use_zero_based_row_index
+            start_row += 1
+            end_row += 1
+          end
+        when :all, nil
           start_row = 1
           end_row = num_rows
         else
-          raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError.new(:rows, hash)
+          raise SpreadsheetArchitect::Exceptions::InvalidRangeOptionError.new(:rows, hash)
         end
 
         range_str = "#{start_col}#{start_row}:#{end_col}#{end_row}"
@@ -137,11 +158,11 @@ module SpreadsheetArchitect
             end_col, end_row = back.scan(/\d+|\D+/)
 
             unless COL_NAMES.include?(start_col) && COL_NAMES.include?(end_col)
-              raise SpreadsheetArchitect::Exceptions::InvalidRangeError.new(:columns, range)
+              raise SpreadsheetArchitect::Exceptions::InvalidRangeValue.new(:columns, range)
             end
             
             unless start_row.to_i <= num_rows && end_row.to_i <= num_rows
-              raise SpreadsheetArchitect::Exceptions::InvalidRangeError.new(:rows, range)
+              raise SpreadsheetArchitect::Exceptions::InvalidRangeValue.new(:rows, range)
             end
           else
             raise SpreadsheetArchitect::Exceptions::InvalidRangeError.new(:format, range)

data/lib/spreadsheet_architect/utils.rb

@@ -10,7 +10,9 @@ module SpreadsheetArchitect
       if options[:headers] == true
         headers = []
 
-        if !options[:data]
+        if options[:data]
+          headers = false
+        else
           needs_headers = true
         end
       elsif options[:headers].is_a?(Array)
@@ -143,50 +145,22 @@ module SpreadsheetArchitect
       end
 
       if options[:freeze]
+        options[:freeze] = SpreadsheetArchitect::Utils.symbolize_keys(options[:freeze])
+
         if options[:freeze_headers]
           raise SpreadsheetArchitect::Exceptions::ArgumentError.new('Cannot use both :freeze and :freeze_headers options at the same time')
-        elsif options[:freeze].is_a?(Hash) && !options[:freeze][:rows]
-          raise SpreadsheetArchitect::Exceptions::ArgumentError.new('Must provide a :rows key when passing a hash to the :freeze option')
         end
       end
 
-      return options
-    end
-
-    def self.convert_styles_to_ods(styles={})
-      styles = {} unless styles.is_a?(Hash)
-      styles = stringify_keys(styles)
-
-      property_styles = {}
-
-      text_styles = {}
-      text_styles['font-weight'] = styles.delete('bold') ? 'bold' : styles.delete('font-weight')
-      text_styles['font-size'] = styles.delete('font_size') || styles.delete('font-size')
-      text_styles['font-style'] = styles.delete('italic') ? 'italic' : styles.delete('font-style')
-      if styles['underline']
-        styles.delete('underline')
-        text_styles['text-underline-style'] = 'solid'
-        text_styles['text-underline-type'] = 'single'
-      end
-      if styles['align']
-        text_styles['align'] = true
-      end 
-      if styles['color'].respond_to?(:sub) && !styles['color'].empty?
-        text_styles['color'] = "##{styles.delete('color').sub('#','')}"
-      end
-      text_styles.delete_if{|_,v| v.nil?}
-      property_styles['text'] = text_styles
-      
-      cell_styles = {}
-      styles['background_color'] ||= styles.delete('background-color')
-      if styles['background_color'].respond_to?(:sub) && !styles['background_color'].empty?
-        cell_styles['background-color'] = "##{styles.delete('background_color').sub('#','')}"
+      if options[:escape_formulas].nil?
+        options[:escape_formulas] = true
       end
 
-      cell_styles.delete_if{|_,v| v.nil?}
-      property_styles['cell'] = cell_styles
+      if options[:use_zero_based_row_index].nil?
+        options[:use_zero_based_row_index] = false
+      end
 
-      return property_styles
+      return options
     end
 
     private
@@ -290,8 +264,9 @@ module SpreadsheetArchitect
       row_style: Hash,
       sheet_name: String,
       spreadsheet_columns: [Proc, Symbol, String],
+      escape_formulas: [TrueClass, FalseClass, Array],
+      use_zero_based_row_index: [TrueClass, FalseClass],
     }.freeze
 
-
   end
 end

data/lib/spreadsheet_architect/version.rb

@@ -1,3 +1,3 @@
 module SpreadsheetArchitect
-  VERSION = "4.2.0"
+  VERSION = "5.0.0"
 end