inci_score 4.1.4 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81748de653f3df8bca12f42b32322214040c71f4b943bbea225e12f8683e35f2
-  data.tar.gz: aa461eb90bc58f31a55bd6263cab0a64b1cb22f7ffde4fec202531df6710bbc7
+  metadata.gz: 07a79ba247cd43e62ef0988548df410598bf87cb653fd1540f8c6e419a31d03a
+  data.tar.gz: d0ea4f382824592d33d5bc6ec8bc5d3f88c6a704d24f093259a90da77bf3c6c9
 SHA512:
-  metadata.gz: 5592961b10ec6bbef156e83358c880776cba5ffdd00c5ec42c804f7acf86cf7a9ebf832cda9da4345e670ab139d3682e787aedf272db5cf2469fc5afedcff86e
-  data.tar.gz: 560ef5d1da9749a4adfaae809fd04d2efa9ec56dd1e2ab9b39644d950c35b335fc412dda6d72adfa9bb033877a6cb41d7052d9a75a7a38dacd9ab6ebd1c510b8
+  metadata.gz: 5b92528b5d0ef275afce0db6c5d8039eb48daa2e08c098cd5d768dc61be10c2bfa72c24795dea1f28ebc54ef3287beb60449a4a41930e19283072a7c3948cc6f
+  data.tar.gz: e414756b761775502d54ab4e62e20385148a1a706fed3057ad5a74b47be7ee8274cddcde235d357851158e3e5b28f9961e7873dd675125291b1c226b6f2dc71f

data/config/catalog.yml

@@ -2054,6 +2054,7 @@ isododecane: 3
 isodonis japonicus: 0
 isodonis torichocarpus: 0
 isoeugenol: 3
+isohexadecane: 3
 isolaureth-10: 3
 isolaureth-3: 3
 isolaureth-6: 3

data/lib/inci_score/cli.rb

@@ -4,20 +4,19 @@ require 'optparse'
 
 module InciScore
   class CLI
-    attr_reader :args, :io, :catalog
+    attr_reader :args, :io
     attr_accessor :src
 
-    def initialize(args:, io: STDOUT, catalog: Config::CATALOG)
+    def initialize(args:, io: STDOUT)
       @args = args
       @io = io
-      @catalog = catalog
       @src = nil
     end
 
     def call
       parser.parse!(args)
       return io.puts(%q{Specify inci list as: --src='aqua, parfum, etc'}) unless src
-      computer = Computer.new(src: src, catalog: catalog)
+      computer = Computer.new(src: src)
       io.puts computer.call
     end
 

data/lib/inci_score/computer.rb

@@ -5,12 +5,11 @@ module InciScore
     TOLERANCE = 30.0
     DECIMALS = 2
 
-    attr_reader :src, :catalog, :rules, :ingredients, :components, :unrecognized
+    attr_reader :src, :rules, :ingredients, :components, :unrecognized
 
-    def initialize(src:, catalog: Config::CATALOG, rules: Normalizer::DEFAULT_RULES)
+    def initialize(src:, rules: Normalizer::DEFAULT_RULES)
       @unrecognized = []
       @src = src
-      @catalog = catalog
       @rules = rules
       @ingredients = Normalizer.new(src: src, rules: rules).call
       @components = fetch_components
@@ -21,7 +20,6 @@ module InciScore
       Response.new(components: components,
                    unrecognized: unrecognized,
                    score: score,
-                   valid: valid?,
                    precision: precision)
     end
 
@@ -41,7 +39,7 @@ module InciScore
 
     def fetch_components
       ingredients.map do |ingredient|
-        Recognizer.new(ingredient, catalog).call.tap do |component|
+        Recognizer.new(ingredient).call.tap do |component|
           unrecognized << ingredient unless component
         end
       end.compact

data/lib/inci_score/recognizer.rb

@@ -2,15 +2,14 @@
 
 module InciScore
   class Recognizer
-    DEFAULT_RULES = [Rules::Key, Rules::Levenshtein, Rules::Digits, Rules::Hazard, Rules::Tokens].freeze
+    DEFAULT_RULES = [Rules::Key, Rules::Levenshtein, Rules::Hazard, Rules::Prefix, Rules::Tokens].freeze
 
     Component = Struct.new(:name, :hazard)
 
-    attr_reader :ingredient, :catalog, :rules, :applied
+    attr_reader :ingredient, :rules, :applied
 
-    def initialize(ingredient, catalog, rules = DEFAULT_RULES, wrapper = Ingredient)
+    def initialize(ingredient, rules = DEFAULT_RULES, wrapper = Ingredient)
       @ingredient = wrapper.new(ingredient)
-      @catalog = catalog
       @rules = rules
       @applied = []
       freeze
@@ -20,7 +19,7 @@ module InciScore
       return if ingredient.to_s.empty?
       component = find_component
       return unless component
-      Component.new(component, catalog[component])
+      Component.new(component, Config::CATALOG[component])
     end
 
     private
@@ -35,7 +34,7 @@ module InciScore
 
     def apply(rule)
       ingredient.values.map do |value|
-        rule.call(value, catalog)
+        rule.call(value)
       end.find(&:itself)
     end
   end

data/lib/inci_score/recognizer_rules.rb

@@ -7,9 +7,9 @@ module InciScore
     module Rules
       TOLERANCE = 3
 
-      Key = ->(src, catalog) { src if catalog.has_key?(src) }
+      Key = ->(src) { src if Config::CATALOG.has_key?(src) }
 
-      Hazard = ->(src, _) { 'generic-hazard' if Config::HAZARDS.any? { |h| src.include?(h) } }
+      Hazard = ->(src) { 'generic-hazard' if Config::HAZARDS.any? { |h| src.include?(h) } }
 
       module Levenshtein
         extend self
@@ -20,12 +20,12 @@ module InciScore
           end
         end
 
-        def call(src, catalog)
+        def call(src)
           return if src.empty?
           size = src.size
           farthest = Result.new(nil, size)
           initial = src[0]
-          result = catalog.reduce(farthest) do |nearest, (component, _)|
+          result = Config::CATALOG.reduce(farthest) do |nearest, (component, _)|
             next nearest unless component.start_with?(initial)
             next nearest if component.size > (size + TOLERANCE)
             d = src.distance(component)
@@ -36,15 +36,15 @@ module InciScore
         end
       end
 
-      module Digits
+      module Prefix
         extend self
 
         MIN_MEANINGFUL = 7
 
-        def call(src, catalog)
+        def call(src)
           return if src.size < TOLERANCE
           digits = src[0, MIN_MEANINGFUL]
-          catalog.detect { |component, _| component.start_with?(digits) }.to_a.first
+          Config::CATALOG.detect { |component, _| component.start_with?(digits) }.to_a.first
         end
       end
 
@@ -53,9 +53,10 @@ module InciScore
 
         UNMATCHABLE = %w[extract oil sodium acid sulfate].freeze
 
-        def call(src, catalog)
+        def call(src)
+          return if src.size <= TOLERANCE
           tokens(src).each do |token|
-            catalog.each do |component, _|
+            Config::CATALOG.each do |component, _|
               return component if component.include?(token)
             end
           end
@@ -65,7 +66,8 @@ module InciScore
         private
 
         def tokens(src)
-          (src.split(' ') - UNMATCHABLE).reject { |t| t.size < TOLERANCE }.sort! { |a, b| b.size <=> a.size }
+          words = src.split(' ').map { |w| w.split('-') }.flatten
+          (words - UNMATCHABLE).reject { |t| t.size < TOLERANCE }.sort! { |a, b| b.size <=> a.size }
         end
       end
     end

data/lib/inci_score/response.rb

@@ -4,19 +4,18 @@ require 'oj'
 
 module InciScore
   class Response
-    attr_reader :components, :score, :unrecognized, :valid, :precision
+    attr_reader :components, :score, :unrecognized, :precision
 
     def initialize(options = {})
       @components = options.fetch(:components) { [] }
       @score = options.fetch(:score) { 0.0 }
       @unrecognized = options.fetch(:unrecognized) { [] }
-      @valid = options.fetch(:valid) { false }
       @precision = options.fetch(:precision) { 0 }
       freeze
     end
 
     def to_json
-      data = { components: components.map(&:to_h), unrecognized: unrecognized, score: score, valid: valid, precision: precision }.freeze
+      data = { components: components.map(&:to_h), unrecognized: unrecognized, score: score, precision: precision }.freeze
       Oj.dump(data, mode: :compat)
     end
 
@@ -24,8 +23,6 @@ module InciScore
       %Q{
 TOTAL SCORE:
       \t#{score}
-VALID STATE:
-      \t#{valid}
 PRECISION:
       \t#{precision}
 COMPONENTS:

data/lib/inci_score/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module InciScore
-  VERSION = '4.1.4'
+  VERSION = '4.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 4.1.4
+  version: 4.2.1
 platform: ruby
 authors:
 - costajob