name-spotter 0.2.4 → 0.3.0

data/spec/scientific_name_spec.rb

@@ -1,25 +1,20 @@
-# encoding: utf-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
 describe NameSpotter::ScientificName do
-  
-  describe "without doing anything" do
-    before :each do
-      @find_me = "M. musculus"
-      @name = NameSpotter::ScientificName.new(@find_me, {:start_position => 30, :scientific_name => "Mus musculus"})
-    end
-    
-    it "should have figured out the end position" do
-      @name.end_pos.should eq @name.start_pos + @find_me.length - 1
+
+  describe ".new" do
+    it "calculates end_pos" do
+      find_me = "M. musculus"
+      name = NameSpotter::ScientificName.new(
+        find_me, { start_position: 30, scientific_name: "Mus musculus" }
+      )
+      expect(name.end_pos).to eq(name.start_pos + find_me.length - 1)
     end
-  end
-  
-  describe "unicode" do
-    it "should handle unicode characters" do
+
+    it "handles unicode characters" do
       verbatim = "Slovenščina"
-      name = NameSpotter::ScientificName.new(verbatim, {:start_position => 48193})
-      name.verbatim.should eq verbatim
-      name.end_pos.should eq name.start_pos + verbatim.length - 1
+      name = NameSpotter::ScientificName.
+        new(verbatim, { start_position: 48193 })
+      expect(name.verbatim).to eq verbatim
+      expect(name.end_pos).to eq(name.start_pos + verbatim.length - 1)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,2 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'name-spotter'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end
+require "rspec"
+require "name-spotter"

data/tf_logic.txt

@@ -23,11 +23,11 @@ for Genus + species
   if genus found and species, but not end of the sentence
     $currentString $cleanCandidateWord|species|$wordListMatches"."$score||-1||
     search continues... found species, can be subspecies
-  
+
   for abbreviated Genera (1-2 letters (where '-' can also be the first letter ???):
     expand Genus if last used genus is known with this letters
     if abbrev did not make sense (genus is not found):
-      ||0||-1|| 
+      ||0||-1||
       - result is nothing
       Also means 2 letter genera are not found by NameFinder
 
@@ -43,7 +43,7 @@ for Genus + species
         "$currentString ($cleanCandidateWord)|genus|$wordListMatches"."$scoreG||-1||\n"
     if next word is genus
       ****"$cleanCandidateWord|genus|$scoreG|$currentString|$wordListMatches||\n"
-  
+
   if next word is family
     if genus was abbreviated make it ""
       ****"||0|$currentString|$wordListMatches"; empty string genus -- should be ignored

metadata

@@ -1,254 +1,185 @@
 --- !ruby/object:Gem::Specification
 name: name-spotter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Anthony Goddard
 - Chuck Ha
 - Dmitry Mozzherin
+- David Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: unicode_utils
+  name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: unsupervised-language-detection
+  name: unicode_utils
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-expectations
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: unsupervised-language-detection
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.0.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '8.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: The gem searches for scientific names in texts using socket servers running
-  TaxonFinder (by Patrick Leary) and NetiNeti (by Lakshmi Manohar Akella)
+        version: '8.2'
+description: |-
+  The gem searches for scientific names in texts using
+                       socket servers running TaxonFinder (by Patrick Leary)
+                       and NetiNeti (by Lakshmi Manohar Akella)
 email: dmozzherin@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- .rvmrc
+- ".byebug_history"
+- ".document"
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
-- features/name-spotter.feature
-- features/step_definitions/name-spotter_steps.rb
-- features/support/env.rb
 - lib/name-spotter.rb
 - lib/name-spotter/client.rb
 - lib/name-spotter/monkey_patches.rb
 - lib/name-spotter/neti_neti_client.rb
 - lib/name-spotter/scientific_name.rb
 - lib/name-spotter/taxon_finder_client.rb
+- lib/name-spotter/version.rb
 - name-spotter.gemspec
 - spec/files/english.txt
 - spec/files/journalofentomol13pomo_0018.txt
@@ -261,29 +192,25 @@ files:
 homepage: http://github.com/GlobalNamesArchitecture/name-spotter
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3941125736575369993
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Scientific names finder
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-1.9.3-p194@namespotter --create

data/Gemfile.lock

@@ -1,84 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.2)
-    builder (3.0.0)
-    capybara (1.1.2)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
-    columnize (0.3.6)
-    cucumber (1.2.1)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
-    debugger (1.2.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
-    diff-lcs (1.1.3)
-    ffi (1.1.5)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.7.5)
-    libwebsocket (0.1.5)
-      addressable
-    mime-types (1.19)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    rack (1.4.1)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    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)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.25.0)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    unicode_utils (1.3.0)
-    unsupervised-language-detection (0.0.6)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  builder
-  bundler
-  capybara
-  cucumber
-  debugger
-  jeweler (~> 1.6.4)
-  json
-  rake
-  rest-client
-  rspec
-  rspec-expectations
-  unicode_utils
-  unsupervised-language-detection