eco-helpers 2.0.13 → 2.0.18

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

@@ -0,0 +1,53 @@
+module Eco
+  module Data
+    module FuzzyMatch
+      class Results < Struct.new(:needle, :value, :raw_results)
+
+        def results_with_false_positives
+          relevant_results(methods: :jaro_winkler, threshold: 0.5)
+        end
+
+        def relevant_results(methods: order, threshold: 0.5)
+          raw_results.select do |result|
+            result.all_threshold?(methods, threshold)
+          end.yield_self do |filtered|
+            self.class.new(needle, value, filtered).tap do |results|
+              results.order = methods
+            end
+          end
+        end
+
+        def order=(values)
+          @order = [values].flatten.compact
+          raw_results.each {|r| r.order = @order}
+        end
+
+        def order
+          @order ||= [:words_ngrams, :dice]
+        end
+
+        def results
+          raw_results.sort
+        end
+
+        def print
+          msg = results.map do |result|
+            result.print
+          end.join("\n  ")
+
+          puts "'#{value}':\n  " + msg
+        end
+
+        private
+
+        def item_string(item, attr = self.method)
+          return item if !item || item.is_a?(String) || !attr
+          attr = attr.to_sym
+          return item.send(attr) if item.respond_to?(attr)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Eco
+  module Data
+    module FuzzyMatch
+      class Score < Struct.new(:score, :total)
+
+        def ratio(decimals = 6)
+          ((score || 0).to_f / (total || 1)).round(decimals)
+        end
+
+        def percent(decimals = 3)
+          (100 * ratio).round(decimals)
+        end
+
+        def increase(value = 1)
+          self.score += value
+        end
+
+        def increase_total(value)
+          self.total += value
+        end
+
+        def values_at(*keys)
+          keys.map do |key|
+            self.send(key) if self.respond_to?(key)
+          end
+        end
+
+        # Merges 2 Score instance objects
+        def merge(value)
+          Score.new(*values_at(:score, :total)).merge!(value)
+        end
+
+        def merge!(value)
+          raise "Expecting Score object. Given: #{value.class}" unless value.is_a?(Score)
+          increase(value.score)
+          increase_total(value.total)
+          self
+        end
+
+      end
+
+    end
+  end
+end

data/lib/eco/data/fuzzy_match/stop_words.rb

