dwc_agent 1.4.1 → 1.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dwc_agent/cleaner.rb +18 -10
- data/lib/dwc_agent/constants.rb +7 -1
- data/lib/dwc_agent/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 75ac9f77b1b4d5761881cafca45e66c2745eb47bb501ad9fab84cad6324b41ee
|
|
4
|
+
data.tar.gz: 16057726f330cb033fe7e3af0af58dd4fbb2f6f9817a56c3e86c88da1fbccf61
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f628d3bfec046b54338eb08ec18cc5352dff7560e5e87e2c949378e66bcb44df84af637ea7c8b4d559504945b5682b6f019f2bde56d31552a1c4537902b2a71e
|
|
7
|
+
data.tar.gz: 444b15c0d391e12d8ccd6823f8ae97688d9b20ed075323795e22acd7834add4e5068fcc2d4fc3729e36aa3bdc11f29f4a6f8af8c7fc1cfc34d1f294159212328
|
data/lib/dwc_agent/cleaner.rb
CHANGED
|
@@ -22,6 +22,10 @@ module DwcAgent
|
|
|
22
22
|
return blank_name
|
|
23
23
|
end
|
|
24
24
|
|
|
25
|
+
if parsed_namae.given && GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
|
|
26
|
+
return blank_name
|
|
27
|
+
end
|
|
28
|
+
|
|
25
29
|
if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
|
|
26
30
|
return blank_name
|
|
27
31
|
end
|
|
@@ -38,9 +42,9 @@ module DwcAgent
|
|
|
38
42
|
return blank_name
|
|
39
43
|
end
|
|
40
44
|
|
|
41
|
-
if parsed_namae.given &&
|
|
42
|
-
parsed_namae.family &&
|
|
43
|
-
parsed_namae.family.count(".") > 0 &&
|
|
45
|
+
if parsed_namae.given &&
|
|
46
|
+
parsed_namae.family &&
|
|
47
|
+
parsed_namae.family.count(".") > 0 &&
|
|
44
48
|
parsed_namae.family.length - parsed_namae.family.count(".") <= 3
|
|
45
49
|
given = parsed_namae.given
|
|
46
50
|
family = parsed_namae.family
|
|
@@ -48,9 +52,9 @@ module DwcAgent
|
|
|
48
52
|
parsed_namae.given = family
|
|
49
53
|
end
|
|
50
54
|
|
|
51
|
-
if parsed_namae.given &&
|
|
52
|
-
parsed_namae.family &&
|
|
53
|
-
parsed_namae.family.length <=3 &&
|
|
55
|
+
if parsed_namae.given &&
|
|
56
|
+
parsed_namae.family &&
|
|
57
|
+
parsed_namae.family.length <=3 &&
|
|
54
58
|
parsed_namae.family == parsed_namae.family.upcase &&
|
|
55
59
|
parsed_namae.given[-1] != "."
|
|
56
60
|
given = parsed_namae.given
|
|
@@ -59,9 +63,9 @@ module DwcAgent
|
|
|
59
63
|
parsed_namae.given = family
|
|
60
64
|
end
|
|
61
65
|
|
|
62
|
-
if parsed_namae.given &&
|
|
63
|
-
(parsed_namae.given == parsed_namae.given.upcase ||
|
|
64
|
-
parsed_namae.given == parsed_namae.given.downcase) &&
|
|
66
|
+
if parsed_namae.given &&
|
|
67
|
+
(parsed_namae.given == parsed_namae.given.upcase ||
|
|
68
|
+
parsed_namae.given == parsed_namae.given.downcase) &&
|
|
65
69
|
!parsed_namae.given.include?(".") &&
|
|
66
70
|
parsed_namae.given.tr(".","").length >= 4
|
|
67
71
|
parsed_namae.given = NameCase(parsed_namae.given)
|
|
@@ -115,8 +119,12 @@ module DwcAgent
|
|
|
115
119
|
return blank_name
|
|
116
120
|
end
|
|
117
121
|
|
|
122
|
+
if !given.nil? && GIVEN_BLACKLIST.any?{ |s| s.casecmp(given) == 0 }
|
|
123
|
+
return blank_name
|
|
124
|
+
end
|
|
125
|
+
|
|
118
126
|
{ given: given, family: family, particle: particle }
|
|
119
127
|
end
|
|
120
128
|
|
|
121
129
|
end
|
|
122
|
-
end
|
|
130
|
+
end
|
data/lib/dwc_agent/constants.rb
CHANGED
|
@@ -238,7 +238,13 @@ module DwcAgent
|
|
|
238
238
|
"data",
|
|
239
239
|
"orig",
|
|
240
240
|
"science",
|
|
241
|
-
"catalogue"
|
|
241
|
+
"catalogue",
|
|
242
|
+
"entered"
|
|
243
|
+
]
|
|
244
|
+
|
|
245
|
+
GIVEN_BLACKLIST = [
|
|
246
|
+
"not any",
|
|
247
|
+
"has not"
|
|
242
248
|
]
|
|
243
249
|
|
|
244
250
|
TITLE = /\s*\b(sir|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|prof|dr|md|ph\.?d|rev|docteur|mme|abbé|ptre)\.?|frère|frere|père|pere|professor|esq\.?)(\s+|$)/i
|
data/lib/dwc_agent/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dwc_agent
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.4.
|
|
4
|
+
version: 1.4.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- David P. Shorthouse
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-12-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: namae
|
|
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
119
119
|
- !ruby/object:Gem::Version
|
|
120
120
|
version: '0'
|
|
121
121
|
requirements: []
|
|
122
|
-
rubygems_version: 3.0.
|
|
122
|
+
rubygems_version: 3.0.6
|
|
123
123
|
signing_key:
|
|
124
124
|
specification_version: 4
|
|
125
125
|
summary: Parse Darwin Core agent terms such as recordedBy and identifiedBy
|