ndr_import 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f530e3c2d2fecb22289a673a1219b4d1830493c4d2417728f1ce6116f7f1b953
-  data.tar.gz: 3208097b9fb246fc10b514ddc9fa21107b1de94bc7eefcb0ea884cc2b5d88616
+  metadata.gz: 82e0bb47cb3a5c62b7cd5701c7196760cf9977357490a0e9ce708c2d814a51fc
+  data.tar.gz: 111f781ab628de952d6b305e4fd7f0f8eb412b6c7b7b539dca2786e46904b05d
 SHA512:
-  metadata.gz: ede70472e72bc8edda889ce03483706be25a8d5f3d1a3f05ea3863de0085e3df7bea6f6da9307daa7011dbee655d7caf6f6f36bd680e4f84f437f54e63792ac8
-  data.tar.gz: '089787a8761ed13581726c43d4a805c598bff04ad1564c3b0ff997c1f9dfc620a6487b88a432a16db39b287fbe84b3e6de59de84aa61787413b7ebc8fe67bea2'
+  metadata.gz: f6d269d1d9e73ce154f7e8886a9109c16b74ba83d5b5c8f296f2c241609f1f5c9309afd08bee8538b34c36e534d48bacc5e1af6ff1fe89f89d9d30846c8841bc
+  data.tar.gz: e332a7c3af8857095e5f1dc0de7fd7693f7df4b639c3f1a34858b4f5c7af68b73dbff751142e485a0f836e7addf656043dd944816ad03ecf9b56797d8cd5a740

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 8.3.0 / 2019-03-04
+### Added
+* Allow `klass` in the column level mapping to be embedded array.
+
 ## 8.2.0 / 2019-02-25
 ### Added
 * Support automatically generating a per row identifier with `row_identifier` (#34)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 640464d804e8eca15db14b8dfeb8c1ffa7d0fa85
+    safe_revision: 6271165699e2d886f94d45277baa955023e3f094
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -187,7 +187,7 @@ file safety:
   lib/ndr_import/table.rb:
     comments: uses File.basename
     reviewed_by: josh.pencheon
-    safe_revision: fac9e62618a32fab7a09a4996d27e1e7437b7dfb
+    safe_revision: 04abeab4948a1e889d259d2a71a619af761ac1c3
   lib/ndr_import/universal_importer_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -195,7 +195,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: 640464d804e8eca15db14b8dfeb8c1ffa7d0fa85
+    safe_revision: 6271165699e2d886f94d45277baa955023e3f094
   lib/ndr_import/xml/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -479,7 +479,7 @@ file safety:
   test/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: fac9e62618a32fab7a09a4996d27e1e7437b7dfb
+    safe_revision: 04abeab4948a1e889d259d2a71a619af761ac1c3
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_import/table.rb

@@ -169,7 +169,7 @@ module NdrImport
     # relate to this klass, returning the masked mappings
     def mask_mappings_by_klass(klass)
       @columns.dup.map do |mapping|
-        if Array(mapping['klass']).include?(klass)
+        if Array(mapping['klass']).flatten.include?(klass)
           mapping
         else
           { 'do_not_capture' => true }

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.2.0'.freeze
+  VERSION = '8.3.0'.freeze
 end

data/test/table_test.rb

@@ -285,15 +285,16 @@ class TableTest < ActiveSupport::TestCase
   end
 
   def test_mask_mappings_by_klass
-    table = NdrImport::Table.new(:header_lines => 2, :footer_lines => 1,
-                                 :columns => column_level_klass_mapping)
+    table1 = NdrImport::Table.new(:header_lines => 2, :footer_lines => 1,
+                                  :columns => column_level_klass_mapping)
+
     some_test_klass_mapping = [
       { 'column' => 'one', 'klass' => 'SomeTestKlass' },
       { 'column' => 'two', 'klass' => %w(SomeTestKlass SomeOtherKlass) },
       { 'do_not_capture' => true }
     ]
     assert_equal some_test_klass_mapping,
-                 table.send(:mask_mappings_by_klass, 'SomeTestKlass')
+                 table1.send(:mask_mappings_by_klass, 'SomeTestKlass')
 
     some_other_klass_mapping = [
       { 'do_not_capture' => true },
@@ -301,7 +302,26 @@ class TableTest < ActiveSupport::TestCase
       { 'column' => 'three', 'klass' => 'SomeOtherKlass' }
     ]
     assert_equal some_other_klass_mapping,
-                 table.send(:mask_mappings_by_klass, 'SomeOtherKlass')
+                 table1.send(:mask_mappings_by_klass, 'SomeOtherKlass')
+
+    table2 = NdrImport::Table.new(:header_lines => 2, :footer_lines => 1,
+                                  :columns => column_level_klass_mapping_embedded_klasses)
+
+    some_test_klass_mapping_embedded_klasses = [
+      { 'column' => 'one', 'klass' => 'SomeTestKlass' },
+      { 'column' => 'two', 'klass' => [['SomeTestKlass'], 'SomeOtherKlass'] },
+      { 'do_not_capture' => true }
+    ]
+    assert_equal some_test_klass_mapping_embedded_klasses,
+                 table2.send(:mask_mappings_by_klass, 'SomeTestKlass')
+
+    some_other_klass_mapping_embedded_klasses = [
+      { 'do_not_capture' => true },
+      { 'column' => 'two', 'klass' => [['SomeTestKlass'], 'SomeOtherKlass'] },
+      { 'column' => 'three', 'klass' => 'SomeOtherKlass' }
+    ]
+    assert_equal some_other_klass_mapping_embedded_klasses,
+                 table2.send(:mask_mappings_by_klass, 'SomeOtherKlass')
   end
 
   def test_valid_single_line_header
@@ -493,6 +513,14 @@ YML
     ]
   end
 
+  def column_level_klass_mapping_embedded_klasses
+    [
+      { 'column' => 'one', 'klass' => 'SomeTestKlass' },
+      { 'column' => 'two', 'klass' => [['SomeTestKlass'], 'SomeOtherKlass'] },
+      { 'column' => 'three', 'klass' => 'SomeOtherKlass' }
+    ]
+  end
+
   def column_level_klass_masked_mappings
     {
       'SomeTestKlass' => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 8.3.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel