ndr_import 3.0.1 → 3.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/code_safety.yml +10 -14
- data/lib/ndr_import/mapper.rb +5 -1
- data/lib/ndr_import/version.rb +1 -1
- data/test/mapper_test.rb +18 -0
- data/test/test_helper.rb +11 -0
- metadata +38 -39
- data/.ruby-version +0 -1
checksums.yaml
CHANGED
@@ -1,15 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
|
5
|
-
data.tar.gz: !binary |-
|
6
|
-
ZTFkYjNkNzBiNzE3YTRhNmY2M2QzMGE1OTRlOWQyOGE2YjNkOGJmZQ==
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 4dd8607e78411219cbfe94134c3a1d5586a5a8a6
|
4
|
+
data.tar.gz: f1ecd6a75c57cb2c34d1ea095cf498c116529f20
|
7
5
|
SHA512:
|
8
|
-
metadata.gz:
|
9
|
-
|
10
|
-
MzEzZTQ0M2QyN2M4YTU0M2YzZTUzN2Y4YWEzMDY3NjRjNGQ2ZmFmMTgzMGIy
|
11
|
-
YjUwNmRhZjc1YWUzYjcwYTFhYmFiN2NmZDBhMTYxMWZhMjFkNGI=
|
12
|
-
data.tar.gz: !binary |-
|
13
|
-
Y2U3NTBmNzQwODdiOWNmNmFkYThmMjkzYjMzYzgwYjgwMjYxZmFkMjNlOWM4
|
14
|
-
NzE5YzM2ZThhYWNmNzM5MDdjMTRkYzkyMzViNDRmNTBlN2Y5NmMzMGM2ZmJm
|
15
|
-
NWU4MmI3ODRlMDNiMjgzNWVmNDdjOGYyODMyMjhiMmViYzAzN2E=
|
6
|
+
metadata.gz: e2ad1086a1e754d3a31b9ffbd4aaa4f836406668c59acb68a1a0d679a08174b4e044d056a1f547517914e5c030ddebd125da41d6850a1a8a6a17ba3db43fd095
|
7
|
+
data.tar.gz: ca864436b5dc2f29c769a29d4de0ac1893b0b8236a9decbb19a461294f1749b9ce19b1f8986b66875860b728b83140d6326d9dc5f478907af66acde334a95bc8
|
data/code_safety.yml
CHANGED
@@ -1,18 +1,14 @@
|
|
1
1
|
---
|
2
2
|
file safety:
|
3
|
-
.gitignore:
|
4
|
-
comments:
|
3
|
+
".gitignore":
|
4
|
+
comments: whole file re-reviewed
|
5
5
|
reviewed_by: josh.pencheon
|
6
6
|
safe_revision: d22b012a99fb1f8d94acbe445b6170f251a7b4a2
|
7
|
-
.rubocop.yml:
|
7
|
+
".rubocop.yml":
|
8
8
|
comments:
|
9
9
|
reviewed_by: timgentry
|
10
10
|
safe_revision: 0cf75d467319de27ef1ff8395346f2f888843302
|
11
|
-
.
|
12
|
-
comments:
|
13
|
-
reviewed_by: timgentry
|
14
|
-
safe_revision: 002969562baf46931e8192cd6ca1344952b00a41
|
15
|
-
.travis.yml:
|
11
|
+
".travis.yml":
|
16
12
|
comments:
|
17
13
|
reviewed_by: josh.pencheon
|
18
14
|
safe_revision: 0e553a5088e832258526f10976935a917c6eedec
|
@@ -123,7 +119,7 @@ file safety:
|
|
123
119
|
lib/ndr_import/mapper.rb:
|
124
120
|
comments:
|
125
121
|
reviewed_by: josh.pencheon
|
126
|
-
safe_revision:
|
122
|
+
safe_revision: 74ea81bd4c4119912012ff9f3b7c031e592438f9
|
127
123
|
lib/ndr_import/mapping_error.rb:
|
128
124
|
comments:
|
129
125
|
reviewed_by: timgentry
|
@@ -163,7 +159,7 @@ file safety:
|
|
163
159
|
lib/ndr_import/version.rb:
|
164
160
|
comments:
|
165
161
|
reviewed_by: josh.pencheon
|
166
|
-
safe_revision:
|
162
|
+
safe_revision: b980e1c079c1517ab171e915164d725f57e90708
|
167
163
|
ndr_import.gemspec:
|
168
164
|
comments:
|
169
165
|
reviewed_by: timgentry
|
@@ -226,8 +222,8 @@ file safety:
|
|
226
222
|
safe_revision: 9abdd6ced1d0c90ce8dd88abee4eb6472c7ff0d6
|
227
223
|
test/mapper_test.rb:
|
228
224
|
comments: exposes Mapper internals to test them
|
229
|
-
reviewed_by:
|
230
|
-
safe_revision:
|
225
|
+
reviewed_by: josh.pencheon
|
226
|
+
safe_revision: e1cc1153509ac371438aa68708a6c316dbf09eee
|
231
227
|
test/non_tabular/mapping_test.rb:
|
232
228
|
comments:
|
233
229
|
reviewed_by: timgentry
|
@@ -386,5 +382,5 @@ file safety:
|
|
386
382
|
safe_revision: 6bb588c17d33a604c96c648c6eebfe2d063dfbc0
|
387
383
|
test/test_helper.rb:
|
388
384
|
comments:
|
389
|
-
reviewed_by:
|
390
|
-
safe_revision:
|
385
|
+
reviewed_by: josh.pencheon
|
386
|
+
safe_revision: c244390ab15a9745d4e8c4cbfbaff67d7ef80cb4
|
data/lib/ndr_import/mapper.rb
CHANGED
@@ -21,7 +21,11 @@ module NdrImport::Mapper
|
|
21
21
|
|
22
22
|
[field_mapping['replace']].flatten.each do |field_replacement|
|
23
23
|
field_replacement.each do |pattern, replacement|
|
24
|
-
original_value.
|
24
|
+
if original_value.is_a?(Array)
|
25
|
+
original_value.map { |val| val.gsub!(pattern, replacement) }
|
26
|
+
else
|
27
|
+
original_value.gsub!(pattern, replacement)
|
28
|
+
end
|
25
29
|
end
|
26
30
|
end
|
27
31
|
end
|
data/lib/ndr_import/version.rb
CHANGED
data/test/mapper_test.rb
CHANGED
@@ -265,6 +265,18 @@ class MapperTest < ActiveSupport::TestCase
|
|
265
265
|
- :invalid_encoding
|
266
266
|
YML
|
267
267
|
|
268
|
+
replace_array_mapping = YAML.load <<-YML
|
269
|
+
- column: consultantcode
|
270
|
+
mappings:
|
271
|
+
- field: consultantcode
|
272
|
+
- column: hospital
|
273
|
+
mappings:
|
274
|
+
- field: hospital
|
275
|
+
replace:
|
276
|
+
- ? !ruby/regexp /Addenbrookes/
|
277
|
+
: 'RGT01'
|
278
|
+
YML
|
279
|
+
|
268
280
|
test 'map should return a number' do
|
269
281
|
assert_equal '1', TestMapper.new.mapped_value('A', map_mapping)
|
270
282
|
end
|
@@ -326,6 +338,12 @@ class MapperTest < ActiveSupport::TestCase
|
|
326
338
|
assert_equal '1234', TestMapper.new.mapped_value('1234', clean_opcs_mapping)
|
327
339
|
end
|
328
340
|
|
341
|
+
test 'map should handle array original value' do
|
342
|
+
original_value = ['C9999998', %w(Addenbrookes RGT01)]
|
343
|
+
mapped_value = TestMapper.new.mapped_line(original_value, replace_array_mapping)
|
344
|
+
assert_equal %w(RGT01 RGT01), mapped_value['hospital']
|
345
|
+
end
|
346
|
+
|
329
347
|
test 'should return correct date format for date fields with daysafter' do
|
330
348
|
assert_equal Date.new(2012, 5, 18), TestMapper.new.mapped_value(2, daysafter_mapping)
|
331
349
|
assert_equal Date.new(2012, 5, 18), TestMapper.new.mapped_value('2', daysafter_mapping)
|
data/test/test_helper.rb
CHANGED
@@ -7,6 +7,17 @@ require 'ndr_support/safe_path'
|
|
7
7
|
require 'ndr_import'
|
8
8
|
require 'yaml'
|
9
9
|
|
10
|
+
begin
|
11
|
+
# Shim for Test::Unit vs. Minitest:
|
12
|
+
require 'active_support/testing/autorun'
|
13
|
+
rescue LoadError
|
14
|
+
# Rails 4+ only
|
15
|
+
end
|
16
|
+
|
17
|
+
# The default changes to UTC in Rails 4.
|
18
|
+
# TODO: ndr_support should cope...
|
19
|
+
ActiveRecord::Base.default_timezone = :local
|
20
|
+
|
10
21
|
SafePath.configure! File.dirname(__FILE__) + '/resources/filesystem_paths.yml'
|
11
22
|
NdrImport::StandardMappings.mappings = YAML.load_file(
|
12
23
|
File.expand_path(File.dirname(__FILE__) + '/resources/standard_mappings.yml')
|
metadata
CHANGED
@@ -1,103 +1,103 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ndr_import
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0
|
4
|
+
version: 3.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- NCRS Development Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2016-01-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- -
|
17
|
+
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: 3.2.18
|
20
|
-
- - <
|
20
|
+
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: 5.0.0
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
|
-
- -
|
27
|
+
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: 3.2.18
|
30
|
-
- - <
|
30
|
+
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
32
|
version: 5.0.0
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: ndr_support
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
|
-
- - ~>
|
37
|
+
- - "~>"
|
38
38
|
- !ruby/object:Gem::Version
|
39
39
|
version: '3.0'
|
40
40
|
type: :runtime
|
41
41
|
prerelease: false
|
42
42
|
version_requirements: !ruby/object:Gem::Requirement
|
43
43
|
requirements:
|
44
|
-
- - ~>
|
44
|
+
- - "~>"
|
45
45
|
- !ruby/object:Gem::Version
|
46
46
|
version: '3.0'
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: rubyzip
|
49
49
|
requirement: !ruby/object:Gem::Requirement
|
50
50
|
requirements:
|
51
|
-
- - ~>
|
51
|
+
- - "~>"
|
52
52
|
- !ruby/object:Gem::Version
|
53
53
|
version: '1.1'
|
54
54
|
type: :runtime
|
55
55
|
prerelease: false
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
58
|
-
- - ~>
|
58
|
+
- - "~>"
|
59
59
|
- !ruby/object:Gem::Version
|
60
60
|
version: '1.1'
|
61
61
|
- !ruby/object:Gem::Dependency
|
62
62
|
name: roo
|
63
63
|
requirement: !ruby/object:Gem::Requirement
|
64
64
|
requirements:
|
65
|
-
- - ~>
|
65
|
+
- - "~>"
|
66
66
|
- !ruby/object:Gem::Version
|
67
67
|
version: '2.0'
|
68
68
|
type: :runtime
|
69
69
|
prerelease: false
|
70
70
|
version_requirements: !ruby/object:Gem::Requirement
|
71
71
|
requirements:
|
72
|
-
- - ~>
|
72
|
+
- - "~>"
|
73
73
|
- !ruby/object:Gem::Version
|
74
74
|
version: '2.0'
|
75
75
|
- !ruby/object:Gem::Dependency
|
76
76
|
name: nokogiri
|
77
77
|
requirement: !ruby/object:Gem::Requirement
|
78
78
|
requirements:
|
79
|
-
- - ~>
|
79
|
+
- - "~>"
|
80
80
|
- !ruby/object:Gem::Version
|
81
81
|
version: '1.6'
|
82
82
|
type: :runtime
|
83
83
|
prerelease: false
|
84
84
|
version_requirements: !ruby/object:Gem::Requirement
|
85
85
|
requirements:
|
86
|
-
- - ~>
|
86
|
+
- - "~>"
|
87
87
|
- !ruby/object:Gem::Version
|
88
88
|
version: '1.6'
|
89
89
|
- !ruby/object:Gem::Dependency
|
90
90
|
name: roo-xls
|
91
91
|
requirement: !ruby/object:Gem::Requirement
|
92
92
|
requirements:
|
93
|
-
- -
|
93
|
+
- - ">="
|
94
94
|
- !ruby/object:Gem::Version
|
95
95
|
version: '0'
|
96
96
|
type: :runtime
|
97
97
|
prerelease: false
|
98
98
|
version_requirements: !ruby/object:Gem::Requirement
|
99
99
|
requirements:
|
100
|
-
- -
|
100
|
+
- - ">="
|
101
101
|
- !ruby/object:Gem::Version
|
102
102
|
version: '0'
|
103
103
|
- !ruby/object:Gem::Dependency
|
@@ -146,112 +146,112 @@ dependencies:
|
|
146
146
|
name: bundler
|
147
147
|
requirement: !ruby/object:Gem::Requirement
|
148
148
|
requirements:
|
149
|
-
- - ~>
|
149
|
+
- - "~>"
|
150
150
|
- !ruby/object:Gem::Version
|
151
151
|
version: '1.7'
|
152
152
|
type: :development
|
153
153
|
prerelease: false
|
154
154
|
version_requirements: !ruby/object:Gem::Requirement
|
155
155
|
requirements:
|
156
|
-
- - ~>
|
156
|
+
- - "~>"
|
157
157
|
- !ruby/object:Gem::Version
|
158
158
|
version: '1.7'
|
159
159
|
- !ruby/object:Gem::Dependency
|
160
160
|
name: rake
|
161
161
|
requirement: !ruby/object:Gem::Requirement
|
162
162
|
requirements:
|
163
|
-
- - ~>
|
163
|
+
- - "~>"
|
164
164
|
- !ruby/object:Gem::Version
|
165
165
|
version: '10.0'
|
166
166
|
type: :development
|
167
167
|
prerelease: false
|
168
168
|
version_requirements: !ruby/object:Gem::Requirement
|
169
169
|
requirements:
|
170
|
-
- - ~>
|
170
|
+
- - "~>"
|
171
171
|
- !ruby/object:Gem::Version
|
172
172
|
version: '10.0'
|
173
173
|
- !ruby/object:Gem::Dependency
|
174
174
|
name: minitest
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
176
176
|
requirements:
|
177
|
-
- -
|
177
|
+
- - ">="
|
178
178
|
- !ruby/object:Gem::Version
|
179
179
|
version: '0'
|
180
180
|
type: :development
|
181
181
|
prerelease: false
|
182
182
|
version_requirements: !ruby/object:Gem::Requirement
|
183
183
|
requirements:
|
184
|
-
- -
|
184
|
+
- - ">="
|
185
185
|
- !ruby/object:Gem::Version
|
186
186
|
version: '0'
|
187
187
|
- !ruby/object:Gem::Dependency
|
188
188
|
name: guard
|
189
189
|
requirement: !ruby/object:Gem::Requirement
|
190
190
|
requirements:
|
191
|
-
- -
|
191
|
+
- - ">="
|
192
192
|
- !ruby/object:Gem::Version
|
193
193
|
version: '0'
|
194
194
|
type: :development
|
195
195
|
prerelease: false
|
196
196
|
version_requirements: !ruby/object:Gem::Requirement
|
197
197
|
requirements:
|
198
|
-
- -
|
198
|
+
- - ">="
|
199
199
|
- !ruby/object:Gem::Version
|
200
200
|
version: '0'
|
201
201
|
- !ruby/object:Gem::Dependency
|
202
202
|
name: guard-rubocop
|
203
203
|
requirement: !ruby/object:Gem::Requirement
|
204
204
|
requirements:
|
205
|
-
- -
|
205
|
+
- - ">="
|
206
206
|
- !ruby/object:Gem::Version
|
207
207
|
version: '0'
|
208
208
|
type: :development
|
209
209
|
prerelease: false
|
210
210
|
version_requirements: !ruby/object:Gem::Requirement
|
211
211
|
requirements:
|
212
|
-
- -
|
212
|
+
- - ">="
|
213
213
|
- !ruby/object:Gem::Version
|
214
214
|
version: '0'
|
215
215
|
- !ruby/object:Gem::Dependency
|
216
216
|
name: guard-test
|
217
217
|
requirement: !ruby/object:Gem::Requirement
|
218
218
|
requirements:
|
219
|
-
- -
|
219
|
+
- - ">="
|
220
220
|
- !ruby/object:Gem::Version
|
221
221
|
version: '0'
|
222
222
|
type: :development
|
223
223
|
prerelease: false
|
224
224
|
version_requirements: !ruby/object:Gem::Requirement
|
225
225
|
requirements:
|
226
|
-
- -
|
226
|
+
- - ">="
|
227
227
|
- !ruby/object:Gem::Version
|
228
228
|
version: '0'
|
229
229
|
- !ruby/object:Gem::Dependency
|
230
230
|
name: terminal-notifier-guard
|
231
231
|
requirement: !ruby/object:Gem::Requirement
|
232
232
|
requirements:
|
233
|
-
- -
|
233
|
+
- - ">="
|
234
234
|
- !ruby/object:Gem::Version
|
235
235
|
version: '0'
|
236
236
|
type: :development
|
237
237
|
prerelease: false
|
238
238
|
version_requirements: !ruby/object:Gem::Requirement
|
239
239
|
requirements:
|
240
|
-
- -
|
240
|
+
- - ">="
|
241
241
|
- !ruby/object:Gem::Version
|
242
242
|
version: '0'
|
243
243
|
- !ruby/object:Gem::Dependency
|
244
244
|
name: simplecov
|
245
245
|
requirement: !ruby/object:Gem::Requirement
|
246
246
|
requirements:
|
247
|
-
- -
|
247
|
+
- - ">="
|
248
248
|
- !ruby/object:Gem::Version
|
249
249
|
version: '0'
|
250
250
|
type: :development
|
251
251
|
prerelease: false
|
252
252
|
version_requirements: !ruby/object:Gem::Requirement
|
253
253
|
requirements:
|
254
|
-
- -
|
254
|
+
- - ">="
|
255
255
|
- !ruby/object:Gem::Version
|
256
256
|
version: '0'
|
257
257
|
description: NDR ETL Importer
|
@@ -260,10 +260,9 @@ executables: []
|
|
260
260
|
extensions: []
|
261
261
|
extra_rdoc_files: []
|
262
262
|
files:
|
263
|
-
- .gitignore
|
264
|
-
- .rubocop.yml
|
265
|
-
- .
|
266
|
-
- .travis.yml
|
263
|
+
- ".gitignore"
|
264
|
+
- ".rubocop.yml"
|
265
|
+
- ".travis.yml"
|
267
266
|
- CODE_OF_CONDUCT.md
|
268
267
|
- Gemfile
|
269
268
|
- Guardfile
|
@@ -368,17 +367,17 @@ require_paths:
|
|
368
367
|
- lib
|
369
368
|
required_ruby_version: !ruby/object:Gem::Requirement
|
370
369
|
requirements:
|
371
|
-
- -
|
370
|
+
- - ">="
|
372
371
|
- !ruby/object:Gem::Version
|
373
372
|
version: 1.9.3
|
374
373
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
375
374
|
requirements:
|
376
|
-
- -
|
375
|
+
- - ">="
|
377
376
|
- !ruby/object:Gem::Version
|
378
377
|
version: '0'
|
379
378
|
requirements: []
|
380
379
|
rubyforge_project:
|
381
|
-
rubygems_version: 2.4.
|
380
|
+
rubygems_version: 2.4.5.1
|
382
381
|
signing_key:
|
383
382
|
specification_version: 4
|
384
383
|
summary: NDR Import
|
data/.ruby-version
DELETED
@@ -1 +0,0 @@
|
|
1
|
-
1.9.3-p547
|