taxamatch_rb 0.8.4 → 0.8.5

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/lib/taxamatch_rb/atomizer.rb

@@ -62,11 +62,17 @@ module Taxamatch
       res[:years] = []
       [:basionymAuthorTeam, :combinationAuthorTeam].each do |au|
         if node[au]
-          res[:authors] += node[au][:author] 
-          res[:years] << node[au][:year] if node[au][:year]
+          res[:authors] += node[au][:author]
+          if node[au][:year]
+            year = Taxamatch::Normalizer.normalize_year(node[au][:year])
+            res[:years] << year if year
+          end
           if node[au][:exAuthorTeam]
             res[:authors] += node[au][:exAuthorTeam][:author]
-            res[:years] << node[au][:exAuthorTeam][:year] if node[au][:exAuthorTeam][:year]
+            if node[au][:exAuthorTeam][:year]
+              year = Taxamatch::Normalizer.normalize_year(node[:exAuthorTeam][:year])
+              res[:years] << year if year
+            end
           end
         end
       end

data/lib/taxamatch_rb/normalizer.rb

@@ -15,7 +15,14 @@ module Taxamatch
       self.normalize(string).gsub(/[^A-Z]/, ' ').gsub(/[\s]{2,}/, ' ').strip
     end
 
-  protected
+    def self.normalize_year(year_string)
+      year_int = year_string.gsub(/[^\d]/, '').to_i
+      year_int = nil unless year_int.between?(1757, Time.now.year + 1)
+      year_int
+    end
+      
+
+  private
     def self.utf8_to_ascii(string)
       string = string.gsub(/\s{2,}/, ' ')
       string = string.gsub(/[ÀÂÅÃÄÁẤẠ]/, "A")

data/spec/taxamatch_rb_spec.rb

@@ -8,15 +8,20 @@ describe 'Atomizer' do
 
   it 'should parse uninomials' do
     @parser.parse('Betula').should == {:all_authors=>[], :all_years=>[], :uninomial=>{:string=>"Betula", :normalized=>"BETULA", :phonetized=>"BITILA", :authors=>[], :years=>[], :normalized_authors=>[]}}
-    @parser.parse('Ærenea Lacordaire, 1872').should == {:all_authors=>["LACORDAIRE"], :all_years=>["1872"], :uninomial=>{:string=>"Aerenea", :normalized=>"AERENEA", :phonetized=>"ERINIA", :authors=>["Lacordaire"], :years=>["1872"], :normalized_authors=>["LACORDAIRE"]}}
+    @parser.parse('Ærenea Lacordaire, 1872').should == {:all_authors=>["LACORDAIRE"], :all_years=>[1872], :uninomial=>{:string=>"Aerenea", :normalized=>"AERENEA", :phonetized=>"ERINIA", :authors=>["Lacordaire"], :years=>[1872], :normalized_authors=>["LACORDAIRE"]}}
   end
 
   it 'should parse binomials' do
-    @parser.parse('Leœptura laetifica Dow, 1913').should == {:all_authors=>["DOW"], :all_years=>["1913"], :genus=>{:string=>"Leoeptura", :normalized=>"LEOEPTURA", :phonetized=>"LIPTIRA", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"laetifica", :normalized=>"LAETIFICA", :phonetized=>"LITIFICA", :authors=>["Dow"], :years=>["1913"], :normalized_authors=>["DOW"]}}
+    @parser.parse('Leœptura laetifica Dow, 1913').should == {:all_authors=>["DOW"], :all_years=>[1913], :genus=>{:string=>"Leoeptura", :normalized=>"LEOEPTURA", :phonetized=>"LIPTIRA", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"laetifica", :normalized=>"LAETIFICA", :phonetized=>"LITIFICA", :authors=>["Dow"], :years=>[1913], :normalized_authors=>["DOW"]}}
   end
 
   it 'should parse trinomials' do
