ndr_import 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c3697b01f732fdef03d66858b9f699b0c95673824332a1d4f2d8fa2b845aed24
-  data.tar.gz: 87bb849993db749b7b9a58d2a47be6b1f4ecd5a928f9541f97529452836f7fb1
+SHA1:
+  metadata.gz: 411899f19141a2e2da38b712d76d4de02b00bda7
+  data.tar.gz: 9feaaf50a3bb840974a0ce38ef66fee5ab32c19e
 SHA512:
-  metadata.gz: 445825462bf049b2d8ebacd391695176302924e8b12a5e08c283e9b5ed32bb9600befa48c6777ed038f8a2f6c257604d3c86b899b795fd8d13e7980f85b7911f
-  data.tar.gz: a9c796eb0f8d1914df8fc1dc5c943c49ab7de68f7f109e2e917637a88262d334ef1e1a47f5f23571a910e51664109851f4748988c0b8592cf3c376f8d8c5b0cd
+  metadata.gz: 4d10e6a1d6370dd513364cf6332daf14ab6fe75e9b320906fa6a93e4e08422e54ebe16755bfbbd966e05c130bf53eab329e84ef2b5e766acd600e7059fd939f6
+  data.tar.gz: c824e74a89cfe9c9ded3f4a95b42f1be7bc31ae475b503264aa10e14621223691eb936dcd550792592ce7104c6eb278f7cb43059dacba916a26fc0f9ce4b8f6c

data/code_safety.yml

@@ -58,8 +58,8 @@ file safety:
     safe_revision: c158dc783b84cab31380708e76e3812544cc1c2f
   lib/ndr_import.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: a8451809db86e0e023b0d93826114a33ff896c4f
+    reviewed_by: ollie.tulloch
+    safe_revision: dfc958d44b6c58355445fa395db08a62213ee709
   lib/ndr_import/csv_library.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -100,6 +100,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+  lib/ndr_import/fixed_width/table.rb:
+    comments: 
+    reviewed_by: ollie.tulloch
+    safe_revision: dfc958d44b6c58355445fa395db08a62213ee709
   lib/ndr_import/helpers/file/delimited.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -170,12 +174,12 @@ file safety:
     safe_revision: 36143ff4f48e0433a7b04b63143ef6d6d2481fec
   lib/ndr_import/version.rb:
     comments: another check?
-    reviewed_by: josh.pencheon
-    safe_revision: 1df87077495c1f595023bdbbd1e0bfb220dc5da5
+    reviewed_by: ollie.tulloch
+    safe_revision: fa21aae027f436337eb0de481e390cdbab348123
   ndr_import.gemspec:
     comments: 
-    reviewed_by: josh.pencheon
-    safe_revision: b3f39d7243c41a44594336c3feed3b29c2386a0e
+    reviewed_by: ollie.tulloch
+    safe_revision: a76d7fd03894158417411d0c9620ea4c1d5a03d6
   test/file/base_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -208,6 +212,10 @@ file safety:
     comments: 
     reviewed_by: timgentry
     safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+  test/fixed_width/table_test.rb:
+    comments: 
+    reviewed_by: ollie.tulloch
+    safe_revision: dfc958d44b6c58355445fa395db08a62213ee709
   test/helpers/file/delimited_test.rb:
     comments: 
     reviewed_by: joshpencheon

data/lib/ndr_import.rb

@@ -5,6 +5,7 @@ require 'ndr_import/mapper'
 require 'ndr_import/non_tabular_file_helper'
 require 'ndr_import/table'
 require 'ndr_import/non_tabular/table'
+require 'ndr_import/fixed_width/table'
 
 module NdrImport
   def self.root

data/lib/ndr_import/fixed_width/table.rb

@@ -0,0 +1,25 @@
+require 'ndr_import/table'
+
+module NdrImport
+  module FixedWidth
+    # This class maintains the state of a fixed width table mapping and encapsulates
+    # the logic required to transform a table of data into "records". Particular
+    # attention has been made to use enumerables throughout to help with the
+    # transformation of large quantities of data.
+    class Table < ::NdrImport::Table
+      # This method transforms an incoming line of fixed wwidrh data by applying
+      # each of the klass masked mappings to the line and yielding the klass
+      # and fields for each mapped klass.
+      def transform_line(line, index)
+        return enum_for(:transform_line, line, index) unless block_given?
+
+        masked_mappings.each do |klass, klass_mappings|
+          line = fixed_width_columns(line, klass_mappings)
+          fields = mapped_line(line, klass_mappings)
+          next if fields[:skip].to_s == 'true'.freeze
+          yield(klass, fields, index)
+        end
+      end
+    end
+  end
+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 = '5.0.0'.freeze
+  VERSION = '5.1.0'.freeze
 end

