From a049b7048724c760488b94aa030310de89ab8a9e Mon Sep 17 00:00:00 2001
From: Michael Ball <cycomachead@gmail.com>
Date: Thu, 1 Apr 2021 15:05:47 -0700
Subject: [PATCH] Update axlsx to caxlsx for mimemagic changes

---
 Gemfile      |  4 ++--
 Gemfile.lock | 25 ++++++++++---------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 87a01972..06e7a17d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -138,8 +138,8 @@ gem 'prawn-rails'
 gem 'rqrcode'
 
 # to render XLS spreadsheets
-gem 'axlsx', git: 'https://github.com/randym/axlsx.git'
-gem 'axlsx_rails'
+gem 'caxlsx'
+gem 'caxlsx_rails'
 
 gem 'sentry-delayed_job'
 gem 'sentry-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 14699cc7..859064e5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,3 @@
-GIT
-  remote: https://github.com/randym/axlsx.git
-  revision: c593a08b2a929dac7aa8dc418b55e26b4c49dc34
-  specs:
-    axlsx (3.0.0.pre)
-      htmlentities (~> 4.3, >= 4.3.4)
-      mimemagic (~> 0.3)
-      nokogiri (~> 1.8, >= 1.8.2)
-      rubyzip (~> 1.2, >= 1.2.1)
-
 GEM
   remote: https://rubygems.org/
   remote: https://rails-assets.org/
@@ -82,9 +72,6 @@ GEM
     awesome_nested_set (3.4.0)
       activerecord (>= 4.0.0, < 7.0)
     aws_cf_signer (0.1.3)
-    axlsx_rails (0.5.2)
-      actionpack (>= 3.1)
-      axlsx (>= 2.0.1)
     bcrypt (3.1.16)
     bindex (0.6.0)
     bootstrap-sass (3.4.1)
@@ -118,6 +105,14 @@ GEM
       fastimage
     case_transform (0.2)
       activesupport
+    caxlsx (3.1.0)
+      htmlentities (~> 4.3, >= 4.3.4)
+      marcel (~> 1.0)
+      nokogiri (~> 1.10, >= 1.10.4)
+      rubyzip (>= 1.3.0, < 3)
+    caxlsx_rails (0.6.2)
+      actionpack (>= 3.1)
+      caxlsx (>= 3.0)
     chartkick (3.4.2)
     childprocess (3.0.0)
     chronic (0.10.2)
@@ -679,8 +674,6 @@ DEPENDENCIES
   annotate
   autoprefixer-rails
   awesome_nested_set
-  axlsx!
-  axlsx_rails
   bootstrap-sass (~> 3.4.0)
   bootstrap-switch-rails (~> 3.0.0)
   bootstrap3-datetimepicker-rails (~> 4.17.47)
@@ -689,6 +682,8 @@ DEPENDENCIES
   capybara
   carrierwave
   carrierwave-bombshelter
+  caxlsx
+  caxlsx_rails
   chartkick
   climate_control
   cloudinary