biodiversity19 0.5.16 → 0.6.0

data/.gitignore

@@ -1,3 +1,5 @@
+lib/biodiversity/parser/*rb
+*.gemspec
 *.sw?
 .DS_Store
 coverage

data/README.rdoc

@@ -1,17 +1,17 @@
 = Biodiversity
 
-Parses species scientific name and breaks it into elements.
+Parses taxonomic scientific name and breaks it into semantic elements.
 
 == Installation
 
-To install gem you need RubyGems >= 1.2.0
+To install gem you need RubyGems >= 1.3.6
 
-  $ gem sources -a http://gems.github.com (you only have to do this once)
-  $ sudo gem install dimus-biodiversity
+  $ sudo gem install biodiversity #for ruby 1.8.x
+  $ sudo gem install biodiversity19 #for ruby 1.9.x
 
 == Example usage
 
-You can parse file with species names from command line. File should contain one scientific name per line
+You can parse file with taxonomic names from command line. File should contain one scientific name per line
 
   nnparser file_with_names
   

data/Rakefile

@@ -13,11 +13,13 @@ Spec::Rake::SpecTask.new do |t|
   t.pattern = 'spec/**/*spec.rb'
 end
 
+ruby_version = RUBY_VERSION.split('.')[0..1].join('').to_i
+
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "biodiversity19"
+    gem.name = ruby_version < 19 ? "biodiversity" : "biodiversity19"
     gem.summary = 'Parser of scientific names'
     gem.description = 'Tools for biodiversity informatics'
     gem.email = "dmozzherin@gmail.com"
@@ -37,11 +39,14 @@ end
 
 task :tt do
   ['scientific_name_clean', 'scientific_name_dirty', 'scientific_name_canonical'].each do |f|
-    system("tt #{dir}/lib/biodiversity/parser/#{f}.treetop")
-    rf = "#{dir}/lib/biodiversity/parser/#{f}.rb"
+    file = "#{dir}/lib/biodiversity/parser/#{f}"
+    FileUtils.rm("#{file}.rb") if FileTest.exist?("#{file}.rb")
+    system("tt #{file}.treetop")
+    rf = "#{file}.rb"
     rfn = open(rf + ".tmp", 'w')
     skip_head = false
     f = open(rf)
