From 1a81a99ff0c61236eefd45dd29e18a3d1bc211a0 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Tue, 19 Dec 2017 16:17:11 +0100
Subject: [PATCH] Remove Creek XLSX parser gem as it causes conflicts
 [SCI-1891]

---
 Gemfile                            |  3 +--
 Gemfile.lock                       | 12 ++++--------
 app/services/spreadsheet_parser.rb |  4 ++--
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index a6faa99e0..2880c5b9a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,6 @@ gem 'commit_param_routing' # Enables different submit actions in the same form t
 gem 'kaminari'
 gem 'i18n-js', '~> 3.0' # Localization in javascript files
 gem 'roo', '~> 2.7.1' # Spreadsheet parser
-gem 'creek'
 gem 'wicked_pdf'
 gem 'silencer' # Silence certain Rails logs
 gem 'wkhtmltopdf-heroku'
@@ -59,7 +58,7 @@ gem 'remotipart', '~> 1.2' # Async file uploads
 gem 'faker' # Generate fake data
 gem 'auto_strip_attributes', '~> 2.1' # Removes unnecessary whitespaces from ActiveRecord or ActiveModel attributes
 gem 'deface', '~> 1.0'
-gem 'nokogiri' # HTML/XML parser
+gem 'nokogiri', '~> 1.8.1' # HTML/XML parser
 gem 'sneaky-save', git: 'https://github.com/einzige/sneaky-save'
 gem 'rails_autolink', '~> 1.1', '>= 1.1.6'
 gem 'delayed_paperclip',
diff --git a/Gemfile.lock b/Gemfile.lock
index e199e4a57..501eeab73 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -123,9 +123,6 @@ GEM
     commit_param_routing (0.0.1)
     concurrent-ruby (1.0.5)
     crass (1.0.3)
-    creek (1.1.2)
-      nokogiri (~> 1.6.0)
-      rubyzip (>= 1.0.0)
     cucumber (3.1.0)
       builder (>= 2.1.2)
       cucumber-core (~> 3.1.0)
@@ -247,7 +244,7 @@ GEM
     mime-types (1.25.1)
     mimemagic (0.3.0)
     mini_mime (1.0.0)
-    mini_portile2 (2.1.0)
+    mini_portile2 (2.3.0)
     minitest (5.10.3)
     minitest-reporters (1.1.19)
       ansi
@@ -263,8 +260,8 @@ GEM
       jquery-rails
       rails (>= 3.2.0)
     newrelic_rpm (4.6.0.338)
-    nokogiri (1.6.8.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     nokogumbo (1.4.13)
       nokogiri
     oj (2.18.5)
@@ -482,7 +479,6 @@ DEPENDENCIES
   byebug
   capybara
   commit_param_routing
-  creek
   cucumber-rails
   database_cleaner
   deface (~> 1.0)
@@ -511,7 +507,7 @@ DEPENDENCIES
   momentjs-rails (>= 2.9.0)
   nested_form_fields
   newrelic_rpm
-  nokogiri
+  nokogiri (~> 1.8.1)
   omniauth
   paperclip (~> 4.3)
   pg
diff --git a/app/services/spreadsheet_parser.rb b/app/services/spreadsheet_parser.rb
index 3d5a64774..73e04b119 100644
--- a/app/services/spreadsheet_parser.rb
+++ b/app/services/spreadsheet_parser.rb
@@ -20,8 +20,8 @@ class SpreadsheetParser
     when '.xlsx'
       # Roo Excel parcel was replaced with Creek, but it can be enabled back,
       # just swap lines below. But only one can be enabled at the same time.
-      # Roo::Excelx.new(file_path)
-      Creek::Book.new(file_path).sheets[0]
+      Roo::Excelx.new(file_path)
+      # Creek::Book.new(file_path).sheets[0]
     else
       raise TypeError
     end