dwc-archive 0.7.8 → 0.7.9

data/Gemfile.lock

@@ -61,10 +61,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler
-  cucumber
-  jeweler
-  nokogiri
+  bundler (~> 1.0)
+  cucumber (~> 1.1.3)
+  jeweler (~> 1.6.4)
+  nokogiri (~> 1.5.0)
   parsley-store (~> 0.3.0)
-  rspec
-  ruby-debug19
+  rspec (~> 2.7.0)
+  ruby-debug19 (~> 0.11.6)

data/VERSION

@@ -1 +1 @@
-0.7.8
+0.7.9

data/features/step_definitions/dwc-reader_steps.rb

@@ -197,6 +197,8 @@ Then /^there are paths, synonyms and vernacular names in normalized classificati
     end
     if v.vernacular_names.size > 0
       @vernaculars_are_generated = true
+      vn = v.vernacular_names[0]
+      (vn.respond_to?('locality') && vn.respond_to?('country_code') && vn.respond_to?('language')).should be_true
     end
     break if (@vernaculars_are_generated && @paths_are_generated && @synonyms_are_generated)
   end

data/lib/dwc-archive/classification_normalizer.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 require 'parsley-store'
 
-class DarwinCore 
-    
+class DarwinCore
+
   class TaxonNormalized
     attr_accessor :id, :parent_id, :classification_path_id, :classification_path, :current_name, :current_name_canonical, :synonyms, :vernacular_names, :rank, :status
 
@@ -19,7 +19,7 @@ class DarwinCore
   end
 
   class SynonymNormalized < Struct.new(:id, :name, :canonical_name, :status);end
-  class VernacularNormalized < Struct.new(:name, :language, :locality);end
+  class VernacularNormalized < Struct.new(:name, :language, :locality, :country_code);end
 
   class ClassificationNormalizer
     attr_reader :error_names, :tree, :normalized_data
@@ -82,24 +82,24 @@ class DarwinCore
         nil
       end
     end
-    
+
     def get_fields(element)
       data = element.fields.inject({}) { |res, f| res[f[:term].split('/')[-1].downcase.to_sym] = f[:index].to_i; res }
-      data[:id] = element.id[:index] 
+      data[:id] = element.id[:index]
       data
     end
 
     def status_synonym?(status)
       status && !!status.match(/^syn/)
     end
-    
+
     def add_synonym_from_core(taxon_id, row)
       @synonyms[row[@core_fields[:id]]] = taxon_id
       taxon = @normalized_data[row[taxon_id]] ? @normalized_data[row[taxon_id]] : @normalized_data[row[taxon_id]] = DarwinCore::TaxonNormalized.new
       synonym = SynonymNormalized.new(
         row[@core_fields[:id]],
-        row[@core_fields[:scientificname]], 
-        row[@core_fields[:canonicalname]], 
+        row[@core_fields[:scientificname]],
+        row[@core_fields[:canonicalname]],
         @core_fields[:taxonomicstatus] ? row[@core_fields[:taxonomicstatus]] : nil)
       taxon.synonyms <<  synonym
       add_name_string(synonym.name)
@@ -148,7 +148,7 @@ class DarwinCore
             taxon.id = r[@core_fields[:id]]
             taxon.current_name = r[@core_fields[:scientificname]]
             taxon.current_name_canonical = r[@core_fields[:canonicalname]]
-            taxon.parent_id = has_parent_id? ? r[parent_id] : nil 
+            taxon.parent_id = has_parent_id? ? r[parent_id] : nil
             taxon.rank = r[@core_fields[:taxonrank]] if @core_fields[:taxonrank]
             taxon.status = r[@core_fields[:taxonomicstatus]] if @core_fields[:taxonomicstatus]
             add_name_string(taxon.current_name)
@@ -157,7 +157,7 @@ class DarwinCore
         end
       end
     end
-    
+
     def has_parent_id?
       @has_parent_id ||= @core_fields.has_key?(:highertaxonid) || @core_fields.has_key?(:parentnameusageid)
     end
@@ -188,7 +188,7 @@ class DarwinCore
         parent_cp = parent_cpid = nil
         if @normalized_data[taxon.parent_id]
           parent_cp = @normalized_data[taxon.parent_id].classification_path if @with_canonical_names
-          parent_cpid = @normalized_data[taxon.parent_id].classification_path_id 
+          parent_cpid = @normalized_data[taxon.parent_id].classification_path_id
         else
           current_parent = @normalized_data[@synonyms[taxon.parent_id]]
           if current_parent
@@ -200,11 +200,11 @@ class DarwinCore
           else
             error = "WARNING: The parent of the taxon \'#{taxon.current_name}\' not found"
             @error_names << {:data => taxon, :error => :deprecated_parent, :current_parent => nil}
-          end  
+          end
         end
         return 'error' unless parent_cpid
         if parent_cpid.empty?
-          res = get_classification_path(@normalized_data[taxon.parent_id]) 
+          res = get_classification_path(@normalized_data[taxon.parent_id])
           return res if res == 'error'
           if @with_canonical_names
             taxon.classification_path += @normalized_data[taxon.parent_id].classification_path + [taxon.current_name_canonical]
@@ -233,7 +233,7 @@ class DarwinCore
         ingest_vernaculars(e) if fields.keys.include? :vernacularname
       end
     end
-    
+
     def ingest_synonyms(extension)
       DarwinCore.logger_write(@dwc.object_id, "Ingesting synonyms extension")
       ext, fields = *extension
@@ -242,8 +242,8 @@ class DarwinCore
           set_scientific_name(r, fields)
           synonym = SynonymNormalized.new(
             nil,
-            r[fields[:scientificname]], 
-            r[fields[:canonicalname]], 
+            r[fields[:scientificname]],
+            r[fields[:canonicalname]],
             fields[:taxonomicstatus] ? r[fields[:taxonomicstatus]] : nil)
           @normalized_data[r[fields[:id]]].synonyms << synonym
           add_name_string(synonym.name)
@@ -262,15 +262,18 @@ class DarwinCore
           if fields[:language]
             language = r[fields[:language]]
           elsif fields[:languagecode]
-            language = r[fields[:languagecode]] 
+            language = r[fields[:languagecode]]
           end
-          
+
           locality = fields[:locality] ? r[fields[:locality]] : nil
-          
+
+          country_code = fields[:countrycode] ? r[fields[:countrycode]] : nil
+
           vernacular = VernacularNormalized.new(
             r[fields[:vernacularname]],
             language,
-            locality)
+            locality,
+            country_code)
           @normalized_data[r[fields[:id]]].vernacular_names << vernacular
           add_vernacular_name_string(vernacular.name)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwc-archive
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70358171329960 !ruby/object:Gem::Requirement
+  requirement: &70152131291540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70358171329960
+  version_requirements: *70152131291540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70358171328420 !ruby/object:Gem::Requirement
+  requirement: &70152131290940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70358171328420
+  version_requirements: *70152131290940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70358171317420 !ruby/object:Gem::Requirement
+  requirement: &70152131290300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70358171317420
+  version_requirements: *70152131290300
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70358171315520 !ruby/object:Gem::Requirement
+  requirement: &70152131289460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70358171315520
+  version_requirements: *70152131289460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70358171313280 !ruby/object:Gem::Requirement
+  requirement: &70152131288800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70358171313280
+  version_requirements: *70152131288800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70358171310420 !ruby/object:Gem::Requirement
+  requirement: &70152131288320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70358171310420
+  version_requirements: *70152131288320
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70358171307220 !ruby/object:Gem::Requirement
+  requirement: &70152131287820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *70358171307220
+  version_requirements: *70152131287820
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70358171305420 !ruby/object:Gem::Requirement
+  requirement: &70152131287300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70358171305420
+  version_requirements: *70152131287300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70358171280220 !ruby/object:Gem::Requirement
+  requirement: &70152131286800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70358171280220
+  version_requirements: *70152131286800
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70358171279080 !ruby/object:Gem::Requirement
+  requirement: &70152131286300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70358171279080
+  version_requirements: *70152131286300
 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.
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Handler of Darwin Core Archive files