ndr_import 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d7bbcf9d60dbced9953f7cc2db6f65d18ef2d5
-  data.tar.gz: ad595813359e1552b8ef74e3e9593f3bf3632ca9
+  metadata.gz: 48a0ef9610f39b40881de9c2cbd4d79ac2fe197e
+  data.tar.gz: 69303c1297dcb5db806b996e95afad84fd31cae4
 SHA512:
-  metadata.gz: 51807710e98e5dab6f0f13880d3dac921580897174e23e91683c2aff4784bd3eea99380112274578b0b1b58d569f3ab6c9865158081c0d744967b80786983986
-  data.tar.gz: 2fe6008c0e1e43c772e127899e4ae6e243c071cc3069e5bf7d4a79c56b467d31eac700f719a212c1bafa4a1c02af3bf156283a249f0039aa0f1995e8c4fef7ef
+  metadata.gz: 877ff4160d5eeb02f372cae707118fffad4e8b0b702435753cdd06095b11097ac41a5a2010827936449d1f7656df9fbb62196cc7dc756be16a57f8a1e94c92f3
+  data.tar.gz: d330674f04f8bbd6cc50197ed48d75943182209ed2d20721b95bedb3fadc93d9105572d2c76f5ce9d595d1f8c2ed64276905244067f107b1bc0216c69b81131a

data/code_safety.yml

@@ -74,8 +74,8 @@ file safety:
     safe_revision: a8451809db86e0e023b0d93826114a33ff896c4f
   lib/ndr_import/file/delimited.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 4f7588ef0246bfced14f42b247436507568422a2
+    reviewed_by: josh.pencheon
+    safe_revision: 62702f103dd41c188684cfda73a94401b130cd01
   lib/ndr_import/file/excel.rb:
     comments: 
     reviewed_by: joshpencheon
@@ -126,8 +126,8 @@ file safety:
     safe_revision: 6c6f204fab2f4232d81cb76aa523c26b0c490ae7
   lib/ndr_import/mapper.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 582ce42b27ce3813efa7f93e09928e8f228ba6df
+    reviewed_by: josh.pencheon
+    safe_revision: fc27767d88956ef8e1182d6c1a6335266d34f7c5
   lib/ndr_import/mapping_error.rb:
     comments: 
     reviewed_by: timgentry
@@ -171,19 +171,19 @@ file safety:
   lib/ndr_import/version.rb:
     comments: another check?
     reviewed_by: josh.pencheon
-    safe_revision: db6baab3610d561026a405c4a6bef683dbba3ca0
+    safe_revision: 5b8e738929c12ccf800a2729d567fdf57a1bc159
   ndr_import.gemspec:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 0a8fccbac2a264adcdae7e46df54da25dc9cfdcd
+    safe_revision: c84ea01ab925addd5aa744ea8bc5382df5a1583d
   test/file/base_test.rb:
     comments: 
     reviewed_by: timgentry
     safe_revision: a8451809db86e0e023b0d93826114a33ff896c4f
   test/file/delimited_test.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: c88000b32401b5ae9ef7f5878a9b630506ab5a94
+    reviewed_by: josh.pencheon
+    safe_revision: 62702f103dd41c188684cfda73a94401b130cd01
   test/file/excel_test.rb:
     comments: 
     reviewed_by: joshpencheon
@@ -406,8 +406,8 @@ file safety:
     safe_revision: e70ece909c44b26208eaff3cf27ada7145e03f11
   test/test_helper.rb:
     comments: 
-    reviewed_by: joshpencheon
-    safe_revision: 646c08329cba0ba8ea2c37226cf26434da29c747
+    reviewed_by: josh.pencheon
+    safe_revision: 53cc0af4321b64746367231b65821fda0f8d8a0a
   test/universal_importer_helper_test.rb:
     comments: 
     reviewed_by: josh.pencheon

data/lib/ndr_import/file/delimited.rb

@@ -27,15 +27,20 @@ module NdrImport
         return enum_for(:rows) unless block_given?
 
         safe_path = SafeFile.safepath_to_string(@filename)
-        encodings = determine_encodings!(safe_path)
 
         # By now, we know `encodings` should let us read the whole
         # file succesfully; if there are problems, we should crash.
-        CSVLibrary.foreach(safe_path, encodings) do |line|
+        CSVLibrary.foreach(safe_path, encodings(safe_path)) do |line|
           yield line.map(&:to_s)
         end
       end
 
+      # Cache the determined encodings, so rewinding the enumerator doesn't
+      # have to redo this, but equally it is still done lazily:
+      def encodings(safe_path)
+        @encodings ||= determine_encodings!(safe_path)
+      end
+
       # Derive the source encoding by trying all supported encodings.
       # Returns first set of working options, or raises if none could be found.
       def determine_encodings!(safe_path)

data/lib/ndr_import/mapper.rb

@@ -17,12 +17,22 @@ module NdrImport::Mapper
 
   # the replace option can be used before any other mapping option
   def replace_before_mapping(original_value, field_mapping)
-    return unless field_mapping.include?('replace') && original_value
+    return unless original_value && field_mapping.include?('replace')
 
-    [field_mapping['replace']].flatten.each do |field_replacement|
-      field_replacement.each do |pattern, replacement|
-        Array(original_value).each { |val| val.gsub!(pattern, replacement) }
-      end
+    replaces = field_mapping['replace']
+
+    if replaces.is_a?(Array)
+      replaces.each { |repls| apply_replaces(original_value, repls) }
+    else
+      apply_replaces(original_value, replaces)
+    end
+  end
+
+  def apply_replaces(value, replaces)
+    if value.is_a?(Array)
+      value.each { |val| apply_replaces(val, replaces) }
+    else
+      replaces.each { |pattern, replacement| value.gsub!(pattern, replacement) }
     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 = '4.1.1'.freeze
+  VERSION = '4.1.2'.freeze
 end

data/ndr_import.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activesupport', '>= 3.2.18', '< 5.1'
   spec.add_dependency 'ndr_support', '>= 4.1.2', '< 6'
 
-  spec.add_dependency 'rubyzip', '~> 1.1'
+  spec.add_dependency 'rubyzip', '~> 1.2', '>= 1.2.1'
   spec.add_dependency 'roo', '~> 2.0'
 
   spec.add_dependency 'nokogiri', '~> 1.6'
@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'ndr_dev_support', '~> 1.1', '>= 1.1.3'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-rubocop'

data/test/file/delimited_test.rb

@@ -138,6 +138,23 @@ module NdrImport
               'Original: Missing or stray quote in line 2'
         assert_equal msg, exception.message
       end
+
+      test 'should only determine encodings once' do
+        file_path = @permanent_test_files.join('normal.csv')
+        handler = NdrImport::File::Delimited.new(file_path, 'csv', 'col_sep' => nil)
+
+        handler.expects(determine_encodings!: { encoding: 'bom|utf-8', col_sep: ',' }).once
+
+        2.times do
+          handler.tables.each do |tablename, sheet|
+            assert_nil tablename
+            sheet = sheet.to_a
+            assert_equal(('A'..'Z').to_a, sheet[0])
+            assert_equal ['1'] * 26, sheet[1]
+            assert_equal ['2'] * 26, sheet[2]
+          end
+        end
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -24,3 +24,5 @@ SafePath.configure! File.dirname(__FILE__) + '/resources/filesystem_paths.yml'
 NdrImport::StandardMappings.mappings = YAML.load_file(
   File.expand_path(File.dirname(__FILE__) + '/resources/standard_mappings.yml')
 )
+
+require 'mocha/mini_test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,14 +56,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +196,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ndr_dev_support
   requirement: !ruby/object:Gem::Requirement
@@ -410,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: NDR Import