inci_score 4.2.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a79ba247cd43e62ef0988548df410598bf87cb653fd1540f8c6e419a31d03a
-  data.tar.gz: d0ea4f382824592d33d5bc6ec8bc5d3f88c6a704d24f093259a90da77bf3c6c9
+  metadata.gz: 462ec33d1c493272235feaef061ac62822c4dfd6ad6c339e858da8fdfa491894
+  data.tar.gz: 42f1e47b971185e92d4af19f2fbdee0f363dc9f241041b8ed800230ae9bd0e22
 SHA512:
-  metadata.gz: 5b92528b5d0ef275afce0db6c5d8039eb48daa2e08c098cd5d768dc61be10c2bfa72c24795dea1f28ebc54ef3287beb60449a4a41930e19283072a7c3948cc6f
-  data.tar.gz: e414756b761775502d54ab4e62e20385148a1a706fed3057ad5a74b47be7ee8274cddcde235d357851158e3e5b28f9961e7873dd675125291b1c226b6f2dc71f
+  metadata.gz: cc4f049d56ea9fc60ce92943d7da50c15b697f8712733b409e3327ab73b3c4c0e60d0687f55fcbbefb9f4fd2fdc4c05fe5aa86435f5b75fb558bf456744c9cc4
+  data.tar.gz: a706360921a1cc36b1b5f1fef53932b859de69a27b02fd8b662b76dc8fe9808e1409779297bfa159c0d57bc6bb1dfb6e5287d4455def84500ce194fa0102706a

data/README.md

