nuva 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f23a09f7de2d295f934dfb79dcdfd9a4be86849678a21dcbec54c96d1c3d1e
-  data.tar.gz: d18ffafed00d97d0d0cce364a9ff26785ae68940c53a08525db017e29f59d716
+  metadata.gz: 42d68d0dbbdfc96e269f94cc15383d7117613c807d4f7b73e108972c50a8dad2
+  data.tar.gz: c19f6dfecda00b7219a5f87b7b7bc6824dfa1d512ee4c2d3759c4020761c4df4
 SHA512:
-  metadata.gz: 13488a433f342b2e78ce857afc3bd22c9c9d1c20d9306efe89a0c5bb0a4fa5a34ee3f17a57b7d476aa4d8dbb873dd4b35e97daf074ea8caed93eb10e6d63ed89
-  data.tar.gz: e9cd4e696d86ccc714bf12b468acb1f0002d7c1107afc35c0d86b008e821d61151490b7b920b816302840b96c99886f86c432fcc481fb9917e2e0ae237edf988
+  metadata.gz: f75fbf53fb2eb1ee61ea47d504ab0b302b0544a40f2893b01a50d3acfde1a01bd2f5ddd14330e4572bfe96073ece9fc2e55924a2bd7295322906c8cec7079f6a
+  data.tar.gz: 22175c5e8695d51530003a58644fca0f4ead3b638b420bf2bee3dea6bfeff999aff9caaba2d780e8ceaf5cbfe7937aa7b1c2632e9b4a472b93e61d1bce5a3373

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,116 @@
+require:
+  - rubocop-performance
+
+AllCops:
+  TargetRubyVersion: 3.2
+  # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
+  # to ignore them, so only the ones explicitly set in this file are enabled.
+  DisabledByDefault: true
+  Exclude:
+    - "**/vendor/**/*"
+    - "**/*_pb.rb"
+
+# Prefer &&/|| over and/or.
+Style/AndOr:
+  Enabled: true
+
+Layout:
+  Enabled: false
+
+# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
+Style/HashSyntax:
+  Enabled: true
+
+Style/DefWithParentheses:
+  Enabled: true
+
+# Defining a method with parameters needs parentheses.
+Style/MethodDefParentheses:
+  Enabled: true
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: always
+
+Layout/EmptyLineAfterMagicComment:
+  Enabled: true
+
+Style/RedundantFreeze:
+  Enabled: true
+
+# Use quotes for string literals when they are enough.
+Style/RedundantPercentQ:
+  Enabled: true
+
+Style/StringLiterals:
+  Enabled: false
+
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/AmbiguousRegexpLiteral:
+  Enabled: true
+
+Lint/ErbNewArguments:
+  Enabled: true
+
+# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
+Lint/RequireParentheses:
+  Enabled: true
+
+Lint/ShadowingOuterLocalVariable:
+  Enabled: true
+
+Lint/RedundantStringCoercion:
+  Enabled: true
+
+Lint/UriEscapeUnescape:
+  Enabled: true
+
+Lint/UselessAssignment:
+  Enabled: true
+
+Lint/DeprecatedClassMethods:
+  Enabled: true
+
+Style/ParenthesesAroundCondition:
+  Enabled: true
+
+Style/RedundantBegin:
+  Enabled: false
+
+Style/RedundantReturn:
+  Enabled: true
+  AllowMultipleReturnValues: true
+
+Style/Semicolon:
+  Enabled: true
+  AllowAsExpressionSeparator: true
+
+# Prefer Foo.method over Foo::method
+Style/ColonMethodCall:
+  Enabled: true
+
+Style/TrivialAccessors:
+  Enabled: true
+
+Performance/FlatMap:
+  Enabled: true
+
+Performance/RedundantMerge:
+  Enabled: true
+
+Performance/StartWith:
+  Enabled: true
+
+Performance/EndWith:
+  Enabled: true
+
+Performance/RegexpMatch:
+  Enabled: true
+
+Performance/ReverseEach:
+  Enabled: true
+
+Performance/UnfreezeString:
+  Enabled: true

data/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: %i[spec rubocop]

