biodiversity19 1.0.18 → 1.0.19

data/VERSION

@@ -1 +1 @@
-1.0.18
+1.0.19

data/lib/biodiversity/parser/scientific_name_dirty.treetop

@@ -92,6 +92,44 @@ grammar ScientificNameDirty
     super
   end
   
+  rule infraspecies_string
+    sel:rank space_hard a:species_word {
+      def value 
+        sel.apply(a)
+      end
+      def canonical
+        sel.canonical(a)
+      end
+      
+      def pos
+        sel.pos(a)
+      end
+    
+      def details
+        sel.details(a)
+      end
+    }
+    /
+    species_word ![\.] {
+      def value
+        text_value.tr('àâåãäáçčëéèíìïňññóòôøõöúùüŕřŗššşž',
+                     'aaaaaacceeeiiinnnoooooouuurrrsssz')
+      end
+      
+      def canonical
+        value
+      end
+  
+      def pos
+        {interval.begin => ['infraspecies', interval.end]}
+      end
+  
+      def details
+        {:infraspecies => {:string => value, :rank => 'n/a'}}
+      end
+    }
+  end
+  
   rule species
     a:species_string space b:year {
        def value

data/spec/parser/scientific_name_dirty.spec.rb

@@ -97,6 +97,7 @@ describe ScientificNameDirty do
       parse(name).should_not be_nil
     end
     details("Hirsutëlla mâle").should == [{:genus=>{:string=>"Hirsutella"}, :species=>{:string=>"male"}}] 
+    details("Triticum repens vulgäre").should == [{:genus=>{:string=>"Triticum"}, :species=>{:string=>"repens"}, :infraspecies=>[{:string=>"vulgare", :rank=>"n/a"}]}]
   end
   
 # AsterophUa japonica

data/spec/parser/test_data.txt

@@ -57,6 +57,8 @@ Pseudocercospora dendrobii U. Braun et Crous|{"scientificName":{"parsed":true, "
 Pseudocercospora dendrobii U. Braun and Crous|{"scientificName":{"parsed":true, "parser_version":"test_version", "parser_run":1,"verbatim":"Pseudocercospora dendrobii U. Braun and Crous","normalized":"Pseudocercospora dendrobii U. Braun et Crous","canonical":"Pseudocercospora dendrobii","hybrid":false,"details":[{"genus":{"string":"Pseudocercospora"},"species":{"string":"dendrobii","authorship":"U. Braun and Crous","basionymAuthorTeam":{"authorTeam":"U. Braun and Crous","author":["U. Braun","Crous"]}}}],"positions":{"0":["genus",16],"17":["species",26],"27":["author_word",29],"30":["author_word",35],"40":["author_word",45]}}}
 Schottera nicaeënsis (J.V. Lamouroux ex Duby) Guiry & Hollenberg|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Schottera nicaeënsis (J.V. Lamouroux ex Duby) Guiry & Hollenberg", "normalized":"Schottera nicaeensis (J.V. Lamouroux ex Duby) Guiry et Hollenberg", "canonical":"Schottera nicaeensis", "hybrid":false, "details":[{"genus":{"string":"Schottera"}, "species":{"string":"nicaeensis", "authorship":"(J.V. Lamouroux ex Duby) Guiry & Hollenberg", "combinationAuthorTeam":{"authorTeam":"Guiry & Hollenberg", "author":["Guiry", "Hollenberg"]}, "basionymAuthorTeam":{"authorTeam":"J.V. Lamouroux", "author":["J.V. Lamouroux"], "exAuthorTeam":{"authorTeam":"Duby", "author":["Duby"]}}}}], "parser_run":1, "positions":{"0":["genus", 9], "10":["species", 20], "22":["author_word", 26], "27":["author_word", 36], "40":["author_word", 44], "46":["author_word", 51], "54":["author_word", 64]}}}
 Hirsutëlla mâle|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Hirsutëlla mâle", "normalized":"Hirsutella male", "canonical":"Hirsutella male", "hybrid":false, "details":[{"genus":{"string":"Hirsutella"}, "species":{"string":"male"}}], "parser_run":2, "positions":{"0":["genus", 10], "11":["species", 15]}}}
+Triticum repens vulgäre|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Triticum repens vulgäre", "normalized":"Triticum repens vulgare", "canonical":"Triticum repens vulgare", "hybrid":false, "details":[{"genus":{"string":"Triticum"}, "species":{"string":"repens"}, "infraspecies":[{"string":"vulgare", "rank":"n/a"}]}], "parser_run":2, "positions":{"0":["genus", 8], "9":["species", 15], "16":["infraspecies", 23]}}}
+Triticum repens var. vulgäre|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Triticum repens var. vulgäre", "normalized":"Triticum repens var. vulgare", "canonical":"Triticum repens vulgare", "hybrid":false, "details":[{"genus":{"string":"Triticum"}, "species":{"string":"repens"}, "infraspecies":[{"string":"vulgare", "rank":"var."}]}], "parser_run":2, "positions":{"0":["genus", 8], "9":["species", 15], "16":["infraspecific_type", 20], "21":["infraspecies", 28]}}}
 
 #binomial with several authors and a year
 Pseudocercospora dendrobii U. Braun & Crous 2003|{"scientificName":{"parsed":true, "parser_version":"test_version", "parser_run":1,"verbatim":"Pseudocercospora dendrobii U. Braun & Crous 2003","normalized":"Pseudocercospora dendrobii U. Braun et Crous 2003","canonical":"Pseudocercospora dendrobii","hybrid":false,"details":[{"genus":{"string":"Pseudocercospora"},"species":{"string":"dendrobii","authorship":"U. Braun & Crous 2003","basionymAuthorTeam":{"authorTeam":"U. Braun & Crous","author":["U. Braun","Crous"],"year":"2003"}}}],"positions":{"0":["genus",16],"17":["species",26],"27":["author_word",29],"30":["author_word",35],"38":["author_word",43],"44":["year",48]}}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biodiversity19
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -325014686368639596
+      hash: -2276684114644108557
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: