inci_score 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8aab0ebc926de421bb3aaecf7c52a8522c8f47e4
-  data.tar.gz: 1306f8fd4375384c4c2965155759cfe251b515fb
+  metadata.gz: 56f2819f82f662dbf078b260ab01bece90139a70
+  data.tar.gz: d35b798d8e5929c9cf55e9c9fc2ee05e0a6dae42
 SHA512:
-  metadata.gz: 0ce833b953c31f2097356e87c2c33fbbe49e866e26e541b836b8bfba7b2b999ef7cd5ae3d3e81b92ad05e473aabdfec7fb0c45496f7cd3aa096103e3b9fac8a1
-  data.tar.gz: 046d1e9c4a481919546f27287442401ee05d9d2265cd1413eff5bcfb5f75b6de1619439bba3aaeef78b6fb6f8173a93ca70737a165d311c7614990242f46d88b
+  metadata.gz: da5b974de687b71893ec6d7e38777cca0f234a397ef9c4bf51dfd6429d3f61f453c293401e6242006cf4b9f451d6cea3ea81f1b391cdc4dd691b58d29735651a
+  data.tar.gz: 28a4bc62c3dc7cef808d6e01e7712e6962d92f316675ce4e01d5dde16da26be960bbfb8cc6508acac84003f37006ebe7c0f92bb37eeafcb66bc846adce17997f

data/.gitignore

@@ -0,0 +1,13 @@
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/sample
+/spec/reports/
+/spec/sample
+/tmp/
+/**/.DS_Store
+*.gem

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.2.2
+  - 2.3.0
+  - 2.4.0
+before_install: gem install bundler -v 1.11.2

data/README.md

