inci_score 4.2.1 → 4.3.0

data/lib/inci_score/config.rb

@@ -5,6 +5,7 @@ require 'yaml'
 module InciScore
   module Config
     CATALOG = YAML::load_file(File::expand_path('../../../config/catalog.yml', __FILE__)).freeze
+    CIR = File.readlines(File::expand_path('../../../config/cir', __FILE__)).freeze
     HAZARDS = YAML::load_file(File::expand_path('../../../config/hazards.yml', __FILE__)).freeze
   end
 end

data/lib/inci_score/ingredient.rb

@@ -5,14 +5,13 @@ module InciScore
     SLASH = '/'
     SLASH_RULE = /(?<!ate)\//.freeze
     PARENTHESIS = %w[( ) [ ]].freeze
-    DETAILS_RULE = /(\(.+\)|\[.+\])/.freeze
+    PARENTHESIS_RULE = /(\(.+\)|\[.+\])/.freeze
 
-    attr_reader :raw, :tokens, :values
+    attr_reader :raw, :values
 
     def initialize(raw)
       @raw = raw.to_s
-      @tokens = @raw.split(SLASH_RULE).map(&:strip)
-      @values ||= synonims.unshift(name).compact
+      @values = fetch_values
       freeze
     end
 
@@ -22,13 +21,15 @@ module InciScore
 
     private
 
-    def name
-      return tokens.first unless parenthesis?
-      raw.sub(DETAILS_RULE, '').strip
-    end
-
-    def synonims
-      tokens[1, tokens.size].to_a
+    def fetch_values
+      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].concat(parenthesis_values)
+      else
+        raw.split(SLASH_RULE).map(&:strip)
+      end
     end
 
     def parenthesis?

data/lib/inci_score/recognizer.rb

@@ -8,8 +8,8 @@ module InciScore
 
     attr_reader :ingredient, :rules, :applied
 
-    def initialize(ingredient, rules = DEFAULT_RULES, wrapper = Ingredient)
-      @ingredient = wrapper.new(ingredient)
+    def initialize(ingredient, rules = DEFAULT_RULES)
+      @ingredient = Ingredient.new(ingredient)
       @rules = rules
       @applied = []
       freeze

data/lib/inci_score/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - costajob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -106,6 +106,7 @@ files:
 - README.md
 - bin/inci_score
 - config/catalog.yml
+- config/cir
 - config/hazards.yml
 - ext/levenshtein.c
 - lib/inci_score.rb