ndr_import 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae1ff625cdd7352f4b3306f9a49905b2563557b487762611dfd0391735177ee
-  data.tar.gz: a7bdc413db721c0f813b9fd7ef862beff3cf6a9a76f042eef15d141b2526f5a7
+  metadata.gz: 5f9be51a2c9d3ec3312fb4f2be9435f5fdddecdd76f35a71cdd321d40f4a39d5
+  data.tar.gz: 9ca49c658395de4d43a268219fde8abf9ef2b38d1494945d0241de4ebcc6fed5
 SHA512:
-  metadata.gz: 3d572905a49329c295a9ab701de99a4f82a9165a399b05ca6f80e48218e2c603fddca14768d4aad2e9139ac07cdbaa6c5ba1f1851527cc50f7f6f4b45ed2392e
-  data.tar.gz: 3414e9efa2b16b60e9d532075fca1df095bdcab20516738243fc9ed9ac5b30540b3ad1f9139feaedfd3f5c3182c049e2deb5f5cd878a67360bdefaeffd9c6452
+  metadata.gz: b5f4591fcd249ef471379f33553f7b22cc392058a1adf2b1eac0fb4ecf9597d02edac84f812ddb80eecc2a170cf08f0b6c32bc2df3043fa4b16bf77e5fd3c7d7
+  data.tar.gz: 60188e2b35683b23a2f8142aace35b35e5e09ae49a537a1e8829262985ec3f7858a5bb9328eb37344adebe208d85e5aafa53c75d211d27eaf57f960543ca6a5e

data/code_safety.yml

@@ -141,9 +141,9 @@ file safety:
     reviewed_by: timgentry
     safe_revision: 6c6f204fab2f4232d81cb76aa523c26b0c490ae7
   lib/ndr_import/mapper.rb:
-    comments: 
+    comments: Writes to a Tempfile, but cleans up. Ruby will respect TMP_DIR
     reviewed_by: josh.pencheon
-    safe_revision: 4ab72f84201c2d5f0147b7dfd041f488f6ff0422
+    safe_revision: a41595349baf4428e63380c103b524ba2fa8d7df
   lib/ndr_import/mapping_error.rb:
     comments: 
     reviewed_by: timgentry
@@ -187,7 +187,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: 0b1ab7c810d0fa46d153238d69627c07f56d1efa
+    safe_revision: 32f813db3eaf29fd24f6bba6e3b2a1ba137d5d1d
   lib/ndr_import/xml/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -267,7 +267,7 @@ file safety:
   test/mapper_test.rb:
     comments: exposes Mapper internals to test them
     reviewed_by: josh.pencheon
-    safe_revision: 4ab72f84201c2d5f0147b7dfd041f488f6ff0422
+    safe_revision: a41595349baf4428e63380c103b524ba2fa8d7df
   test/non_tabular/mapping_test.rb:
     comments: 
     reviewed_by: timgentry

data/lib/ndr_import/mapper.rb

@@ -3,6 +3,7 @@ require 'ndr_support/string/conversions'
 require 'ndr_import/standard_mappings'
 require 'base64'
 require 'msworddoc-extractor'
+require 'docx'
 
 # This module provides helper logic for mapping unified sources for import into the system
 module NdrImport::Mapper
@@ -242,11 +243,23 @@ module NdrImport::Mapper
     end
   end
 
-  # Given an IO stream representing a .doc word document,
-  # this method will extract the text for the document in the same way
-  # as NdrImport::Helpers::File::Word#read_word_file
+  # Given an IO stream representing a .doc or .docx word document,
+  # this method will extract the text from the document in the same way
+  # as NdrImport::File::Word or NdrImport::File::Docx respectively
   def read_word_stream(stream)
     # whole_contents adds "\n" to end of stream, we remove it
     MSWordDoc::Extractor.load(stream).whole_contents.sub(/\n\z/, '')
+  rescue Ole::Storage::FormatError
+    stream.rewind
+    read_docx(stream)
+  end
+
+  def read_docx(stream)
+    Tempfile.create(encoding: 'ascii-8bit') do |tempfile|
+      tempfile.write(stream.read)
+
+      docx = ::Docx::Document.open(tempfile.path)
+      docx.paragraphs.map(&:to_s).join("\n")
+    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 = '6.3.0'.freeze
+  VERSION = '6.4.0'.freeze
 end

data/test/mapper_test.rb

@@ -622,6 +622,16 @@ class MapperTest < ActiveSupport::TestCase
     assert_equal 'Hello world, this is a word document', line_hash[:rawtext]['base64']
   end
 
+  test 'should decode base64 encoded docx document' do
+    test_file = @permanent_test_files.join('hello_world.docx')
+    encoded_content = Base64.encode64(File.binread(test_file))
+    line_hash = TestMapper.new.mapped_line([encoded_content], base64_mapping)
+    expected_content = "Hello world, this is a modern word document\n" \
+                       "With more than one line of text\nThree in fact"
+
+    assert_equal expected_content, line_hash[:rawtext]['base64']
+  end
+
   test 'should decode word.doc' do
     test_file = @permanent_test_files.join('hello_world.doc')
     file_content = File.binread(test_file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport