inci_score 4.5.0 → 4.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462ec33d1c493272235feaef061ac62822c4dfd6ad6c339e858da8fdfa491894
-  data.tar.gz: 42f1e47b971185e92d4af19f2fbdee0f363dc9f241041b8ed800230ae9bd0e22
+  metadata.gz: 9b62e565ea7191b030ebcdf3b278130065ecb325743bf4ca618e0c8e7d7559a8
+  data.tar.gz: 0fcbf56e6edb8a314c202200e89d8f53428b009472440d7a1e92815be90b9df9
 SHA512:
-  metadata.gz: cc4f049d56ea9fc60ce92943d7da50c15b697f8712733b409e3327ab73b3c4c0e60d0687f55fcbbefb9f4fd2fdc4c05fe5aa86435f5b75fb558bf456744c9cc4
-  data.tar.gz: a706360921a1cc36b1b5f1fef53932b859de69a27b02fd8b662b76dc8fe9808e1409779297bfa159c0d57bc6bb1dfb6e5287d4455def84500ce194fa0102706a
+  metadata.gz: 7f4040838f05e804090a2482d3b6ea03c1c4575e5133a0989af9f733c373f6c1c507426196fca5eba539c4fbe5c3322a62e623a1630c8ade6dfe2f056a616938
+  data.tar.gz: c14b303bae2a60c0f16b1df28e95e77cf2b32caaa33086d8852edf8486dfccbaf29bb361a7d8c2150eb32a569890c84a812369f13bdd38f61df979a76f18abd2

data/README.md

@@ -57,7 +57,7 @@ You can include this gem into your own library and start computing the INCI scor
 require "inci_score"
 
 inci = InciScore::Computer.new(src: 'aqua, dimethicone').call
-inci.score # 53.76
+inci.score # 56.25
 ```
 
 As you see the results are wrapped by an *InciScore::Response* object, this is useful when dealing with the CLI and HTTP interfaces (read below).
@@ -80,7 +80,7 @@ You can collect INCI data by using the available CLI interface:
 inci_score --src="ingredients: aqua, dimethicone, pej-10, noent"
 
 TOTAL SCORE:
-      	47.18
+      	53.22
 PRECISION:
       	75.0
 COMPONENTS:

data/config/catalog.yml

@@ -4019,6 +4019,7 @@ prunus avium: 0
 prunus cerasus: 0
 prunus domestica: 0
 prunus dulcis: 0
+prunus amygdalus dulcis (sweet almond) oil: 0
 prunus persica: 0
 prunus serotina: 0
 prunus spinosa: 0
@@ -4908,6 +4909,7 @@ tripeptide-29: 1
 triphenyl trimethicone: 4
 tripotassium edta: 4
 trisodium edta: 4
+trisodium ethylenediamine disuccinate: 2
 trisodium hedta: 4
 trisodium lauroampho pg-acetate phosphate chloride: 3
 trisodium methylglycinediacetate: 1

data/lib/inci_score/ingredient.rb

@@ -25,7 +25,7 @@ module InciScore
       if parenthesis?
         parenthesis = PARENTHESIS.join
         parenthesis_values = raw.match(PARENTHESIS_RULE).captures.map { |c| c.delete(parenthesis) }
-        deparenthesized = raw.sub(PARENTHESIS_RULE, '').sub(/\s+/, ' ').strip
+        deparenthesized = raw.sub(PARENTHESIS_RULE, '').sub(/\s{2,}/, ' ').strip
         [deparenthesized].concat(parenthesis_values)
       else
         raw.split(SLASH_RULE).map(&:strip)

data/lib/inci_score/recognizer_rules.rb

@@ -7,7 +7,11 @@ module InciScore
     module Rules
       TOLERANCE = 3
 
-      Component = Struct.new(:name, :hazard)
+      Component = Struct.new(:name, :hazard) do
+        def to_s
+          "#{name} (#{hazard})"
+        end
+      end
 
       Key = ->(src) do
         score = Config::CATALOG[src]
@@ -53,7 +57,7 @@ module InciScore
         def call(src)
           return if src.size < TOLERANCE
           digits = src[0, MIN_MEANINGFUL]
-          pairs = Config::CATALOG.detect { |name, _| name.start_with?(digits) }.to_a.first
+          pairs = Config::CATALOG.detect { |name, _| name.start_with?(digits) }
           Component.new(*pairs) if pairs
         end
       end

data/lib/inci_score/response.rb

@@ -41,7 +41,7 @@ PRECISION:
       return '' if components.empty?
       %Q{
 COMPONENTS:
-      \t#{components.map { |c| "#{c.name} (#{c.hazard})" }.join(', ')}}
+      \t#{components.map(&:to_s).join(', ')}}
     end
 
     def unrecognized_str

data/lib/inci_score/scorer.rb

@@ -40,7 +40,11 @@ module InciScore
     end
 
     def weight(index)
-      Math.log(index+1, size * WEIGHT_FACTOR)
+      Math.log(index + 1, size * ratio(index))
+    end
+
+    def ratio(index)
+      WEIGHT_FACTOR / (index + 1)
     end
   end
 end

data/lib/inci_score/version.rb

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

metadata

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