berkeley_library-holdings 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3eb22100a823f3b72627e1298176ff71d2f03a1a73262018b2739d43fcceded1
-  data.tar.gz: 128191b7233193db6135bb5d9229f71ffe017c945261047203d6a1f9734c9cb5
+  metadata.gz: e63c750942749c07b981b702ef360b3c554f3e63107d47821dd0872ed6676c28
+  data.tar.gz: e9a80f67dff1895124ff50813bd594a109ab8e84a7e8d0825248917dcf1b3501
 SHA512:
-  metadata.gz: e7ee7b5b3178c507f6e7e937d56d9b0fe48cfbe6116ce12a29343e3ed4d9155803b14fdca813e5a0a967856033e45e7051687915c90f3ea371e5d36ca817719e
-  data.tar.gz: 2bfe0f25c2f0375f4b95f78a49440a56688473ac5cd68ddea3c3e492df72662955762749ffa87b0ee0e53c13dc1b214525645a4bf5bd18241681c0455b61f701
+  metadata.gz: db655747b51ef598e41b6bc4411452e912558af91d81a1c7067c1204f5a0eb3113dfeb8cec8d1f31454251914280c58ec08cfe9c1ebe3c9f5ec0a8d4ee9c906b
+  data.tar.gz: 9f573016a2ef9bd89411513c6007dd14ab4dbf701ce7a81cf14bbad4a8cd3db5fba0494575c8980bcc53a498c10c3364c9b2c385472968246f78fdc3cba2f0b8

data/CHANGES.md

@@ -0,0 +1,19 @@
+# 1.0.3 (2023-04-27)
+
+- Fix issue requiring RubyXL extensions to be explicitly required 
+
+# 1.0.2 (2023-04-27)
+
+- Overwrite existing blank columns when writing results to spreadsheet
+
+# 1.0.1 (2023-04-26)
+
+- First working RubyGems release
+
+# 1.0.0 (2023-04-25)
+
+- Initial (broken) RubyGems release
+
+# 0.1.0 (2023-02-24)
+
+- Initial release

data/lib/berkeley_library/holdings/module_info.rb

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'Holdings-related utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'A collection of holdings-related utilities for the UC Berkeley Library'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '1.0.1'.freeze
+      VERSION = '1.0.3'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/holdings'.freeze
     end
   end

data/lib/berkeley_library/util/xlsx/rubyxl_cell_extensions.rb

@@ -0,0 +1,31 @@
+require 'rubyXL'
+
+module BerkeleyLibrary
+  module Util
+    module XLSX
+      module RubyXLCellExtensions
+        # Workaround for https://github.com/weshatheleopard/rubyXL/issues/441
+        def initialize(params = nil)
+          super
+
+          return unless params.respond_to?(:[])
+
+          @worksheet ||= params[:worksheet]
+          self.row ||= params[:row] # NOTE: not an instance variable
+        end
+
+        def blank?
+          return true if value.nil?
+
+          value.respond_to?(:strip) && value.strip.empty?
+        end
+      end
+    end
+  end
+end
+
+module RubyXL
+  class Cell
+    prepend BerkeleyLibrary::Util::XLSX::RubyXLCellExtensions
+  end
+end

data/lib/berkeley_library/util/xlsx/rubyxl_worksheet_extensions.rb

@@ -0,0 +1,24 @@
+require 'rubyXL'
+require 'berkeley_library/util/xlsx/rubyxl_cell_extensions'
+
+module BerkeleyLibrary
+  module Util
+    module XLSX
+      module RubyXLWorksheetExtensions
+        def first_blank_column_index
+          sheet_data.rows.inject(0) do |first_blank_c_index, row|
+            trailing_blank_cells = row.cells.reverse.take_while(&:blank?)
+            row_first_blank_c_index = row.size - trailing_blank_cells.size
+            [first_blank_c_index, row_first_blank_c_index].max
+          end
+        end
+      end
+    end
+  end
+end
+
+module RubyXL
+  class Worksheet
+    prepend BerkeleyLibrary::Util::XLSX::RubyXLWorksheetExtensions
+  end
+end

data/lib/berkeley_library/util/xlsx/spreadsheet.rb

@@ -3,6 +3,7 @@ require 'rubyXL'
 require 'rubyXL/convenience_methods/cell'
 require 'rubyXL/convenience_methods/worksheet'
 require 'zip'
+require 'berkeley_library/util/xlsx'
 
 module BerkeleyLibrary
   module Util
@@ -113,7 +114,8 @@ module BerkeleyLibrary
           c_index_existing = find_column_index_by_header(header)
           return c_index_existing if c_index_existing
 
-          column_count.tap { |cc| worksheet.insert_cell(0, cc, header) }
+          c_index_next = worksheet.first_blank_column_index
+          c_index_next.tap { |cc| worksheet.add_cell(0, cc, header) }
         end
 
         private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-holdings
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-26 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -260,7 +260,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
+- CHANGES.md
 - LICENSE.md
 - README.md
 - lib/berkeley_library/holdings.rb
@@ -280,6 +280,8 @@ files:
 - lib/berkeley_library/holdings/xlsx_reader.rb
 - lib/berkeley_library/holdings/xlsx_writer.rb
 - lib/berkeley_library/util/xlsx.rb
+- lib/berkeley_library/util/xlsx/rubyxl_cell_extensions.rb
+- lib/berkeley_library/util/xlsx/rubyxl_worksheet_extensions.rb
 - lib/berkeley_library/util/xlsx/spreadsheet.rb
 homepage: https://github.com/BerkeleyLibrary/holdings
 licenses:

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-## [Unreleased]
-
-## [0.1.0] - 2023-02-24
-
-- Initial release