ndr_import 8.5.2 → 8.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/code_safety.yml +7 -7
  4. data/lib/ndr_import/non_tabular/column_mapping.rb +2 -1
  5. data/lib/ndr_import/non_tabular/record.rb +4 -1
  6. data/lib/ndr_import/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 66af1dbe18a160875b514f4b7c7bf259b6b43f0565d45beeccb87fd647a5983e
4
- data.tar.gz: 0c2a1a0d00ab0371ef9b9d845487cd8e0b67137816b02cefbce7d554c4df6a32
3
+ metadata.gz: ffddef09a58ca08e5d491449ef48cd829dfd045bf6f38b5289cff240859940e0
4
+ data.tar.gz: 30540a5af117b4ae57e002794f26df18544a99b07c7fdfb95a2ad552e9efa7b6
5
5
  SHA512:
6
- metadata.gz: 93e749531fc2834866ecf83a16231b233b2800eab53a8ea1d663fa9525fc014a9f9a77b6fd93b43100fe34bbd2e435e3c77e6b4b5ce538927646ceb39c6551c1
7
- data.tar.gz: d04b1fb034f37f6129213a1615bd7db360690ed1da9e9028990dc0bd70aeff0ac9211a2028912d89700c67907e03453d6b9cf2868b67194a450b9a14f48ca4e1
6
+ metadata.gz: 2ff3840cb513c4d0253c9c40db709563bf7bd8d62777ed49358e9a67a5304c03b7f18a966bb894099a4f7f9a64933bc11151048e29ce50989a791732cceee74c
7
+ data.tar.gz: de437a4e4e62c77e93050df6c0d50c486d2faca290830acb1d719ddadc0b2165bd5405a11a38db4bd0ca438432b082fddafb42edaf41b09a98efcdfd79c63f55
data/CHANGELOG.md CHANGED
@@ -1,6 +1,10 @@
1
1
  ## [Unreleased]
2
2
  *no unreleased changes*
3
3
 
4
+ ## 8.6.0 / 2019-06-07
5
+ ### Added
6
+ * Allow conditional preservation of blank lines when joining lines in non-tabular data (#41)
7
+
4
8
  ## 8.5.2 / 2019-05-17
5
9
  ### Fixed
6
10
  * Fixed issue with `file_password` option key as a String or Symbol
data/code_safety.yml CHANGED
@@ -19,7 +19,7 @@ file safety:
19
19
  CHANGELOG.md:
20
20
  comments:
21
21
  reviewed_by: josh.pencheon
22
- safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
22
+ safe_revision: 53c17f14ee19a9ea83d044508093147daa32ba3d
23
23
  CODE_OF_CONDUCT.md:
24
24
  comments:
25
25
  reviewed_by: timgentry
@@ -187,7 +187,7 @@ file safety:
187
187
  lib/ndr_import/non_tabular/column_mapping.rb:
188
188
  comments:
189
189
  reviewed_by: josh.pencheon
190
- safe_revision: f216687d0bba7f2940f74a3353a32be3c900c194
190
+ safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
191
191
  lib/ndr_import/non_tabular/line.rb:
192
192
  comments:
193
193
  reviewed_by: timgentry
@@ -198,8 +198,8 @@ file safety:
198
198
  safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
199
199
  lib/ndr_import/non_tabular/record.rb:
200
200
  comments:
201
- reviewed_by: timgentry
202
- safe_revision: 63b1e8c275bd63377309d9b124176f39f75576a9
201
+ reviewed_by: josh.pencheon
202
+ safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
203
203
  lib/ndr_import/non_tabular/table.rb:
204
204
  comments:
205
205
  reviewed_by: josh.pencheon
@@ -231,7 +231,7 @@ file safety:
231
231
  lib/ndr_import/version.rb:
232
232
  comments: another check?
233
233
  reviewed_by: josh.pencheon
234
- safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
234
+ safe_revision: 53c17f14ee19a9ea83d044508093147daa32ba3d
235
235
  lib/ndr_import/xml/table.rb:
236
236
  comments:
237
237
  reviewed_by: josh.pencheon
@@ -330,8 +330,8 @@ file safety:
330
330
  safe_revision: a69d4a57ddcf13cdc13c27bd2eb91a395fa7ea36
331
331
  test/non_tabular_file_helper_test.rb:
332
332
  comments:
333
- reviewed_by: timgentry
334
- safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
333
+ reviewed_by: josh.pencheon
334
+ safe_revision: bb44ade56a2151706eede2c31142440ccf49e6f6
335
335
  test/pdf_form/table_test.rb:
336
336
  comments:
337
337
  reviewed_by: josh.pencheon
data/lib/ndr_import/non_tabular/column_mapping.rb CHANGED
@@ -6,7 +6,7 @@ module NdrImport
6
6
  # the logic associated with finding matching lines of source data and subsequently
7
7
  # capturing arrays of values within them.
8
8
  class ColumnMapping
9
- attr_accessor :name, :cell_mapping, :lines, :capture, :join
9
+ attr_accessor :name, :cell_mapping, :lines, :capture, :join, :preserve_blank_lines
10
10
 
11
11
  def initialize(column_mapping)
12
12
  @name = column_mapping['rawtext_name'] ||
@@ -18,6 +18,7 @@ module NdrImport
18
18
 
19
19
  @lines = @cell_mapping['lines']
20
20
  @join = @cell_mapping['join']
21
+ @preserve_blank_lines = @cell_mapping['preserve_blank_lines']
21
22
  end
22
23
 
23
24
  # This method returns the range of matching source data lines. If the range is a
data/lib/ndr_import/non_tabular/record.rb CHANGED
@@ -74,7 +74,10 @@ module NdrImport
74
74
  begin
75
75
  matches = get_matches(column_mapping)
76
76
  # Join the non-blank lines together and add to the array of cells
77
- cells << matches.select { |value| !value.blank? }.join(column_mapping.join || '')
77
+ lines = matches.select do |value|
78
+ column_mapping.preserve_blank_lines ? value : value.present?
79
+ end
80
+ cells << lines.join(column_mapping.join || '')
78
81
  rescue RegexpRange::PatternMatchError
79
82
  cells << nil
80
83
  end
data/lib/ndr_import/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
  # This stores the current version of the NdrImport gem
3
3
  module NdrImport
4
- VERSION = '8.5.2'.freeze
4
+ VERSION = '8.6.0'.freeze
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ndr_import
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.5.2
4
+ version: 8.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - NCRS Development Team
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2019-05-17 00:00:00.000000000 Z
11
+ date: 2019-06-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemodel