gnfinder 0.15.5 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbac598ce79e8e9db5ad0fd4f24b5004b2cf4f91d3f5fae0ece871b525d1f488
-  data.tar.gz: 36abaa471d385f27ae6bfa32f6f960bb7bc3a1b258b0b2a5402826e41d629d6f
+  metadata.gz: 1ff9a965f8ae94b254f1719f14400257bdc10d5bd40a7e889894363f2c9d8467
+  data.tar.gz: ba2bdb53c528385e1e5df6b843fa4416151932da9911aa6e25367fa6707c53ed
 SHA512:
-  metadata.gz: 5e6a3e825edfaa873e0d178a7323d7a9b6124292e940e504834b48d8127e18ae08298044458b15fc1125abf9b98afcd1faa292eadfb6edf64f80d6b3d89d43d7
-  data.tar.gz: 68e7871b2ce105ca751c63b391ca7477a33ce965c88d6ef87235635fd8aebbfba18e856c549d0e0a26d2a4228f0a0bf46ab8cce58892c677824273f6c1f9d259
+  metadata.gz: 729654107c13040303a2764c1e4046c909b9c3669115c0f95cf7d0d089cca76df94d0bf252fe8d734adbba450cb272483447fafca5c00545c96d5e16ca8c3873
+  data.tar.gz: 2500251bb7da19028f9dcb0cb5c24156cf821e6e5e0c9f285f73b275e3ea0ea553041c257cb38d2cab217b4397224cdf0f9b14adbb513b6b0910fdab393cb476

