gnparser 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874326057814cbb368cc59f78df30e16faae8ba69dfe86140686597e779cb6b0
-  data.tar.gz: 904391d4ef7e7d5c48c58df05a343823fff0841b96edb82ae36a5fd7135e7df6
+  metadata.gz: ee60435b3b83e338ef45457f0ac6c809dac4e7b6efad9e96ee9f3ffc66363c76
+  data.tar.gz: eed51e44fcfe2ee9939e0201ffb768e259acfdbbc60c9701efc5e0ce147c215d
 SHA512:
-  metadata.gz: 513947853fec9b99cccc50819e1b7b4a5f6ea1558c6307e9d7d91e862a86f1fe4d26066ef1c2d9d20b6b25dd08629573c7f37e461b7b44014ae4b74361b41029
-  data.tar.gz: 1747254684ba4f37eda45db9b4ac4992e603ef98f63b10c231e06b1deab845892ce2d1e4694621982f0ae42929312cb0fcb0f1bba9d0b9469a6ade8b32c29eaf
+  metadata.gz: 3b7183db1c922b54d8d8e44089c011df900c9c9652d1f444eff139478c5dcbf14b01d91c3cbc6c37b8c5e514e2ef616336c76cc7c507773f1526ac0838b1664d
+  data.tar.gz: 490f323db0aae6c4bc6c6217de1f5eb05747da04c6ee6cfe46ed20c7a7e0aa89d7bf098f499bdea373b185d0de385a0e23caaca8c3d6b61a9af965650b4a03a3

data/.rubocop.yml

@@ -5,6 +5,8 @@ AllCops:
     - 'lib/gnparser_services_pb.rb'
 Style/StringLiterals:
   EnforcedStyle: single_quotes
+Metrics/AbcSize:
+  Max: 30
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'

data/gnparser.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 12.3'
   gem.add_development_dependency 'rspec', '~> 3.8'
   gem.add_development_dependency 'rubocop', '~> 0.59'
+  gem.add_development_dependency 'solargraph', '~> 0.38.0'
 end

data/lib/gnparser/client.rb

@@ -8,11 +8,22 @@ module GNparser
     def initialize(host = '0.0.0.0', port = '8778')
       @stub = Pb::GNparser::Stub.new("#{host}:#{port}",
                                      :this_channel_is_insecure)
-      return if parser_version.value >= PARSER_MIN_VERSION
+      return if supported_parser(parser_version.value)
 
       raise 'gRPC server of gnparser should be at least ' \
-            ' #{PARSER_MIN_VERSION}.\n Download latest version from ' \
-            'https://gitlab/gogna/gnparser/releases.'
+            " #{PARSER_MIN_VERSION}.\n Download latest version from " \
+            'https://gitlab/gogna/gnparser/releases. '
+    end
+
+    def supported_parser(ver_str)
+      return true if ver_str == PARSER_MIN_VERSION
+
+      ver = ver_str[1..-1].split('.')
+      ref = PARSER_MIN_VERSION[1..-1].split('.')
+      return true if ver[0].to_i > ref[0].to_i || ver[1].to_i > ref[1].to_i ||
+                     ver[2].to_i > ref[2].to_i
+
+      false
     end
 
     # parser_version retrieves the version of gnparser used by gRPC service.

data/lib/gnparser/version.rb

@@ -2,7 +2,7 @@
 
 # GNparser is a namespace module for gnparser gem.
 module GNparser
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 
   def self.version
     VERSION

data/lib/gnparser_pb.rb

@@ -4,124 +4,127 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "pb.Version" do
-    optional :value, :string, 1
-    optional :build_time, :string, 2
-  end
-  add_message "pb.Void" do
-  end
-  add_message "pb.InputArray" do
-    optional :jobs_number, :int32, 1
-    optional :skip_cleaning, :bool, 2
-    repeated :names, :string, 3
-  end
-  add_message "pb.OutputArray" do
-    repeated :output, :message, 1, "pb.Parsed"
-  end
-  add_message "pb.Parsed" do
-    optional :parsed, :bool, 1
-    optional :quality, :int32, 2
-    repeated :quality_warning, :message, 3, "pb.QualityWarning"
-    optional :verbatim, :string, 4
-    optional :normalized, :string, 5
-    optional :canonical, :message, 6, "pb.Canonical"
-    optional :authorship, :message, 7, "pb.Authorship"
-    repeated :positions, :message, 8, "pb.Position"
-    optional :hybrid, :bool, 9
-    optional :bacteria, :bool, 10
-    optional :tail, :string, 11
-    optional :id, :string, 12
-    optional :parser_version, :string, 13
-    optional :cardinality, :int32, 14
-    optional :name_type, :enum, 15, "pb.NameType"
-    repeated :details_hybrid_formula, :message, 20, "pb.HybridFormula"
-    oneof :details do
-      optional :uninomial, :message, 16, "pb.Uninomial"
-      optional :species, :message, 17, "pb.Species"
-      optional :comparison, :message, 18, "pb.Comparison"
-      optional :approximation, :message, 19, "pb.Approximation"
+  add_file("gnparser.proto", :syntax => :proto3) do
+    add_message "pb.Version" do
+      optional :value, :string, 1
+      optional :build_time, :string, 2
     end
-  end
-  add_message "pb.HybridFormula" do
-    oneof :element do
-      optional :uninomial, :message, 1, "pb.Uninomial"
-      optional :species, :message, 2, "pb.Species"
-      optional :comparison, :message, 3, "pb.Comparison"
-      optional :approximation, :message, 4, "pb.Approximation"
+    add_message "pb.Void" do
+    end
+    add_message "pb.InputArray" do
+      optional :jobs_number, :int32, 1
+      optional :skip_cleaning, :bool, 2
+      repeated :names, :string, 3
+    end
+    add_message "pb.OutputArray" do
+      repeated :output, :message, 1, "pb.Parsed"
+    end
+    add_message "pb.Parsed" do
+      optional :parsed, :bool, 1
+      optional :quality, :int32, 2
+      repeated :quality_warning, :message, 3, "pb.QualityWarning"
+      optional :verbatim, :string, 4
+      optional :normalized, :string, 5
+      optional :canonical, :message, 6, "pb.Canonical"
+      optional :authorship, :message, 7, "pb.Authorship"
+      repeated :positions, :message, 8, "pb.Position"
+      optional :hybrid, :bool, 9
+      optional :bacteria, :bool, 10
+      optional :tail, :string, 11
+      optional :id, :string, 12
+      optional :parser_version, :string, 13
+      optional :cardinality, :int32, 14
+      optional :name_type, :enum, 15, "pb.NameType"
+      repeated :details_hybrid_formula, :message, 20, "pb.HybridFormula"
+      oneof :details do
+        optional :uninomial, :message, 16, "pb.Uninomial"
+        optional :species, :message, 17, "pb.Species"
+        optional :comparison, :message, 18, "pb.Comparison"
+        optional :approximation, :message, 19, "pb.Approximation"
+      end
+    end
+    add_message "pb.HybridFormula" do
+      oneof :element do
+        optional :uninomial, :message, 1, "pb.Uninomial"
+        optional :species, :message, 2, "pb.Species"
+        optional :comparison, :message, 3, "pb.Comparison"
+        optional :approximation, :message, 4, "pb.Approximation"
+      end
+    end
+    add_message "pb.Canonical" do
+      optional :stem, :string, 1
+      optional :simple, :string, 2
+      optional :full, :string, 3
+    end
+    add_message "pb.Position" do
+      optional :type, :string, 1
+      optional :start, :int32, 2
+      optional :end, :int32, 3
+    end
+    add_message "pb.QualityWarning" do
+      optional :quality, :int32, 1
+      optional :message, :string, 2
+    end
+    add_message "pb.Uninomial" do
+      optional :value, :string, 1
+      optional :rank, :string, 2
+      optional :parent, :string, 3
+      optional :authorship, :message, 4, "pb.Authorship"
+    end
+    add_message "pb.Species" do
+      optional :genus, :string, 1
+      optional :sub_genus, :string, 2
+      optional :species, :string, 3
+      optional :species_authorship, :message, 4, "pb.Authorship"
+      repeated :infra_species, :message, 5, "pb.InfraSpecies"
+    end
+    add_message "pb.InfraSpecies" do
+      optional :value, :string, 1
+      optional :rank, :string, 2
+      optional :authorship, :message, 3, "pb.Authorship"
+    end
+    add_message "pb.Comparison" do
+      optional :genus, :string, 1
+      optional :species, :string, 2
+      optional :species_authorship, :message, 3, "pb.Authorship"
+      optional :comparison, :string, 4
+    end
+    add_message "pb.Approximation" do
+      optional :genus, :string, 1
+      optional :species, :string, 2
+      optional :species_authorship, :message, 3, "pb.Authorship"
+      optional :approximation, :string, 4
+      optional :ignored, :string, 5
+    end
+    add_message "pb.Authorship" do
+      optional :value, :string, 1
+      repeated :all_authors, :string, 2
+      optional :original, :message, 3, "pb.AuthGroup"
+      optional :combination, :message, 4, "pb.AuthGroup"
+    end
+    add_message "pb.AuthGroup" do
+      repeated :authors, :string, 1
+      optional :year, :string, 2
+      optional :approximate_year, :bool, 3
+      optional :ex_authors, :message, 4, "pb.Authors"
+      optional :emend_authors, :message, 5, "pb.Authors"
+    end
+    add_message "pb.Authors" do
+      repeated :authors, :string, 1
+      optional :year, :string, 2
+      optional :approximate_year, :bool, 3
+    end
+    add_enum "pb.NameType" do
+      value :NONE, 0
+      value :UNINOMIAL, 1
+      value :SPECIES, 2
+      value :COMPARISON, 3
+      value :APPROX_SURROGATE, 4
+      value :SURROGATE, 5
+      value :NAMED_HYBRID, 6
+      value :HYBRID_FORMULA, 7
+      value :VIRUS, 8
     end