data/gen_proto.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+find ../nuva -type f -name '*.proto' -exec basename {} \; | xargs protoc --ruby_out=./lib/nuva -I ../nuva
+
+if [ `uname` = 'Darwin' ]; then
+    sed -i '' -E "s/^require '([a-zA-Z_]+)'/require_relative '\1'/" ./lib/nuva/*_pb.rb
+else
+    sed -i -E "s/^require '([a-zA-Z_]+)'/require_relative '\1'/" ./lib/nuva/*_pb.rb
+fi

data/lib/{queries.rb → nuva/queries.rb}

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'fuzzy_match'
 
 module Nuva
   module Queries
     class ValencesByVaccine
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @valences_by_vaccine_id = repositories[:valences].all.reduce(h) do |acc, valence|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @valences_by_vaccine_id = repositories[:valences].all.reduce(hash) do |acc, valence|
           valence.vaccine_ids.each do |vaccine_id|
             acc[vaccine_id] << valence
           end
@@ -20,8 +22,8 @@ module Nuva
 
     class VaccinesByValence
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @vaccines_by_valence_id = repositories[:vaccines].all.reduce(h) do |acc, vaccine|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @vaccines_by_valence_id = repositories[:vaccines].all.reduce(hash) do |acc, vaccine|
           vaccine.valence_ids.each do |valence_id|
             acc[valence_id] << vaccine
           end
@@ -36,8 +38,8 @@ module Nuva
 
     class VaccinesByDisease
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @vaccines_by_disease_id = repositories[:valences].all.reduce(h) do |acc, valence|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @vaccines_by_disease_id = repositories[:valences].all.reduce(hash) do |acc, valence|
           valence.disease_ids.each do |disease_id|
             valence.vaccine_ids.each do |vaccine_id|
               acc[disease_id] << repositories[:vaccines].find(vaccine_id)
@@ -48,14 +50,14 @@ module Nuva
       end
 
       def call(disease)
-        @vaccines_by_disease_id[disease.id]
+        @vaccines_by_disease_id[disease.id].uniq(&:id)
       end
     end
 
     class ValencesByDisease
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @valences_by_disease_id = repositories[:valences].all.reduce(h) do |acc, valence|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @valences_by_disease_id = repositories[:valences].all.reduce(hash) do |acc, valence|
           valence.disease_ids.each do |disease_id|
             acc[disease_id] << valence
           end
@@ -70,8 +72,8 @@ module Nuva
 
     class DiseasesByVaccine
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @diseases_by_vaccine_id = repositories[:valences].all.reduce(h) do |acc, valence|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @diseases_by_vaccine_id = repositories[:valences].all.reduce(hash) do |acc, valence|
           valence.vaccine_ids.each do |vaccine_id|
             valence.disease_ids.each do |disease_id|
               acc[vaccine_id] << repositories[:diseases].find(disease_id)
@@ -82,14 +84,14 @@ module Nuva
       end
 
       def call(vaccine)
-        @diseases_by_vaccine_id[vaccine.id]
+        @diseases_by_vaccine_id[vaccine.id].uniq(&:id)
       end
     end
 
     class DiseasesByValence
       def initialize(repositories)
-        h = Hash.new { |h, k| h[k] = [] }
-        @diseases_by_valence_id = repositories[:diseases].all.reduce(h) do |acc, disease|
+        hash = Hash.new { |h, k| h[k] = [] }
+        @diseases_by_valence_id = repositories[:diseases].all.reduce(hash) do |acc, disease|
           disease.valence_ids.each do |valence_id|
             acc[valence_id] << disease
           end
@@ -104,8 +106,8 @@ module Nuva
 
     class VaccineFuzzySearch
       def initialize(repositories)
-        @engine = FuzzyMatch.new(repositories.vaccines.all, :read => ->(v) {
-          return v.name
+        @engine = FuzzyMatch.new(repositories.vaccines.all, read: ->(v) {
+          v.name
         })
       end
 
@@ -148,7 +150,7 @@ module Nuva
       end
     end
 
-    class LookupSpecializedVaccines
+    class LookupGeneralizedVaccines
       def initialize(repositories, valencesByVaccine)
         @vaccines = repositories.vaccines
         @valences = repositories.valences
@@ -158,56 +160,28 @@ module Nuva
       def call(vaccine)
         targetValences = @valencesByVaccine.(vaccine)
         list = @vaccines.all.filter do |candidate|
-          candidate.id != vaccine.id && targetValences.all? do |targetValence|
-            @valencesByVaccine.(candidate).any? do |candidateValence|
-              child_of? candidateValence, targetValence
+          next if candidate.id == vaccine.id || !candidate.generic
+          
+          @valencesByVaccine.(candidate).all? do |candidateValence|
+            targetValences.any? do |targetValence|
+              parent_of?(candidateValence, targetValence)
             end
           end
         end
-        list.sort_by do |v| @valencesByVaccine.(v).length end
+        list.sort_by do |v| -@valencesByVaccine.(v).length end
       end
 
       private def child_of?(valence, parent)
-        unless valence.nil?
+        until valence.nil?
           return true if valence.id == parent.id
-          valence = @valences.find valence.parent_id
+          valence = @valences.find(valence.parent_id)
         end
         
         false
       end
-    end
-
 
-    class LookupGeneralizedVaccines
-      def initialize(repositories, valencesByVaccine)
-        @vaccines = repositories.vaccines
-        @valences = repositories.valences
-        @valencesByVaccine = valencesByVaccine
-      end
-
-      def call(vaccine)
-        targetValences = @valencesByVaccine.(vaccine)
-        list = @vaccines.all.filter do |candidate|
-          candidate.id != vaccine.id && targetValences.all? do |targetValence|
-            @valencesByVaccine.(candidate).any? do |candidateValence|
-              child_of? candidateValence, targetValence
-            end
-          end
-        end
-        list.sort_by do |v| @valencesByVaccine.(v).length end
-      end
-
-      private def parent_of?(valence, parent)
-        child_of? parent, valence
-      end
-
-      private def child_of?(valence, parent)
-        unless valence.nil?
-          return true if valence.id == parent.id
-          valence = @valences.find valence.parent_id
-        end
-        
-        false
+      def parent_of?(parent, child)
+        child_of?(child, parent)
       end
     end
 
@@ -228,7 +202,7 @@ module Nuva
         @vaccines = repositories.vaccines
       end
 
-      def call()
+      def call
         @vaccines
           .all
           .flat_map(&:codes)

data/lib/{repositories → nuva/repositories}/disease_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nuva
   class DiseaseRepository < Repository
   end

data/lib/{repositories → nuva/repositories}/vaccine_repository.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nuva
   class VaccineRepository < Repository
   end

data/lib/{repositories → nuva/repositories}/valence_repository.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Nuva
   class ValenceRepository < Repository
     def initialize(data)

data/lib/{repository.rb → nuva/repository.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Nuva
   class Repository
     attr_reader :data

data/lib/nuva/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Nuva
+  VERSION = '0.1.7'
+end

data/lib/nuva.rb

@@ -1,7 +1,9 @@
-require_relative './version'
-require_relative './NuvaDatabase_pb'
-require_relative './repository'
-require_relative './queries'
+# frozen_string_literal: true
+
+require_relative 'nuva/version'
+require_relative 'nuva/NuvaDatabase_pb'
+require_relative 'nuva/repository'
+require_relative 'nuva/queries'
 require 'net/http'
 require 'json'
 require 'ostruct'
@@ -30,18 +32,21 @@ module Nuva
             @queries.vaccine_fuzzy_search = ::Nuva::Queries::VaccineFuzzySearch.new @repositories
             @queries.lookup_vaccine_by_code = ::Nuva::Queries::LookupVaccineByCode.new @repositories
             @queries.lookup_equivalent_vaccines = ::Nuva::Queries::LookupEquivalentVaccines.new @repositories
-            @queries.lookup_specialized_vaccines = ::Nuva::Queries::LookupSpecializedVaccines.new @repositories, @queries.valences_by_vaccine
             @queries.lookup_generalized_vaccines = ::Nuva::Queries::LookupGeneralizedVaccines.new @repositories, @queries.valences_by_vaccine
             @queries.all_nomenclatures = ::Nuva::Queries::AllNomenclatures.new @repositories
             @queries.all_code_by_nomenclature = ::Nuva::Queries::AllCodeByNomenclature.new @repositories
             @queries.freeze
         end
 
+        def version
+          @db.version
+        end
+
         def self.load(lang = "en")
             latest_version_uri = URI "https://cdnnuva.mesvaccins.net/versions/last.json"
 
             ::Net::HTTP.start(latest_version_uri.host, latest_version_uri.port,
-                :use_ssl => latest_version_uri.scheme == 'https') do |http|
+                use_ssl: latest_version_uri.scheme == 'https') do |http|
                 
                 # Fetch version manifest
                 req = ::Net::HTTP::Get.new latest_version_uri
@@ -49,7 +54,7 @@ module Nuva
                 res = http.request req
                 res.value
 
-                manifest = JSON::parse(res.body)
+                manifest = JSON.parse(res.body)
 
                 dump_hash = manifest['dump_hash']
 

data/nuva.gemspec

@@ -1,16 +1,37 @@
-require_relative "lib/version"
+# frozen_string_literal: true
 
-Gem::Specification.new do |s|
-  s.name        = 'nuva'
-  s.version     = Nuva::VERSION
-  s.licenses    = ['MIT']
-  s.summary     = "NUVA"
-  s.description = "nuva library aims to simplify working and interacting with the NUVA nomenclature through queries and repositories"
-  s.authors     = ["Syadem"]
-  s.email       = ''
-  s.files       = Dir.chdir(File.expand_path(__dir__)) {
-    `find . -type f -name '*.rb' -print0`.split("\0").concat %w[nuva.gemspec]
-  }
-  s.add_dependency 'google-protobuf', '~> 3.25', '>= 3.25.3'
-  s.add_dependency 'fuzzy_match', '~> 2.1'
+require_relative "lib/nuva/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "nuva"
+  spec.version = Nuva::VERSION
+  spec.authors = ["Syadem"]
+  spec.email = ["developers@mesvaccins.net"]
+
+  spec.summary = "NUVA"
+  spec.description = "nuva library aims to simplify working and interacting with the NUVA nomenclature through queries and repositories."
+  spec.homepage = "https://docs.nuva.mesvaccins.net"
+  spec.required_ruby_version = ">= 3.0.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  # spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
+  # spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git .gitlab-ci.yml appveyor Gemfile])
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency 'google-protobuf', '~> 3.25', '>= 3.25.3'
+  spec.add_dependency 'fuzzy_match', '~> 2.1'
+
+  # For more information and examples about making a new gem, check out our
+  # guide at: https://bundler.io/guides/creating_gem.html
 end

data/sig/nuva.rbs

@@ -0,0 +1,4 @@
+module Nuva
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nuva
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Syadem
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2024-03-26 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -45,31 +45,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 description: nuva library aims to simplify working and interacting with the NUVA nomenclature
-  through queries and repositories
-email: ''
+  through queries and repositories.
+email:
+- developers@mesvaccins.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- "./lib/Code_pb.rb"
-- "./lib/Disease_pb.rb"
-- "./lib/InjectionMethod_pb.rb"
-- "./lib/NuvaDatabase_pb.rb"
-- "./lib/Vaccine_pb.rb"
-- "./lib/Valence_pb.rb"
-- "./lib/VersionInfo_pb.rb"
-- "./lib/nuva.rb"
-- "./lib/queries.rb"
-- "./lib/repositories/disease_repository.rb"
-- "./lib/repositories/vaccine_repository.rb"
-- "./lib/repositories/valence_repository.rb"
-- "./lib/repository.rb"
-- "./lib/version.rb"
+- ".rspec"
+- ".rubocop.yml"
+- Rakefile
+- gen_proto.sh
+- lib/nuva.rb
+- lib/nuva/Code_pb.rb
+- lib/nuva/Disease_pb.rb
+- lib/nuva/InjectionMethod_pb.rb
+- lib/nuva/NuvaDatabase_pb.rb
+- lib/nuva/Vaccine_pb.rb
+- lib/nuva/Valence_pb.rb
+- lib/nuva/VersionInfo_pb.rb
+- lib/nuva/queries.rb
+- lib/nuva/repositories/disease_repository.rb
+- lib/nuva/repositories/vaccine_repository.rb
+- lib/nuva/repositories/valence_repository.rb
+- lib/nuva/repository.rb
+- lib/nuva/version.rb
 - nuva.gemspec
-homepage:
-licenses:
-- MIT
-metadata: {}
+- sig/nuva.rbs
+homepage: https://docs.nuva.mesvaccins.net
+licenses: []
+metadata:
+  homepage_uri: https://docs.nuva.mesvaccins.net
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -78,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/version.rb

@@ -1,3 +0,0 @@
-module Nuva
-  VERSION = '0.1.6'
-end