quarantine 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffb721a4514eda413ea4c096913b5d0c3a672b23fe6aefee44393062f202e453
-  data.tar.gz: eec03b0ec1533643ae86245e76a69b51fdbf871e6e621293fa542b1b252fc123
+  metadata.gz: 3c4a41e99736f29fd49d864c842b1ecb87ac0fe514bd887176b97f13d49761cd
+  data.tar.gz: f36d408661b7cce88e7d4cffd0a6214ad937f452479bd8e706cdbcd03ee3d9f0
 SHA512:
-  metadata.gz: 67f36af412a0f1b23aaa018402e81b087f9595d3257726aac3b4e6472f232a498be52d683fd6b0216f652ad3f2b702d6a5f582de70a62a8fb25fc29ec5a21df1
-  data.tar.gz: 3aabf31b49b00cded2af25bac1b8d9f3c1c1bb89a202689a87ded5e23369fb6e4d32b82f664d3c4d3b1f314cae02f34dc80ca0a0380e6c034466e7ae8ec15300
+  metadata.gz: c06c78fa1741d68ebfbc1c3a88b02d30391465f532f4a4597e3625b4379924ed0852518b1d11c79ae09b0248396a579b26fce8b9cc03a8c6203bb71513c56055
+  data.tar.gz: 61cc08f36624613bd9a1250926216b7ea60b3847ab505881974b710035a76c22a43159e3a7735a1360d59f4f31ada5cd99c3da9eb99338bca66e5432a1726f2b

data/lib/quarantine/databases/google_sheets.rb

@@ -35,7 +35,8 @@ class Quarantine
         new_rows = []
 
         # Map existing ID to row index
-        indexes = Hash[parse_rows(worksheet).each_with_index.map { |item, idx| [item['id'], idx] }]
+        parsed_rows = parse_rows(worksheet)
+        indexes = Hash[parsed_rows.each_with_index.map { |item, idx| [item['id'], idx] }]
 
         items.each do |item|
           cells = headers.map { |header| item[header].to_s }
@@ -51,7 +52,7 @@ class Quarantine
         end
 
         # Insert any items whose IDs weren't found in existing rows at the end
-        worksheet.insert_rows(worksheet.rows.count + 1, new_rows)
+        worksheet.insert_rows(parsed_rows.count + 2, new_rows)
         worksheet.save
       end
 
@@ -98,9 +99,11 @@ class Quarantine
         rows.map do |row|
           hash_row = Hash[headers.zip(row)]
           # TODO: use Google Sheets developer metadata to store type information
-          hash_row['extra_attributes'] = JSON.parse(hash_row['extra_attributes']) if hash_row['extra_attributes']
-          hash_row
-        end
+          unless hash_row['id'].empty?
+            hash_row['extra_attributes'] = JSON.parse(hash_row['extra_attributes']) if hash_row['extra_attributes']
+            hash_row
+          end
+        end.compact
       end
     end
   end

data/lib/quarantine/version.rb

@@ -1,3 +1,3 @@
 class Quarantine
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quarantine
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Flexport Engineering, Eric Zhu