-  end
-  add_message "pb.Canonical" do
-    optional :simple, :string, 1
-    optional :full, :string, 2
-  end
-  add_message "pb.Position" do
-    optional :type, :string, 1
-    optional :start, :int32, 2
-    optional :end, :int32, 3
-  end
-  add_message "pb.QualityWarning" do
-    optional :quality, :int32, 1
-    optional :message, :string, 2
-  end
-  add_message "pb.Uninomial" do
-    optional :value, :string, 1
-    optional :rank, :string, 2
-    optional :parent, :string, 3
-    optional :authorship, :message, 4, "pb.Authorship"
-  end
-  add_message "pb.Species" do
-    optional :genus, :string, 1
-    optional :sub_genus, :string, 2
-    optional :species, :string, 3
-    optional :species_authorship, :message, 4, "pb.Authorship"
-    repeated :infra_species, :message, 5, "pb.InfraSpecies"
-  end
-  add_message "pb.InfraSpecies" do
-    optional :value, :string, 1
-    optional :rank, :string, 2
-    optional :authorship, :message, 3, "pb.Authorship"
-  end
-  add_message "pb.Comparison" do
-    optional :genus, :string, 1
-    optional :species, :string, 2
-    optional :species_authorship, :message, 3, "pb.Authorship"
-    optional :comparison, :string, 4
-  end
-  add_message "pb.Approximation" do
-    optional :genus, :string, 1
-    optional :species, :string, 2
-    optional :species_authorship, :message, 3, "pb.Authorship"
-    optional :approximation, :string, 4
-    optional :ignored, :string, 5
-  end
-  add_message "pb.Authorship" do
-    optional :value, :string, 1
-    repeated :all_authors, :string, 2
-    optional :original, :message, 3, "pb.AuthGroup"
-    optional :combination, :message, 4, "pb.AuthGroup"
-  end
-  add_message "pb.AuthGroup" do
-    repeated :authors, :string, 1
-    optional :year, :string, 2
-    optional :approximate_year, :bool, 3
-    optional :ex_authors, :message, 4, "pb.Authors"
-    optional :emend_authors, :message, 5, "pb.Authors"
-  end
-  add_message "pb.Authors" do
-    repeated :authors, :string, 1
-    optional :year, :string, 2
-    optional :approximate_year, :bool, 3
-  end
-  add_enum "pb.NameType" do
-    value :NONE, 0
-    value :UNINOMIAL, 1
-    value :SPECIES, 2
-    value :COMPARISON, 3
-    value :APPROX_SURROGATE, 4
-    value :SURROGATE, 5
-    value :NAMED_HYBRID, 6
-    value :HYBRID_FORMULA, 7
-    value :VIRUS, 8
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnparser
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Dmitry Mozzherin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -108,6 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.59'
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.38.0
 description: |-
   The gem parses scientific names into semantic elements
                        using gRPC of gnparser app written in Go.
@@ -150,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Scientific name parser