biodiversity19 1.0.20 → 1.0.21

data/Gemfile.lock

@@ -5,23 +5,27 @@ GEM
     columnize (0.3.6)
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.6.4)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+      rdoc
+    json (1.7.5)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    parallel (0.5.9)
+    parallel (0.5.18)
     polyglot (0.3.3)
     rake (0.9.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)

data/VERSION

@@ -1 +1 @@
-1.0.20
+1.0.21

data/lib/biodiversity/parser/scientific_name_clean.treetop

@@ -369,9 +369,9 @@ grammar ScientificNameClean
       end
     }
     /
-    species_word ![\.] {
+    a:species_word ![\.] {
       def value
-        text_value
+        a.value
       end
       
       def canonical

data/lib/biodiversity/parser/scientific_name_dirty.treetop

@@ -110,10 +110,9 @@ grammar ScientificNameDirty
       end
     }
     /
-    species_word ![\.] {
+    a:species_word ![\.] {
       def value
-        text_value.tr('àâåãäáçčëéèíìïňññóòôøõöúùüŕřŗššşž',
-                     'aaaaaacceeeiiinnnoooooouuurrrsssz')
+        a.value
       end
       
       def canonical

data/spec/parser/test_data.txt

@@ -87,6 +87,8 @@ Leœptura laetifica Dow, 1913|{"scientificName":{"parsed":true, "parser_version"
 Ærenea cognata Lacordaire, 1872|{"scientificName":{"parsed":true, "parser_version":"test_version", "parser_run":1,"verbatim":"\u00c6renea cognata Lacordaire, 1872","normalized":"Aerenea cognata Lacordaire 1872","canonical":"Aerenea cognata","hybrid":false,"details":[{"genus":{"string":"Aerenea"},"species":{"string":"cognata","authorship":"Lacordaire, 1872","basionymAuthorTeam":{"authorTeam":"Lacordaire","author":["Lacordaire"],"year":"1872"}}}],"positions":{"0":["genus",6],"7":["species",14],"15":["author_word",25],"27":["year",31]}}}
 Œdicnemus capensis|{"scientificName":{"parsed":true, "parser_version":"test_version", "parser_run":1,"verbatim":"\u0152dicnemus capensis","normalized":"Oedicnemus capensis","canonical":"Oedicnemus capensis","hybrid":false,"details":[{"genus":{"string":"Oedicnemus"},"species":{"string":"capensis"}}],"positions":{"0":["genus",9],"10":["species",18]}}}
 Œnanthe œnanthe|{"scientificName":{"parsed":true, "parser_version":"test_version", "parser_run":1,"verbatim":"\u0152nanthe \u0153nanthe","normalized":"Oenanthe oenanthe","canonical":"Oenanthe oenanthe","hybrid":false,"details":[{"genus":{"string":"Oenanthe"},"species":{"string":"oenanthe"}}],"positions":{"0":["genus",7],"8":["species",15]}}}
+Hördeum vulgare cœrulescens|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Hördeum vulgare cœrulescens", "normalized":"Hordeum vulgare coerulescens", "canonical":"Hordeum vulgare coerulescens", "hybrid":false, "details":[{"genus":{"string":"Hordeum"}, "species":{"string":"vulgare"}, "infraspecies":[{"string":"coerulescens", "rank":"n/a"}]}], "parser_run":2, "positions":{"0":["genus", 7], "8":["species", 15], "16":["infraspecies", 27]}}}
+Hordeum vulgare f. cœrulescens|{"scientificName":{"parsed":true, "parser_version":"test_version", "verbatim":"Hordeum vulgare f. cœrulescens", "normalized":"Hordeum vulgare f. coerulescens", "canonical":"Hordeum vulgare coerulescens", "hybrid":false, "details":[{"genus":{"string":"Hordeum"}, "species":{"string":"vulgare"}, "infraspecies":[{"string":"coerulescens", "rank":"f."}]}], "parser_run":1, "positions":{"0":["genus", 7], "8":["species", 15], "16":["infraspecific_type", 18], "19":["infraspecies", 30]}}}
 
 # old style s (ſ)
 Musca domeſtica Linnaeus 1758 sec. Pemberton 1947|{"scientificName":{"parsed":true, "verbatim":"Musca domeſtica Linnaeus 1758 sec. Pemberton 1947", "normalized":"Musca domestica Linnaeus 1758", "canonical":"Musca domestica", "hybrid":false, "details":[{"genus":{"string":"Musca"}, "species":{"string":"domestica", "authorship":"Linnaeus 1758", "basionymAuthorTeam":{"authorTeam":"Linnaeus", "author":["Linnaeus"], "year":"1758"}}}],  "parser_version":"test_version", "parser_run":1, "positions":{"0":["genus", 5], "6":["species", 15], "16":["author_word", 24], "25":["year", 29]}}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biodiversity19
 version: !ruby/object:Gem::Version
-  version: 1.0.20
+  version: 1.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -162,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1298219178266283746
+      hash: -4518593018536167902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: