dwc-archive 0.7.2 → 0.7.3

data/Rakefile

@@ -46,7 +46,7 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/dwc-archive/classification_normalizer.rb

@@ -60,7 +60,7 @@ class DarwinCore
     def get_canonical_name(a_scientific_name)
       a_scientific_name.force_encoding('utf-8')
       canonical_name = @parser.parse(a_scientific_name, :canonical_only => true)
-      canonical_name.to_s.empty? ? a_scientific_name : canonical_name.force_encoding('utf-8')
+      canonical_name.to_s.empty? ? a_scientific_name : canonical_name
     end
     
     def get_fields(element)
@@ -89,10 +89,10 @@ class DarwinCore
     def set_scientific_name(row, fields)
       row[fields[:scientificname]] = 'N/A' unless row[fields[:scientificname]]
       canonical_name = ''
-      scientific_name = row[fields[:scientificname]].strip
+      scientific_name = row[fields[:scientificname]].strip.force_encoding('utf-8')
       if separate_canonical_and_authorship?(row, fields)
-        canonical_name = row[fields[:scientificname]].strip
-        scientific_name += " #{row[fields[:scientificnameauthorship]].strip}"
+        canonical_name = row[fields[:scientificname]].strip.force_encoding('utf-8')
+        scientific_name += " #{row[fields[:scientificnameauthorship]].strip.force_encoding('utf-8')}"
       else
         canonical_name = get_canonical_name(row[fields[:scientificname]])
       end
@@ -124,8 +124,8 @@ class DarwinCore
           else
             taxon = @normalized_data[r[@core_fields[:id]]] ? @normalized_data[r[@core_fields[:id]]] : @normalized_data[r[@core_fields[:id]]] = DarwinCore::TaxonNormalized.new
             taxon.id = r[@core_fields[:id]]
-            taxon.current_name = r[@core_fields[:scientificname]].force_encoding("utf-8")
-            taxon.current_name_canonical = r[@core_fields[:canonicalname]].force_encoding("utf-8")
+            taxon.current_name = r[@core_fields[:scientificname]]
+            taxon.current_name_canonical = r[@core_fields[:canonicalname]]
             taxon.parent_id = r[parent_id] 
             taxon.rank = r[@core_fields[:taxonrank]] if @core_fields[:taxonrank]
             taxon.status = r[@core_fields[:taxonomicstatus]] if @core_fields[:taxonomicstatus]
@@ -248,5 +248,3 @@ class DarwinCore
 
   end
 end
-
-

data/spec/lib/dwc-archive_spec.rb

@@ -120,9 +120,11 @@ describe DarwinCore do
     it "should be able work with files which have scientificNameAuthorship" do
       file = File.join(@file_dir, 'sci_name_authorship.tar.gz')
       dwc = DarwinCore.new(file)
-      $lala = 1
       cn = DarwinCore::ClassificationNormalizer.new(dwc)
       norm = cn.normalize
+      path_encodings = norm.map {|taxon_id, taxon| taxon.classification_path}.flatten.map { |name| name.encoding.to_s }.uniq
+      path_encodings.size.should == 1
+      path_encodings[0].should == "UTF-8"
       taxa = norm.select{|k,v| v.current_name_canonical.match " "}.select{|k,v| [v.current_name.split(" ").size >  v.current_name_canonical.split(" ").size]}
       taxa.size.should == 507
       syn = norm.select{|k,v| v.synonyms.size > 0}.map {|k,v| v.synonyms}.flatten.select {|s| s.name.split(" ").size  > s.canonical_name.split(" ").size}
@@ -132,7 +134,6 @@ describe DarwinCore do
     it "should be able work with files which repeat scientificNameAuthorship value in scientificName field" do
       file = File.join(@file_dir, 'sci_name_authorship_dup.tar.gz')
       dwc = DarwinCore.new(file)
-      $lala = 1
       norm = dwc.normalize_classification
       taxa = norm.select{|k,v| v.current_name_canonical.match " "}.select{|k,v| [v.current_name.split(" ").size >  v.current_name_canonical.split(" ").size]}
       taxa.size.should == 507

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwc-archive
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70198504788000 !ruby/object:Gem::Requirement
+  requirement: &70195181105880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198504788000
+  version_requirements: *70195181105880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70198504787520 !ruby/object:Gem::Requirement
+  requirement: &70195181104820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70198504787520
+  version_requirements: *70195181104820
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70198504787040 !ruby/object:Gem::Requirement
+  requirement: &70195181104200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198504787040
+  version_requirements: *70195181104200
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70198504786560 !ruby/object:Gem::Requirement
+  requirement: &70195181103720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198504786560
+  version_requirements: *70195181103720
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70198504786080 !ruby/object:Gem::Requirement
+  requirement: &70195181103100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70198504786080
+  version_requirements: *70195181103100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70198504785600 !ruby/object:Gem::Requirement
+  requirement: &70195181102480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70198504785600
+  version_requirements: *70195181102480
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70198504785060 !ruby/object:Gem::Requirement
+  requirement: &70195181102000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198504785060
+  version_requirements: *70195181102000
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70198504784520 !ruby/object:Gem::Requirement
+  requirement: &70195181101520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198504784520
+  version_requirements: *70195181101520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70198504784020 !ruby/object:Gem::Requirement
+  requirement: &70195181101020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70198504784020
+  version_requirements: *70195181101020
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70198504783540 !ruby/object:Gem::Requirement
+  requirement: &70195181100540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198504783540
+  version_requirements: *70195181100540
 description: Darwin Core Archive is the current standard exchange format for GLobal
   Names Architecture modules. This gem makes it easy to incorporate files in Darwin
   Core Archive format into a ruby project.