data/.github/workflows/ruby.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest] #, windows-latest]
         ruby: [2.6, 2.7, 3.0]
 
     steps:

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## [v0.17.0]
+
+- Update to gnfinder v0.17.0
+
 ## [v0.15.5]
 
 - Add [#16]: Search names using URL.

data/README.md

@@ -1,31 +1,37 @@
 # gnfinder
 
 Ruby gem to access functionality of [GNfinder] project written in Go. This gem
-allows to perform fast and accurate scientific name finding in UTF-8 encoded
-plain texts for Ruby-based projects.
-
-- [GNfinder](#gnfinder)
-  - [Requirements](#requirements)
-  - [Installation](#installation)
-  - [Usage](#usage)
-    - [Finding names in a text using default settings](#finding-names-in-a-text-using-default-settings)
-    - [Optionally disable Bayes search](#optionally-disable-bayes-search)
-    - [Set a language for the text](#set-a-language-for-the-text)
-  - [Set automatic detection of text's language](#set-automatic-detection-of-texts-language)
-    - [Set verification option](#set-verification-option)
-    - [Set preferred data-sources list](#set-preferred-data-sources-list)
-    - [Combination of parameters.](#combination-of-parameters)
-  - [Development](#development)
+allows to perform fast and accurate scientific name finding in texts,
+web-pages, as well as a large variety of documents. Document files can be
+accessed either locally or via a URL.
+
+
+<!-- vim-markdown-toc GFM -->
+
+* [Requirements](#requirements)
+* [Installation](#installation)
+* [Usage](#usage)
+  * [Finding names in a text using default settings](#finding-names-in-a-text-using-default-settings)
+  * [Finding names by a URL](#finding-names-by-a-url)
+  * [Finding names in a file](#finding-names-in-a-file)
+  * [Optionally disable Bayes search](#optionally-disable-bayes-search)
+  * [Set a language for the text](#set-a-language-for-the-text)
+* [Set automatic detection of text's language](#set-automatic-detection-of-texts-language)
+  * [Set verification option](#set-verification-option)
+  * [Set preferred data-sources list](#set-preferred-data-sources-list)
+  * [Combination of parameters.](#combination-of-parameters)
+* [Development](#development)
+
+<!-- vim-markdown-toc -->
 
 ## Requirements
 
 This gem uses REST API to access a running [GNfinder] server. You can find how
-to run it in [GNfinder] README file.
+to run it in [GNfinder] README file. By default it uses
+`https://gnfinder.globalnames.org/api/v0`
 
 ## Installation
 
-To use the gem from a Ruby proect install it using Gemfile, or manually:
-
 ```bash
 gem install gnfinder
 ```
@@ -37,7 +43,7 @@ applications. If you need to find names using other languages, use the
 [source code][client] of this gem for reference. For other usages read
 the original Go-lang [GNfinder] README file.
 
-First you need to create a instance of a `gnfinder` client
+First you need to create an instance of a `gnfinder` client
 
 ```ruby
 require 'gnfinder'
@@ -45,19 +51,18 @@ require 'gnfinder'
 gf = Gnfinder::Client.new
 ```
 
-By default the client will try to connect to `localhost:8778`. If you
-have another location for the server use:
-
-
+By default the client will try to connect to
+`https://gnfinder.globalnames.org/api/v0`. If you have another location for the
+server use:
 
 ```ruby
 require 'gnfinder'
 
 # you can use global public gnfinder server
 # located at finder-rpc.globalnames.org
-gf = Gnfinder::Client.new(host = 'finder-rpc.globalnames.org', port = 80)
+gf = Gnfinder::Client.new(host = 'finder.example.org', port = 80)
 
-# localhost, different port
+# localhost, port 8000
 gf = Gnfinder::Client.new(host = '0.0.0.0', port = 8000)
 ```
 
@@ -85,7 +90,27 @@ puts res.names[0].value
 puts res.names[0].odds
 ```
 
-Returned result will have the following methods for each name:
+### Finding names in a file
+
+Many different file types are supported (PDF, JPB, TIFF, MS Word, MS Excel
+etc).
+
+```ruby
+path = "/path/to/file.pdf"
+res = gf.find_file(path)
+puts res.names[0].value
+```
+
+Support of file-uploading uses 'multipart/form' approach. Here is an
+illustration for `curl`:
+
+```bash
+curl -v -F sources[]=1 -F sources[]=12 -F file=@file.pdf \
+    https://finder.globalnames.org/api/v0/find
+```
+
+Returned result is quite detailed and contains many accessor methods, for
+example:
 
   * value: name-string cleaned up for verification.
   * verbatim: name-string as it was found in the text.

data/lib/gnfinder/client.rb

@@ -4,7 +4,7 @@ module Gnfinder
   # Gnfinder::Client connects to gnfinder server
   class Client
     def initialize(host = 'https://gnfinder.globalnames.org', port = '')
-      api_path = '/api/v1'
+      api_path = '/api/v0'
       url = host + api_path
       url = "#{host}:#{port}#{api_path}" if port.to_s != ''
       @site = RestClient::Resource.new(url, read_timeout: 60)
@@ -21,6 +21,15 @@ module Gnfinder
       @site['/ping'].get.body
     end
 
+    def find_file(path, opts = {})
+      params = {}
+      update_params(params, opts)
+      file = File.new(path, 'rb')
+      params = params.merge(file: file)
+      resp = @site['find'].post(params)
+      prepare_result(resp)
+    end
+
     def find_url(url, opts = {})
       return to_open_struct({ "names": [] }) if url.to_s.strip == ''
 
@@ -39,29 +48,33 @@ module Gnfinder
 
     # rubocop:disable all
     def find(params, opts = {})
+      update_params(params, opts)
+
+      resp = @site['find'].post params.to_json, {content_type: :json, accept: :json}
+      prepare_result(resp)
+    end
+    # rubocop:enable all
+
+    def prepare_result(response)
+      output = JSON.parse(response.body)
+      res = output['metadata']
+      res['names'] = output['names'] || []
+      res = res.deep_transform_keys(&:underscore)
+      res['names'] = [] if res['names'].nil?
+      to_open_struct(res)
+    end
+
+    # rubocop:disable all
+    def update_params(params, opts)
       params[:noBayes] = true if opts[:no_bayes]
       params[:oddsDetails] = true if opts[:odds_details]
       params[:language] = opts[:language] if opts[:language].to_s.strip != ''
 
-      if opts[:words_around] && opts[:words_around] > 0
-        params[:wordsAround] = opts[:words_around]
-      end
+      params[:wordsAround] = opts[:words_around] if opts[:words_around] && opts[:words_around].positive?
 
       params[:verification] = true if opts[:verification]
 
-      if opts[:sources] && !opts[:sources].empty?
-        params[:sources] = opts[:sources]
-      end
-
-      res = @site['find'].post params.to_json, {content_type: :json, accept: :json}
-      output = JSON.parse(res.body)
-      res = output["metadata"]
-      res["names"] = output["names"] || []
-      res = res.deep_transform_keys(&:underscore)
-      if res["names"].nil?
-        res["names"] = []
-      end
-      to_open_struct(res)
+      params[:sources] = opts[:sources] if opts[:sources] && !opts[:sources].empty?
     end
     # rubocop:enable all
 

data/lib/gnfinder/version.rb

@@ -3,7 +3,7 @@
 # Gnfinder is a namespace module for gndinfer gem.
 module Gnfinder
   # Version corresponds to the minimal supported version of Go gnfinder
-  VERSION = '0.15.5'
+  VERSION = '0.18.0'
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnfinder
 version: !ruby/object:Gem::Version
-  version: 0.15.5
+  version: 0.18.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client