+    #getting around a bug in treetop which prevents setting UTF-8 encoding in ruby19
     f.each_with_index do |l, i|
       skip_head = l.match(/^# Autogenerated/) if i == 0
       if skip_head && (l.strip == '' || l.match(/^# Autogenerated/))

data/VERSION

@@ -1 +1 @@
-0.5.16
+0.6.0

data/bin/nnparse

@@ -1,11 +1,15 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'biodiversity' rescue nil
+gem_name = RUBY_VERSION.split('.')[0..1].join('').to_i > 18 ? 'biodiversity19' : 'biodiversity'
+gem gem_name rescue nil
 
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'biodiversity'
 require 'json'
 
+def parser_error(name)
+  {'scientificName' => {'parsed' => false, 'verbatim' => name,  'error' => 'Parser error'}}.to_json
+end
 
 if ARGV.empty?
   puts "Usage:\n\nnnparse file_with_scientific_names [output_file]\n\ndefault output_file is parsed.json\n\n"
@@ -31,12 +35,12 @@ IO.foreach(input) do |line|
       $KCODE = 'NONE'
     end
     p.parse(name) 
-    parsed_data = p.parsed.all_json rescue {'scientificName' => {'parsed' => false, 'verbatim' => name,  'error' => 'Parser error'}}.to_json
+    parsed_data = p.parsed.all_json rescue parser_error(name)
     if ruby_min_version < 19
       $KCODE = old_kcode
     end
   rescue 
-    parsed_data = {'parsed' => false, 'verbatim' => name,  'error' => 'Parser error'}.to_json
+    parsed_data = parser_error(name)
   end
   o.write parsed_data + "\n"
 end

data/bin/parserver

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'socket'
 require 'biodiversity'          # Get sockets from stdlib
+puts "Running parser service on port 4334"
 parser = ScientificNameParser.new
 server = TCPServer.open(4334)  # Socket to listen on port 4334
 loop do                         # Servers run forever

data/lib/biodiversity/parser/scientific_name_clean.treetop

@@ -30,6 +30,28 @@ grammar ScientificNameClean
   end
   
   rule scientific_name_5
+    a:multinomial_name space_hard hybrid_character space_hard b:species {
+      def value
+        a.value + " × " + b.value
+      end
+      
+      def canonical
+        a.canonical + " × " + b.canonical
+      end
+      
+      def pos
+        a.pos.merge(b.pos)
+      end
+      
+      def hybrid
+        true
+      end
+      
+      def details
+        [a.details, b.details.merge({:genus => a.details[:genus]})]
+      end
+    }
+    /
     a:scientific_name_1 space b:taxon_concept_rank space c:authorship {
       def value
         a.value + " " + b.apply(c)
@@ -62,7 +84,7 @@ grammar ScientificNameClean
       end
       
       def canonical
-        a.canonical + " " + b.canonical
+        a.canonical + " × " + b.canonical
       end
       
       def pos
@@ -196,7 +218,7 @@ grammar ScientificNameClean
       end
     
       def canonical
-        a.canonical + " " + b.canonical + " " + c.canonical + " " + d.canonical
+        a.canonical + " " + c.canonical + " " + d.canonical
       end
     
       def pos
@@ -381,7 +403,7 @@ grammar ScientificNameClean
   end
   
   rule rank
-    ("morph."/"f.sp."/"B"/"ssp."/"mut."/"nat"/"nothosubsp."/"pseudovar."/"sect."/"ser."/"var."/"subvar."/ "[var.]" /"subsp."/"subf."/"race"/"α" 
+    ("morph."/"f.sp."/"B"/"ssp."/"mut."/"nat"/"nothosubsp."/"pseudovar."/"sect."/"ser."/"var."/"subvar."/ "[var.]" /"var"/"subsp."/"subsp"/"subf."/"race"/"α" 
     /"ββ"/"β"/"γ"/"δ"/"ε"/"φ"/"θ"/"μ"/"a."/"b."/"c."/"d."/"e."/"g."/"k."/"****"/"**"/"*")
     {
       def value
@@ -405,7 +427,7 @@ grammar ScientificNameClean
   end
   
   rule rank_forma
-    ("forma"/"form."/"fo."/"f.")
+    ("forma"/"form."/"form"/"fo."/"f.")
     {
       def value
         "f."
@@ -449,28 +471,28 @@ grammar ScientificNameClean
   end
   
   rule species_string
-    a:species_word &(space_hard author_prefix_word space_hard) {
-      def value 
-        a.value
-      end
-      
-      def canonical
-        a.value
-      end
-      
-      def hybrid
-        a.hybrid rescue false
-      end
-    
-      def pos
-        {a.interval.begin => ['species', a.interval.end]}
-      end
-    
-      def details
-        {:species => {:string => a.value}}
-      end
-    }
-    /
+    # a:species_word &(space_hard author_prefix_word space_hard) {
+    #   def value 
+    #     a.value
+    #   end
+    #   
+    #   def canonical
+    #     a.value
+    #   end
+    #   
+    #   def hybrid
+    #     a.hybrid rescue false
+    #   end
+    # 
+    #   def pos
+    #     {a.interval.begin => ['species', a.interval.end]}
+    #   end
+    # 
+    #   def details
+    #     {:species => {:string => a.value}}
+    #   end
+    # }
+    # /
     species_word {
       def canonical
         value
@@ -493,7 +515,7 @@ grammar ScientificNameClean
   end
   
   rule infragenus
-    left_paren space a:cap_latin_word space right_paren {
+    left_paren space a:(cap_latin_word/capped_dotted_char) space right_paren {
       def value
         "(" + a.value + ")"
       end
@@ -513,7 +535,7 @@ grammar ScientificNameClean
   end
   
   rule genus
-    a:(cap_latin_word_pair/cap_latin_word) !(space_hard author_prefix_word space_hard author_word) {
+    a:uninomial_string !(space_hard author_prefix_word space_hard author_word) {
       def value
         a.value
       end
@@ -533,6 +555,50 @@ grammar ScientificNameClean
   end
   
   rule uninomial_name
+    a:uninomial_string space b:infragenus space c:simple_authorship {
+      def value
+        a.value + " " + b.value + " " + c.value
+      end
+      
+      def canonical
+        a.canonical
+      end
+      
+      def pos
+        a.pos.merge(b.pos).merge(c.pos)
+      end
+      
+      def hybrid
+        false
+      end
+      
+      def details
+        {:uninomial => a.details[:uninomial].merge(b.details).merge(c.details)}
+      end
+    }
+    /
+    a:uninomial_string space b:infragenus {
+      def value
+        a.value + " " + b.value
+      end
+      
+      def canonical
+        a.canonical
+      end
+      
+      def pos
+        a.pos.merge(b.pos)
+      end
+      
+      def hybrid
+        false
+      end
+      
+      def details
+        {:uninomial => a.details[:uninomial].merge(b.details)}
+      end
+    }
+    /
     a:uninomial_string space_hard b:authorship {
       def value
         a.value + " " + b.value
@@ -799,7 +865,7 @@ grammar ScientificNameClean
   
   
   rule unknown_auth
-    ("auct."/"hort."/"anon."/"ht.") {
+    ("auct."/"auct"/"hort."/"hort"/"anon."/"anon"/"ht."/"ht") {
       def value
         text_value
       end
@@ -837,7 +903,7 @@ grammar ScientificNameClean
   end
   
   rule author_name
-    space a:author_prefix_word space b:author_name space {
+    space a:author_prefix_word space b:author_name {
       def value
         a.value + " " + b.value
       end
@@ -851,7 +917,7 @@ grammar ScientificNameClean
       end
     }
     /
-    space a:author_word space b:author_name space {
+    a:author_word space b:author_name {
       def value
         a.value + " " + b.value
       end
@@ -883,7 +949,7 @@ grammar ScientificNameClean
       end
     }
     /
-    ("arg."/"et al.\{\?\}"/"et al.") {
+    ("arg."/"et al.\{\?\}"/"et al."/"et al") {
       def value
         text_value.strip
       end
@@ -930,7 +996,7 @@ grammar ScientificNameClean
   end
   
   rule author_prefix_word
-    space ("ab"/"bis"/"da"/"der"/"den"/"della"/"dela"/"de"/"di"/"du"/"la"/"ter"/"van"/"von") &space_hard {
+    space ("ab"/"bis"/"da"/"der"/"des"/"den"/"della"/"dela"/"de"/"di"/"du"/"la"/"ter"/"van"/"von") &space_hard {
       def value
         text_value
       end
@@ -976,6 +1042,14 @@ grammar ScientificNameClean
     }
   end
 
+  rule capped_dotted_char
+    [A-Z] "." {
+      def value
+        text_value
+      end
+    }
+  end
+
   rule species_word_hybrid
     a:multiplication_sign space b:species_word {
       def value
@@ -1051,7 +1125,9 @@ grammar ScientificNameClean
   rule species_word
     a:[0-9]+ "-"? b:latin_word {
       def value
-        a.text_value + "-" + b.value
+        num = {"1" => "uni", "2" => "du", "3" => "tri", "4" => "quadri", "5" => "quinque", "6" => "hexa", "7" => "septem", "8" => "octo", "9" => "novem", "10" => "decem", "11" => "undecim", "12" => "duodec", "13" => "tredec", "14" => "quattuordec", "15" => "quinquadec", "16" => "hexadec", "17" => "septendec", "18" => "octodec", "19" => "novemdec", "20" => "viginti", "21" => "unviginti", "22" => "duodeviginti", "23" => "triviginti", "24" => "quattuorviginti", "25" => "quinquatviginti", "26" => "hexaviginti", "27" => "septenviginti", "28" => "octoviginti", "29" => "novemviginti", "30" => "triginta", "38" => "trigintaocto", "100" => "centi"}
+        a_value = num[a.text_value] ? num[a.text_value] : a.text_value + "-"
+        a_value + b.value
       end
     }
     /
@@ -1059,18 +1135,21 @@ grammar ScientificNameClean
   end
 
   rule latin_word
-    a:[a-zëæœ] b:valid_name_letters {
+    a:valid_name_letters "-" b:latin_word {
+      def value
+        a.value + "-" + b.value
+      end
+    }
+    /
+    a:valid_name_letter b:valid_name_letters {
       def value
-        l = a.text_value
-        l = 'ae' if l == 'æ'
-        l = 'oe' if l == 'œ'
-        l + b.value
+        a.value + b.value
       end
      }
   end
 
   rule valid_name_letters
-    [a-z\-ëæœ]+ {
+    [a-zëæœ]+ {
       def value
         res = ''
         text_value.split('').each do |l|
@@ -1086,6 +1165,18 @@ grammar ScientificNameClean
     }
   end
 
+  rule valid_name_letter
+    [a-zëæœ] {
+      def value
+        res = text_value
+        res = 'ae' if res == 'æ'
+        res = 'oe' if res == 'œ'
+        res
+      end
+    }
+  end
+
+
   rule cap_digraph
     "Æ" {
       def value

data/lib/biodiversity/parser.rb

@@ -6,6 +6,35 @@ require File.join(dir, *%w[parser scientific_name_canonical])
 require 'rubygems'
 require 'json'
 
+module PreProcessor
+  NOTES = /\s+(species\s+group|species\s+complex|group|author)\b.*$/i
+  TAXON_CONCEPTS1 = /\s+(sensu\.|sensu|auct\.|auct)\b.*$/i
+  TAXON_CONCEPTS2 = /\s+(\(?s\.\s?s\.|\(?s\.\s?l\.|\(?s\.\s?str\.|\(?s\.\s?lat\.|sec\.|sec|near)\b.*$/
+  TAXON_CONCEPTS3 = /(,\s*|\s+)(pro parte|p.\s?p.)\s*$/i  
+  NOMEN_CONCEPTS  = /(,\s*|\s+)(\(?nomen|\(?nom\.|\(?comb\.).*$/i
+  LAST_WORD_JUNK  = /(,\s*|\s+)(von|van|sensu|new|non|nec|cf|ssp|subsp|subgen|hybrid|hort.|hort)\s*$/i
+  
+  def self.clean(a_string)
+    [NOTES, TAXON_CONCEPTS1, TAXON_CONCEPTS2, TAXON_CONCEPTS3, NOMEN_CONCEPTS, LAST_WORD_JUNK].each do |i|
+      a_string = a_string.gsub(i, '')
+    end
+    a_string = a_string.tr('ſ','s') #old 's'
+    a_string
+  end   
+end
+
+# we can use these expressions when we are ready to parse virus names
+# class VirusParser
+#   def initialize
+#     @order     = /^\s*[A-Z][a-z]\+virales/i
+#     @family    = /^\s*[A-Z][a-z]\+viridae|viroidae/i
+#     @subfamily = /^\s*[A-Z][a-z]\+virinae|viroinae/i
+#     @genus     = /^\s*[A-Z][a-z]\+virus|viroid/i
+#     @species   = /^\s*[A-z0-9u0391-u03C9\[\] ]\+virus|phage|viroid|satellite|prion[A-z0-9u0391-u03C9\[\] ]\+/i
+#     @parsed    = nil
+#   end
+# end
+
 class ScientificNameParser
   
   def initialize
@@ -15,21 +44,36 @@ class ScientificNameParser
     @canonical = ScientificNameCanonicalParser.new
     @parsed = nil
   end
-  
+
+  def virus?(a_string)
+    !!(a_string.match(/\sICTV\s*$/) || a_string.match(/\s(virus|phage|viroid|satellite|prion)\b/i))
+  end 
+
   def parsed
     @parsed
   end
   
   def parse(a_string)
     @verbatim = a_string
-    @parsed = @clean.parse(a_string) || @dirty.parse(a_string) || @canonical.parse(a_string) || {:verbatim => a_string}
-    def @parsed.all
+    a_string = PreProcessor::clean(a_string)
+    
+    if virus?(a_string)
+      @parsed = { :verbatim => a_string, :virus => true }
+    else
+      @parsed = @clean.parse(a_string) || @dirty.parse(a_string) || @canonical.parse(a_string) || { :verbatim => a_string }
+    end
+
+    def @parsed.verbatim=(a_string)
+      @verbatim = a_string
+    end
+
+    def @parsed.all(verbatim = @verbatim)
       parsed = self.class != Hash
       res = {:parsed => parsed}
       if parsed
         hybrid = self.hybrid rescue false
         res.merge!({
-          :verbatim => self.text_value,
+          :verbatim => @verbatim,
           :normalized => self.value,
           :canonical => self.canonical,
           :hybrid => hybrid,
@@ -51,7 +95,8 @@ class ScientificNameParser
     def @parsed.all_json
       self.all.to_json rescue ''
     end
-    
+
+    @parsed.verbatim = @verbatim
     @parsed.all
   end
 end

data/spec/parser/scientific_name_clean.spec.rb

@@ -98,7 +98,8 @@ describe ScientificNameClean do
       ['Ærenea cognata Lacordaire, 1872', 'Aerenea cognata Lacordaire 1872'],
       ['Œdicnemus capensis', 'Oedicnemus capensis'],
       ['Œnanthæ œnanthe','Oenanthae oenanthe'],
-      ['Œnanthe œnanthe','Oenanthe oenanthe']
+      ['Œnanthe œnanthe','Oenanthe oenanthe'],
+      ['Cerambyx thomæ Gmelin J. F., 1790', 'Cerambyx thomae Gmelin J. F. 1790']
     ]
     names.each do |name_pair|
       parse(name_pair[0]).should_not be_nil
@@ -120,6 +121,18 @@ describe ScientificNameClean do
     canonical(sn).should == "Hegeter intercedens"
     details(sn).should == [{:genus=>{:string=>"Hegeter"}, :infragenus=>{:string=>"Hegeter"}, :species=>{:string=>"intercedens", :authorship=>"Lindberg H 1950", :basionymAuthorTeam=>{:authorTeam=>"Lindberg H", :author=>["Lindberg H"], :year=>"1950"}}}]
     pos(sn).should == {0=>["genus", 7], 9=>["infragenus", 16], 18=>["species", 29], 30=>["author_word", 38], 39=>["author_word", 40], 41=>["year", 45]}
+    sn = "Ixodes (Ixodes) hexagonus hexagonus Neumann, 1911"
+    canonical(sn).should == "Ixodes hexagonus hexagonus"
+    sn = "Brachytrypus (B.) grandidieri" 
+    canonical(sn).should == "Brachytrypus grandidieri"
+    details(sn).should == [{:genus=>{:string=>"Brachytrypus"}, :infragenus=>{:string=>"B."}, :species=>{:string=>"grandidieri"}}]
+    sn = "Empis (Argyrandrus) Bezzi 1909"
+    details(sn).should == [{:uninomial=>{:string=>"Empis", :infragenus=>{:string=>"Argyrandrus"}, :authorship=>"Bezzi 1909", :basionymAuthorTeam=>{:authorTeam=>"Bezzi", :author=>["Bezzi"], :year=>"1909"}}}]
+    sn = "Platydoris (Bergh )"
+    details(sn).should == [{:uninomial=>{:string=>"Platydoris", :infragenus=>{:string=>"Bergh"}}}]
+    value(sn).should == "Platydoris (Bergh)"
+    sn = "Platydoris (B.)"
+    details(sn).should == [{:uninomial=>{:string=>"Platydoris", :infragenus=>{:string=>"B."}}}]
   end
   
   it 'should parse several authors without a year' do
@@ -219,6 +232,8 @@ describe ScientificNameClean do
     value(sn).should == "Phaeographis inusta var. macularis (Leight.) A.L. Sm. 1861"
     canonical(sn).should == "Phaeographis inusta macularis"
     pos(sn).should == {0=>["genus", 12], 13=>["species", 19], 25=>["infraspecies", 34], 35=>["author_word", 42], 44=>["author_word", 48], 49=>["author_word", 52], 53=>["year", 57]}
+    sn = "Cassytha peninsularis J. Z. Weber var. flindersii"
+    canonical(sn).should == "Cassytha peninsularis flindersii"
   end
 
   it 'should parse unknown original authors (auct.)/(hort.)/(?)' do
@@ -239,7 +254,7 @@ describe ScientificNameClean do
     pos(sn).should == {0=>["genus", 4], 5=>["species", 10], 11=>["unknown_author", 14]}
   end
   
-  it 'shuould parse real world examples' do
+  it 'should parse real world examples' do
     sn = "Stagonospora polyspora M.T. Lucas & Sousa da Câmara 1934"
     parse(sn).should_not be_nil
     value(sn).should == "Stagonospora polyspora M.T. Lucas et Sousa da Câmara 1934"
@@ -283,16 +298,16 @@ describe ScientificNameClean do
     sn = "Gastrosericus eremorum von Beaumont 1955"
     canonical(sn).should == 'Gastrosericus eremorum'
     sn = "Cypraeovula (Luponia) amphithales perdentata"
-    canonical(sn).should == 'Cypraeovula Luponia amphithales perdentata'
+    canonical(sn).should == 'Cypraeovula amphithales perdentata'
     details(sn).should == [{:genus=>{:string=>"Cypraeovula"}, :infragenus=>{:string=>"Luponia"}, :species=>{:string=>"amphithales"}, :infraspecies=>[{:string=>"perdentata", :rank=>"n/a"}]}]
     sn = "Polyrhachis orsyllus nat musculus Forel 1901"
     canonical(sn).should == "Polyrhachis orsyllus musculus"
     sn = 'Latrodectus 13-guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus 13-guttatus'
-    value(sn).should == 'Latrodectus 13-guttatus Thorell 1875'
-    sn = 'Latrodectus 3guttatus Thorell, 1875'
-    canonical(sn).should == 'Latrodectus 3-guttatus'
-    value(sn).should == 'Latrodectus 3-guttatus Thorell 1875'
+    canonical(sn).should == 'Latrodectus tredecguttatus'
+    value(sn).should == 'Latrodectus tredecguttatus Thorell 1875'
+    sn = 'Latrodectus 3-guttatus Thorell, 1875'
+    canonical(sn).should == 'Latrodectus triguttatus'
+    value(sn).should == 'Latrodectus triguttatus Thorell 1875'
     sn = 'Balaninus c-album Schönherr, CJ., 1836'
     canonical(sn).should == 'Balaninus c-album'
   end
@@ -353,7 +368,7 @@ describe ScientificNameClean do
     parse(sn).should_not be_nil
     value(sn).should == "Arthopyrenia hyalospora (Nyl.) R.C. Harris comb. nov."
     canonical(sn).should == "Arthopyrenia hyalospora"
-    details(sn).should ==  [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl.) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris ", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}, :status=>"comb. nov."}]
+    details(sn).should ==  [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora", :authorship=>"(Nyl.) R.C. Harris", :combinationAuthorTeam=>{:authorTeam=>"R.C. Harris", :author=>["R.C. Harris"]}, :basionymAuthorTeam=>{:authorTeam=>"Nyl.", :author=>["Nyl."]}}, :status=>"comb. nov."}]
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 29], 31=>["author_word", 35], 36=>["author_word", 42]}
   end
   
@@ -414,6 +429,9 @@ describe ScientificNameClean do
       parse(res[0]).hybrid.should be_true
       details(res[0]).should == res[1]
    end
+   sn = "Rosa alpina x pomifera"
+   canonical(sn).should == "Rosa alpina × pomifera"
+   parse(sn).details.should == [{:genus=>{:string=>"Rosa"}, :species=>{:string=>"alpina"}}, {:species=>{:string=>"pomifera"}, :genus=>{:string=>"Rosa"}}]
   end
   
   it "should parse hybrid combination" do
@@ -421,14 +439,14 @@ describe ScientificNameClean do
     parse(sn).should_not be_nil
     parse(sn).hybrid.should be_true
     value(sn).should == "Arthopyrenia hyalospora \303\227 Hydnellum scrobiculatum"
-    canonical(sn).should == "Arthopyrenia hyalospora Hydnellum scrobiculatum"
+    canonical(sn).should == "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
     details(sn).should == [{:genus=>{:string=>"Arthopyrenia"}, :species=>{:string=>"hyalospora"}}, {:genus=>{:string=>"Hydnellum"}, :species=>{:string=>"scrobiculatum"}}]
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 26=>["genus", 35], 36=>["species", 49]}
     sn = "Arthopyrenia hyalospora (Banker) D. Hall X Hydnellum scrobiculatum D.E. Stuntz"
     parse(sn).should_not be_nil
     parse(sn).hybrid.should be_true
     value(sn).should == "Arthopyrenia hyalospora (Banker) D. Hall \303\227 Hydnellum scrobiculatum D.E. Stuntz"
-    canonical(sn).should == "Arthopyrenia hyalospora Hydnellum scrobiculatum"
+    canonical(sn).should == "Arthopyrenia hyalospora × Hydnellum scrobiculatum"
     pos(sn).should == {0=>["genus", 12], 13=>["species", 23], 25=>["author_word", 31], 33=>["author_word", 35], 36=>["author_word", 40], 43=>["genus", 52], 53=>["species", 66], 67=>["author_word", 71], 72=>["author_word", 78]}
     value("Arthopyrenia hyalospora X").should == "Arthopyrenia hyalospora \303\227 ?"  
     sn = "Arthopyrenia hyalospora x"
@@ -446,7 +464,6 @@ describe ScientificNameClean do
   
   it 'should parse names with taxon concept' do
     sn = "Stenometope laevissimus sec. Eschmeyer 2004"
-    val = @parser.failure_reason.to_s.match(/column [0-9]*/).to_s().gsub(/column /,'')
     details(sn).should == [{:genus=>{:string=>"Stenometope"}, :species=>{:string=>"laevissimus"}, :taxon_concept=>{:authorship=>"Eschmeyer 2004", :basionymAuthorTeam=>{:authorTeam=>"Eschmeyer", :author=>["Eschmeyer"], :year=>"2004"}}}]
     pos(sn).should == {0=>["genus", 11], 12=>["species", 23], 29=>["author_word", 38], 39=>["year", 43]}
     sn = "Stenometope laevissimus Bibron 1855 sec. Eschmeyer 2004"
@@ -501,26 +518,35 @@ describe ScientificNameClean do
     details(sn).should == [{:genus=>{:string=>"Flexibacter"}, :species=>{:string=>"elegans", :authorship=>"Soriano 1945, non Lewin 1969", :basionymAuthorTeam=>{:authorTeam=>"Soriano", :author=>["Soriano"], :year=>"1945"}}}]
   end
   
-  # it 'should parse hybrid names with capitalized second name in genus (botanical code error)' do
-  #   sn = 'Anacampti-Platanthera P. Fourn.'
-  #   @parser.parse(sn)
-  #   puts @parser.failure_reason
-  #   parse(sn).should_not be_nil
-  #   canonical(sn).should == 'Anacamptiplatanthera'
-  #   sn = 'Anacampti-Platanthera vulgaris P. Fourn.'
-  #   parse(sn).should_not be_nil
-  #   canonical(sn).should == 'Anacamptiplatanthera'
-  # end
+  # Combination genus names should be merged without dash or capital letter
+  it 'should parse hybrid names with capitalized second name in genus (botanical code error)' do
+    sn = 'Anacampti-Platanthera P. Fourn.'
+    parse(sn).should_not be_nil
+    canonical(sn).should == 'Anacamptiplatanthera'
+    sn = 'Anacampti-Platanthera vulgaris P. Fourn.'
+    parse(sn).should_not be_nil
+    canonical(sn).should == 'Anacamptiplatanthera vulgaris'
+  end
 
-  # it 'shoud parse hybrid names with * character' do 
-  #   sn = "Carduus acanthoides * crispus"
-  #   details(sn).should == ''
-  # end
-    
   it 'should parse genus names starting with uppercase letters AE OE' do
     sn = 'AEmona separata Broun 1921'
     canonical(sn).should == 'Aemona separata'
     sn = 'OEmona simplex White, 1855'
     canonical(sn).should == 'Oemona simplex'
   end
+  #"Arthrosamanea eriorhachis (Harms & sine ref. ) Aubrév." -- ignore & sine ref. (means without reference)
+  
+=begin
+  new stuff
+
+   sn = "Orchidaceae × Asconopsis hort."
+   canonical(sn).should == "Orchidaceae x Asconopsis"
+   sn 
+   Tamiops swinhoei near hainanus|Tamiops swinhoei near hainanus
+   Conus textile form archiepiscopus|Conus textile form archiepiscopus|
+   Crypticus pseudosericeus ssp. olivieri Desbrochers des Loges,1881|Crypticus pseudosericeus olivieri des
+   Solanum nigrum subsp nigrum|Solanum nigrum subsp nigrum
+   Protoglossus taeniatum author unknown|Protoglossus taeniatum author unknown
+   Dupontiella (S. ?) bicolor|Dupontiella|
+=end
 end