eco-helpers 2.0.19 → 2.0.21

data/lib/eco/data/fuzzy_match/results.rb

@@ -2,9 +2,27 @@ module Eco
   module Data
     module FuzzyMatch
       class Results < Struct.new(:needle, :value, :raw_results)
+        include Enumerable
 
         attr_accessor :threshold
 
+        def empty?
+          count < 1
+        end
+
+        def each(&block)
+          return to_enum(:each) unless block
+          raw_results.each(&block)
+        end
+
+        # Merges the results of both Results object
+        def merge(res)
+          unless self.needle == res.needle
+            raise "To merge 2 Results, needle should be the same ('#{value}'). Given '#{res.value}'"
+          end
+          self.class.new(needle, value, raw_results.concat(res.raw_results))
+        end
+
         def results_with_false_positives
           relevant_results(order: :jaro_winkler, threshold: 0.5)
         end

data/lib/eco/data/fuzzy_match/score.rb

@@ -4,7 +4,10 @@ module Eco
       class Score < Struct.new(:score, :total)
 
         def ratio(decimals = 6)
-          ((score || 0).to_f / (total || 1)).round(decimals)
+          tot = self.total; sc = self.score
+          tot = tot && tot > 0 ? tot : 1
+          sc  = sc  && sc  > 0 ? sc  : 0
+          (sc.to_f / tot).round(decimals)
         end
 
         def percent(decimals = 3)
@@ -13,6 +16,8 @@ module Eco
 
         def increase(value = 1)
           self.score += value
+          raise "Score #{self.score} (increase: #{value}) can't be greater than total #{self.total}" if self.score > self.total
+          self.score
         end
 
         def increase_total(value)
@@ -26,14 +31,14 @@ module Eco
         end
 
         # Merges 2 Score instance objects
-        def merge(value)
-          Score.new(*values_at(:score, :total)).merge!(value)
+        def merge(scr)
+          Score.new(*values_at(:score, :total)).merge!(scr)
         end
 
-        def merge!(value)
-          raise "Expecting Score object. Given: #{value.class}" unless value.is_a?(Score)
-          increase(value.score)
-          increase_total(value.total)
+        def merge!(scr)
+          raise "Expecting Score object. Given: #{scr.class}" unless scr.is_a?(Score)
+          increase_total(scr.total)
+          increase(scr.score)
           self
         end
 

data/lib/eco/data/fuzzy_match/string_helpers.rb

@@ -17,7 +17,7 @@ module Eco
         def get_words(str, normalized: false)
           return [] unless str
           str = normalize_string(str) unless normalized
-          str.scan(/[a-zA-Z'-]+/)
+          str.scan(/[a-zA-Z'-]+/).compact
         end
 
         # Keeps the start order of the `words` and consecutive `words` together/consecutive.
@@ -63,6 +63,19 @@ module Eco
           str.tr(' ', '')
         end
 
+        # Deletes the words of `str1` and `str2` that match
+        # @return [Array<String>] pair of words.
+        def remove_matching_words(str1, str2, normalized: false)
+          unless normalized
+            str1 = normalize_string(str1)
+            str2 = normalize_string(str2)
+          end
+          return [str1, str2] if !str1 || !str2 || str1.empty? || str2.empty?
+          ws1 = get_words(str1)
+          ws2 = get_words(str2)
+          [(ws1 - ws2).join(" "), (ws2 - ws1).join(" ")]
+        end
+
       end
     end
   end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.19"
+  VERSION = "2.0.21"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.19
+  version: 2.0.21
 platform: ruby
 authors:
 - Oscar Segura
@@ -230,6 +230,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: hashdiff
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +310,66 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: roo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: roo-xls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: creek
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: 
 email:
 - oscar@ecoportal.co.nz
@@ -443,6 +523,7 @@ files:
 - lib/eco/api/usecases/default_cases/analyse_people_case.rb
 - lib/eco/api/usecases/default_cases/append_usergroups_case.rb
 - lib/eco/api/usecases/default_cases/change_email_case.rb
+- lib/eco/api/usecases/default_cases/clean_unknown_tags_case.rb
 - lib/eco/api/usecases/default_cases/codes_to_tags_case.rb
 - lib/eco/api/usecases/default_cases/create_case.rb
 - lib/eco/api/usecases/default_cases/create_details_case.rb
@@ -547,7 +628,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.4
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="