dimus-taxamatch_rb 0.5.6 → 0.5.7

data/lib/taxamatch_rb/atomizer.rb

@@ -12,7 +12,7 @@ module Taxamatch
   
     def parse(name)
       @res = {:all_authors => [], :all_years => []}
-      @parsed_raw = JSON.load(@parser.parse(name).to_json)['scientificName']
+      @parsed_raw = @parser.parse(name)[:scientificName]
       organize_results
     end
   
@@ -24,12 +24,12 @@ module Taxamatch
 
     def organize_results
       pr = @parsed_raw
-      return nil unless pr['parsed']
-      d = pr['details'][0]
-      process_node(:uninomial, d['uninomial'])
-      process_node(:genus, d['genus'])
-      process_node(:species, d['species'], true)
-      process_infraspecies(d['infraspecies'])
+      return nil unless pr[:parsed]
+      d = pr[:details][0]
+      process_node(:uninomial, d[:uninomial])
+      process_node(:genus, d[:genus])
+      process_node(:species, d[:species], true)
+      process_infraspecies(d[:infraspecies])
       @res[:all_authors] = @res[:all_authors].uniq.map {|a| Taxamatch::Normalizer.normalize(a)}
       @res[:all_years].uniq!
       @res.keys.size > 2 ? @res : nil
@@ -38,9 +38,9 @@ module Taxamatch
     def process_node(name, node, is_species = false)
       return unless node
       @res[name] = {}
-      @res[name][:epitheton] = node['epitheton']
-      @res[name][:normalized] = Taxamatch::Normalizer.normalize(node['epitheton'])
-      @res[name][:phonetized] = Taxamatch::Phonetizer.near_match(node['epitheton'], is_species)
+      @res[name][:epitheton] = node[:epitheton]
+      @res[name][:normalized] = Taxamatch::Normalizer.normalize(node[:epitheton])
+      @res[name][:phonetized] = Taxamatch::Phonetizer.near_match(node[:epitheton], is_species)
       get_authors_years(node, @res[name])
     end
   
@@ -49,9 +49,9 @@ module Taxamatch
       @res[:infraspecies] = []
       node.each do |infr|
         hsh = {}
-        hsh[:epitheton] = infr['epitheton']
-        hsh[:normalized] = Taxamatch::Normalizer.normalize(infr['epitheton'])
-        hsh[:phonetized] = Taxamatch::Phonetizer.near_match(infr['epitheton'], true)
+        hsh[:epitheton] = infr[:epitheton]
+        hsh[:normalized] = Taxamatch::Normalizer.normalize(infr[:epitheton])
+        hsh[:phonetized] = Taxamatch::Phonetizer.near_match(infr[:epitheton], true)
         get_authors_years(infr,hsh)
         @res[:infraspecies] << hsh
       end
@@ -60,13 +60,13 @@ module Taxamatch
     def get_authors_years(node, res)
       res[:authors] = []
       res[:years] = []
-      ['basionymAuthorTeam','combinationAuthorTeam'].each do |au|
+      [:basionymAuthorTeam, :combinationAuthorTeam].each do |au|
         if node[au]
-          res[:authors] += node[au]['author'] 
-          res[:years] << node[au]['year'] if node[au]['year']
-          if node[au]['exAuthorTeam']
-            res[:authors] += node[au]['exAuthorTeam']['author']
-            res[:years] << node[au]['exAuthorTeam']['year'] if node[au]['exAuthorTeam']['year']
+          res[:authors] += node[au][:author] 
+          res[:years] << node[au][:year] if node[au][:year]
+          if node[au][:exAuthorTeam]
+            res[:authors] += node[au][:exAuthorTeam][:author]
+            res[:years] << node[au][:exAuthorTeam][:year] if node[au][:exAuthorTeam][:year]
           end
         end
       end
@@ -80,9 +80,3 @@ module Taxamatch
   end
 end
 
-if __FILE__ == $0
-  require 'pp'
-  p = Parser.new
-  puts p.parse('Salmonella werahensis (Castellani) Hauduroy and Ehringer in Hauduroy 1937')  
-end
-

data/spec/taxamatch_rb_spec.rb

@@ -14,12 +14,13 @@ describe 'DamerauLevenshteinMod' do
   end
 end
 
-describe 'Parser' do
+describe 'Atomizer' do
   before(:all) do
     @parser = Taxamatch::Atomizer.new
   end
   
   it 'should parse uninomials' do
+    @parser.parse
     @parser.parse('Betula').should == {:all_authors=>[], :all_years=>[], :uninomial=>{:epitheton=>"Betula", :normalized=>"BETULA", :phonetized=>"BITILA", :authors=>[], :years=>[], :normalized_authors=>[]}}
     @parser.parse('Ærenea Lacordaire, 1872').should == {:all_authors=>["LACORDAIRE"], :all_years=>["1872"], :uninomial=>{:epitheton=>"Aerenea", :normalized=>"AERENEA", :phonetized=>"ERINIA", :authors=>["Lacordaire"], :years=>["1872"], :normalized_authors=>["LACORDAIRE"]}}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dimus-taxamatch_rb
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-16 00:00:00 -07:00
+date: 2009-08-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.5.13
     version: 
 description: This gem implements algorithsm for fuzzy matching scientific names developed by Tony Rees
 email: dmozzherin@eol.org