Remove active_support dependency from axlsx_styler

3 files changed, 28 insertions, 6 deletions

diff --git a/lib/axlsx.rb b/lib/axlsx.rb
index f2403893..c30fcf26 100644
--- a/lib/axlsx.rb
+++ b/lib/axlsx.rb
@@ -166,6 +166,19 @@ module Axlsx
     end
   end
 
+  # utility method for performing a deep merge on a Hash
+  # @param [Hash] Hash to merge into
+  # @param [Hash] Hash to be added
+  def self.hash_deep_merge(first_hash, second_hash)
+    first_hash.merge(second_hash) do |key, this_val, other_val|
+      if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+        Axlsx.hash_deep_merge(this_val, other_val)
+      else
+        other_val
+      end
+    end
+  end
+
   # Instructs the serializer to not try to escape cell value input.
   # This will give you a huge speed bonus, but if you content has <, > or other xml character data
   # the workbook will be invalid and excel will complain.
diff --git a/lib/axlsx/workbook/workbook.rb b/lib/axlsx/workbook/workbook.rb
index f9e857fc..417e15a3 100644
--- a/lib/axlsx/workbook/workbook.rb
+++ b/lib/axlsx/workbook/workbook.rb
@@ -196,7 +196,6 @@ require 'axlsx/workbook/worksheet/selection.rb'
 
     # A helper to apply styles that were added using `worksheet.add_style`
     # @return [Boolean]
-    require 'active_support/core_ext/hash/deep_merge' ### TODO: keep or replace with local solution
     def apply_styles
       return false if !styled_cells
 
@@ -204,7 +203,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
         current_style = styles.style_index[cell.style]
 
         if current_style
-          new_style = current_style.deep_merge(cell.raw_style)
+          new_style = Axlsx.hash_deep_merge(current_style, cell.raw_style)
         else
           new_style = cell.raw_style
         end
@@ -419,5 +418,18 @@ require 'axlsx/workbook/worksheet/selection.rb'
       str << '</workbook>'
     end
 
+    private
+
+    # Utility method for performing a deep merge on a Hash
+    def hash_deep_merge(first_hash, second_hash)
+      first_hash.merge(second_hash) do |key, this_val, other_val|
+        if this_val.is_a?(Hash) && other_val.is_a?(Hash)
+          this_val.deep_merge(other_val, &block)
+        else
+          other_val
+        end
+      end
+    end
+
   end
 end
diff --git a/lib/axlsx/workbook/worksheet/cell.rb b/lib/axlsx/workbook/worksheet/cell.rb
index 626cf60f..9ab93e61 100644
--- a/lib/axlsx/workbook/worksheet/cell.rb
+++ b/lib/axlsx/workbook/worksheet/cell.rb
@@ -84,7 +84,6 @@ module Axlsx
 
     attr_accessor :raw_style
 
-    require 'active_support/core_ext/hash/deep_merge' ### TODO: can/should we remove this dependency
     # The index of the cellXfs item to be applied to this cell.
     # @param [Hash] styles
     # @see Axlsx::Styles
@@ -92,9 +91,7 @@ module Axlsx
     def add_style(style)
       self.raw_style ||= {}
 
-      # using deep_merge from active_support:
-      # with regular Hash#merge adding borders fails miserably
-      new_style = raw_style.deep_merge(style)
+      new_style = Axlsx.hash_deep_merge(raw_style, style)
 
       all_edges = [:top, :right, :bottom, :left]