uc3-dmp-id 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f692820577dff088fec1d1df2e4975a00a6b30952fa66979b1fa8449523d092e
-  data.tar.gz: 8bf2326f3a6fddf9454e915c596eb40231c939337e517de73f6ea998f04a9d6f
+  metadata.gz: 17f46e6944531f941dd897052fcf78719c8dd5596ec829614f31fb80a5daba91
+  data.tar.gz: b5d84feae8896a1ba0dffbefb23d213a315828330510368099a329c787b3abd8
 SHA512:
-  metadata.gz: fcc0689438e54715882ed7c30aa7d608e9c3abaa1e61fec7589a213c7665f257be933f93a482dc4d589756517c94a7f9b4803930f0a2a1bd51d877cd890b8a90
-  data.tar.gz: df18ed7a17053c9527e6a111150b81c2a6d285bda1263b854b0cc3fae5b703e3ef9dd3213b62230431c898c948cf80f6e821da3515089e6cfc156622223bdf7e
+  metadata.gz: c0ce4ad0d1a07e58cd13d25c8b8f68f7d7f71094fd73a89651c099c2d8ae2e49a71aad3556da1cbd215dcfd6d450d3dab2d6505363daea9c17565c61307b8a36
+  data.tar.gz: 3d14bd02b6ca70548d7e0f5567df945c39693184fb5633f4191b54c84dd406de940ad2cbd1b9774aaf6e73d595d70b8f9e60dcd6c0ccce4524539143a01da729

data/lib/uc3-dmp-id/comparator.rb

@@ -53,27 +53,30 @@ module Uc3DmpId
     # }
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def compare(hash:)
-      return [] unless hash.is_a?(Hash) && !hash['title'].nil?
+      scoring = []
+      return scoring unless hash.is_a?(Hash) && !hash['title'].nil?
 
-      # Compare the grant ids. If we have a match return the response immediately since that is
-      # a very positive match!
-      scoring = @dmps.map do |entry|
+      @dmps.each do |entry|
         dmp = entry.fetch('_source', {})
+
+        # Compare the grant ids. If we have a match return the response immediately since that is
+        # a very positive match!
         response = { dmp_id: dmp['_id'], confidence: 'None', score: 0, notes: [] }
         response = _grants_match?(array: hash.fetch('grant_ids', []), dmp:, response:)
-        return response if response[:confidence] != 'None'
+        scoring << respoonse if response[:confidence] != 'None'
+        next if response[:confidence] != 'None'
 
+        # Compare the people involved, their affiliations and any funding opportunity numbers
         response = _opportunities_match?(array: hash.fetch('funder_opportunity_ids', []), dmp:, response:)
         response = _orcids_match?(array: hash.fetch('people_ids', []), dmp:, response:)
         response = _last_name_and_affiliation_match?(hash:, dmp:, response:)
 
-        # Only process the following if we had some matching contributors, affiliations or opportuniy nbrs
+        # Only process the following if we had some matching people, affiliations or opportunity nbrs
         response = _repository_match?(hash:, dmp:, response:) if response[:score].positive?
-        # response = _keyword_match?(array: hash['keywords'], response:) if response[:score].positive?
         response = _text_match?(type: 'title', text: hash['title'], dmp:, response:) if response[:score].positive?
         response = _text_match?(type: 'abstract', text: hash['description'], dmp:, response:) if response[:score].positive?
         # If the score is less than 3 then we have no confidence that it is a match
-        return nil if response[:score] <= 2
+        next if response[:score] <= 2
 
         # Set the confidence level based on the score
         response[:confidence] = if response[:score] > 10
@@ -81,7 +84,7 @@ module Uc3DmpId
                                 else
                                   (response[:score] > 5 ? 'Medium' : 'Low')
                                 end
-        response
+        scoring << response
       end
 
       # TODO: introduce a tie-breaker here (maybe the closes to the project_end date)
@@ -171,7 +174,7 @@ module Uc3DmpId
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     def _last_name_and_affiliation_match?(hash:, dmp:, response:)
       return response unless hash.is_a?(Hash) && dmp.is_a?(Hash) && response.is_a?(Hash)
-      return response unless hash['people'].is_a?(Array) && !dmp['people'].empty?
+      return response unless hash['people'].is_a?(Array)
 
       # Check the person last names and affiliation name and RORs
       last_names_matched = _compare_arrays(array_a: dmp['people'], array_b: hash['people'])
@@ -193,7 +196,7 @@ module Uc3DmpId
     # rubocop:disable Metrics/AbcSize
     def _repository_match?(hash:, dmp:, response:)
       return response unless hash.is_a?(Hash) && dmp.is_a?(Hash) && response.is_a?(Hash)
-      return response unless hash['repo_ids'].is_a?(Array) && !dmp['repo_ids'].empty?
+      return response unless hash['repo_ids'].is_a?(Array)
 
       matched = _compare_arrays(array_a: dmp['repo_ids'], array_b: hash['repo_ids'])
       return response if matched <= 0

data/lib/uc3-dmp-id/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpId
-  VERSION = '0.1.26'
+  VERSION = '0.1.27'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-id
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Brian Riley