dwc-archive 0.7.1 → 0.7.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/VERSION +1 -1
  2. data/lib/dwc-archive/classification_normalizer.rb +4 -6
  3. data/spec/lib/dwc-archive_spec.rb +7 -0
  4. metadata +22 -22
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.7.1
1
+ 0.7.2
data/lib/dwc-archive/classification_normalizer.rb CHANGED
@@ -58,11 +58,9 @@ class DarwinCore
58
58
  private
59
59
 
60
60
  def get_canonical_name(a_scientific_name)
61
- if R19
62
- a_scientific_name.force_encoding('utf-8')
63
- end
61
+ a_scientific_name.force_encoding('utf-8')
64
62
  canonical_name = @parser.parse(a_scientific_name, :canonical_only => true)
65
- canonical_name.to_s.empty? ? a_scientific_name : canonical_name
63
+ canonical_name.to_s.empty? ? a_scientific_name : canonical_name.force_encoding('utf-8')
66
64
  end
67
65
 
68
66
  def get_fields(element)
@@ -126,8 +124,8 @@ class DarwinCore
126
124
  else
127
125
  taxon = @normalized_data[r[@core_fields[:id]]] ? @normalized_data[r[@core_fields[:id]]] : @normalized_data[r[@core_fields[:id]]] = DarwinCore::TaxonNormalized.new
128
126
  taxon.id = r[@core_fields[:id]]
129
- taxon.current_name = r[@core_fields[:scientificname]]
130
- taxon.current_name_canonical = r[@core_fields[:canonicalname]]
127
+ taxon.current_name = r[@core_fields[:scientificname]].force_encoding("utf-8")
128
+ taxon.current_name_canonical = r[@core_fields[:canonicalname]].force_encoding("utf-8")
131
129
  taxon.parent_id = r[parent_id]
132
130
  taxon.rank = r[@core_fields[:taxonrank]] if @core_fields[:taxonrank]
133
131
  taxon.status = r[@core_fields[:taxonomicstatus]] if @core_fields[:taxonomicstatus]
data/spec/lib/dwc-archive_spec.rb CHANGED
@@ -68,6 +68,13 @@ describe DarwinCore do
68
68
  dwc = DarwinCore.new(file)
69
69
  norm = dwc.normalize_classification
70
70
  norm.class.should == Hash
71
+ path_encodings = []
72
+ norm.each do |taxon_id, taxon|
73
+ taxon.classification_path.each {|p| path_encodings << p.encoding}
74
+ end
75
+ path_encodings.uniq!
76
+ path_encodings.size.should == 1
77
+ path_encodings[0].to_s.should == "UTF-8"
71
78
  norm['leptogastrinae:tid:2857'].class.should == DarwinCore::TaxonNormalized
72
79
  end
73
80
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dwc-archive
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.1
4
+ version: 0.7.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-09 00:00:00.000000000Z
12
+ date: 2011-11-16 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: parsley-store
16
- requirement: &70350712407260 !ruby/object:Gem::Requirement
16
+ requirement: &70198504788000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.3.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70350712407260
24
+ version_requirements: *70198504788000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &70350712406680 !ruby/object:Gem::Requirement
27
+ requirement: &70198504787520 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 2.3.0
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70350712406680
35
+ version_requirements: *70198504787520
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: nokogiri
38
- requirement: &70350712406100 !ruby/object:Gem::Requirement
38
+ requirement: &70198504787040 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70350712406100
46
+ version_requirements: *70198504787040
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: cucumber
49
- requirement: &70350712405520 !ruby/object:Gem::Requirement
49
+ requirement: &70198504786560 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70350712405520
57
+ version_requirements: *70198504786560
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: bundler
60
- requirement: &70350712404940 !ruby/object:Gem::Requirement
60
+ requirement: &70198504786080 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 1.0.0
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70350712404940
68
+ version_requirements: *70198504786080
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: jeweler
71
- requirement: &70350712404360 !ruby/object:Gem::Requirement
71
+ requirement: &70198504785600 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: 1.6.4
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70350712404360
79
+ version_requirements: *70198504785600
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: ruby-debug19
82
- requirement: &70350712403780 !ruby/object:Gem::Requirement
82
+ requirement: &70198504785060 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70350712403780
90
+ version_requirements: *70198504785060
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: parsley-store
93
- requirement: &70350712403180 !ruby/object:Gem::Requirement
93
+ requirement: &70198504784520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 0.3.0
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70350712403180
101
+ version_requirements: *70198504784520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec
104
- requirement: &70350712402640 !ruby/object:Gem::Requirement
104
+ requirement: &70198504784020 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 1.2.9
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70350712402640
112
+ version_requirements: *70198504784020
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: cucumber
115
- requirement: &70350712402100 !ruby/object:Gem::Requirement
115
+ requirement: &70198504783540 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70350712402100
123
+ version_requirements: *70198504783540
124
124
  description: Darwin Core Archive is the current standard exchange format for GLobal
125
125
  Names Architecture modules. This gem makes it easy to incorporate files in Darwin
126
126
  Core Archive format into a ruby project.