ndr_import 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 214f73452462c2ea7182deaa8c90e4818d8ab6caf3fd604af4a64833e2518b41
-  data.tar.gz: 5d15e20e7b0c13fa3d3cd9169ad70c9028cc64d688906dd965a09ce791e97022
+  metadata.gz: f530e3c2d2fecb22289a673a1219b4d1830493c4d2417728f1ce6116f7f1b953
+  data.tar.gz: 3208097b9fb246fc10b514ddc9fa21107b1de94bc7eefcb0ea884cc2b5d88616
 SHA512:
-  metadata.gz: 7d4080dc6d86e553f8f6a07d2fe4876c6d014ecc8b5b3e729ac089147223ecf2d18f9f9bddfbc64c692e73deb08e27a12e09793fbd155c2a859b29c7efff7c3b
-  data.tar.gz: 46b267832414e13f1580da5fc386bebe34c5debb79d03e288c3f793b6c28158e362eb3971d2f275f68c398a4f8e3293321a585df2be2595369197bb70bf32eef
+  metadata.gz: ede70472e72bc8edda889ce03483706be25a8d5f3d1a3f05ea3863de0085e3df7bea6f6da9307daa7011dbee655d7caf6f6f36bd680e4f84f437f54e63792ac8
+  data.tar.gz: '089787a8761ed13581726c43d4a805c598bff04ad1564c3b0ff997c1f9dfc620a6487b88a432a16db39b287fbe84b3e6de59de84aa61787413b7ebc8fe67bea2'

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 8.2.0 / 2019-02-25
+### Added
+* Support automatically generating a per row identifier with `row_identifier` (#34)
+
 ## 8.1.0 / 2019-01-08
 ### Added
 * Support `liberal_parsing` when using the delimited helper

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 5ca2f7e9cb0e79134e5fa54ca2316c584696b34a
+    safe_revision: 640464d804e8eca15db14b8dfeb8c1ffa7d0fa85
   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: 2baccd482bcd875dc273f6a34a0e28823790e8d5
+    safe_revision: fac9e62618a32fab7a09a4996d27e1e7437b7dfb
   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: 5ca2f7e9cb0e79134e5fa54ca2316c584696b34a
+    safe_revision: 640464d804e8eca15db14b8dfeb8c1ffa7d0fa85
   lib/ndr_import/xml/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -287,7 +287,7 @@ file safety:
   test/non_tabular/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: f216687d0bba7f2940f74a3353a32be3c900c194
+    safe_revision: fac9e62618a32fab7a09a4996d27e1e7437b7dfb
   test/non_tabular_file_helper_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -479,7 +479,7 @@ file safety:
   test/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 2baccd482bcd875dc273f6a34a0e28823790e8d5
+    safe_revision: fac9e62618a32fab7a09a4996d27e1e7437b7dfb
   test/test_helper.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_import/table.rb

@@ -11,7 +11,7 @@ module NdrImport
 
     def self.all_valid_options
       %w[canonical_name delimiter liberal_parsing filename_pattern tablename_pattern header_lines
-         footer_lines format klass columns xml_record_xpath]
+         footer_lines format klass columns xml_record_xpath row_identifier]
     end
 
     def all_valid_options
@@ -81,8 +81,16 @@ module NdrImport
     def transform_line(line, index)
       return enum_for(:transform_line, line, index) unless block_given?
 
+      identifier = case @row_identifier.to_s
+                   when 'index'
+                     index
+                   when 'uuid'
+                     SecureRandom.uuid
+                   end
+
       masked_mappings.each do |klass, klass_mappings|
         fields = mapped_line(line, klass_mappings)
+        fields['row_identifier'] = identifier unless identifier.nil?
         next if fields[:skip].to_s == 'true'
         yield(klass, fields, index)
       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.1.0'.freeze
+  VERSION = '8.2.0'.freeze
 end

data/test/non_tabular/table_test.rb

@@ -49,7 +49,7 @@ STR
   def test_all_valid_options
     valid_options = %w[
       canonical_name capture_end_line capture_start_line columns end_in_a_record end_line_pattern
-      filename_pattern format klass remove_lines start_in_a_record start_line_pattern
+      filename_pattern format klass remove_lines row_identifier start_in_a_record start_line_pattern
     ]
     assert_equal valid_options.sort,
                  NdrImport::NonTabular::Table.all_valid_options.sort

data/test/table_test.rb

@@ -140,6 +140,42 @@ class TableTest < ActiveSupport::TestCase
     assert_equal expected_output.sort, output.sort
   end
 
+  def test_transform_line_row_identifier_index
+    table = NdrImport::Table.new(:header_lines => 2, :footer_lines => 1, :row_identifier => :index,
+                                 :columns => column_level_klass_mapping)
+    enum = table.transform_line(%w(CARROT POTATO PEA), 7)
+    assert_instance_of Enumerator, enum
+
+    output = []
+    enum.each do |klass, fields, index|
+      output << [klass, fields, index]
+    end
+
+    expected_output = [
+      ['SomeTestKlass', { :rawtext => { 'one' => 'CARROT', 'two' => 'POTATO' }, 'row_identifier' => 7 }, 7],
+      ['SomeOtherKlass', { :rawtext => { 'two' => 'POTATO', 'three' => 'PEA' }, 'row_identifier' => 7 }, 7]
+    ]
+    assert_equal expected_output.sort, output.sort
+  end
+
+  def test_transform_line_row_identifier_uuid
+    table = NdrImport::Table.new(:header_lines => 2, :footer_lines => 1, :row_identifier => :uuid,
+                                 :columns => column_level_klass_mapping)
+    enum = table.transform_line(%w(CARROT POTATO PEA), 7)
+    assert_instance_of Enumerator, enum
+
+    output = []
+    enum.each do |klass, fields, _index|
+      output << [klass, fields['row_identifier']]
+    end
+    identifiers = output.map(&:last)
+
+    assert_equal 2, identifiers.count
+    assert_equal 2, identifiers.compact.count
+    assert_equal 1, identifiers.uniq.count
+    assert_equal 36, identifiers.first.length
+  end
+
   def test_encode_with
     table = NdrImport::Table.new
     assert table.instance_variables.include?(:@row_index)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: NDR Import