caxlsx 3.1.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef44b04d373e873848cd74d5bebae4d327cd0d9cba06ee74de6d0aac35b51ab9
-  data.tar.gz: b54abdd82f277253216da4ad9d938c2508c9f1ed54abd080d4437e5523c470e1
+  metadata.gz: 4f5803740b82493118fd7fe6787c90dd0eb8e2f7908736597026d03c4255597b
+  data.tar.gz: 3bf010de6171b2862cd27ea12df265162071801b0cac7172cee4d1629e856835
 SHA512:
-  metadata.gz: bce9d28013a2ec3ffec4be335a2b933ba38fb508dbc4f486a3df135dc81122a236ff9439792ac8bc64c4150e523af261deea02c5a86b9f3838a38b2a26e0d537
-  data.tar.gz: 1bca0d82c582818a822feefbb499caef3b622f8d4203543a1c6d11f57876944df01db0bafb30d6238f9a268d731a0a78de0ed4efa97a205db43465d73dab7d74
+  metadata.gz: 40af150a59e4aacb3f1d385117d0c21b1b2d8ca3c36e12592f23464b35270ac07af826c2494c9922510603e96933de82dafb4819b8ac31b892c7ce842eb190cc
+  data.tar.gz: bd16de0493f11a225fd7e376cdce5b10433f253431e2d00f9ecfeca464f96336499d35806781de77ad5c1dad62a63bb2545deb7e00cfef6fc0a4a1f0657103e1

data/CHANGELOG.md

@@ -1,16 +1,53 @@
 CHANGELOG
 ---------