@@ -5,12 +5,10 @@
 * [Computation](#computation)
   * [Component matching](#component-matching)
   * [Sources](#sources)
-* [API](#api)
-  * [Unrecognized components](#unrecognized-components)
-* [CLI](#cli)
-  * [HTTP server](#http-server)
-    * [Triggering a request](#triggering-a-request)
-  * [Getting help](#getting-help)
+* [Installation](#installation)
+* [Usage](#usage)
+  * [Library](#library)
+  * [CLI](#cli)
 * [Benchmark](#benchmark)
   * [Levenshtein in C](#levenshtein-in-c)
   * [Platform](#platform)
@@ -46,17 +44,27 @@ The ingredients are typically separated by comma, although normalizer will detec
 "Ingredients: Aqua, Disodium Laureth Sulfosuccinate, Cocamidopropiyl\nBetaine"
 ```
 
-## API
-The API of the gem is pretty simple, you can open irb by *bundle console* and start computing the INCI score:
+## Installation
+Install the gem from your shell:
+```shell
+gem install inci_score
+```
+
+## Usage
+
+### Library
+You can include this gem into your own library and start computing the INCI score:
 
 ```ruby
+require "inci_score"
+
 inci = InciScore::Computer.new(src: 'aqua, dimethicone').call
 inci.score # 53.7629
 ```
 
 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).
 
-### Unrecognized components
+#### Unrecognized components
 The API treats unrecognized components as a common case by just marking the object as non valid and raise a warning in case more than 30% of the ingredients are not found.  
 In such case the score is computed anyway by considering only recognized components.  
 Is still possible to query the object for its state:
@@ -67,7 +75,7 @@ inci.valid # false
 inci.unrecognized # ["noent1", "noent2"]
 ```
 
-## CLI
+### CLI
 You can collect INCI data by using the available CLI interface:
 
 ```shell
@@ -85,7 +93,7 @@ UNRECOGNIZED:
         noent
 ```
 
-### HTTP server
+#### HTTP server
 The CLI interface exposes a Web layer based on the [Puma](http://puma.io/) application server.  
 The HTTP server is started on the specified port by spawning as many workers as your current workstation supports:
 ```shell
@@ -93,7 +101,7 @@ inci_score --http=9292
 ```
 Consider all other options are discarded when running HTTP server.
 
-#### Triggering a request
+##### Triggering a request
 The HTTP server responds with a JSON representation of the original *InciScore::Response* object.  
 You can pass the source string directly as a HTTP parameter (URI escaped):
 
@@ -102,7 +110,7 @@ curl http://127.0.0.1:9292?src=aqua,dimethicone
 => {"components":{"aqua":0,"dimethicone":4},"unrecognized":[],"score":53.7629,"valid":true}
 ```
 
-### Getting help
+#### Getting help
 You can get CLI interface help by:
 ```shell
 Usage: inci_score --src="aqua, parfum, etc"
@@ -120,7 +128,7 @@ After some pointless optimization, i replaced this routine with a C implementati
 
 ### Platform
 I registered these benchmarks with a MacBook PRO 15 mid 2015 having these specs:
-* OSX El Captain
+* OSX Sierra
 * 2,2 GHz Intel Core i7 (4 cores)
 * 16 GB 1600 MHz DDR3
 * Ruby 2.4

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "inci_score"
+require "irb"
+require "irb/completion"
+IRB.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/inci_score.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email = ["costajob@gmail.com"]
   s.summary = %q{A library that computes the hazard of cosmetic products components, based on the Biodizionario data.}
   s.homepage = "https://github.com/costajob/inci_score.git"
-  s.files = %w(README.md Rakefile inci_score.gemspec Gemfile Gemfile.lock config.ru config/catalog.yml ext/levenshtein.c bin/inci_score) + Dir["{spec,lib}/**/*.rb"]
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.bindir = "bin"
   s.executables << "inci_score"
   s.require_paths = ["lib"]

data/lib/inci_score/recognizer_rules.rb

@@ -24,6 +24,7 @@ module InciScore
         end
 
         def call(src, catalog)
+          return if src.empty?
           size = src.size
           farthest = Result.new(nil, size)
           initial = src[0]

data/lib/inci_score/version.rb

@@ -1,3 +1,3 @@
 module InciScore
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/log/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
@@ -116,11 +116,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
+- bin/console
 - bin/inci_score
+- bin/setup
 - config.ru
 - config/catalog.yml
 - ext/levenshtein.c
@@ -142,25 +145,7 @@ files:
 - lib/inci_score/scorer.rb
 - lib/inci_score/server.rb
 - lib/inci_score/version.rb
-- spec/bench/levenshtein_bench.rb
-- spec/bench/normalizer_rules_bench.rb
-- spec/bench/recognizer_rules_bench.rb
-- spec/helper.rb
-- spec/integration/api_spec.rb
-- spec/stubs.rb
-- spec/unit/catalog_spec.rb
-- spec/unit/cli_spec.rb
-- spec/unit/computer_spec.rb
-- spec/unit/ingredient_spec.rb
-- spec/unit/levenshtein_spec.rb
-- spec/unit/normalizer_rules_spec.rb
-- spec/unit/normalizer_spec.rb
-- spec/unit/recognizer_rules_spec.rb
-- spec/unit/recognizer_spec.rb
-- spec/unit/response_spec.rb
-- spec/unit/score_spec.rb
-- spec/unit/scorer_spec.rb
-- spec/unit/server_spec.rb
+- log/.gitignore
 homepage: https://github.com/costajob/inci_score.git
 licenses:
 - MIT

data/Gemfile.lock

@@ -1,34 +0,0 @@
-PATH
-  remote: .
-  specs:
-    inci_score (3.1.0)
-      RubyInline (~> 3)
-      puma (~> 3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    RubyInline (3.12.4)
-      ZenTest (~> 4.3)
-    ZenTest (4.11.1)
-    benchmark-ips (2.7.2)
-    minitest (5.10.3)
-    puma (3.10.0)
-    rack (2.0.3)
-    rack-test (0.7.0)
-      rack (>= 1.0, < 3)
-    rake (10.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  benchmark-ips (~> 2)
-  bundler (~> 1.11)
-  inci_score!
-  minitest (~> 5.0)
-  rack-test (~> 0.6)
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.15.4

data/spec/bench/levenshtein_bench.rb

@@ -1,17 +0,0 @@
-require "helper"
-
-s, t = "agua", "aqua"
-lev_ruby = InciScore::Levenshtein.new(s, t)
-lev_c = InciScore::LevenshteinC.new
-
-Benchmark.ips do |x|
-  x.report("levenshtein ruby") do
-    lev_ruby.call
-  end
-
-  x.report("levenshtein C") do
-    lev_c.call(s, s.size, t, t.size)
-  end
-
-  x.compare!
-end

data/spec/bench/normalizer_rules_bench.rb

@@ -1,40 +0,0 @@
-require "helper"
-
-replacer = InciScore::Normalizer::Rules::Replacer
-downcaser = InciScore::Normalizer::Rules::Downcaser
-beheader = InciScore::Normalizer::Rules::Beheader
-separator = InciScore::Normalizer::Rules::Separator
-tokenizer = InciScore::Normalizer::Rules::Tokenizer
-sanitizer = InciScore::Normalizer::Rules::Sanitizer
-uniquifier = InciScore::Normalizer::Rules::Uniquifier
-src = "‘INGREDIENTS‘:\n\nCOCO—BETANE,AQUA/WATER,DIMETHICONE"
-
-Benchmark.ips do |x|
-  x.report("replacer") do
-    replacer.call(src)
-  end
-
-  x.report("downcaser") do
-    downcaser.call(src)
-  end
-
-  x.report("beheader") do
-    beheader.call(src)
-  end
-
-  x.report("separator") do
-    separator.call(src)
-  end
-
-  x.report("tokenizer") do
-    tokenizer.call(src)
-  end
-
-  x.report("sanitizer") do
-    sanitizer.call(src)
-  end
-
-  x.report("uniquifier") do
-    uniquifier.call(src)
-  end
-end

data/spec/bench/recognizer_rules_bench.rb

@@ -1,24 +0,0 @@
-require "helper"
-
-key = InciScore::Recognizer::Rules::Key
-levenshtein = InciScore::Recognizer::Rules::Levenshtein
-digits = InciScore::Recognizer::Rules::Digits
-tokens = InciScore::Recognizer::Rules::Tokens
-
-Benchmark.ips do |x|
-  x.report("key") do
-    key.call("aqua", Stubs.catalog)
-  end
-
-  x.report("levenshtein") do
-    levenshtein.call("agua", Stubs.catalog)
-  end
-
-  x.report("digits") do
-    digits.call("olea europaea oil", Stubs.catalog)
-  end
-
-  x.report("tokens") do
-    tokens.call("f588 capric triglyceride", Stubs.catalog)
-  end
-end

data/spec/helper.rb

@@ -1,6 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
-require "minitest/autorun"
-require "rack/test"
-require "stubs"
-require "benchmark/ips"
-require "inci_score"

data/spec/integration/api_spec.rb

@@ -1,23 +0,0 @@
-require "helper"
-
-include Rack::Test::Methods
-
-def app
-  InciScore::Api
-end
-
-describe InciScore::Api do
-  Stubs.sources.each_with_index do |src, i|
-
-    status, score = Stubs.statuses[i], Stubs.scores[i]
-
-    it "cosmetic #{i} must get a proper response" do
-      get "/", src: src
-      assert last_response.ok?
-      last_response.content_type.must_equal "application/json"
-      body = JSON::parse(last_response.body)
-      body.fetch("score").must_be_close_to score, 0.5
-      body.fetch("valid").must_equal status
-    end
-  end
-end

data/spec/stubs.rb

@@ -1,170 +0,0 @@
-require "yaml"
-
-module Stubs
-  extend self
-
-  def yaml
-    <<-END
----
-parfum: 0
-phosphatidylcholine: 1
-1-naphthol: 4
-1,2,4-benzenetriacetate: 4
-1,3-bis-(2,4-diaminophenoxy)propane: 4
-1,5-naphthalenediol: 4
-2-aminobutanol: 3
-END
-  end
-
-  def distances
-    [['', '', 0],
-     ['elvis', '', 5],
-     ['', 'elvis', 5],
-     ['elvis', 'elvis', 0],
-     ['elvis', 'ELVIS', 0],
-     ['elvis', 'elviz', 1],
-     ['king', 'the king', 4],
-     ['graceland', 'disneyland', 5],
-     ["föo", 'foo', 1],
-     ["français", "francais", 1],
-     ["français", "franæais", 1],
-     ["私の名前はポールです", "ぼくの名前はポールです", 2],
-     ["elvis\n", 'elvis', 1],
-     ["\rking\n", "\nking", 2],
-     ['teddybear', "\t\tteddybear\n", 3]]
-  end
-
-  def sources
-    ["Ingredients: Aqua, Disodium Laureth Sulfosuccinate, Cocamidopropiyl\nBetaine, Disodium Cocoamphodiacetate, Giyceryi Laurate, PEGJ\nGlyceryi Cocoate, Sodium Lactate, Parfum,\n\nNiacinamide, Glycine, Magnesium Aspanate,\n\nAianine, Lysine, Leucine,A||antoin, PEG-150 E‘—\n\nDistearate, PEG-120 Methyl Glucose Dioleate, \n\nPhenoxyethanoi, CI 61570. 50\n\n \n\n",
-     "\n\nDIENTS: Aqua, Sodium Laureth Sulfate, Sodium Chlor .\ngflfamine, Selaginella Lepidophylla Aerial Extract,PruI|:1es'§:::m\n0.11050“, Irehalose, Gluconolaaone, Glycenn, Guar Hydmyp«mylmmwmu:n\nChloride, Dimethiconol, Parfum, TEA-Dodetylbenzenesulfonate, 015mm\nEDIA, Mica, Carbomer, PPS-12, Citric Acid, Sodium HydmxideJEMuHate,\n\nWnethanolamine, Sodium Benzoate, DMDM Hydantoin, Methykhlowiso-\nIhmzoh'none, Methylisothiazolinone, ButylphenyI Methylpmpionaumm\n(142051), CI 47005, CI 77891.\n\n",
-     "1099488 B - INGREDIENTS : AOUA I WATER.\nSODIUM LAURETH SULFATE, COCO-BETAINE,\nSODIUM LAURYL SULFATE. SODIUM CHLORIDE.\nGLYCOL DISTEARATE, NIACINAMIDE,_ ALCOHOL\nDEI‘IAT., SACCHARUM OFFICINARUM’EXTRACT I\nSUGAR CANE EXTRACT, HYDROXYPROPXLGUAR\nHYDROXVPROPYLTRIMONIUM CHLORIDE. SODIUM\nHYDROXIDE, AMINOPROPYL TRIETHOXYSILANE,\nPOLYOUATERNIUM-SO. CAMELLIA SINENGIS\nLEAF EXTRACT, BENZYL ALCOHOL, LINALOOL,\nPUNICA GRANATUM EXTRACT, 2—OLEAMIDO-1,3-\nOCTADECANEDIOL, ACRYLATES COPOLYMER, PYRUS\nMALUS EXTRACT / APPLE FRUIT EXTRACT, PYRIDOXINE\nHCI. CITRIC ACID, METHYLCHLOROISOTHIAZOUNONE.\nMETHYLISOTHIAZOUNONE, CITRUS MEDICA UMONUM\nPEEL EXTRACT/ LEMON PEEL EXTRACT. HEXYLENE\n\nGLYCOL, HEXYL CINNAMAL, AMYL CINNAMAL.\n\nPARFUM / FRAGRANCE (FIL C1631 07/2).\n\n",
-     "7023 10 - INGREDIENTS: CAPRYLIC/CAPRIC\nfilGLYCERIDE, ISOPROPYL PALMITATE, ISOPROPYL\nMYRISTATE, PARFUM / FRAGRANCE, BENZYL ALCOHOL.\nBENZY L SALICYLATE, COUMARIN. HEXYL CINNAMAL,\nLIMONENE, LINALOOL, OLEA\n\nEUROPAEA 0|L/ OLIVE FRUIT\nOIL, PENTAERYTHRITYL\nTETRA-DI-T-BUTYL\nHYDROXYHYDROCINNAMAIE.\n«11317540710.\n\n",
-     "mom-mansmsms: AQUA/WATER, PETROLATUM, GLVCERIN, PARAFFINUM\nunumum MINERAL OIL. CETEARYL ALCOHOL, DIMETHICONE, Buwnomamtmfigfi‘\nUUERISHEA BUTTER. BENZYL ALCOHOL. BENZVL SALICVLATE, CAPRYLVGLVCERYL\nc1 15510/0RANGE 4, CI 47005/ACID YELLOW 3, COUMARILP‘JVE W M\nCiNNAMAL, LIMONENE, LINALOOL, OLEA EUROPAEA OIL I 0\n6-100 STEARATE, PENTAERYTHRITVL\nTVLH‘IDROXVHVDROCINNAMATE,\nSODIUM anaome, 31mm ACID, PARFUM/\n~ ammo/1).\n\n \n \n \n   \n\n",
-     " \n    \n \n \n     \n      \n    \n\n \n \n   \n\nINGREDIENTszA'oLM- a; V\nETHYLHEXYL PALMITATE - BE -~ x\n\nNIUM CHLORIDE ' SIMMONDSIA CH1 ‘   ~ .‘\nROSPERMUM PARK\" BUTTER ' PARFUM ' BONED?“ ALM\n\n- SODIUM BENZOATE - PANTHENOL ~ GUAR HYDROXYPRUWL-\nTRIMONIUM CHLORIDE - PHOSPHOLlPlDS ‘ C\\TR\\C AC“) -\nGLYCINE SOJA OIL ‘ TOCOPHERYL ACETATE - GLYCOLPm\n\n' GLYCINE SOJA STEROLS ' TOCOPHEROL\n\n  \n\n",
-     "11005140-INGREDIENTS:AOUA/WATER,CE[EARYLALCOHOL\nDISTEAROYLETHYL annoxvmvwomw\nMETHOSULFATE,OCTYLDODECANULJEAMAYS J\nSTARCH / CORN STARCH. NIACINAMIDE r\nTOMPHEROLSACCHARUMOFFIUNARUMRM f\n/SJJGARCANEEXTRACT,MN.PIGH|APUNICIFOUAI '\nACEHOLAFRUITEXTRACT,CAMEL|NASATNAO|L/ f\nCAMELINASATIVASEEDOILCAMELUASlNENSlS :\nEXTRACT/CAMELLIASINENSISLEAFEXTRACT, F\nBENZOICACID,LlNALOOL,CAPRYLYLGLYCOL, ,5\nCADRYUUCAPRICTRIGLVCERIDEEYRUSM I\nEXTRACT /APPLE FRUIT EXTRACT, wmnome J\nHcmnmcgfimCIIRUSMEDICALIMONUM ;\nPEEL EXTRACT / LEMON PEEL EXTRACT. j\nPRUNUSARMENIACAKERNELOIL/APRICOT\nxmaommanmmamm ;\nOIL / SUYBEAN OIL, PARFUM I Emacs. ;\n\n(FlL 04391213) /\n\n \n\n",
-     "      \n   \n   \n        \n    \n      \n\nINGREDIENTS: Butane, Isobutane, Propane,\nAluminum Chlorohydrate, PPG-14 Butyl Ether,\nCyclopentasiloxane, Parfum, Disteardimonium\nHectonte, Helianthus Annuus Seed Oil, C12-15\n§kV‘B?”103te,Octyldodecanol, BHT,\nflah'confl. Propylene Carbonate, PEG4.\nEsme, Citric Acid, AI ha-Isomethyl lonone,\n09W. Benzyl alicylate, ButylphenY'\na?p'9na|. CItraI, Geraniol, Hexyl\n'L'm0nene, Linalool.\n\n",
-     "INGREDIENTS : AQUa (wa‘efl'\nslearate, Propylene glycol, F588\ncapric triglyceride, COCOS can\" ‘Wcla\n(Coconul) oil, Isupropyl palmna‘eW’ 09M\nalcohol, Sorbitan palmitate, pom\n\n40, Parfum (Fragrance), DisodiUm E\nCarbomer. Limonene, cum BHr\nSodium hydroxide, cums glands.\n(Grapefruit) fruit extract, SodiUm\ndroacetate, Sodium methyl dehy‘\n\nSorbic acid, Tetrasodium Elm-A CI\n10316 (Ext Yellow 7)‘\n\n",
-     "782208 5‘ » INGREDIEMS: AQUA/WATER ~ GLYCERIN ' DIMETHICONE ' ISOHEXADEUNE ' SILICA\n‘ HVDROXVEIHYIHPERAZINE ETHANE SULFONIC ACID ' ALCOHOL DENAT. ' WE SLY“,- '\nSVNTHETIC WAX ' CI 77163 I BISMUTH OXVCHLORIDE ' CI 77391 / TIIANIUM DIOXIDE ' SECALE\nCEREALE EXTRACT/ RYE SEED EXTRACT ' SODIUM ACRYLATES COPOLVMER ‘ SODIUM\nHVALURONATE ‘ PHENOXYETHANOL ‘ ADENDSINE ~ PEG-10 DIMETHICONE ‘ ETHYLHEXYL\nHYDROXVSTEARATE ' NYLON-12 ' DIMETHICONE/PEG-IO/IS CROSSPOLVMER -\nD|HETHICONE/POLVGLYCERIN-3 CROSSPOLYMER ' PENWLENE GLYCOL ‘ SYNTHEIIC\nFLUORPHLOGOPITE ' BENZVL SALICVLATE - BENZVL ALCOHOL ' LINALOOL ‘ BENZVL BENZOATE '\nCAPRVLIUCAPRIC TRIGLYCERIDE ' CAPRVLYL GLYCOI. ‘ DIPOTASSIUM GLVCVRRHIZATE ' ALPINIA\nGAUNGA LEAF EXTRACT ' DISTEARDIMDNIUN HECTDRITE ' DISOUIUM EDTA - CIIRONELLOL ‘\nPARFUH/ FRAGRANCE. (F.I.L 3166675”).\nIorl MermIzIonI su\n\nM399 V ,\nwww.lorealpans.nt\n\n \n\n \n\n"]
-  end
-  
-  def scores
-    [79, 64, 72, 63, 61, 82, 75, 56, 75, 62]
-  end
-
-  def statuses
-    [true, true, true, true, true, true, false, true, true, true]
-  end
-
-  def ingredients
-    [["aqua", "disodium laureth sulfosuccinate", "cocamidopropiyl betaine", "disodium cocoamphodiacetate", "giyceryi laurate", "pegj glyceryi cocoate", "sodium lactate", "parfum", "niacinamide", "glycine", "magnesium aspanate", "aianine", "lysine", "leucine", "allantoin", "peg-150 e- distearate", "peg-120 methyl glucose dioleate", "phenoxyethanoi", "ci 61570", "50"],
-     ["aqua", "sodium laureth sulfate", "sodium chlor", "gfamine", "selaginella lepidophylla aerial extract", "pruil1esm 011050", "irehalose", "gluconolaaone", "glycenn", "guar hydmypmylmmwmun chloride", "dimethiconol", "parfum", "tea-dodetylbenzenesulfonate", "015mm edia", "mica", "carbomer", "pps-12", "citric acid", "sodium hydmxidejemuhate", "wnethanolamine", "sodium benzoate", "dmdm hydantoin", "methykhlowiso- ihmzohnone", "methylisothiazolinone", "butylphenyi methylpmpionaumm (142051)", "ci 47005", "ci 77891"],
-     ["aoua/water", "sodium laureth sulfate", "coco-betaine", "sodium lauryl sulfate", "sodium chloride", "glycol distearate", "niacinamide", "alcohol deiiat", "saccharum officinarumextract/sugar cane extract", "hydroxypropxlguar hydroxvpropyltrimonium chloride", "sodium hydroxide", "aminopropyl triethoxysilane", "polyouaternium-so", "camellia sinengis leaf extract", "benzyl alcohol", "linalool", "punica granatum extract", "2-oleamido-1", "3- octadecanediol", "acrylates copolymer", "pyrus malus extract / apple fruit extract", "pyridoxine hci", "citric acid", "methylchloroisothiazounone", "methylisothiazounone", "citrus medica umonum peel extract/ lemon peel extract", "hexylene glycol", "hexyl cinnamal", "amyl cinnamal", "parfum / fragrance (fil c1631 07/2)"],
-     ["caprylic/capric lglyceride", "isopropyl palmitate", "isopropyl myristate", "parfum / fragrance", "benzyl alcohol", "benzy l salicylate", "coumarin", "hexyl cinnamal", "limonene", "linalool", "olea europaea 0ll/ olive fruit oil", "pentaerythrityl tetra-di-t-butyl hydroxyhydrocinnamaie", "11317540710"],
-     ["aqua/water", "petrolatum", "glvcerin", "paraffinum unumum mineral oil", "cetearyl alcohol", "dimethicone", "buwnomamtmg uuerishea butter", "benzyl alcohol", "benzvl salicvlate", "caprylvglvceryl c1 15510/0range 4", "ci 47005/acid yellow 3", "coumarilpjve w m cinnamal", "limonene", "linalool", "olea europaea oil/0 6-100 stearate", "pentaerythritvl tvlhidroxvhvdrocinnamate", "sodium anaome", "31mm acid", "parfum/", "ammo/1)"],
-     ["ingredientszaolm- a", "v ethylhexyl palmitate", "be -- x nium chloride", "simmondsia ch1", " rospermum park butter", "parfum", "boned alm", "sodium benzoate", "panthenol", "guar hydroxypruwl- trimonium chloride", "phosphollplds", "ctrc ac)", "glycine soja oil", "tocopheryl acetate", "glycolpm", "glycine soja sterols", "tocopherol"],
-     ["aoua/water", "ce[earylalcohol distearoylethyl annoxvmvwomw methosulfate", "octyldodecanuljeamays j starch / corn starch", "niacinamide r tompherolsaccharumoffiunarumrm f /sjjgarcaneextract", "mnpighlapunicifouai", "aceholafruitextract", "camellnasatnaoll/ f camelinasativaseedoilcameluaslnensls", "extract/camelliasinensisleafextract", "f benzoicacid", "llnalool", "caprylylglycol", "5 cadryuucaprictriglvcerideeyrusm/extract /apple fruit extract", "wmnome j hcmnmcgmciirusmedicalimonum", "peel extract / lemon peel extract", "j prunusarmeniacakerneloil/apricot xmaommanmmamm", "oil / suybean oil", "parfum/emacs", "(fll 04391213) /"],
-     ["butane", "isobutane", "propane", "aluminum chlorohydrate", "ppg-14 butyl ether", "cyclopentasiloxane", "parfum", "disteardimonium hectonte", "helianthus annuus seed oil", "c12-15 kvb103te", "octyldodecanol", "bht", "ahcon", "propylene carbonate", "peg4", "esme", "citric acid", "ai ha-isomethyl lonone", "09w", "benzyl alicylate", "butylpheny ap9nal", "citrai", "geraniol", "hexyl lm0nene", "linalool"],
-     ["aqua (wae slearate", "propylene glycol", "f588 capric triglyceride", "cocos can wcla (coconul) oil", "isupropyl palmnaew 09m alcohol", "sorbitan palmitate", "pom 40", "parfum (fragrance)", "disodium e carbomer", "limonene", "cum bhr sodium hydroxide", "cums glands", "(grapefruit) fruit extract", "sodium droacetate", "sodium methyl dehy sorbic acid", "tetrasodium elm-a ci 10316 (ext yellow 7)"],
-     ["aqua/water", "glycerin", "dimethicone", "isohexadeune", "silica", "hvdroxveihyihperazine ethane sulfonic acid", "alcohol denat", " we sly", "-", "svnthetic wax", "ci 77163/bismuth oxvchloride", "ci 77391 / tiianium dioxide", "secale cereale extract/ rye seed extract", "sodium acrylates copolvmer", "sodium hvaluronate", "phenoxyethanol", "adendsine", "peg-10 dimethicone", "ethylhexyl hydroxvstearate", "nylon-12", "dimethicone/peg-io/is crosspolvmer", "dlhethicone/polvglycerin-3 crosspolymer", "penwlene glycol", "syntheiic fluorphlogopite", "benzvl salicvlate", "benzvl alcohol", "linalool", "benzvl benzoate", "caprvliucapric triglyceride", "caprvlyl glycoi", " dipotassium glvcvrrhizate", "alpinia gaunga leaf extract", "disteardimdniun hectdrite", "disouium edta", "ciironellol", "parfuh/ fragrance", "(fil 3166675)", "iorl mermizioni su m399 v", "wwwlorealpansnt"]]
-  end
-
-  def components
-    [["ci 61570", "ci 61570"],
-     ["agua", "aqua"],
-     ["olea europaea oil", "olea europea"],
-     ["f588 capric triglyceride", "caprylic/capric triglyceride"]]
-  end
-
-  def catalog
-    {"parfum"=>0, "bha"=>4, "alanine"=>0, "allantoin"=>0, "aqua"=>0, "ci 61570"=>3, "ci 77491"=>0, "ci 77492"=>1, "cocamidopropyl betaine"=>1, "disodium cocoamphodiacetate"=>0, "disodium laureth sulfosuccinate"=>2, "glyceryl laurate"=>0, "glycine"=>0, "leucine"=>0, "lysine"=>0, "magnesium aspartate"=>0, "niacinamide"=>0, "peg-120 methyl glucose dioleate"=>3, "peg-150 distearate"=>3, "peg-7 glyceryl cocoate"=>3, "phenoxyethanol"=>2, "sodium lactate"=>0, "paraffinum liquidum"=>3, "ci 47005"=>3, "olea europea"=>0, "capryl glycol"=>2, "caprylic/capric triglyceride"=>0, "betula alba leaf water"=>1, "connective tissue extract"=>4, "dmhf"=>3, "acrylamide/sodium acrylate copolymer"=>3}
-  end
-
-  def hazards
-    [[[], 0],
-     [[0,1], 91], 
-     [[1,0], 87], 
-     [Array.new(10) { 4 }, 0],
-     [Array.new(10) { 3 }, 25],
-     [Array.new(10) { 2 }, 50],
-     [Array.new(10) { 1 }, 75],
-     [Array.new(10) { 0 }, 100],
-     [[4,3,4,4,1,1,0], 46],
-     [[0,1,0,0,2,3,0,4], 74],
-     [[2,4,3,0,0,0,0,4], 63],
-     [[1,0,0,1,0,2,0,4,3], 75],
-     [[0,0,0,0,0,0,0,4], 89],
-     [[4,4,4,4,4,4,4,0], 20],
-     [[0,1,2,3,4] * 10, 61],
-     [[0,1,2,3,4] * 100, 63]]
-  end
-
-  def response
-    InciScore::Response.new(components: %w(aqua dimethicone peg-10), score: 47.18034913243358, valid: true)
-  end
-
-  class Computer
-    def initialize(src:, catalog:, precise: false)
-      @src = src
-      @catalog = catalog
-      @precise = precise
-    end
-
-    def call
-      @src.split(",").map(&:strip).reduce({}) do |acc, component|
-        _component = @catalog[component]
-        next(acc) unless _component
-        acc[component] = _component 
-        acc
-      end 
-    end
-  end
-
-  class Configuration
-    attr_reader :app, :host, :wrks, :min, :max, :preload 
-
-    def initialize(opts = {})
-      yield(self) if block_given?
-    end
-
-    def rackup(f)
-      @app = f
-    end
-
-    def bind(host)
-      @host = host
-    end
-
-    def workers(n)
-      @wrks = n
-    end
-
-    def threads(min, max)
-      @min, @max = min, max
-    end
-
-    def preload_app!
-      @preload = true
-    end
-  end
-
-  class Launcher
-    def initialize(config)
-      @config = config
-    end
-
-    def run
-      @config
-    end
-  end
-
-  class Server
-    def initialize(port:, preload:)
-      @port = port
-      @preload = preload
-    end
-
-    def run
-      :"run_on_port_#{@port}"
-    end
-  end
-end

data/spec/unit/catalog_spec.rb

@@ -1,7 +0,0 @@
-require "helper"
-
-describe InciScore::Catalog do
-  it "must return a hash representation" do
-    InciScore::Catalog.fetch(Stubs.yaml).fetch("1,3-bis-(2,4-diaminophenoxy)propane").must_equal 4
-  end
-end

data/spec/unit/cli_spec.rb

@@ -1,29 +0,0 @@
-require "helper"
-
-describe InciScore::CLI do
-  let(:io) { StringIO.new }
-
-  it "must warn if no inci is specified" do
-    InciScore::CLI.new(args: ["aqua"], io: io, catalog: Stubs.catalog).call
-    io.string.must_equal "Specify inci list as: --src=\"aqua, parfum, etc\"\n"
-  end
-
-  it "must print the help" do
-    begin
-      InciScore::CLI.new(args: %w[--help], io: io, catalog: Stubs.catalog).call
-    rescue SystemExit
-      io.string.must_equal "Usage: inci_score --src=\"aqua, parfum, etc\"\n    -s, --src=SRC                    The INCI list: \"aqua, parfum, etc\"\n        --http=PORT                  Start HTTP server on the specified port\n    -h, --help                       Prints this help\n"
-    end
-  end
-
-  it "must call computer" do
-    cli = InciScore::CLI.new(args: ["--src=aqua, parfum, peg-10"], io: io, catalog: {"aqua" => 0, "parfum" => 0})
-    cli.call(computer_klass: Stubs::Computer)
-    io.string.must_equal "{\"aqua\"=>0, \"parfum\"=>0}\n"
-  end
-
-  it "must run server" do
-    cli = InciScore::CLI.new(args: ["--http=9292", "--src=agua"], io: io, catalog: Stubs.catalog)
-    cli.call(server_klass: Stubs::Server).must_equal :run_on_port_9292
-  end
-end

data/spec/unit/computer_spec.rb

@@ -1,31 +0,0 @@
-require "helper"
-
-describe InciScore::Computer do
-  let(:computer) { InciScore::Computer.new(src: Stubs.sources[0], catalog: Stubs.catalog) }
-
-  it "must collect components" do
-    computer.call.components.must_equal(["aqua", "disodium laureth sulfosuccinate", "cocamidopropyl betaine", "disodium cocoamphodiacetate", "glyceryl laurate", "peg-7 glyceryl cocoate", "sodium lactate", "parfum", "niacinamide", "glycine", "magnesium aspartate", "alanine", "lysine", "leucine", "allantoin", "peg-150 distearate", "peg-120 methyl glucose dioleate", "phenoxyethanol", "ci 61570"])
-  end
-
-  it "must collect unrecognized components" do
-    computer.call.unrecognized.map(&:to_s).must_equal %w[50]
-  end
-
-  it "must detect valid state" do
-    assert computer.call.valid
-  end
-
-  it "must compute the score" do
-    computer.call.score.must_be_close_to 82, 0.5
-  end
-
-  it "must detect invalid state" do
-    computer = InciScore::Computer.new(src: "ingredients: aqua, noent1, noent2", catalog: Stubs.catalog)
-    refute computer.call.valid
-  end
-
-  it "must overwrite tolerance" do
-    computer = InciScore::Computer.new(src: "ingredients: aqua, noent1, noent2", catalog: Stubs.catalog, tolerance: 75.0)
-    assert computer.call.valid
-  end
-end

data/spec/unit/ingredient_spec.rb

@@ -1,28 +0,0 @@
-require "helper"
-
-describe InciScore::Ingredient do
-  it "must be represented as a string" do
-    ingredient = InciScore::Ingredient.new("acrylamidopropyltrimonium chloride/acrylates copolymer")
-    ingredient.to_s.must_equal "acrylamidopropyltrimonium chloride/acrylates copolymer"
-  end
-
-  it "must be represented as a string withoud details" do
-    ingredient = InciScore::Ingredient.new("1,3-bis-(2,4-diaminophenoxy)propane")
-    ingredient.to_s.must_equal "1,3-bis-propane"
-  end
-
-  it "must fetch values with plain name" do
-    ingredient = InciScore::Ingredient.new("aqua")
-    ingredient.values.must_equal ["aqua"]
-  end
-
-  it "must fetch values with syninims" do
-    ingredient = InciScore::Ingredient.new("peg-3/ppg-2 glyceryl/sorbitol hydroxystearate/isostearate")
-    ingredient.values.must_equal ["peg-3", "ppg-2 glyceryl", "sorbitol hydroxystearate/isostearate"]
-  end
-
-  it "must fetch values with details" do
-    ingredient  = InciScore::Ingredient.new("camelia sinensis (leave on)")
-    ingredient.values.must_equal ["camelia sinensis"]
-  end
-end

data/spec/unit/levenshtein_spec.rb

@@ -1,19 +0,0 @@
-require "helper"
-
-describe InciScore::Levenshtein do
-  it "must compute edit distance for UTF8 characters" do
-    Stubs.distances.each do |args|
-      t, s, d = *args
-      lev = InciScore::Levenshtein.new(s, t)
-      lev.call.must_equal d
-    end
-  end
-
-  it "must compute edit distance" do
-    Stubs.distances.first(8).each do |args|
-      t, s, d = *args
-      lev = InciScore::LevenshteinC.new.call(s.downcase, s.size, t.downcase, t.size)
-      lev.must_equal d
-    end
-  end
-end

data/spec/unit/normalizer_rules_spec.rb

@@ -1,58 +0,0 @@
-require "helper"
-
-describe InciScore::Normalizer::Rules do
-  it "must replace invalid chars" do
-    src = "‘ingredients‘:\n\nCOCO—BETANE -_AQUA I WATER\t\t~\n\ng|igeryn"
-    rule = InciScore::Normalizer::Rules::Replacer
-    rule.call(src).must_equal "'ingredients': COCO-BETANE - AQUA/WATER - gligeryn"
-  end
-
-  it "must downcase the source" do
-    src = "AQUA, DIMETHICONE, PEG-10"
-    rule = InciScore::Normalizer::Rules::Downcaser
-    rule.call(src).must_equal src.downcase
-  end
-
-  it "must remove the head from the source" do
-    src = "ingredients: aqua, dimethicone, PEG-10"
-    rule = InciScore::Normalizer::Rules::Beheader
-    rule.call(src).must_equal " aqua, dimethicone, PEG-10"
-  end
-
-  it "must return source if there is no title separator" do
-    src = "aqua, dimethicone, PEG-10"
-    rule = InciScore::Normalizer::Rules::Beheader
-    rule.call(src).must_equal src
-  end
-
-  it "must return source if title separator index is geater than max" do
-    spacer = "*" * InciScore::Normalizer::Rules::Beheader::MAX_INDEX
-    src = "#{spacer} aqua : water : dimethicone"
-    rule = InciScore::Normalizer::Rules::Beheader
-    rule.call(src).must_equal src
-  end
-
-  it "must replace separators with default char" do
-    src = "aqua; dimethicone : PEG-10 - magnesium. parfum"
-    rule = InciScore::Normalizer::Rules::Separator
-    rule.call(src).must_equal "aqua,dimethicone,PEG-10,magnesium,parfum"
-  end
-
-  it "must tokenize string" do
-    src = "aqua/water , PEG-10, magnesium , &/&$$£"
-    rule = InciScore::Normalizer::Rules::Tokenizer
-    rule.call(src).must_equal %w[aqua/water PEG-10 magnesium &/&$$£]
-  end
-
-  it "must sanitize invalid characters" do
-    src = %w[aqua/water PEG&-10 magnesium$ &/&$$£]
-    rule = InciScore::Normalizer::Rules::Sanitizer
-    rule.call(src).must_equal %w[aqua/water PEG-10 magnesium /]
-  end
-
-  it "must remove duplicates" do
-    src = %w[aqua/water magnesium parfum/fragrance magnesium]
-    rule = InciScore::Normalizer::Rules::Uniquifier
-    rule.call(src).must_equal %w[aqua/water magnesium parfum/fragrance]
-  end
-end

data/spec/unit/normalizer_spec.rb

@@ -1,31 +0,0 @@
-require "helper"
-require "inci_score/normalizer"
-
-describe InciScore::Normalizer do
-  it "must raise an argument error for missing src" do
-    -> { InciScore::Normalizer.new }.must_raise ArgumentError
-  end
-
-  it "must apply all rules to fetch ingredients" do
-    Stubs.sources.each_with_index do |src, i|
-      InciScore::Normalizer.new(src: src).call.must_equal Stubs.ingredients[i]
-    end
-  end
-
-  it "must apply custom rules" do
-    custom = [->(src) { src.upcase }, ->(src) { src.split("-").map(&:strip) }]
-    normalizer = InciScore::Normalizer.new(src: "aqua/water - parfum - magnesium", rules: custom)
-    normalizer.call.must_equal %w[AQUA/WATER PARFUM MAGNESIUM]
-  end
-
-  it "can accept a block to augment rules" do
-    normalizer = InciScore::Normalizer.new(src: "aqua/water - parfum - magnesium", rules: [->(src) { src.split("-") }])
-    stripper = ->(src) { src.map(&:strip) }
-    capitalizer = ->(src) { src.map(&:capitalize) }
-    normalizer.call do |rules|
-      rules << stripper 
-      rules << capitalizer
-    end
-    normalizer.src.must_equal %w[Aqua/water Parfum Magnesium]
-  end
-end

data/spec/unit/recognizer_rules_spec.rb

@@ -1,46 +0,0 @@
-require "helper"
-require "inci_score/recognizer_rules"
-
-describe InciScore::Recognizer::Rules do
-  let(:catalog) { Stubs.catalog }
-
-  it "must recognize component by key" do
-    rule = InciScore::Recognizer::Rules::Key
-    rule.call("ci 61570", catalog).must_equal "ci 61570"
-  end
-
-  it "must return nil for unfound key" do
-    rule = InciScore::Recognizer::Rules::Key
-    refute rule.call("water", catalog)
-  end
-
-  it "must recognize component by Levenshtein distance" do
-    rule = InciScore::Recognizer::Rules::Levenshtein
-    rule.call("agua", catalog).must_equal "aqua"
-  end
-
-  it "returns nil if too distant" do
-    rule = InciScore::Recognizer::Rules::Levenshtein
-    refute rule.call("water", catalog)
-  end
-
-  it "must recognize component by meaningful digits" do
-    rule = InciScore::Recognizer::Rules::Digits
-    rule.call("olea europaea oil", catalog).must_equal "olea europea"
-  end
-
-  it "must return nil with no matchings" do
-    rule = InciScore::Recognizer::Rules::Digits
-    refute rule.call("water", catalog)
-  end
-
-  it "must recognize component by tokens" do
-    rule = InciScore::Recognizer::Rules::Tokens
-    rule.call("f588 capric triglyceride", catalog).must_equal "caprylic/capric triglyceride"
-  end
-
-  it "must return nil with no matchings" do
-    rule = InciScore::Recognizer::Rules::Tokens
-    refute rule.call("agua", catalog)
-  end
-end

data/spec/unit/recognizer_spec.rb

@@ -1,47 +0,0 @@
-require "helper"
-
-describe InciScore::Recognizer do
-  let(:rules) { [] }
-
-  it "must recognize the components based on applied rules" do
-    Stubs.components.each do |ingredient, name|
-      recognizer = InciScore::Recognizer.new(ingredient, Stubs.catalog)
-      recognizer.call.name.must_equal name
-    end
-  end
-
-  it "must skip recognition for empty ingredient" do
-    recognizer = InciScore::Recognizer.new(nil, Stubs.catalog)
-    recognizer.call.must_be_nil
-  end
-
-  it "must recognize by key only" do
-    recognizer = InciScore::Recognizer.new("aqua", Stubs.catalog)
-    recognizer.call
-    recognizer.applied.must_equal InciScore::Recognizer::DEFAULT_RULES[0,1]
-  end
-
-  it "must recognize by key by using synonim" do
-    recognizer = InciScore::Recognizer.new("olio di oliva/olea europea", Stubs.catalog)
-    recognizer.call
-    recognizer.applied.must_equal InciScore::Recognizer::DEFAULT_RULES[0,1]
-  end
-
-  it "must recognize by key and levenshtein" do
-    recognizer = InciScore::Recognizer.new("agua", Stubs.catalog)
-    recognizer.call
-    recognizer.applied.must_equal InciScore::Recognizer::DEFAULT_RULES[0,2]
-  end
-
-  it "must recognize by key, levenshtein and digits" do
-    recognizer = InciScore::Recognizer.new("olea europaea oil", Stubs.catalog)
-    recognizer.call
-    recognizer.applied.must_equal InciScore::Recognizer::DEFAULT_RULES[0,3]
-  end
-
-  it "must recognize by key, levenshtein, digits and tokens" do
-    recognizer = InciScore::Recognizer.new("f588 capric triglyceride", Stubs.catalog)
-    recognizer.call
-    recognizer.applied.must_equal InciScore::Recognizer::DEFAULT_RULES
-  end
-end

data/spec/unit/response_spec.rb

@@ -1,8 +0,0 @@
-require "helper"
-require "inci_score/response"
-
-describe InciScore::Response do
-  it "must return a JSON representation" do
-    Stubs.response.to_json.must_equal %{{"components":["aqua","dimethicone","peg-10"],"unrecognized":[],"score":47.18034913243358,"valid":true}}
-  end
-end

data/spec/unit/score_spec.rb

@@ -1,12 +0,0 @@
-require "helper"
-require "inci_score/score"
-
-describe InciScore::Score do
-  it "must compute score value accordingly" do
-    InciScore::Score.new(3, 0.66).value.must_equal 2.34
-  end
-
-  it "must return zero fr negative score" do
-    InciScore::Score.new(0, 0.66).value.must_equal 0.0
-  end
-end

data/spec/unit/scorer_spec.rb

@@ -1,11 +0,0 @@
-require "helper"
-require "inci_score/scorer"
-
-describe InciScore::Scorer do
-  it "must compute the full score" do
-    Stubs.hazards.each do |args|
-      hazards, score = *args
-      InciScore::Scorer.new(hazards).call.must_be_close_to score, 0.5
-    end
-  end
-end

data/spec/unit/server_spec.rb

@@ -1,30 +0,0 @@
-require "helper"
-require "inci_score/server"
-
-describe InciScore::Server do
-  it "must run with default options" do
-    server = InciScore::Server.new(config_klass: Stubs::Configuration, 
-                                   launcher_klass: Stubs::Launcher)
-    config = server.run
-    config.app.must_equal InciScore::Server::RACKUP_FILE
-    config.host.must_equal "tcp://#{InciScore::Server::DEFAULT_HOST}:9292"
-    config.min.must_equal "0"
-    config.max.must_equal "#{InciScore::Server::CPUs*4}"
-    config.wrks.must_equal Etc.nprocessors
-    refute config.preload
-  end
-
-  it "must run with custom options" do
-    server = InciScore::Server.new(port: 9001, threads: "3:6", 
-                                   workers: 1, preload: true,
-                                   config_klass: Stubs::Configuration, 
-                                   launcher_klass: Stubs::Launcher)
-    config = server.run
-    config.app.must_equal InciScore::Server::RACKUP_FILE
-    config.host.must_equal "tcp://#{InciScore::Server::DEFAULT_HOST}:9001"
-    config.min.must_equal "3"
-    config.max.must_equal "6"
-    config.wrks.must_be_nil
-    assert config.preload
-  end
-end