inci_score 4.1.1 → 4.1.4

data/config/hazards.yml

@@ -0,0 +1,31 @@
+- peg-
+- ppg-
+- dea-
+- mipa-
+- edta-
+- thicone
+- siloxane
+- chlorexidine
+- petrolatum
+- paraffinum liquidum
+- carbomer
+- crosspolymer
+- acrylate
+- styrene
+- copolymer
+- triethanolamine
+- triclosan
+- dmdm
+- hydantoin
+- imidazolidinyl urea
+- diazolidinyl urea
+- formaldheyde
+- methylchloroisothiazolinone
+- methylisothiazolinone
+- sodium hydroxymethylglycinate
+- nonoxynol
+- poloxamer
+- trimonium
+- dimonium
+- glycol
+- glicol

data/ext/levenshtein.c

@@ -0,0 +1,43 @@
+static int call(const char* word1, int len1, const char* word2, int len2) {
+        int matrix[len1 + 1][len2 + 1];
+        int i;
+        for (i = 0; i <= len1; i++) {
+                matrix[i][0] = i;
+        }
+        for (i = 0; i <= len2; i++) {
+                matrix[0][i] = i;
+        }
+        for (i = 1; i <= len1; i++) {
+                int j;
+                char c1;
+
+                c1 = word1[i-1];
+                for (j = 1; j <= len2; j++) {
+                        char c2;
+
+                        c2 = word2[j-1];
+                        if (c1 == c2) {
+                                matrix[i][j] = matrix[i-1][j-1];
+                        }
+                        else {
+                                int delete;
+                                int insert;
+                                int substitute;
+                                int minimum;
+
+                                delete = matrix[i-1][j] + 1;
+                                insert = matrix[i][j-1] + 1;
+                                substitute = matrix[i-1][j-1] + 1;
+                                minimum = delete;
+                                if (insert < minimum) {
+                                        minimum = insert;
+                                }
+                                if (substitute < minimum) {
+                                        minimum = substitute;
+                                }
+                                matrix[i][j] = minimum;
+                        }
+                }
+        }
+        return matrix[len1][len2];
+}

data/lib/inci_score/cli.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'inci_score/computer'
 
 module InciScore
   class CLI

data/lib/inci_score/computer.rb

@@ -18,7 +18,7 @@ module InciScore
     end
 
     def call
-      Response.new(components: components.map(&:name),
+      Response.new(components: components,
                    unrecognized: unrecognized,
                    score: score,
                    valid: valid?,

data/lib/inci_score/normalizer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'inci_score/normalizer_rules'
-
 module InciScore
   class Normalizer
     DEFAULT_RULES = [Rules::Replacer, Rules::Downcaser, Rules::Beheader, Rules::Separator, Rules::Tokenizer, Rules::Sanitizer, Rules::Uniquifier].freeze

data/lib/inci_score/recognizer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "inci_score/recognizer_rules"
-
 module InciScore
   class Recognizer
     DEFAULT_RULES = [Rules::Key, Rules::Levenshtein, Rules::Digits, Rules::Hazard, Rules::Tokens].freeze

data/lib/inci_score/recognizer_rules.rb

@@ -1,9 +1,8 @@
 # frozen_string_literal: true
 
-require 'inci_score/refinements'
-
 module InciScore
   using Refinements
+
   class Recognizer
     module Rules
       TOLERANCE = 3

data/lib/inci_score/refinements.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'inci_score/levenshtein'
-
 module InciScore
   module Refinements
     refine(String) do

data/lib/inci_score/response.rb

@@ -16,7 +16,7 @@ module InciScore
     end
 
     def to_json
-      data = { components: components, unrecognized: unrecognized, score: score, valid: valid, precision: precision }.freeze
+      data = { components: components.map(&:to_h), unrecognized: unrecognized, score: score, valid: valid, precision: precision }.freeze
       Oj.dump(data, mode: :compat)
     end
 
@@ -29,9 +29,9 @@ VALID STATE:
 PRECISION:
       \t#{precision}
 COMPONENTS:
-      #{components.map { |c| "\t#{c}" }.join('\n')}
+      \t#{components.map { |c| "#{c.name} (#{c.hazard})" }.join(', ')}
 UNRECOGNIZED:
-      #{unrecognized.map { |c| "\t#{c}" }.join('\n')}
+      \t#{unrecognized.join(', ')}
       }
     end
   end

data/lib/inci_score/scorer.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'inci_score/score'
-
 module InciScore
   class Scorer
     HAZARD_PERCENT = 25

data/lib/inci_score/version.rb

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

data/lib/inci_score.rb

@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
 require 'inci_score/ingredient'
+require 'inci_score/normalizer_rules'
 require 'inci_score/normalizer'
+require 'inci_score/levenshtein'
+require 'inci_score/refinements'
+require "inci_score/recognizer_rules"
 require 'inci_score/recognizer'
 require 'inci_score/response'
+require 'inci_score/score'
 require 'inci_score/scorer'
 require 'inci_score/version'
 require 'inci_score/config'
+require 'inci_score/computer'
 require 'inci_score/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.4
 platform: ruby
 authors:
 - costajob
@@ -98,17 +98,16 @@ description:
 email:
 - costajob@gmail.com
 executables:
-- inci_console
 - inci_score
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
-- bin/inci_console
 - bin/inci_score
-- bin/setup
+- config/catalog.yml
+- config/hazards.yml
+- ext/levenshtein.c
 - lib/inci_score.rb
 - lib/inci_score/cli.rb
 - lib/inci_score/computer.rb

data/bin/inci_console

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

data/bin/setup

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