+- **Unreleased**
+
+- **October.21.22**: 3.3.0
+  - [PR #168](https://github.com/caxlsx/caxlsx/pull/168) - Merge in the gem [`axlsx_styler`](https://github.com/axlsx-styler-gem/axlsx_styler)
+    - Add ability to both apply or append to existing styles after rows have been created using `worksheet.add_style`
+      - `worksheet.add_style "A1", {b: true}`
+      - `worksheet.add_style "A1:B2", {b: true}`
+      - `worksheet.add_style ["A1", "B2:C7", "D8:E9"], {b: true}`
+    - Add ability to create borders upon specific areas of the page using `worksheet.add_border`
+      - `worksheet.add_border "A1", {style: :thin}`
+      - `worksheet.add_border "A1:B2", {style: :thin}`
+      - `worksheet.add_border ["A1", "B2:C7", "D8:E9"], {style: :thin}`
+    - Add `Axlsx::BorderCreator` the class used under the hood for `worksheet.add_border`
+    - Allow specifying `:all` in `border: {edges: :all}` which is a shortcut for `border: {edges: [:left, :right, :top, :bottom]}`
+  - [PR #156](https://github.com/caxlsx/caxlsx/pull/156) - Prevent Excel from crashing when multiple data columns added to PivotTable
+  - [PR #155](https://github.com/caxlsx/caxlsx/pull/155) - Add `hideDropDown` alias for `showDropDown` setting, as the latter is confusing to use (because its logic seems inverted).
+  - [PR #143](https://github.com/caxlsx/caxlsx/pull/143) - Add setting `sort_on_headers` for pivot tables
+  - [PR #132](https://github.com/caxlsx/caxlsx/pull/132) - Remove monkey patch from Object#instance_values
+  - [PR #139](https://github.com/caxlsx/caxlsx/pull/139) - Sort archive entries for correct MIME detection with `file` command
+  - [PR #140](https://github.com/caxlsx/caxlsx/pull/140) - Update gemspec to recent styles - it reduced the size of the gem
+  - [PR #147](https://github.com/caxlsx/caxlsx/pull/147) - Implement “rounded corners” setting for charts.
+  - [PR #145](https://github.com/caxlsx/caxlsx/pull/145) - Implement “plot visible only” setting for charts.
+  - [PR #144](https://github.com/caxlsx/caxlsx/pull/144) - Completely hide chart titles if blank; Fix missing cell reference for chart title when cell empty.
+
+- **February.23.22**: 3.2.0
+  - [PR #75](https://github.com/caxlsx/caxlsx/pull/85) - Added manageable markers for scatter series
+  - [PR #116](https://github.com/caxlsx/caxlsx/pull/116) - Validate name option to be non-empty string when passed.
+  - [PR #117](https://github.com/caxlsx/caxlsx/pull/117) - Allow passing an Array of border hashes to the `border` style. Change previous behaviour where `border_top`, `border_*` styles would not be applied unless `border` style was also defined.
+  - [PR #122](https://github.com/caxlsx/caxlsx/pull/122) - Improve error messages when incorrect ranges are provided to `Worksheet#[]`
+  - [PR #123](https://github.com/caxlsx/caxlsx/pull/123) - Fix invalid xml when pivot table created with more than one column in data field. Solves [Issue #110](https://github.com/caxlsx/caxlsx/issues/110)
+  - [PR #127](https://github.com/caxlsx/caxlsx/pull/127) - Possibility to configure the calculation of the autowidth mechanism with `font_scale_divisor` and `bold_font_multiplier`. Example: [Fine tuned autowidth](examples/fine_tuned_autowidth_example.md)
+  - [PR #85](https://github.com/caxlsx/caxlsx/pull/85) - Manageable markers for scatter series
+  - [PR #120](https://github.com/caxlsx/caxlsx/pull/120) - Return output stream in binmode
 
 - **September.22.21**: 3.1.1
   - [PR #107](https://github.com/caxlsx/caxlsx/pull/107) - Add overlap to bar charts
   - [PR #108](https://github.com/caxlsx/caxlsx/pull/108) - Fix gap depth and gap depth validators for bar charts and 3D bar charts
+  - [PR #94](https://github.com/caxlsx/caxlsx/pull/94) - Major performance improvement for charts with large amounts of data
+  - [PR #81](https://github.com/caxlsx/caxlsx/pull/81) - Add option to define a color for the BarSeries
 
 - **March.27.21**: 3.1.0
-  - [PR #95](https://github.com/caxlsx/caxlsx/pull/95) - Replace mimemagic with marcel  
+  - [PR #95](https://github.com/caxlsx/caxlsx/pull/95) - Replace mimemagic with marcel
   - [PR #87](https://github.com/caxlsx/caxlsx/pull/87) - Implement :offset option for worksheet#add_row
   - [PR #79](https://github.com/caxlsx/caxlsx/pull/79) - Add support for format in pivot tables
   - [PR #77](https://github.com/caxlsx/caxlsx/pull/77) - Fix special characters in table header
   - [PR #57](https://github.com/caxlsx/caxlsx/pull/57) - Deprecate using #serialize with boolean argument: Calls like `Package#serialize("name.xlsx", false)` should be replaced with `Package#serialize("name.xlsx", confirm_valid: false)`.
+  - [PR #78](https://github.com/caxlsx/caxlsx/pull/78) - Fix special characters in pivot table cache definition
+  - [PR #84](https://github.com/caxlsx/caxlsx/pull/84) - Add JRuby 9.2 to the CI
 
 - **January.5.21**: 3.0.4
   - [PR #72](https://github.com/caxlsx/caxlsx/pull/72) - Relax Ruby dependency to allow for Ruby 3. This required Travis to be upgraded from Ubuntu Trusty to Ubuntu Bionic. rbx-3 was dropped.
@@ -23,11 +60,16 @@ CHANGELOG
   - [PR #56](https://github.com/caxlsx/caxlsx/pull/56) - Add `zip_command` option to `#serialize` for faster serialization of large Excel files by using a zip binary
   - [PR #54](https://github.com/caxlsx/caxlsx/pull/54) - Fix type detection for floats with out-of-rage exponents
   - [I #67](https://github.com/caxlsx/caxlsx/issues/67) - Fix regression in worksheet name length enforcement: Some unicode characters were counted incorrectly, so that names that previously worked fine now stopped working. (This was introduced in 3.0.2)
+  - [I #58](https://github.com/caxlsx/caxlsx/issues/58) - Fix explosion for pie chart throwing error
+  - [PR #60](https://github.com/caxlsx/caxlsx/pull/60) - Add Ruby 2.7 to the CI
+  - [PR #47](https://github.com/caxlsx/caxlsx/pull/47) - Restructure examples folder
 
 - **July.16.20**: 3.0.2
   - [I #51](https://github.com/caxlsx/caxlsx/issues/51) - Images do not import on Windows. IO read set explicitly to binary mode.
   - [PR #53](https://github.com/caxlsx/caxlsx/pull/53) - Limit column width to 255. Maximum column width limit in MS Excel is 255 characters, see https://support.microsoft.com/en-us/office/excel-specifications-and-limits-1672b34d-7043-467e-8e27-269d656771c3
   - [PR #44](https://github.com/caxlsx/caxlsx/pull/44) - Improve cell autowidth calculations. Previously columns with undefined/auto width would tend to be just slightly too small for the content. This is because certain letters were being excluded from the width calculation because they were deemed not wide enough. We now treat all characters as equal width which helps ensure columns auto-widths are actually large enough for the content. This will gain us a very slight performance improvement because of we are no longer searching the string for specific characters.
+  - [PR #40](https://github.com/caxlsx/caxlsx/pull/40) - Escape special characters in charts
+  - [PR #34](https://github.com/caxlsx/caxlsx/pull/34) - Add option to protect against csv injection attacks
 
 - **October.4.19**: 3.0.1
   - Support for ruby versions limited to officially supported version (Ruby v2.3+)

data/README.md

@@ -1,13 +1,12 @@
 # Caxlsx (Community Continued Version)
-[![Build Status](https://travis-ci.com/caxlsx/caxlsx.svg?branch=master)](https://travis-ci.com/caxlsx/caxlsx)
-[![Gem
-Version](https://badge.fury.io/rb/caxlsx.svg)](http://badge.fury.io/rb/caxlsx)
+[![Build Status](https://github.com/caxlsx/caxlsx/workflows/Test/badge.svg)](https://github.com/caxlsx/caxlsx/actions)
+[![Gem Version](https://badge.fury.io/rb/caxlsx.svg)](http://badge.fury.io/rb/caxlsx)
 ![Total downloads](http://ruby-gem-downloads-badge.herokuapp.com/caxlsx?type=total)
-![Downloads for 3.1.1 (latest)](http://ruby-gem-downloads-badge.herokuapp.com/caxlsx/3.1.1?label=downloads%203.1.1)
+![Downloads for 3.3.0 (latest)](http://ruby-gem-downloads-badge.herokuapp.com/caxlsx/3.3.0?label=downloads%203.3.0)
 
 ## Notice: Community Axlsx Organization
 
-To better maintain the Axlsx ecosystem, all related gems have been forked or moved to the following community organization: 
+To better maintain the Axlsx ecosystem, all related gems have been forked or moved to the following community organization:
 
 http://github.com/caxlsx
 
@@ -120,8 +119,6 @@ Currently the following additional gems are available:
   * Provides a `.axlsx` renderer to Rails so you can move all your spreadsheet code from your controller into view files.
 - [activeadmin-caxlsx](https://github.com/caxlsx/activeadmin-caxlsx)
   * An Active Admin plugin that includes DSL to create downloadable reports.
-- [axlsx_styler](https://github.com/axlsx-styler-gem/axlsx_styler)
-  * Allows you to build clean and maintainable styles for your axlsx spreadsheets. Build your spreadsheeet with data and then apply styles later.
 
 ## Known Software Interoperability Issues
 
@@ -155,10 +152,6 @@ p.use_shared_strings = true
 p.serialize('simple.xlsx')
 ```
 
-## Known Bugs
-
-There’s a [list of known bugs](https://github.com/caxlsx/caxlsx/issues?q=label%3A%22known+bug%22). (If you want to contribute to caxlsx, this is a good place to start!)
-
 ## Contributing
 
 See [CONTRIBUTING.md](https://github.com/caxlsx/caxlsx/blob/master/CONTRIBUTING.md)

data/lib/axlsx/content_type/abstract_content_type.rb

@@ -24,7 +24,7 @@ module Axlsx
     # Serialize the contenty type to xml
     def to_xml_string(node_name = '', str = '')
       str << "<#{node_name} "
-      str << instance_values.map { |key, value| Axlsx::camel(key) << '="' << value.to_s << '"' }.join(' ')
+      str << Axlsx.instance_values_for(self).map { |key, value| Axlsx::camel(key) << '="' << value.to_s << '"' }.join(' ')
       str << '/>'
     end
 

data/lib/axlsx/doc_props/app.rb

@@ -223,7 +223,7 @@ module Axlsx
     def to_xml_string(str = '')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
       str << ('<Properties xmlns="' << APP_NS << '" xmlns:vt="' << APP_NS_VT << '">')
-      instance_values.each do |key, value|
+      Axlsx.instance_values_for(self).each do |key, value|
         node_name = Axlsx.camel(key)
         str << "<#{node_name}>#{value}</#{node_name}>"
       end

data/lib/axlsx/drawing/chart.rb

@@ -14,6 +14,8 @@ module Axlsx
     # @option options [Symbol] legend_position
     # @option options [Array|String|Cell] start_at The X, Y coordinates defining the top left corner of the chart.
     # @option options [Array|String|Cell] end_at The X, Y coordinates defining the bottom right corner of the chart.
+    # @option options [Boolean] plot_visible_only (true) Whether only data from visible cells should be plotted.
+    # @option options [Boolean] rounded_corners (true) Whether the chart area shall have rounded corners.
     def initialize(frame, options={})
       @style = 18
       @view_3D = nil
@@ -26,6 +28,8 @@ module Axlsx
       @series_type = Series
       @title = Title.new
       @bg_color = nil
+      @plot_visible_only = true
+      @rounded_corners = true
       parse_options options
       start_at(*options[:start_at]) if options[:start_at]
       end_at(*options[:end_at]) if options[:end_at]
@@ -98,6 +102,14 @@ module Axlsx
     # @return [String]
     attr_reader :bg_color
 
+    # Whether only data from visible cells should be plotted.
+    # @return [Boolean]
+    attr_reader :plot_visible_only
+
+    # Whether the chart area shall have rounded corners.
+    # @return [Boolean]
+    attr_reader :rounded_corners
+
     # The relationship object for this chart.
     # @return [Relationship]
     def relationship
@@ -180,6 +192,16 @@ module Axlsx
       @bg_color = v
     end
 
+    # Whether only data from visible cells should be plotted.
+    # @param [Boolean] v
+    # @return [Boolean]
+    def plot_visible_only=(v) Axlsx::validate_boolean(v); @plot_visible_only = v; end
+
+    # Whether the chart area shall have rounded corners.
+    # @param [Boolean] v
+    # @return [Boolean]
+    def rounded_corners=(v) Axlsx::validate_boolean(v); @rounded_corners = v; end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
@@ -187,9 +209,10 @@ module Axlsx
       str << '<?xml version="1.0" encoding="UTF-8"?>'
       str << ('<c:chartSpace xmlns:c="' << XML_NS_C << '" xmlns:a="' << XML_NS_A << '" xmlns:r="' << XML_NS_R << '">')
       str << ('<c:date1904 val="' << Axlsx::Workbook.date1904.to_s << '"/>')
+      str << ('<c:roundedCorners val="' << rounded_corners.to_s << '"/>')
       str << ('<c:style val="' << style.to_s << '"/>')
       str << '<c:chart>'
-      @title.to_xml_string str
+      @title.to_xml_string(str) unless @title.empty?
       str << ('<c:autoTitleDeleted val="' << (@title == nil).to_s << '"/>')
       @view_3D.to_xml_string(str) if @view_3D
       str << '<c:floor><c:thickness val="0"/></c:floor>'
@@ -206,7 +229,7 @@ module Axlsx
         str << '<c:overlay val="0"/>'
         str << '</c:legend>'
       end
-      str << '<c:plotVisOnly val="1"/>'
+      str << ('<c:plotVisOnly val="' << @plot_visible_only.to_s << '"/>')
       str << ('<c:dispBlanksAs val="' << display_blanks_as.to_s << '"/>')
       str << '<c:showDLblsOverMax val="1"/>'
       str << '</c:chart>'

data/lib/axlsx/drawing/d_lbls.rb

@@ -71,9 +71,10 @@ module Axlsx
     def to_xml_string(str = '')
       validate_attributes_for_chart_type
       str << '<c:dLbls>'
+      instance_vals = Axlsx.instance_values_for(self)
       %w(d_lbl_pos show_legend_key show_val show_cat_name show_ser_name show_percent show_bubble_size show_leader_lines).each do |key|
-        next unless instance_values.keys.include?(key) && instance_values[key] != nil
-        str <<  "<c:#{Axlsx::camel(key, false)} val='#{instance_values[key]}' />" 
+        next unless instance_vals.keys.include?(key) && instance_vals[key] != nil
+        str <<  "<c:#{Axlsx::camel(key, false)} val='#{instance_vals[key]}' />" 
       end
       str << '</c:dLbls>'
     end

data/lib/axlsx/drawing/scatter_series.rb

@@ -28,6 +28,14 @@ module Axlsx
     # @return [Boolean]
     attr_reader :smooth
 
+    # Line markers presence
+    # @return [Boolean]
+    attr_reader :show_marker
+
+    # custom marker symbol
+    # @return [String]
+    attr_reader :marker_symbol
+
     # Creates a new ScatterSeries
     def initialize(chart, options={})
       @xData, @yData = nil
@@ -40,6 +48,9 @@ module Axlsx
         @smooth = options[:smooth]
       end
       @ln_width = options[:ln_width] unless options[:ln_width].nil?
+      @show_marker = [:lineMarker, :marker, :smoothMarker].include?(chart.scatter_style)
+      @marker_symbol = :default
+
       super(chart, options)
       @xData = AxDataSource.new(:tag_name => :xVal, :data => options[:xData]) unless options[:xData].nil?
       @yData = NumDataSource.new({:tag_name => :yVal, :data => options[:yData]}) unless options[:yData].nil?
@@ -61,6 +72,12 @@ module Axlsx
       @ln_width = v
     end
 
+    # @see marker_symbol
+    def marker_symbol=(v)
+      Axlsx::validate_marker_symbol(v)
+      @marker_symbol = v
+    end
+
     # Serializes the object
     # @param [String] str
     # @return [String]
@@ -81,8 +98,12 @@ module Axlsx
           str << '<a:ln><a:solidFill>'
           str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>')
           str << '</c:spPr>'
+          str << marker_symbol_xml
           str << '</c:marker>'
+        else
+          str << "<c:marker>#{marker_symbol_xml}</c:marker>"
         end
+
         if ln_width
           str << '<c:spPr>'
           str << '<a:ln w="' << ln_width.to_s << '"/>'
@@ -94,5 +115,15 @@ module Axlsx
       end
       str
     end
+
+    private
+
+    def marker_symbol_xml
+      if !@show_marker
+        '<c:symbol val="none"/>'
+      elsif @marker_symbol != :default
+        '<c:symbol val="' + @marker_symbol.to_s + '"/>'
+      end.to_s
+    end
   end
 end

data/lib/axlsx/drawing/title.rb

@@ -51,6 +51,16 @@ module Axlsx
       v
     end
 
+    # Check if the title is empty.
+    #
+    # A title is considered empty if it is an empty string. If the title references a cell it is *not* empty,
+    # even if the referenced cell is blank (because the cell’s value could still change later).
+    #
+    # @return [Boolean]
+    def empty?
+      @text.empty? && @cell.nil?
+    end
+
     # Not implemented at this time.
     #def layout=(v) DataTypeValidator.validate 'Title.layout', Layout, v; @layout = v; end
     #def overlay=(v) Axlsx::validate_boolean v; @overlay=v; end
@@ -61,7 +71,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<c:title>'
-      unless @text.empty?
+      unless empty?
         clean_value = Axlsx::trust_input ? @text.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@text.to_s))
         str << '<c:tx>'
         if @cell.is_a?(Cell)

data/lib/axlsx/drawing/view_3D.rb

@@ -107,7 +107,7 @@ module Axlsx
     private
     # Note: move this to Axlsx module if we find the smae pattern elsewhere.
     def element_for_attribute(name, namespace='')
-      val = instance_values[name]
+      val = Axlsx.instance_values_for(self)[name]
       return "" if val == nil
       "<%s:%s val='%s'/>" % [namespace, Axlsx::camel(name, false), val]
     end

data/lib/axlsx/package.rb

@@ -99,8 +99,12 @@ module Axlsx
     #
     #   # Serialize to a stream
     #   s = p.to_stream()
-    #   File.open('example_streamed.xlsx', 'w') { |f| f.write(s.read) }
+    #   File.open('example_streamed.xlsx', 'wb') { |f| f.write(s.read) }
     def serialize(output, options = {}, secondary_options = nil)
+      if !workbook.styles_applied
+        workbook.apply_styles 
+      end
+
       confirm_valid, zip_command = parse_serialize_options(options, secondary_options)
       return false unless !confirm_valid || self.validate.empty?
       zip_provider = if zip_command
@@ -122,9 +126,13 @@ module Axlsx
     # @param [Boolean] confirm_valid Validate the package prior to serialization.
     # @return [StringIO|Boolean] False if confirm_valid and validation errors exist. rewound string IO if not.
     def to_stream(confirm_valid=false)
+      if !workbook.styles_applied
+        workbook.apply_styles 
+      end
+
       return false unless !confirm_valid || self.validate.empty?
       Relationship.initialize_ids_cache
-      zip = write_parts(Zip::OutputStream.new(StringIO.new, true))
+      zip = write_parts(Zip::OutputStream.new(StringIO.new.binmode, true))
       stream = zip.close_buffer
       stream.rewind
       stream
@@ -206,12 +214,10 @@ module Axlsx
     # @private
     def parts
       parts = [
-       {:entry => RELS_PN, :doc => relationships, :schema => RELS_XSD},
        {:entry => "xl/#{STYLES_PN}", :doc => workbook.styles, :schema => SML_XSD},
        {:entry => CORE_PN, :doc => @core, :schema => CORE_XSD},
        {:entry => APP_PN, :doc => @app, :schema => APP_XSD},
        {:entry => WORKBOOK_RELS_PN, :doc => workbook.relationships, :schema => RELS_XSD},
-       {:entry => CONTENT_TYPES_PN, :doc => content_types, :schema => CONTENT_TYPES_XSD},
        {:entry => WORKBOOK_PN, :doc => workbook, :schema => SML_XSD}
       ]
 
@@ -256,7 +262,11 @@ module Axlsx
       end
 
       # Sort parts for correct MIME detection
-      parts.sort_by { |part| part[:entry] }
+      [
+        {:entry => CONTENT_TYPES_PN, :doc => content_types, :schema => CONTENT_TYPES_XSD},
+        {:entry => RELS_PN, :doc => relationships, :schema => RELS_XSD},
+        *(parts.sort_by { |part| part[:entry] }.reverse)
+      ]
     end
 
     # Performs xsd validation for a signle document

data/lib/axlsx/rels/relationship.rb

@@ -103,7 +103,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-      h = self.instance_values.reject{|k, _| k == "source_obj"}
+      h = Axlsx.instance_values_for(self).reject{|k, _| k == "source_obj"}
       str << '<Relationship '
       str << (h.map { |key, value| '' << key.to_s << '="' << Axlsx::coder.encode(value.to_s) << '"'}.join(' '))
       str << '/>'

data/lib/axlsx/stylesheet/border.rb

@@ -6,6 +6,8 @@ module Axlsx
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
 
+    EDGES = [:left, :right, :top, :bottom].freeze
+
     # Creates a new Border object
     # @option options [Boolean] diagonal_up
     # @option options [Boolean] diagonal_down

data/lib/axlsx/stylesheet/font.rb

@@ -147,7 +147,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<font>'
-      instance_values.each do |k, v|
+      Axlsx.instance_values_for(self).each do |k, v|
         v.is_a?(Color) ? v.to_xml_string(str) : (str << ('<' << k.to_s << ' val="' << Axlsx.booleanize(v).to_s << '"/>'))
       end
       str << '</font>'

data/lib/axlsx/stylesheet/styles.rb

@@ -120,6 +120,10 @@ module Axlsx
       load_default_styles
     end
 
+    def style_index
+      @style_index ||= {}
+    end
+
     # Drastically simplifies style creation and management.
     # @return [Integer]
     # @option options [String] fg_color The text color
@@ -156,7 +160,7 @@ module Axlsx
     #   ws.add_row ["Least Popular Pets"]
     #   ws.add_row ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
     #   ws.add_row ["Votes", 6, 4, 1], :style=>Axlsx::STYLE_THIN_BORDER
-    #   f = File.open('example_you_got_style.xlsx', 'w')
+    #   f = File.open('example_you_got_style.xlsx', 'wb')
     #   p.serialize(f)
     #
     # @example Styling specifically
@@ -190,7 +194,7 @@ module Axlsx
     #   ws.add_row ["Q2", 3000, 30], :style=>[title, currency, percent]
     #   ws.add_row ["Q3", 1000, 10], :style=>[title, currency, percent]
     #   ws.add_row ["Q4", 2000, 20], :style=>[title, currency, percent]
-    #   f = File.open('example_you_got_style.xlsx', 'w')
+    #   f = File.open('example_you_got_style.xlsx', 'wb')
     #   p.serialize(f)
     #
     # @example Differential styling
@@ -216,14 +220,39 @@ module Axlsx
     #   ws.add_row ["Q4", 2000, 20], :style=>[title, currency, percent]
     #
     #   ws.add_conditional_formatting("A1:A7", { :type => :cellIs, :operator => :greaterThan, :formula => "2000", :dxfId => profitable, :priority => 1 })
-    #   f = File.open('example_differential_styling', 'w')
+    #   f = File.open('example_differential_styling', 'wb')
     #   p.serialize(f)
     #
+    # An index for cell styles where keys are styles codes as per Axlsx::Style and values are Cell#raw_style
+    # The reason for the backward key/value ordering is that style lookup must be most efficient, while `add_style` can be less efficient
     def add_style(options={})
       # Default to :xf
       options[:type] ||= :xf
+
       raise ArgumentError, "Type must be one of [:xf, :dxf]" unless [:xf, :dxf].include?(options[:type] )
 
+      if options[:border].is_a?(Hash) && options[:border][:edges] == :all
+        options[:border][:edges] = Axlsx::Border::EDGES
+      end
+
+      if options[:type] == :xf
+        # Check to see if style in cache already
+        
+        font_defaults = {name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family} 
+
+        raw_style = {type: :xf}.merge(font_defaults).merge(options)
+
+        if raw_style[:format_code]
+          raw_style.delete(:num_fmt)
+        end
+
+        xf_index = style_index.key(raw_style)
+
+        if xf_index
+          return xf_index
+        end
+      end
+
       fill = parse_fill_options options
       font = parse_font_options options
       numFmt = parse_num_fmt_options options
@@ -238,7 +267,18 @@ module Axlsx
         style = Xf.new :fillId=>fill || 0, :fontId=>font || 0, :numFmtId=>numFmt || 0, :borderId=>border || 0, :alignment => alignment, :protection => protection, :applyFill=>!fill.nil?, :applyFont=>!font.nil?, :applyNumberFormat =>!numFmt.nil?, :applyBorder=>!border.nil?, :applyAlignment => !alignment.nil?, :applyProtection => !protection.nil?
       end
 
-      options[:type] == :xf ? cellXfs << style : dxfs << style
+      if options[:type] == :xf
+        xf_index = (cellXfs << style)
+
+        # Add styles to style_index cache for re-use
+        style_index[xf_index] = raw_style
+
+        return xf_index
+      else
+        dxf_index = (dxfs << style)
+
+        return dxf_index
+      end
     end
 
     # parses add_style options for protection styles
@@ -279,7 +319,7 @@ module Axlsx
     # @return [Font|Integer]
     def parse_font_options(options={})
       return if (options.keys & [:fg_color, :sz, :b, :i, :u, :strike, :outline, :shadow, :charset, :family, :font_name]).empty?
-      fonts.first.instance_values.each do |key, value|
+      Axlsx.instance_values_for(fonts.first).each do |key, value|
         # Thanks for that 1.8.7 - cant do a simple merge...
         options[key.to_sym] = value unless options.keys.include?(key.to_sym)
       end
@@ -310,33 +350,108 @@ module Axlsx
     # may include an :edges entry that references an array of symbols identifying which border edges 
     # you wish to apply the style or any other valid Border initializer options.
     # If the :edges entity is not provided the style is applied to all edges of cells that reference this style.
-	# Also available :border_top, :border_right, :border_bottom and :border_left options with :style and/or :color 
-	# key-value entries, which override :border values.
+    # Also available :border_top, :border_right, :border_bottom and :border_left options with :style and/or :color 
+    # key-value entries, which override :border values.
     # @example
     #   #apply a thick red border to the top and bottom
     #   { :border => { :style => :thick, :color => "FFFF0000", :edges => [:top, :bottom] }
     # @return [Border|Integer]
     def parse_border_options(options={})
-      return unless options[:border]
-      b_opts = options[:border]
-      if b_opts.is_a?(Hash)
-        raise ArgumentError, (ERR_INVALID_BORDER_OPTIONS % b_opts) unless b_opts.keys.include?(:style) && b_opts.keys.include?(:color)
-        border = Border.new b_opts
-        (b_opts[:edges] || [:left, :right, :top, :bottom]).each do |edge|
-          edge_options = options["border_#{edge}".to_sym] || {}
-          border_edge = b_opts.merge(edge_options)
-          b_options = { :name => edge, :style => border_edge[:style], :color => Color.new(:rgb => border_edge[:color]) }
-          border.prs << BorderPr.new(b_options)
+      if options[:border].nil? && Border::EDGES.all?{|x| options["border_#{x}".to_sym].nil? }
+        return nil
+      end
+
+      if options[:border].is_a?(Integer)
+        if options[:border] >= borders.size
+          raise ArgumentError, (ERR_INVALID_BORDER_ID % options[:border])
         end
-        options[:type] == :dxf ? border : borders << border
-      elsif b_opts.is_a? Integer
-        raise ArgumentError, (ERR_INVALID_BORDER_ID % b_opts) unless b_opts < borders.size
+
         if options[:type] == :dxf
-          borders[b_opts].clone
+          return borders[options[:border]].clone
+        else
+          return options[:border]
+        end
+      end
+
+      validate_border_hash = ->(val){
+        if !(val.keys.include?(:style) && val.keys.include?(:color))
+          raise ArgumentError, (ERR_INVALID_BORDER_OPTIONS % options[:border])
+        end
+      }
+
+      borders_array = []
+
+      if options[:border].nil?
+        base_border_opts = {}
+      else
+        if options[:border].is_a?(Array)
+          borders_array += options[:border]
+
+          base_border_opts = {}
+
+          options[:border].each do |b_opts|
+            if b_opts[:edges].nil?
+              base_border_opts = base_border_opts.merge(b_opts)
+            end
+          end
         else
-          border = b_opts
+          borders_array << options[:border]
+
+          base_border_opts = options[:border]
+
+          validate_border_hash.call(base_border_opts)
+        end
+      end
+
+      Border::EDGES.each do |edge|
+        val = options["border_#{edge}".to_sym]
+
+        if val
+          borders_array << val.merge(edges: [edge])
         end
       end
+
+      border = Border.new(base_border_opts)
+
+      Border::EDGES.each do |edge|
+        edge_b_opts = base_border_opts
+
+        skip_edge = true
+
+        borders_array.each do |b_opts|
+          if b_opts[:edges] && b_opts[:edges].include?(edge)
+            edge_b_opts = edge_b_opts.merge(b_opts)
+            skip_edge = false
+          end
+        end
+
+        if options["border_#{edge}".to_sym]
+          edge_b_opts = edge_b_opts.merge(options["border_#{edge}".to_sym])
+          skip_edge = false
+        end
+
+        if skip_edge && base_border_opts[:edges]
+          next
+        end
+
+        if !edge_b_opts.empty?
+          if base_border_opts.empty?
+            validate_border_hash.call(edge_b_opts)
+          end
+
+          border.prs << BorderPr.new({
+            :name => edge, 
+            :style => edge_b_opts[:style], 
+            :color => Color.new(:rgb => edge_b_opts[:color]) },
+          )
+        end
+      end
+
+      if options[:type] == :dxf
+        return border
+      else
+        return borders << border
+      end
     end
 
     # Parses Style#add_style options for number formatting.
@@ -363,8 +478,9 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << ('<styleSheet xmlns="' << XML_NS << '">')
+      instance_vals = Axlsx.instance_values_for(self)
       [:numFmts, :fonts, :fills, :borders, :cellStyleXfs, :cellXfs, :cellStyles, :dxfs, :tableStyles].each do |key|
-        self.instance_values[key.to_s].to_xml_string(str) unless self.instance_values[key.to_s].nil?
+        instance_vals[key.to_s].to_xml_string(str) unless instance_vals[key.to_s].nil?
       end
       str << '</styleSheet>'
     end
@@ -417,4 +533,3 @@ module Axlsx
     end
   end
 end
-