data/ndr_import.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |spec|
 
   # Exclude older versions of this gem from the package.
   spec.files         = `git ls-files -z`.split("\x0").reject { |s| s =~ %r{^pkg/} }
+  # SECURE BNS 2018-08-06: Minimise sharing of (public-key encrypted) slack secrets in .travis.yml
+  spec.files         -= %w[.travis.yml] # Not needed in the gem
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

data/test/fixed_width/table_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+# This tests the NdrImport::FixedWidth::Table mapping class
+module FixedWidth
+  class TableTest < ActiveSupport::TestCase
+    def test_transform_fixed_width_line
+      table = NdrImport::FixedWidth::Table.new(header_lines: 2,
+                                               footer_lines: 1,
+                                               klass: 'SomeTestKlass',
+                                               columns: fixed_width_column_mapping)
+
+      enum = table.transform_line('123  abcdexyz', 2)
+      assert_instance_of Enumerator, enum
+      output = []
+      enum.each do |klass, fields, index|
+        output << [klass, fields, index]
+      end
+
+      expected_output = [
+        ['SomeTestKlass', { rawtext: { 'one' => '123  ', 'two' => 'abcde', 'three' => 'xyz' } }, 2]
+      ]
+      assert_equal expected_output.sort, output.sort
+    end
+
+    private
+
+    def fixed_width_column_mapping
+      [
+        { 'column' => 'one',   'unpack_pattern' => 'a5' },
+        { 'column' => 'two',   'unpack_pattern' => 'a5' },
+        { 'column' => 'three', 'unpack_pattern' => 'a3' }
+      ]
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -309,7 +309,6 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -332,6 +331,7 @@ files:
 - lib/ndr_import/file/text.rb
 - lib/ndr_import/file/word.rb
 - lib/ndr_import/file/zip.rb
+- lib/ndr_import/fixed_width/table.rb
 - lib/ndr_import/helpers/file/delimited.rb
 - lib/ndr_import/helpers/file/excel.rb
 - lib/ndr_import/helpers/file/pdf.rb
@@ -359,6 +359,7 @@ files:
 - test/file/text_test.rb
 - test/file/word_test.rb
 - test/file/zip_test.rb
+- test/fixed_width/table_test.rb
 - test/helpers/file/delimited_test.rb
 - test/helpers/file/excel_test.rb
 - test/helpers/file/pdf_test.rb
@@ -430,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: NDR Import
@@ -443,6 +444,7 @@ test_files:
 - test/file/text_test.rb
 - test/file/word_test.rb
 - test/file/zip_test.rb
+- test/fixed_width/table_test.rb
 - test/helpers/file/delimited_test.rb
 - test/helpers/file/excel_test.rb
 - test/helpers/file/pdf_test.rb

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-rvm:
-- 2.3
-- 2.4
-- 2.5
-gemfile:
-- gemfiles/Gemfile.rails42
-- gemfiles/Gemfile.rails50
-- gemfiles/Gemfile.rails51
-- gemfiles/Gemfile.rails52
-sudo: false
-cache: bundler
-before_script: bundle update
-script: bundle exec rake test
-notifications:
-  slack:
-    on_pull_requests: false
-    on_success: always
-    on_failure: always
-    rooms:
-      secure: NMd9N/jNbECT/fCUBxPDKy4IMpUnRdMhobwa+9kDRaWYbRAwIkHLd8sI1l63qx7O03SlDpsHLLckjayMKS35gO/wRmgC7T8k9ppW75Xs5D4jR/j3FdTFawnXF+wVx0ddQrpH0K8oftPX1euPEllIh7+bJUYct/Siv0UX5eP+qyHT0gKtbDlI2CMKOcOHE8Q/zwjx0mLVSj/0U+HRx5+sMEDcwPupzhCYLdIAtenHsZ2Zmo2uSqOzK9Ruf3UsIh3gVSKXWGvXQzG8bIxogIJbEbwIk/gQyMr7UXwgNzhltPz1CqOrrTmSonrd3HbLVajJvDWPMBPGDZrUyipiW/MOUKpXgd8CsL46o4icYIZIAYEWLsn/AJkrA+UQZ8S5poR06jNH8xrI0eUQsu6maWhJ/rPfzwb6x2hCCyk2iQsGtO+SPCUrWnT1T3ir8H0HStD+AZ4/yz4cdWlClchko2ZfqS0q3Yv5jF3K4iVOF4GOUo01Ft+LDU3sPC7Ngq51bejoaLTzexiOfEaF0kKvB8XNXYYjV5ATNJ8XWQR7ISJ+na4FCwt4KaKtC864TWWDTxaz6lfr0B3Wf0lZLH22+BhpzrfPWFo3YGyMsOcgPU0rPHrtAzks55rqCTQEOaKTw4rfEmuMEFJK/y80GYS2jTPu0nCnJo4NdV1fVuSSD8iUFAM=