@@ -0,0 +1,35 @@
+module Eco
+  module Data
+    module FuzzyMatch
+      module StopWords
+        PREPOSITIONS = [
+          "aboard", "about", "above", "across", "after", "against", "along", "amid", "among", "around", "as", "at",
+          "before", "behind", "below", "beneath", "beside", "between", "beyond", "but", "by",
+          "concerning", "considering", "despite", "down", "during", "except", "following", "for", "from",
+          "in", "inside", "into", "like", "minus", "near", "next",
+          "of", "off", "on", "onto", "opposite", "out", "outside", "over", "past", "per", "plus",
+          "regarding", "round", "save", "since", "than", "through", "till", "to", "toward",
+          "under", "underneath", "unlike", "until", "up", "upon", "versus", "via",
+          "with", "within", "without"
+        ]
+        PRONOUNS = [
+          "all", "another", "any", "anybody", "anyone", "anything", "as", "aught",
+          "both", "each", "each other", "either", "enough", "everybody", "everyone", "everything",
+          "few", "he", "her", "hers", "herself", "him", "himself", "his", "I", "idem", "it", "its", "itself",
+          "many", "me", "mine", "most", "my", "myself", "naught", "neither", "no one", "nobody", "none", "nothing", "nought",
+          "one", "one another", "other", "others", "ought", "our", "ours", "ourself", "ourselves",
+          "several", "she", "some", "somebody", "someone", "something", "somewhat", "such", "suchlike",
+          "that", "thee", "their", "theirs", "theirself", "theirselves", "them", "themself", "themselves", "there",
+          "these", "they", "thine", "this", "those", "thou", "thy", "thyself", "us",
+          "we", "what", "whatever", "whatnot", "whatsoever", "whence", "where", "whereby", "wherefrom",
+          "wherein", "whereinto", "whereof", "whereon", "wherever", "wheresoever", "whereto", "whereunto",
+          "wherewith", "wherewithal", "whether", "which", "whichever", "whichsoever", "who", "whoever", "whom",
+          "whomever", "whomso", "whomsoever", "whose", "whosever", "whosesoever", "whoso", "whosoever",
+          "ye", "yon", "yonder", "you", "your", "yours", "yourself", "yourselves"
+        ]
+        ARTICLES = ["a", "an", "the"]
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module Eco
+  module Data
+    module FuzzyMatch
+      module StringHelpers
+        # Downcases and trims
+        def normalize_string(value)
+          case value
+          when Array
+            value.map {|val| normalize_string(val)}
+          when Symbol
+            normalize_string(value.to_sym)
+          when String
+            value.downcase.strip
+          end
+        end
+
+        def get_words(str, normalized: false)
+          return [] unless str
+          str = normalize_string(str) unless normalized
+          str.scan(/[a-zA-Z'-]+/)
+        end
+
+        # Keeps the start order of the `words` and consecutive `words` together/consecutive.
+        # @param str [String] the input string with the words.
+        # @param range [Integer, Range] determine the lenght of the generated values.
+        # @return [Array<String>] combinations of `range` length of `words`.
+        def string_ngrams(str, range=2..3, normalized: false)
+          ngrams(get_words(str, normalized: normalized), range)
+        end
+
+        # Keeps the start order of the `words` of the input `Array` `words`.
+        # It does **not** keep consecutive `words` together (it can jump/skip items).
+        # @param str [String] the input string with the words.
+        # @param range [Integer, Range] determine the lenght of the generated values.
+        # @return [Array<String>] combinations of `range` length of `words`
+        def string_combinations(str, range=2..3, normalized: false)
+          combinations(get_words(str, normalized: normalized), range)
+          .map {|comb| comb.join(' ')}
+        end
+
+        # It includes `combinations` that break the initial order of the `Array`.
+        # It does **not** keep consecutive `words` together (it can jump/skip items).
+        # @param str [String] the input string with the words.
+        # @param range [Integer, Range] determine the lenght of the generated values.
+        # @return [Array<String>] permutations of `range` length of `words`
+        def string_permutations(str, range=2..3, normalized: false)
+          permutations(get_words(str, normalized: normalized), range)
+          .map {|comb| comb.join(' ')}
+        end
+
+        # Keeps the start order of the `charts` and consecutive `charts` together/consecutive.
+        # @param str [String] the input `word` string.
+        # @param range [Integer, Range] determine the lenght of the generated values.
+        # @return [Array<String>] combinations of `range` length of `words`.
+        def word_ngrams(str, range=2..3, normalized: false)
+          str = normalize_string(str) unless normalized
+          ngrams(str.to_s.chars, range)
+          .map {|comb| no_blanks(comb)}
+        end
+
+        def no_blanks(str)
+          return nil unless str && str.is_a?(String)
+          str.tr(' ', '')
+        end
+
+      end
+    end
+  end
+end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.13"
+  VERSION = "2.0.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.18
 platform: ruby
 authors:
 - Oscar Segura
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.3'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.17
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.3'
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.6
+        version: 0.8.7
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -230,6 +230,66 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: fuzzy_match
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: amatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: jaro_winkler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: 
 email:
 - oscar@ecoportal.co.nz
@@ -318,7 +378,9 @@ files:
 - lib/eco/api/microcases/people_load.rb
 - lib/eco/api/microcases/people_refresh.rb
 - lib/eco/api/microcases/people_search.rb
-- lib/eco/api/microcases/refresh_abilities.rb
+- lib/eco/api/microcases/preserve_default_tag.rb
+- lib/eco/api/microcases/preserve_filter_tags.rb
+- lib/eco/api/microcases/preserve_policy_groups.rb
 - lib/eco/api/microcases/refresh_default_tag.rb
 - lib/eco/api/microcases/s3upload_targets.rb
 - lib/eco/api/microcases/set_account.rb
@@ -335,12 +397,13 @@ files:
 - lib/eco/api/organization.rb
 - lib/eco/api/organization/login_providers.rb
 - lib/eco/api/organization/people.rb
+- lib/eco/api/organization/people_analytics.rb
 - lib/eco/api/organization/person_schemas.rb
 - lib/eco/api/organization/policy_groups.rb
 - lib/eco/api/organization/preferences.rb
 - lib/eco/api/organization/preferences_reference.json
 - lib/eco/api/organization/presets_factory.rb
-- lib/eco/api/organization/presets_reference.json
+- lib/eco/api/organization/presets_integrity.json
 - lib/eco/api/organization/presets_values.json
 - lib/eco/api/organization/tag_tree.rb
 - lib/eco/api/policies.rb
@@ -374,6 +437,8 @@ files:
 - lib/eco/api/usecases/base_case.rb
 - lib/eco/api/usecases/base_io.rb
 - lib/eco/api/usecases/default_cases.rb
+- lib/eco/api/usecases/default_cases/abstract_policygroup_abilities_case.rb
+- 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/codes_to_tags_case.rb
@@ -388,7 +453,6 @@ files:
 - lib/eco/api/usecases/default_cases/new_id_case.rb
 - lib/eco/api/usecases/default_cases/new_id_case0.rb
 - lib/eco/api/usecases/default_cases/org_data_convert_case.rb
-- lib/eco/api/usecases/default_cases/refresh_abilities_case.rb
 - lib/eco/api/usecases/default_cases/refresh_case.rb
 - lib/eco/api/usecases/default_cases/reinvite_sync_case.rb
 - lib/eco/api/usecases/default_cases/reinvite_trans_case.rb
@@ -398,6 +462,8 @@ files:
 - lib/eco/api/usecases/default_cases/restore_db_case.rb
 - lib/eco/api/usecases/default_cases/set_default_tag_case.rb
 - lib/eco/api/usecases/default_cases/set_supervisor_case.rb
+- lib/eco/api/usecases/default_cases/supers_cyclic_identify_case.rb
+- lib/eco/api/usecases/default_cases/supers_hierarchy_case.rb
 - lib/eco/api/usecases/default_cases/switch_supervisor_case.rb
 - lib/eco/api/usecases/default_cases/to_csv_case.rb
 - lib/eco/api/usecases/default_cases/to_csv_detailed_case.rb
@@ -443,6 +509,16 @@ files:
 - lib/eco/data/files/directory.rb
 - lib/eco/data/files/file_pattern.rb
 - lib/eco/data/files/helpers.rb
+- lib/eco/data/fuzzy_match.rb
+- lib/eco/data/fuzzy_match/array_helpers.rb
+- lib/eco/data/fuzzy_match/chars_position_score.rb
+- lib/eco/data/fuzzy_match/ngrams_score.rb
+- lib/eco/data/fuzzy_match/pairing.rb
+- lib/eco/data/fuzzy_match/result.rb
+- lib/eco/data/fuzzy_match/results.rb
+- lib/eco/data/fuzzy_match/score.rb
+- lib/eco/data/fuzzy_match/stop_words.rb
+- lib/eco/data/fuzzy_match/string_helpers.rb
 - lib/eco/data/mapper.rb
 - lib/eco/language.rb
 - lib/eco/language/curry.rb

data/lib/eco/api/microcases/refresh_abilities.rb

@@ -1,19 +0,0 @@
-module Eco
-  module API
-    class MicroCases
-      # It sets the correct set of abilities based on the usergroups of `person`.
-      # @param person [Ecoportal::API::V1::Person] the person we want to update, carrying the changes to be done.
-      # @param options [Hash] the options.
-      def refresh_abilities(person, options)
-        unless options.dig(:exclude, :account)
-          if person.account
-            unless options.dig(:exclude, :abilities) && !person.new?
-              person.account.permissions_custom = session.new_preset(person)
-            end
-          end
-        end
-      end
-
-    end
-  end
-end

data/lib/eco/api/organization/presets_reference.json

@@ -1,59 +0,0 @@
-{
-  "read_only" : {
-    "files": "browse",
-    "data": "view",
-    "reports": "view",
-    "organization": null,
-    "people": null,
-    "person_core": null,
-    "person_core_create": null,
-    "person_core_edit": null,
-    "person_account": null,
-    "person_details": null,
-    "pages": "view",
-    "page_editor": null,
-    "registers": "view"
-  },
-  "forms" : {
-    "files": "browse",
-    "data": "view",
-    "reports": "view",
-    "organization": null,
-    "person_core": "attach",
-    "person_core_create": null,
-    "person_core_edit": null,
-    "person_account": null,
-    "person_details": "view",
-    "pages": "create",
-    "page_editor": "basic",
-    "registers": "view"
-  },
-  "editor" : {
-    "files": "browse",
-    "data": "update",
-    "reports": "edit",
-    "organization": "view",
-    "person_core": "view_people_manager",
-    "person_core_create": null,
-    "person_core_edit": null,
-    "person_account": "view",
-    "person_details": "view",
-    "pages": "create",
-    "page_editor": "intermediate",
-    "registers": "view"
-  },
-  "administrator" : {
-    "files": "administrate",
-    "data": "administrate",
-    "reports": "administrate",
-    "organization": "administrate",
-    "person_core": "view_people_manager",
-    "person_core_create": "create",
-    "person_core_edit": "edit",
-    "person_account": "edit",
-    "person_details": "edit_private",
-    "pages": "administrate",
-    "page_editor": "advanced",
-    "registers": "dashboard"
-  }
-}