keyword_matcher 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903ac5545c5897fc620701c67d1b3bdb719d0117cfcc1baaf1e53ec95348a1a4
-  data.tar.gz: 7b6b576574f7f74aee5591c5f0950c50e069d5c2404221cc4ad6e96884a9cc69
+  metadata.gz: 4c7609c8851ec36b76d1220692d5c6087b121f309251fb37a8dd22f2d9dd5ed8
+  data.tar.gz: df8423e771b29bca9074d63e178ec5cc60f3251b215a882dcbb86cf6fb69cc62
 SHA512:
-  metadata.gz: 6ab982678a3a4075d41cd4d450b20a8f4bccd519ce11f07e5b2ea8cb652febdbdb1ed61ce34a2516ee28381a1b2fcc651b10892c72b8e0af36d19c756e1e7d59
-  data.tar.gz: f2e46d1b3d844a143891a03a2a6c7fc61d2b4019e4267158c85bb7efd8d0aff4a45b595664668dac0be0f1a969a167242384d9d54787c3a07d2a6deb48e0265f
+  metadata.gz: 3dd4f4b380564c9660eb0631497918268b091bf65f2bcfea0a160c25d57d5adce801da740853477cd9376a3289ac8f28f6cfe41a0c356e6bc6f8153d0daa2c55
+  data.tar.gz: 9bdae5184e4e35be59df2ebfb109d1140e17bb80b724c05c8d576fc6d431bc2d207cafff8d03f07b9d77fe97e6e6652f0c1ed24f3f1827068ec44315468facb2

data/.rubocop.yml

@@ -4,8 +4,6 @@ Style/DoubleNegation:
   Enabled: false
 Metrics/BlockLength:
   Enabled: false
-Rails/SkipsModelValidations:
-  Enabled: false
 Lint/AmbiguousBlockAssociation:
   Enabled: false
 Lint/EmptyWhen:

data/keyword_matcher.gemspec

@@ -20,10 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = ['>= 2.4.0', '< 2.6.0']
 
-  spec.add_runtime_dependency 'activesupport', '~> 5.0'
-  spec.add_runtime_dependency 'damerau-levenshtein', '~> 1.3'
+  spec.add_runtime_dependency 'activesupport', '>= 4.0'
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.61.1'
+  spec.add_development_dependency 'rubocop', '~> 0.76.0'
 end

data/lib/keyword_matcher.rb

@@ -1,6 +1,5 @@
 require 'active_support'
 require 'active_support/core_ext'
-require 'damerau-levenshtein'
 require 'keyword_matcher/version'
 require 'keyword_matcher/group'
 require 'keyword_matcher/prophet'

data/lib/keyword_matcher/group.rb

@@ -6,7 +6,8 @@ module KeywordMatcher
     OPERATOR_NOT = 'не'.freeze
 
     def initialize(title)
-      @title = title
+      @title = title.gsub(/(["'])/, '') # remove quotes
+                    .gsub(/(\d)[\.,](\d)/, '\1-\2') # replace separator between digits from , or . to -
       @all = values
       @or = or_groups
       @not = not_groups

data/lib/keyword_matcher/process.rb

@@ -2,9 +2,6 @@ module KeywordMatcher
   class Process
     attr_reader :group, :words
 
-    FUZZINESS = 1
-    MIN_WORD_LENGTH_FOR_FUZZY = 4
-
     def initialize(group, words)
       @group = group
       @words = words
@@ -28,7 +25,10 @@ module KeywordMatcher
           match = false
           terms.each do |term|
             words.each do |word|
-              match = true if condition(term, word)
+              if condition(term, word)
+                match = true
+                break
+              end
             end
           end
           match
@@ -37,9 +37,7 @@ module KeywordMatcher
     end
 
     def matched?(term, word)
-      return word == (quoted?(term) ? term[1..-2] : term) if precise?(term)
-
-      ::DamerauLevenshtein.distance(term, word) <= FUZZINESS
+      word == term
     end
 
     def condition(term, word)
@@ -58,14 +56,5 @@ module KeywordMatcher
         %r{([0-9])([,|.])(.*)} => '\1-\3'
       }
     end
-
-    def precise?(term)
-      quoted?(term) || (quoted?(term).blank? && term.length < MIN_WORD_LENGTH_FOR_FUZZY)
-    end
-
-    def quoted?(term)
-      regex = /(["'])(?:(?=(\\?))\2.)*?\1/
-      term.match?(regex)
-    end
   end
 end

data/lib/keyword_matcher/prophet.rb

@@ -3,7 +3,7 @@ module KeywordMatcher
     attr_reader :phrase
 
     SEPARATOR = %r{[\s\(\)\/*:"#'\[\];<>\\\/\$\.,=“”«»]+}.freeze
-    MEASURES = 'кг|г|л|мл|уп|ед|шт|мг|пак'.freeze
+    MEASURES = 'кг|г|л|мл|уп|ед|шт|мг|пак|гр'.freeze
 
     def initialize(phrase)
       @phrase = phrase
@@ -17,11 +17,11 @@ module KeywordMatcher
     end
 
     def prepare
-      phrase.gsub(/\d{5,}/, '') # remove gteq five-digit
+      phrase.gsub(/[-]/, ' ') # split text contains - character by space
             .gsub(/(\p{Ll}{2,})(\d+\S)/, '\1 \2') # split text contains > 1 character from digits
             .gsub(/%([\p{L}\d])/, '% \1') # add space after percents
             .gsub(/(\d)[\.,](\d)/, '\1-\2') # replace separator between digits from , or . to -
-            .gsub(/(\d)[\.,\s]+(#{MEASURES})\.?/i, '\1\2') # replace gaps between numbers and measures
+            .gsub(/(\d)[\.,\s]+(#{MEASURES})\.?(?!\p{L})/i, '\1\2') # replace gaps between numbers and measures
             .gsub(/(\p{Ll})(\p{Lu})/, '\1 \2') # split camelcase string
             .gsub(/(\d)-0+(#{MEASURES})/i, '\1\2') # remove trailing zeroes after measures
             .gsub(/([а-яa-z])(\d+)(#{MEASURES})/i, '\1 \2\3') # add space between word and measure

data/lib/keyword_matcher/version.rb

@@ -1,3 +1,3 @@
 module KeywordMatcher
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: keyword_matcher
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Ivan Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: damerau-levenshtein
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.61.1
+        version: 0.76.0
 description: 
 email:
 - ivan.novikov@saltpepper.ru