keyword_matcher 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eca50e5c62bdaeea87511401010241d7680e90e994a5178174ea8ff73a413da9
-  data.tar.gz: 88e5e6c5a51b83d41e7697420c1df4cc7688bcfd117213c58c7d43734ca2da4e
+  metadata.gz: 9193a0b98145b71457b73c624d518432ce50da959b6725d10bdc714aabd537ce
+  data.tar.gz: f2dfa8a1e7c48f711ee97369feec3633134283bae94b4d67f8a64b7e16799080
 SHA512:
-  metadata.gz: 4810deef32717d2eaabc2a43e351c24f98c2ed400cd841a43a09289c56613840a26882e82db48e5272a9f8ada36fb798102e81d283f0dee329f180b31fd004bd
-  data.tar.gz: b88391172b5053cf4b16f925c890ed7fa7dc063286d00d62749e43413bd97b7e5fd1103983967a94b7ad604fb3d5de2a169d8e879c71af383e5074e6e432112d
+  metadata.gz: b966edcfd13292288ddd392b403420685a4ec8f7bc82ede00cf8ad8acda8fe394848f8a73d4085ec85e557253821f83605a2dd347a5160c75f1fd732e531adc3
+  data.tar.gz: 5a5b3cb2c9e991a0677a34fab264171c3fe1aa297b513f265ecaf892db13a1475afe938baea1202d137b5059656c05bde54b1b6cdef52b708ce69aec622a576f

data/.rubocop.yml

@@ -10,8 +10,6 @@ Lint/AmbiguousBlockAssociation:
   Enabled: false
 Lint/EmptyWhen:
   Enabled: false
-Style/MethodMissing:
-  Enabled: false
 Style/SymbolProc:
   Enabled: false
 Style/NumericPredicate:

data/keyword_matcher.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'keyword_matcher/version'
 
@@ -19,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.4.0'
+  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_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49.0'
+  spec.add_development_dependency 'rubocop', '~> 0.61.1'
 end

data/lib/keyword_matcher/group.rb

@@ -26,6 +26,7 @@ module KeywordMatcher
 
     def not_groups
       return [] unless title.downcase.match?(/\r?\n#{OPERATOR_NOT}\r?\n/)
+
       title.downcase.match(/\r?\n#{OPERATOR_NOT}.*/m).to_s.split(/\r?\n#{OPERATOR_NOT}\r?\n/).map do |v|
         v.split("\n").reject(&:blank?).map(&:split)
       end.reject(&:blank?)

data/lib/keyword_matcher/process.rb

@@ -18,6 +18,7 @@ module KeywordMatcher
 
     def negation_found?
       return if group.not.blank?
+
       in_any?(group.not)
     end
 
@@ -26,8 +27,8 @@ module KeywordMatcher
         values.map do |terms|
           match = false
           terms.each do |term|
-            words.each do |w|
-              match = true if condition(term, w)
+            words.each do |word|
+              match = true if condition(term, word)
             end
           end
           match
@@ -35,14 +36,15 @@ module KeywordMatcher
       end.include?(true)
     end
 
-    def matched?(term, w)
-      return w == (quoted?(term) ? term[1..-2] : term) if precise?(term)
-      ::DamerauLevenshtein.distance(term, w) <= FUZZINESS
+    def matched?(term, word)
+      return word == (quoted?(term) ? term[1..-2] : term) if precise?(term)
+
+      ::DamerauLevenshtein.distance(term, word) <= FUZZINESS
     end
 
-    def condition(term, w)
+    def condition(term, word)
       synonym = find_synonym(term)
-      synonym.present? ? (matched?(term, w) || matched?(synonym, w)) : matched?(term, w)
+      synonym.present? ? (matched?(term, word) || matched?(synonym, word)) : matched?(term, word)
     end
 
     def find_synonym(term)

data/lib/keyword_matcher/prophet.rb

@@ -2,9 +2,7 @@ module KeywordMatcher
   class Prophet
     attr_reader :phrase
 
-    PRECISION = 0.5
-    SPLIT = 0.2
-    SEPARATOR = %r{[\s\(\)\/*:"'\\\/\$\.,=]+}
+    SEPARATOR = %r{[\s\(\)\/*:"#'\[\];<>\\\/\$\.,=]+}.freeze
     MEASURES = 'кг|г|л|мл|уп|ед|шт|мг|пак'.freeze
 
     def initialize(phrase)
@@ -15,19 +13,20 @@ module KeywordMatcher
       prepare
         .split(SEPARATOR)
         .map(&:strip)
-        .map(&:downcase)
-        .reject { |w| w =~ /\d{5,}/ }
         .reject(&:blank?)
     end
 
     def prepare
-      phrase.gsub(/(\p{Ll}{2,})(\d+\S)/, '\1 \2') # split text contains > 1 character from digits
+      phrase.gsub(/\d{5,}/, '') # remove gteq five-digit
+            .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(/(\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')
+            .gsub(/([а-яa-z])(\d+)(#{MEASURES})/i, '\1 \2\3') # add space between word and measure
+            .gsub(/(\d+)(#{MEASURES})([x|х])/i, '\1\2 \3') # add space before amount
+            .gsub(/([а-я])([a-z]{2,})/i, '\1 \2') # add space between alternating Russian English
             .downcase
     end
   end

data/lib/keyword_matcher/version.rb

@@ -1,3 +1,3 @@
 module KeywordMatcher
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keyword_matcher
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Novikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.0
+        version: 0.61.1
 description: 
 email:
 - ivan.novikov@saltpepper.ru
@@ -132,6 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: 2.4.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="