dwc-archive 0.7.10 → 0.7.11

data/VERSION

@@ -1 +1 @@
-0.7.10
+0.7.11

data/lib/dwc-archive/classification_normalizer.rb

@@ -4,12 +4,13 @@ require 'parsley-store'
 class DarwinCore
 
   class TaxonNormalized
-    attr_accessor :id, :parent_id, :classification_path_id, :classification_path, :current_name, :current_name_canonical, :synonyms, :vernacular_names, :rank, :status
+    attr_accessor :id, :source, :parent_id, :classification_path_id, :classification_path, :current_name, :current_name_canonical, :synonyms, :vernacular_names, :rank, :status
 
     def initialize
       @id = @parent_id = @rank = @status = nil
       @current_name = ''
       @current_name_canonical = ''
+      @source = ''
       @classification_path = []
       @classification_path_id = []
       @synonyms = []
@@ -18,7 +19,7 @@ class DarwinCore
 
   end
 
-  class SynonymNormalized < Struct.new(:id, :name, :canonical_name, :status);end
+  class SynonymNormalized < Struct.new(:id, :name, :canonical_name, :status, :source);end
   class VernacularNormalized < Struct.new(:name, :language, :locality, :country_code);end
 
   class ClassificationNormalizer
@@ -100,7 +101,9 @@ class DarwinCore
         row[@core_fields[:id]],
         row[@core_fields[:scientificname]],
         row[@core_fields[:canonicalname]],
-        @core_fields[:taxonomicstatus] ? row[@core_fields[:taxonomicstatus]] : nil)
+        @core_fields[:taxonomicstatus] ? row[@core_fields[:taxonomicstatus]] : nil,
+        @core_fields[:source] ? row[@core_fields[:source]] : nil
+      )
       taxon.synonyms <<  synonym
       add_name_string(synonym.name)
       add_name_string(synonym.canonical_name)
@@ -151,6 +154,7 @@ class DarwinCore
             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]
+            taxon.source = r[@core_fields[:source]] if @core_fields[:source]
             add_name_string(taxon.current_name)
             add_name_string(taxon.current_name_canonical) if taxon.current_name_canonical && !taxon.current_name_canonical.empty?
           end
@@ -244,7 +248,9 @@ class DarwinCore
             nil,
             r[fields[:scientificname]],
             r[fields[:canonicalname]],
-            fields[:taxonomicstatus] ? r[fields[:taxonomicstatus]] : nil)
+            fields[:taxonomicstatus] ? r[fields[:taxonomicstatus]] : nil,
+            fields[:source] ? r[fields[:source]] : nil
+          )
           if @normalized_data[r[fields[:id]]]
             @normalized_data[r[fields[:id]]].synonyms << synonym
             add_name_string(synonym.name)

data/spec/lib/dwc-archive_spec.rb

@@ -66,7 +66,7 @@ describe DarwinCore do
       cn.normalized_data.size.should > 0
     end
 
-    it "should return name_strings back" do
+    it "should return array or hash of name_strings back" do
       file = File.join(@file_dir, 'data.tar.gz')
       dwc = DarwinCore.new(file)
       cn = DarwinCore::ClassificationNormalizer.new(dwc)
@@ -101,6 +101,7 @@ describe DarwinCore do
       path_encodings.size.should == 1
       path_encodings[0].to_s.should == "UTF-8"
       norm['leptogastrinae:tid:2857'].class.should == DarwinCore::TaxonNormalized
+      norm['leptogastrinae:tid:2857'].source.should == 'http://leptogastrinae.lifedesks.org/pages/2857'
     end
 
     it "should assemble synonyms from core" do
@@ -110,6 +111,7 @@ describe DarwinCore do
       syn = norm.values.select {|n| n.synonyms.size > 0}[0].synonyms[0]
       syn.id.should == 'leptogastrinae:tid:127'
       syn.name.should == "Leptogastridae"
+      syn.source.should == 'http://leptogastrinae.lifedesks.org/pages/127'
     end
 
     it "should be able to assemble vernacular names from an extension" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwc-archive
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70276232306380 !ruby/object:Gem::Requirement
+  requirement: &70111883158320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70276232306380
+  version_requirements: *70111883158320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276232305380 !ruby/object:Gem::Requirement
+  requirement: &70111883157760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70276232305380
+  version_requirements: *70111883157760
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70276232304860 !ruby/object:Gem::Requirement
+  requirement: &70111883157140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *70276232304860
+  version_requirements: *70111883157140
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70276232304380 !ruby/object:Gem::Requirement
+  requirement: &70111883156600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70276232304380
+  version_requirements: *70111883156600
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70276232303880 !ruby/object:Gem::Requirement
+  requirement: &70111883156040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70276232303880
+  version_requirements: *70111883156040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70276232303360 !ruby/object:Gem::Requirement
+  requirement: &70111883155440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70276232303360
+  version_requirements: *70111883155440
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70276232302860 !ruby/object:Gem::Requirement
+  requirement: &70111883154680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.11.6
   type: :development
   prerelease: false
-  version_requirements: *70276232302860
+  version_requirements: *70111883154680
 - !ruby/object:Gem::Dependency
   name: parsley-store
-  requirement: &70276232302340 !ruby/object:Gem::Requirement
+  requirement: &70111883153980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70276232302340
+  version_requirements: *70111883153980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276232301840 !ruby/object:Gem::Requirement
+  requirement: &70111883153440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.9
   type: :development
   prerelease: false
-  version_requirements: *70276232301840
+  version_requirements: *70111883153440
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70276232301300 !ruby/object:Gem::Requirement
+  requirement: &70111883152900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276232301300
+  version_requirements: *70111883152900
 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.
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Handler of Darwin Core Archive files