dimus-biodiversity 0.0.5 → 0.0.6

data/lib/biodiversity/parser/scientific_name.rb

@@ -1833,6 +1833,7 @@ module ScientificName
     def b
       elements[3]
     end
+
   end
 
   module NamePart5
@@ -1930,6 +1931,22 @@ module ScientificName
             if r16
               r17 = _nt_latin_word
               s13 << r17
+              if r17
+                i18 = index
+                if input.index(Regexp.new('[^\\.]'), index) == index
+                  r19 = (SyntaxNode).new(input, index...(index + 1))
+                  @index += 1
+                else
+                  r19 = nil
+                end
+                if r19
+                  self.index = i18
+                  r18 = SyntaxNode.new(input, index...index)
+                else
+                  r18 = nil
+                end
+                s13 << r18
+              end
             end
           end
         end
@@ -1944,13 +1961,13 @@ module ScientificName
         if r13
           r0 = r13
         else
-          r18 = _nt_species_name
-          if r18
-            r0 = r18
+          r20 = _nt_species_name
+          if r20
+            r0 = r20
           else
-            r19 = _nt_cap_latin_word
-            if r19
-              r0 = r19
+            r21 = _nt_cap_latin_word
+            if r21
+              r0 = r21
             else
               self.index = i0
               r0 = nil

data/lib/biodiversity/parser/scientific_name.treetop

@@ -285,7 +285,7 @@ grammar ScientificName
       end
     }
     /
-    space a:species_name space b:latin_word {
+    space a:species_name space b:latin_word &[^\.] {
       def value
         a.value + " " + b.value
       end

data/spec/parser/scientific_name.spec.rb

@@ -108,9 +108,10 @@ describe ScientificName do
     parse("Tuber liui A S. Xu 1999").should_not be_nil
     parse("Agaricus squamula Berk. & M.A. Curtis 1860").should_not be_nil
     parse("Peltula coriacea Büdel, Henssen & Wessels 1986").should_not be_nil
+    #had to add no dot rule for trinomials without a rank to make it to work
+    parse("Saccharomyces drosophilae anon.").should_not be_nil
   end
   
-  
   it 'should parse several authors with several years' do
     parse("Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003").should_not be_nil
     value("Pseudocercospora dendrobii(H.C.     Burnett1883)U. Braun & Crous     2003").should == "Pseudocercospora dendrobii (H.C. Burnett 1883) U. Braun & Crous 2003"
@@ -131,7 +132,6 @@ describe ScientificName do
   end
   
   it "should parse name with f." do
-    
     parse("Sphaerotheca fuliginea f. dahliae Movss. 1967").should_not be_nil
     value("   Sphaerotheca    fuliginea     f.    dahliae    Movss.   1967    ").should == "Sphaerotheca fuliginea f. dahliae Movss. 1967"
     canonical("Sphaerotheca fuliginea f. dahliae Movss. 1967").should == "Sphaerotheca fuliginea dahliae"
@@ -238,7 +238,4 @@ describe ScientificName do
 
   end
   
-  it "should not have this problems, but it has them" do
-    parse("Saccharomyces drosophilae anon.").should be_nil
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dimus-biodiversity
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dmitry Mozzherin