-    @parser.parse('Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972').should == {:all_authors=>["BANKER", "D HALL", "D E STUNTZ"], :all_years=>["1972"], :genus=>{:string=>"Hydnellum", :normalized=>"HYDNELLUM", :phonetized=>"HIDNILIM", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"scrobiculatum", :normalized=>"SCROBICULATUM", :phonetized=>"SCRABICILATA", :authors=>[], :years=>[], :normalized_authors=>[]}, :infraspecies=>[{:string=>"zonatum", :normalized=>"ZONATUM", :phonetized=>"ZANATA", :authors=>["Banker", "D. Hall", "D.E. Stuntz"], :years=>["1972"], :normalized_authors=>["BANKER", "D HALL", "D E STUNTZ"]}]}
+    @parser.parse('Hydnellum scrobiculatum zonatum (Banker) D. Hall et D.E. Stuntz 1972').should == {:all_authors=>["BANKER", "D HALL", "D E STUNTZ"], :all_years=>[1972], :genus=>{:string=>"Hydnellum", :normalized=>"HYDNELLUM", :phonetized=>"HIDNILIM", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"scrobiculatum", :normalized=>"SCROBICULATUM", :phonetized=>"SCRABICILATA", :authors=>[], :years=>[], :normalized_authors=>[]}, :infraspecies=>[{:string=>"zonatum", :normalized=>"ZONATUM", :phonetized=>"ZANATA", :authors=>["Banker", "D. Hall", "D.E. Stuntz"], :years=>[1972], :normalized_authors=>["BANKER", "D HALL", "D E STUNTZ"]}]}
+  end
+
+  it 'should normalize years to integers' do
+    future_year = Time.now.year + 10
+    @parser.parse("Hydnellum scrobiculatum Kern #{future_year} zonatum (Banker) D. Hall et D.E. Stuntz 1972?").should == {:all_authors=>["KERN", "BANKER", "D HALL", "D E STUNTZ"], :all_years=>[1972], :genus=>{:string=>"Hydnellum", :normalized=>"HYDNELLUM", :phonetized=>"HIDNILIM", :authors=>[], :years=>[], :normalized_authors=>[]}, :species=>{:string=>"scrobiculatum", :normalized=>"SCROBICULATUM", :phonetized=>"SCRABICILATA", :authors=>["Kern"], :years=>[], :normalized_authors=>["KERN"]}, :infraspecies=>[{:string=>"zonatum", :normalized=>"ZONATUM", :phonetized=>"ZANATA", :authors=>["Banker", "D. Hall", "D.E. Stuntz"], :years=>[1972], :normalized_authors=>["BANKER", "D HALL", "D E STUNTZ"]}]}
   end
 end
 

data/spec/taxamatch_test.txt

@@ -8,7 +8,7 @@
 Pomatomus|Pomatomas|true|1
 Pomatomus L.|Pomatomas Linn.|true|1
 Pomatomus Ber|Pomatomas Linn|false|1
-Pomatomus L. 1753|Pomatomus Linn. 1800|false|0
+Pomatomus L. 1758|Pomatomus Linn. 1800|false|0
 Patella|Abbella|false|3
 
 ## additional authorship should match
@@ -37,8 +37,8 @@ Pomatomus saltator (Linnaeus, 1766)|Pomatomus saltatrix (Linnaeus, 1766)|true|0|
 #
 #Trinomial names
 Homo sapiens stupidus|Homo spiens stupidus|true|1
-Pomatomus saltator saltator L. 1753|Pomatomus saltator var. saltatror L. 1753|true|1
-Pomatomus saltator L. 1753|Pomatomus saltator var. saltatror L. 1753|false|5
+Pomatomus saltator saltator L. 1758|Pomatomus saltator var. saltatror L. 1758|true|1
+Pomatomus saltator L. 1758|Pomatomus saltator var. saltatror L. 1758|false|5
 Pomatomus saltator saltator saltatorische|Pomatomus saltator soltator|true|1
 
 

data/taxamatch_rb.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "taxamatch_rb"
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmitry Mozzherin"]
-  s.date = "2012-02-13"
+  s.date = "2012-02-22"
   s.description = "This gem implements algorithm for fuzzy matching scientific names developed by Tony Rees"
   s.email = "dmozzherin@eol.org"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: taxamatch_rb
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: biodiversity19
-  requirement: &70328583642780 !ruby/object:Gem::Requirement
+  requirement: &70273147270940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70328583642780
+  version_requirements: *70273147270940
 - !ruby/object:Gem::Dependency
   name: damerau-levenshtein
-  requirement: &70328583642180 !ruby/object:Gem::Requirement
+  requirement: &70273147270340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70328583642180
+  version_requirements: *70273147270340
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70328583629080 !ruby/object:Gem::Requirement
+  requirement: &70273147269760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583629080
+  version_requirements: *70273147269760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70328583628480 !ruby/object:Gem::Requirement
+  requirement: &70273147269160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70328583628480
+  version_requirements: *70273147269160
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70328583627880 !ruby/object:Gem::Requirement
+  requirement: &70273147268580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583627880
+  version_requirements: *70273147268580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70328583627280 !ruby/object:Gem::Requirement
+  requirement: &70273147267980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70328583627280
+  version_requirements: *70273147267980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70328583626700 !ruby/object:Gem::Requirement
+  requirement: &70273147267380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *70328583626700
+  version_requirements: *70273147267380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70328583626100 !ruby/object:Gem::Requirement
+  requirement: &70273147266800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583626100
+  version_requirements: *70273147266800
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70328583625500 !ruby/object:Gem::Requirement
+  requirement: &70273147259780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583625500
+  version_requirements: *70273147259780
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &70328583624960 !ruby/object:Gem::Requirement
+  requirement: &70273147259200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583624960
+  version_requirements: *70273147259200
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70328583624380 !ruby/object:Gem::Requirement
+  requirement: &70273147258620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583624380
+  version_requirements: *70273147258620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70328583623720 !ruby/object:Gem::Requirement
+  requirement: &70273147258080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70328583623720
+  version_requirements: *70273147258080
 description: This gem implements algorithm for fuzzy matching scientific names developed
   by Tony Rees
 email: dmozzherin@eol.org
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1595435064862339145
+      hash: -2248869889461974238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: