ndr_import 8.5.1 → 8.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e9942cb20c52476a27af5b45a5bdb532171e7eb4cbf4b1d6cf40164623702a
-  data.tar.gz: 4e67817d307c143c1dbd3f3dbf17798e8864f8f246149b91d73099763d28488f
+  metadata.gz: 66af1dbe18a160875b514f4b7c7bf259b6b43f0565d45beeccb87fd647a5983e
+  data.tar.gz: 0c2a1a0d00ab0371ef9b9d845487cd8e0b67137816b02cefbce7d554c4df6a32
 SHA512:
-  metadata.gz: 9b36561a8c48c9626dff51913c96426cfa10904f31ba8867056f77e5752583b83080b55b23b5f0b30e74c095e91e08d6563ca1f7bf7f7ae265d03501cf384cbc
-  data.tar.gz: a23881b758d08e34d0b82faa177a193402e50c0ea3373c575189f175af1bcd1e030ceeeacd3eb1a3e21b96b82c3aa8b5a1ee41d5f69aae53977609420b5cf139
+  metadata.gz: 93e749531fc2834866ecf83a16231b233b2800eab53a8ea1d663fa9525fc014a9f9a77b6fd93b43100fe34bbd2e435e3c77e6b4b5ce538927646ceb39c6551c1
+  data.tar.gz: d04b1fb034f37f6129213a1615bd7db360690ed1da9e9028990dc0bd70aeff0ac9211a2028912d89700c67907e03453d6b9cf2868b67194a450b9a14f48ca4e1

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## [Unreleased]
 *no unreleased changes*
 
+## 8.5.2 / 2019-05-17
+### Fixed
+* Fixed issue with `file_password` option key as a String or Symbol
+* Tempfiles now take their encoding from the incoming string/stream
+
 ## 8.5.1 / 2019-05-15
 ### Added
 * Add data loader tools (#39)

data/code_safety.yml

@@ -19,7 +19,7 @@ file safety:
   CHANGELOG.md:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 730152642d4d08454d8aa2f76abe2eda086c077c
+    safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
   CODE_OF_CONDUCT.md:
     comments: 
     reviewed_by: timgentry
@@ -94,8 +94,8 @@ file safety:
     safe_revision: 5cd2cd0b3a1e254d30d4acc28c6731825a1f84f5
   lib/ndr_import/file/base.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: a8451809db86e0e023b0d93826114a33ff896c4f
+    reviewed_by: josh.pencheon
+    safe_revision: c3183e522bce50008df576ceb47fe4761ab8f966
   lib/ndr_import/file/delimited.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -103,11 +103,11 @@ file safety:
   lib/ndr_import/file/docx.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a69d4a57ddcf13cdc13c27bd2eb91a395fa7ea36
+    safe_revision: 897f8b648d633368cf2001d17ab89c06a12d445b
   lib/ndr_import/file/excel.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: a69d4a57ddcf13cdc13c27bd2eb91a395fa7ea36
+    safe_revision: c3183e522bce50008df576ceb47fe4761ab8f966
   lib/ndr_import/file/office_file_helper.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -175,7 +175,7 @@ file safety:
   lib/ndr_import/mapper.rb:
     comments: Writes to a Tempfile, but cleans up. Ruby will respect TMP_DIR
     reviewed_by: josh.pencheon
-    safe_revision: eca44583e9989159b45e90021dd1c65228447180
+    safe_revision: 897f8b648d633368cf2001d17ab89c06a12d445b
   lib/ndr_import/mapping_error.rb:
     comments: 
     reviewed_by: timgentry
@@ -231,7 +231,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: 730152642d4d08454d8aa2f76abe2eda086c077c
+    safe_revision: bd60b56117e65f106d7cb02e0c5772b9e5ec470e
   lib/ndr_import/xml/table.rb:
     comments: 
     reviewed_by: josh.pencheon
@@ -543,7 +543,7 @@ file safety:
   test/universal_importer_helper_test.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 3e3a852b58e8b169535e29029e535a10f6b9cd42
+    safe_revision: c3183e522bce50008df576ceb47fe4761ab8f966
   test/xml/table_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_import/file/base.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/hash'
 require 'ndr_support/safe_file'
 require 'ndr_import/csv_library'
 require_relative 'registry'
@@ -11,7 +12,7 @@ module NdrImport
       def initialize(filename, format, options = {})
         @filename = filename
         @format = format
-        @options = options
+        @options = options.stringify_keys
 
         validate_filename_is_safe_and_readable!
       end

data/lib/ndr_import/file/docx.rb

@@ -17,7 +17,7 @@ module NdrImport
       def rows(&block)
         return enum_for(:rows) unless block
 
-        send(@options.key?(:file_password) ? :decrypted_path : :unencrypted_path) do |path|
+        send(@options['file_password'] ? :decrypted_path : :unencrypted_path) do |path|
           doc = ::Docx::Document.open(path)
 
           doc.paragraphs.each do |p|
@@ -32,8 +32,9 @@ module NdrImport
 
       # This method returns the path to the temporary, decrypted file
       def decrypted_path
-        Tempfile.create(['decrypted', '.docx']) do |file|
-          file.write(decrypted_file_string(@filename, @options[:file_password]))
+        file_string = decrypted_file_string(@filename, @options['file_password'])
+        Tempfile.create(['decrypted', '.docx'], encoding: file_string.encoding) do |file|
+          file.write(file_string)
           file.close
 
           yield file.path

data/lib/ndr_import/file/excel.rb

@@ -91,8 +91,8 @@ module NdrImport
         when '.xls'
           Roo::Excel.new(SafeFile.safepath_to_string(path))
         when '.xlsx'
-          if @options.key?(:file_password)
-            Roo::Excelx.new(StringIO.new(decrypted_file_string(path, @options[:file_password])))
+          if @options['file_password']
+            Roo::Excelx.new(StringIO.new(decrypted_file_string(path, @options['file_password'])))
           else
             Roo::Excelx.new(SafeFile.safepath_to_string(path))
           end

data/lib/ndr_import/mapper.rb

@@ -277,7 +277,7 @@ module NdrImport::Mapper
   end
 
   def read_docx(stream)
-    Tempfile.create(encoding: 'ascii-8bit') do |tempfile|
+    Tempfile.create(encoding: stream.external_encoding) do |tempfile|
       tempfile.write(stream.read)
 
       docx = ::Docx::Document.open(tempfile.path)

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.5.1'.freeze
+  VERSION = '8.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 8.5.1
+  version: 8.5.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel