ndr_import 3.0.1 → 3.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODZiYzUxZjc0MmM2NTBiOGFlZjc4MGNkNTg3YmU0MTE2ZDBiODM4Ng==
-  data.tar.gz: !binary |-
-    ZTFkYjNkNzBiNzE3YTRhNmY2M2QzMGE1OTRlOWQyOGE2YjNkOGJmZQ==
+SHA1:
+  metadata.gz: 4dd8607e78411219cbfe94134c3a1d5586a5a8a6
+  data.tar.gz: f1ecd6a75c57cb2c34d1ea095cf498c116529f20
 SHA512:
-  metadata.gz: !binary |-
-    NjVhNDUyNWM4YzVlYzg1ODhkYjc4YWM2YWI5YmY3NTY3MDM1N2QwOGQ5NjE2
-    MzEzZTQ0M2QyN2M4YTU0M2YzZTUzN2Y4YWEzMDY3NjRjNGQ2ZmFmMTgzMGIy
-    YjUwNmRhZjc1YWUzYjcwYTFhYmFiN2NmZDBhMTYxMWZhMjFkNGI=
-  data.tar.gz: !binary |-
-    Y2U3NTBmNzQwODdiOWNmNmFkYThmMjkzYjMzYzgwYjgwMjYxZmFkMjNlOWM4
-    NzE5YzM2ZThhYWNmNzM5MDdjMTRkYzkyMzViNDRmNTBlN2Y5NmMzMGM2ZmJm
-    NWU4MmI3ODRlMDNiMjgzNWVmNDdjOGYyODMyMjhiMmViYzAzN2E=
+  metadata.gz: e2ad1086a1e754d3a31b9ffbd4aaa4f836406668c59acb68a1a0d679a08174b4e044d056a1f547517914e5c030ddebd125da41d6850a1a8a6a17ba3db43fd095
+  data.tar.gz: ca864436b5dc2f29c769a29d4de0ac1893b0b8236a9decbb19a461294f1749b9ce19b1f8986b66875860b728b83140d6326d9dc5f478907af66acde334a95bc8

data/code_safety.yml

@@ -1,18 +1,14 @@
 ---
 file safety:
-  .gitignore:
-    comments: 
+  ".gitignore":
+    comments: whole file re-reviewed
     reviewed_by: josh.pencheon
     safe_revision: d22b012a99fb1f8d94acbe445b6170f251a7b4a2
-  .rubocop.yml:
+  ".rubocop.yml":
     comments: 
     reviewed_by: timgentry
     safe_revision: 0cf75d467319de27ef1ff8395346f2f888843302
-  .ruby-version:
-    comments: 
-    reviewed_by: timgentry
-    safe_revision: 002969562baf46931e8192cd6ca1344952b00a41
-  .travis.yml:
+  ".travis.yml":
     comments: 
     reviewed_by: josh.pencheon
     safe_revision: 0e553a5088e832258526f10976935a917c6eedec
@@ -123,7 +119,7 @@ file safety:
   lib/ndr_import/mapper.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: 753723d2ce48a4836cf259d07a040924404106f4
+    safe_revision: 74ea81bd4c4119912012ff9f3b7c031e592438f9
   lib/ndr_import/mapping_error.rb:
     comments: 
     reviewed_by: timgentry
@@ -163,7 +159,7 @@ file safety:
   lib/ndr_import/version.rb:
     comments: 
     reviewed_by: josh.pencheon
-    safe_revision: e220a5173df0cb52421305089ea5888bb6fa6308
+    safe_revision: b980e1c079c1517ab171e915164d725f57e90708
   ndr_import.gemspec:
     comments: 
     reviewed_by: timgentry
@@ -226,8 +222,8 @@ file safety:
     safe_revision: 9abdd6ced1d0c90ce8dd88abee4eb6472c7ff0d6
   test/mapper_test.rb:
     comments: exposes Mapper internals to test them
-    reviewed_by: timgentry
-    safe_revision: 753723d2ce48a4836cf259d07a040924404106f4
+    reviewed_by: josh.pencheon
+    safe_revision: e1cc1153509ac371438aa68708a6c316dbf09eee
   test/non_tabular/mapping_test.rb:
     comments: 
     reviewed_by: timgentry
@@ -386,5 +382,5 @@ file safety:
     safe_revision: 6bb588c17d33a604c96c648c6eebfe2d063dfbc0
   test/test_helper.rb:
     comments: 
-    reviewed_by: timgentry
-    safe_revision: cf382902508a21a95b80ac4582fbbd117164e80e
+    reviewed_by: josh.pencheon
+    safe_revision: c244390ab15a9745d4e8c4cbfbaff67d7ef80cb4

data/lib/ndr_import/mapper.rb

@@ -21,7 +21,11 @@ module NdrImport::Mapper
 
     [field_mapping['replace']].flatten.each do |field_replacement|
       field_replacement.each do |pattern, replacement|
-        original_value.gsub!(pattern, replacement)
+        if original_value.is_a?(Array)
+          original_value.map { |val| val.gsub!(pattern, replacement) }
+        else
+          original_value.gsub!(pattern, replacement)
+        end
       end
     end
   end

data/lib/ndr_import/version.rb

@@ -1,4 +1,4 @@
 # This stores the current version of the NdrImport gem
 module NdrImport
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/test/mapper_test.rb

@@ -265,6 +265,18 @@ class MapperTest < ActiveSupport::TestCase
       - :invalid_encoding
   YML
 
+  replace_array_mapping = YAML.load <<-YML
+    - column: consultantcode
+      mappings:
+      - field: consultantcode
+    - column: hospital
+      mappings:
+      - field: hospital
+        replace:
+        - ? !ruby/regexp /Addenbrookes/
+          : 'RGT01'
+  YML
+
   test 'map should return a number' do
     assert_equal '1', TestMapper.new.mapped_value('A', map_mapping)
   end
@@ -326,6 +338,12 @@ class MapperTest < ActiveSupport::TestCase
     assert_equal '1234', TestMapper.new.mapped_value('1234', clean_opcs_mapping)
   end
 
+  test 'map should handle array original value' do
+    original_value = ['C9999998', %w(Addenbrookes RGT01)]
+    mapped_value = TestMapper.new.mapped_line(original_value, replace_array_mapping)
+    assert_equal %w(RGT01 RGT01), mapped_value['hospital']
+  end
+
   test 'should return correct date format for date fields with daysafter' do
     assert_equal Date.new(2012, 5, 18), TestMapper.new.mapped_value(2, daysafter_mapping)
     assert_equal Date.new(2012, 5, 18), TestMapper.new.mapped_value('2', daysafter_mapping)

data/test/test_helper.rb

@@ -7,6 +7,17 @@ require 'ndr_support/safe_path'
 require 'ndr_import'
 require 'yaml'
 
+begin
+  # Shim for Test::Unit vs. Minitest:
+  require 'active_support/testing/autorun'
+rescue LoadError
+  # Rails 4+ only
+end
+
+# The default changes to UTC in Rails 4.
+# TODO: ndr_support should cope...
+ActiveRecord::Base.default_timezone = :local
+
 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')

metadata

@@ -1,103 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: ndr_import
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - NCRS Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.18
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: ndr_support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: roo-xls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -146,112 +146,112 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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: guard
   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: guard-rubocop
   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: guard-test
   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: terminal-notifier-guard
   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: simplecov
   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'
 description: NDR ETL Importer
@@ -260,10 +260,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rubocop.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Guardfile
@@ -368,17 +367,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: NDR Import

data/.ruby-version

@@ -1 +0,0 @@
-1.9.3-p547