biodiversity 5.0.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c26c9c1ada65f95edf5e00365203f4e68d596e0b14f44b6995b46e127afab9
-  data.tar.gz: ce2cced66dbebc464ef47eee7f401a8a6b946d69d6664b7fcf1c8d5c413f7251
+  metadata.gz: edae363431b2855927ee3ff977da0987e3a8989cabf89c05b75f25b6daa82197
+  data.tar.gz: 84cb944df5d6b9779c5103de481dba7fe60f4aedf30515cce752bf79cd3486d4
 SHA512:
-  metadata.gz: ea6b814f8fe7bf451a360c87674c53d63bf49a2351e23aa724b7974cf269986ab7206fd1987dc945224fe9bc9cf36605994f34d6d6fd61ad72c03783cb41629d
-  data.tar.gz: b456ef00e072b37d12f0312b347af29aea126a40f4f86ab0b735b42b185977e692ef6fc94c18072b42e75ee6b69d254ba5bb90fe0a4d7a7f0b057366af403a8e
+  metadata.gz: af5f2f8c954cb3570f7a57b657038936fe544379d196a5c76b73dc783476150b1724c667d0dd2e45e486c1718c2a828089965afde5e90a69d5ce3203761d8ef2
+  data.tar.gz: f40a48c418e83049845fbdbd56d8b29b56f8aed521449ae103c378d510f8b7178958a83632d4a14d00dfb7656929224c3fc1673786e62a3cfa3cd18ce29ae6f7

data/CHANGELOG

@@ -1,3 +1,9 @@
+5.1.2 -- upgrade to gnparser v1.0.2
+
+5.1.1 -- simplified signature of methods
+
+5.1.0 -- changed sinature of methods
+
 5.0.0 -- changed GNparser to v 1.0.0
 
 4.0.3 -- fix memory leak in parse_ary method

data/clib/linux/libgnparser.h

@@ -19,7 +19,7 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_;
 /* Start of preamble from import "C" comments.  */
 
 
-#line 3 "main.go"
+#line 5 "main.go"
 
 	#include "stdlib.h"
 

data/clib/mac/libgnparser.h

@@ -19,7 +19,7 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_;
 /* Start of preamble from import "C" comments.  */
 
 
-#line 3 "main.go"
+#line 5 "main.go"
 
 	#include "stdlib.h"
 
@@ -80,20 +80,17 @@ extern "C" {
 // 'csv', 'compact', 'pretty'. If withDetails argument is 0, additional
 // parsed details are ommited, if it is 1 -- they are included.
 // true.
-
-extern char* ParseToString(char* p0, char* p1, int p2);
+extern char* ParseToString(char* name, char* f, int details);
 
 // FreeMemory takes a string pointer and frees its memory.
-
-extern void FreeMemory(char* p0);
+extern void FreeMemory(char* p);
 
 // ParseAryToString function takes an array of names, parsing format, and a
 // withDetails flag as 0|1 integer.  Parsed outputs are sent as a string in
 // either CSV or JSON format.  Format argument can take values of 'csv',
 // 'compact', or 'pretty'. For withDetails argument 0 means false, 1 means
 // true.
-
-extern char* ParseAryToString(char** p0, int p1, char* p2, int p3);
+extern char* ParseAryToString(char** in, int length, char* f, int details);
 
 #ifdef __cplusplus
 }

data/clib/win/libgnparser.h

@@ -19,7 +19,7 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_;
 /* Start of preamble from import "C" comments.  */
 
 
-#line 3 "main.go"
+#line 5 "main.go"
 
 	#include "stdlib.h"
 
@@ -80,17 +80,17 @@ extern "C" {
 // 'csv', 'compact', 'pretty'. If withDetails argument is 0, additional
 // parsed details are ommited, if it is 1 -- they are included.
 // true.
-extern char* ParseToString(char* name, char* f, int details);
+extern __declspec(dllexport) char* ParseToString(char* name, char* f, int details);
 
 // FreeMemory takes a string pointer and frees its memory.
-extern void FreeMemory(char* p);
+extern __declspec(dllexport) void FreeMemory(char* p);
 
 // ParseAryToString function takes an array of names, parsing format, and a
 // withDetails flag as 0|1 integer.  Parsed outputs are sent as a string in
 // either CSV or JSON format.  Format argument can take values of 'csv',
 // 'compact', or 'pretty'. For withDetails argument 0 means false, 1 means
 // true.
-extern char* ParseAryToString(char** in, int length, char* f, int details);
+extern __declspec(dllexport) char* ParseAryToString(char** in, int length, char* f, int details);
 
 #ifdef __cplusplus
 }

data/lib/biodiversity/parser.rb

@@ -35,21 +35,23 @@ module Biodiversity
 
     def self.parse(name, simple: false)
       format = simple ? 'csv' : 'compact'
+      with_details = simple ? 0 : 1
 
-      parsed, ptr = parse_go(name, format, 0)
+      parsed, ptr = parse_go(name, format, with_details)
       free_mem(ptr)
       output(parsed, simple)
     end
 
     def self.parse_ary(ary, simple: false)
       format = simple ? 'csv' : 'compact'
-      in_ptr = FFI::MemoryPointer.new(:pointer, ary.length)
+      with_details = simple ? 0 : 1
 
+      in_ptr = FFI::MemoryPointer.new(:pointer, ary.length)
       in_ptr.write_array_of_pointer(
         ary.map { |s| FFI::MemoryPointer.from_string(s) }
       )
 
-      parsed, ptr = parse_ary_go(in_ptr, ary.length, format, 0)
+      parsed, ptr = parse_ary_go(in_ptr, ary.length, format, with_details)
       free_mem(ptr)
       if simple
         CSV.new(parsed).map do |row|

data/lib/biodiversity/version.rb

@@ -2,7 +2,7 @@
 
 # Biodiversity module provides a namespace for scientific name parser.
 module Biodiversity
-  VERSION = '5.0.0'
+  VERSION = '5.2.0'
 
   def self.version
     VERSION

data/spec/lib/parser_spec.rb

@@ -14,6 +14,7 @@ describe Biodiversity::Parser do
       parsed = subject.parse('Homo sapiens  Linn.')
       expect(parsed[:canonical][:simple]).to eq 'Homo sapiens'
       expect(parsed[:normalized]).to eq 'Homo sapiens Linn.'
+      expect(parsed[:words].size).to eq 3
     end
 
     it 'gets quality and year correctly in simple form' do
@@ -32,8 +33,9 @@ describe Biodiversity::Parser do
         simple: true
       )
       expect(parsed[0][:canonical][:simple]).to eq 'Homo sapiens'
-      expect(parsed[1][:canonical][:simple]).to eq 'Pardosa moesta'
       expect(parsed[0][:normalized]).to be_nil
+
+      expect(parsed[1][:canonical][:simple]).to eq 'Pardosa moesta'
     end
 
     it 'parsed name in full format' do
@@ -42,8 +44,10 @@ describe Biodiversity::Parser do
       )
       expect(parsed[0][:canonical][:simple]).to eq 'Homo sapiens'
       expect(parsed[0][:normalized]).to eq 'Homo sapiens Linn.'
+      expect(parsed[0][:words].size).to eq 3
       expect(parsed[1][:parsed]).to be false
       expect(parsed[1][:virus]).to be true
+      expect(parsed[1][:words]).to be_nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biodiversity
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.6
 signing_key:
 specification_version: 4
 summary: Parser of scientific names