@@ -9,8 +9,9 @@
 * [Usage](#usage)
   * [Library](#library)
   * [CLI](#cli)
-* [Benchmark](#benchmark)
+* [Benchmarks](#benchmark)
   * [Levenshtein in C](#levenshtein-in-c)
+  * [Run benchmarks](#run-benchmarks)
 
 ## Scope
 This gem computes the score of cosmetic components basing on the information provided by the [Biodizionario site](http://www.biodizionario.it/) by Fabrizio Zago.
@@ -56,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.7629
+inci.score # 53.76
 ```
 
 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,12 +81,10 @@ inci_score --src="ingredients: aqua, dimethicone, pej-10, noent"
 
 TOTAL SCORE:
       	47.18
-VALID STATE:
-      	true
 PRECISION:
       	75.0
 COMPONENTS:
-      	aqua\n	dimethicone\n	peg-10
+      	aqua (0), dimethicone (4), peg-10 (3)
 UNRECOGNIZED:
       	noent
 ```
@@ -98,15 +97,17 @@ Usage: inci_score --src="aqua, parfum, etc"
     -h, --help                       Prints this help
 ```
 
-## Benchmark
+## Benchmarks
 
 ### Levenshtein in C
 I noticed the APIs slows down dramatically when dealing with unrecognized components to fuzzy match on.  
 I profiled the code by using the [benchmark-ips](https://github.com/evanphx/benchmark-ips) gem, finding the bottleneck was the pure Ruby implementation of the Levenshtein distance algorithm.  
-After some pointless optimization, i replaced this routine with a C implementation: i opted for the straightforward [Ruby Inline](https://github.com/seattlerb/rubyinline) library to call the C code straight from Ruby.
 
-Once downloaded source code, run the bench specs by:
+After some pointless optimization, i replaced this routine with a C implementation: i opted for the straightforward [Ruby Inline](https://github.com/seattlerb/rubyinline) library to call the C code straight from Ruby, gaining an order of magnitude in speed (x30).
+
+### Run benchmarks
+Once downloaded source code, run the benchmarks by:
 
 ```shell
-bundle exec rake spec:bench
+bundle exec rake bench
 ```

data/config/catalog.yml

@@ -1,5 +1,4 @@
 ---
-generic-hazard: 3
 aqua: 0
 water: 0
 parfum: 3
@@ -72,6 +71,7 @@ acetanilid: 3
 acetic acid: 0
 acetone: 3
 acetum: 0
+acetyl tyrosine: 3
 acetylated castor oil: 0
 acetylated lanolin: 2
 acetylated lanolin alcohol: 1
@@ -155,6 +155,7 @@ algin: 0
 alginic acid: 0
 alkanna tinctoria: 0
 alkyl benzenesulfonic acid sodium salt: 3
+alkyldimethylsilyl polypropylsesquioxane: 3 
 allantoin: 0
 allantoin acetyl methionine: 0
 allantoin ascorbate: 0
@@ -323,6 +324,7 @@ arnica montana: 0
 artemisia abrotanum: 0
 artemisia absinthium: 4
 artemisia vulgaris: 0
+ascophyllum nodosum extract: 0
 ascorbic acid: 0
 ascorbic acid polypeptide: 1
 ascorbyl dipalmitate: 1
@@ -661,6 +663,7 @@ capryl hydroxyethyl imidazoline: 2
 capryleth-4 carboxylic acid: 3
 capryleth-6 carboxylic acid: 3
 capryleth-9 carboxylic acid: 3
+caprylhydroxamic acid: 3
 caprylic acid: 1
 caprylic alcohol: 1
 caprylic/capric glycerides: 0
@@ -1349,6 +1352,7 @@ dioscorea villosa: 0
 diospyros kaki: 0
 dipalmitoylethyl hydroxyethylmonium methosulfate: 1
 dipalmoylethyl hydroxyethylmonium methosulfate: 1
+dipentaerythrityl tetrabehenate/polyhydroxystearate: 1
 diphenyl dimethicone: 4
 dipotassium aspartate: 1
 dipotassium azelate: 1
@@ -1566,6 +1570,8 @@ euglena gracilis: 0
 eupatorium purpureum: 0
 euphorbia hirta: 0
 euphrasia officinalis: 0
+euterpe edulis: 0
+euterpe oleracea: 0
 evernia furfuracea: 3
 evernia prunastri: 3
 fabiana imbricata: 0
@@ -1612,6 +1618,7 @@ ginkgo biloba: 0
 ginseng hydroxypropyltrimonium chloride: 3
 glechoma hederacea: 0
 glucamine: 0
+glucomannan/konjac: 1
 gluconic acid: 0
 gluconolactone: 0
 glucosamine: 0
@@ -1796,6 +1803,7 @@ hexamidine: 3
 hexamidine diisethionate: 3
 hexamidine paraben: 3
 hexane: 3
+hexanediol: 3
 hexyl cinnamal: 2
 hexyl laurate: 0
 hexyldecyl laurate: 2
@@ -1996,10 +2004,12 @@ indigofera tinctoria: 0
 inositol: 0
 inositol hexanicotinate: 2
 inula helenium: 4
+inulin: 1
 iodized corn protein: 0
 iodized garlic: 0
 iodized garlic extract: 0
 iodized hydrolyzed zein: 1
+iodopropynyl butylcarbamate: 3
 ipomoea purga: 0
 iris florentina: 0
 iris pallida: 0
@@ -2059,6 +2069,7 @@ isolaureth-10: 3
 isolaureth-3: 3
 isolaureth-6: 3
 isolauryl behenate: 1
+isomalt: 2
 isooctyl thioglycolate: 3
 isopropanolamine nitrite: 4
 isopropyl acetate: 3
@@ -2792,6 +2803,7 @@ palmitoyl myristyl serinate: 1
 palmitoyl oligopeptide: 0
 palmitoyl pg-trimonium chloride: 3
 palmitoyl proline: 1
+palmitoyl tripeptide-5: 0
 panax ginseng: 0
 panicum miliaceum: 0
 panthenol: 0
@@ -3352,6 +3364,7 @@ pei-35: 3
 pei-45: 3
 pei-7: 3
 pei-700: 3
+pelargonic acid: 1
 pentapotassium triphosphate: 1
 pentasodium aminotrimethylene phosphonate: 3
 pentasodium pentetate: 3
@@ -3404,6 +3417,7 @@ phthalic anhydride/trimellitic anhydride/glycols copolymer: 3
 physalis alkekengi: 0
 phytantriol: 0
 phytic acid: 0
+phytosterols: 0
 picea excelsa: 0
 picramic acid: 3
 pigment blue: 3
@@ -4013,6 +4027,7 @@ psidium guajava: 0
 psoralea corylifolia: 0
 pterocarpus santalinus: 0
 ptfe: 3
+pullulan: 0
 pulmonaria officinalis: 0
 pumice: 0
 punica granatum: 0
@@ -4190,7 +4205,7 @@ sesamide dea: 3
 sesamidopropyl betaine: 1
 sesamidopropyl dimethylamine: 2
 sesamidopropylamine oxide: 1
-sesamum indicum: 0
+sesamum indicum/sesame oil: 0
 shellac: 0
 shellac cera: 0
 shorea stenoptera: 0
@@ -4804,6 +4819,7 @@ theobroma cacao: 0
 theophylline: 0
 thiamine nitrate: 0
 thiodiglycolic acid: 2
+thiodipropionic acid: 0 
 thioglycerin: 2
 thiolactic acid: 2
 thiolanediol: 2
@@ -4839,9 +4855,12 @@ toluene-2,5-diamine sulfate: 4
 toluene-3,4-diamine: 4
 torreya californica: 0
 trachea hydrolysate: 4
+trehalose: 0
 tri-c12-13 alkyl citrate: 3
 triacetin: 1
+tribehenin peg-20 esters: 3
 tricalcium phosphate: 0
+tricaprylin: 1
 triceteareth-4 phosphate: 3
 triceteth-5 phosphate: 3
 trichloroethane: 4
@@ -4884,6 +4903,8 @@ trilaurylamine: 3
 trilinoleic acid: 1
 trilinolein: 1
 trilinolenin: 1
+trimethylsiloxysilicate: 3
+tripeptide-29: 1
 triphenyl trimethicone: 4
 tripotassium edta: 4
 trisodium edta: 4
@@ -4902,6 +4923,7 @@ tropaeolum majus: 0
 tuna extract: 4
 turpentine: 3
 tussilago farfara: 0
+ubiquinone: 2
 ulex europaeus: 0
 ulmus campestris: 0
 ulmus fulva: 0