inci_score 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d5e69b680cde0fed823fd4672b8b4ec16638fe9
-  data.tar.gz: 488e31a72fd25148a61b32c5fa2a589b6ef438c3
+  metadata.gz: 4c68c4446dbccbbcc8f297ca047af8a27a321c13
+  data.tar.gz: 933e2d099e05c01aaec68a19febc2a2272ee8a62
 SHA512:
-  metadata.gz: 9e9eb717b3460fd139330acd40f7eec880b8b42f6c806f2ff71efdd9f8b2f8a4376a82c2f4133fcc619fa102781e7b96f4a17bb8bb8b81ed245ba11e76a85271
-  data.tar.gz: 7b29bf4e4ab728772be548ba3f81f87ecb6e4b14d8f8e6952a194469314d1445996d9761c90372d19fa99de3030a61f33be7761aaddc98580bc72ce0100ac020
+  metadata.gz: 7508d4f066f1f8faf2ed6e526db78221c8394721772d1eca7d48bba68fc4de3c3b9209fce9a772b92e4e83cf19033d46e2f5cfe41891cb050adc6b40db94e6c2
+  data.tar.gz: 4bd7c6b76bade0820adb6502e5acbcbdaf3769589849920c76ab333723211fc7e335322cc8a321f3fd94c4b4632700d618922ef1e64b10e67b1e907f8a7f24e6

data/lib/inci_score/normalizer.rb

@@ -2,7 +2,7 @@ require "inci_score/normalizer_rules"
 
 module InciScore
   class Normalizer
-    DEFAULT_RULES = [Rules::Replacer, Rules::Downcaser, Rules::Beheader, Rules::Separator, Rules::Tokenizer, Rules::Sanitizer, Rules::Desynonymizer, Rules::Uniquifier]
+    DEFAULT_RULES = [Rules::Replacer, Rules::Downcaser, Rules::Beheader, Rules::Separator, Rules::Tokenizer, Rules::Sanitizer, Rules::Desynonymizer, Rules::Deparenthesizer, Rules::Uniquifier]
 
     attr_reader :src
 

data/lib/inci_score/normalizer_rules.rb

@@ -68,7 +68,7 @@ module InciScore
       module Sanitizer
         extend self
 
-        INVALID_CHARS = /[^\/\(\)\w\s-]/
+        INVALID_CHARS = /[^\/\[\]\(\)\w\s-]/
 
         def call(src)
           Array(src).map do |token|
@@ -89,6 +89,18 @@ module InciScore
         end
       end
 
+      module Deparenthesizer
+        extend self
+
+        PARENTHESIS = /\(.+?\)|\[.+?\]/
+
+        def call(src)
+          Array(src).map do |token|
+            token.sub(PARENTHESIS, '').strip
+          end.reject(&:empty?)
+        end
+      end
+
       module Uniquifier
         extend self
 

data/lib/inci_score/version.rb

@@ -1,3 +1,3 @@
 module InciScore
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

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