ndr_import 8.5.2 → 8.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66af1dbe18a160875b514f4b7c7bf259b6b43f0565d45beeccb87fd647a5983e
-  data.tar.gz: 0c2a1a0d00ab0371ef9b9d845487cd8e0b67137816b02cefbce7d554c4df6a32
+  metadata.gz: ffddef09a58ca08e5d491449ef48cd829dfd045bf6f38b5289cff240859940e0
+  data.tar.gz: 30540a5af117b4ae57e002794f26df18544a99b07c7fdfb95a2ad552e9efa7b6
 SHA512:
-  metadata.gz: 93e749531fc2834866ecf83a16231b233b2800eab53a8ea1d663fa9525fc014a9f9a77b6fd93b43100fe34bbd2e435e3c77e6b4b5ce538927646ceb39c6551c1
-  data.tar.gz: d04b1fb034f37f6129213a1615bd7db360690ed1da9e9028990dc0bd70aeff0ac9211a2028912d89700c67907e03453d6b9cf2868b67194a450b9a14f48ca4e1
+  metadata.gz: 2ff3840cb513c4d0253c9c40db709563bf7bd8d62777ed49358e9a67a5304c03b7f18a966bb894099a4f7f9a64933bc11151048e29ce50989a791732cceee74c
+  data.tar.gz: de437a4e4e62c77e93050df6c0d50c486d2faca290830acb1d719ddadc0b2165bd5405a11a38db4bd0ca438432b082fddafb42edaf41b09a98efcdfd79c63f55

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 8.6.0 / 2019-06-07
+### Added
+* Allow conditional preservation of blank lines when joining lines in non-tabular data (#41)
+
 ## 8.5.2 / 2019-05-17
 ### Fixed
 * Fixed issue with `file_password` option key as a String or Symbol

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
+    safe_revision: 53c17f14ee19a9ea83d044508093147daa32ba3d
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -187,7 +187,7 @@ file safety:
   lib/ndr_import/non_tabular/column_mapping.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: f216687d0bba7f2940f74a3353a32be3c900c194
+    safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
   lib/ndr_import/non_tabular/line.rb:
     comments: 
     reviewed_by: timgentry
@@ -198,8 +198,8 @@ file safety:
     safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
   lib/ndr_import/non_tabular/record.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: 63b1e8c275bd63377309d9b124176f39f75576a9
+    reviewed_by: josh.pencheon
+    safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
   lib/ndr_import/non_tabular/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -231,7 +231,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
+    safe_revision: 53c17f14ee19a9ea83d044508093147daa32ba3d
   lib/ndr_import/xml/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -330,8 +330,8 @@ file safety:
     safe_revision: a69d4a57ddcf13cdc13c27bd2eb91a395fa7ea36
   test/non_tabular_file_helper_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
+    reviewed_by: josh.pencheon
+    safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
   test/pdf_form/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_import/non_tabular/column_mapping.rb

@@ -6,7 +6,7 @@ module NdrImport
     # the logic associated with finding matching lines of source data and subsequently
     # capturing arrays of values within them.
     class ColumnMapping
-      attr_accessor :name, :cell_mapping, :lines, :capture, :join
+      attr_accessor :name, :cell_mapping, :lines, :capture, :join, :preserve_blank_lines
 
       def initialize(column_mapping)
         @name         = column_mapping['rawtext_name'] ||
@@ -18,6 +18,7 @@ module NdrImport
 
         @lines = @cell_mapping['lines']
         @join  = @cell_mapping['join']
+        @preserve_blank_lines = @cell_mapping['preserve_blank_lines']
       end
 
       # This method returns the range of matching source data lines. If the range is a

data/lib/ndr_import/non_tabular/record.rb

@@ -74,7 +74,10 @@ module NdrImport
           begin
             matches = get_matches(column_mapping)
             # Join the non-blank lines together and add to the array of cells
-            cells << matches.select { |value| !value.blank? }.join(column_mapping.join || '')
+            lines = matches.select do |value|
+              column_mapping.preserve_blank_lines ? value : value.present?
+            end
+            cells << lines.join(column_mapping.join || '')
           rescue RegexpRange::PatternMatchError
             cells << nil
           end

data/lib/ndr_import/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # This stores the current version of the NdrImport gem
 module NdrImport
-  VERSION = '8.5.2'.freeze
+  VERSION = '8.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 8.5.2
+  version: 8.6.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-17 00:00:00.000000000 Z
+date: 2019-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel