inci_score 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5970cfdecac8492dbfd510dce7a24488e543233c
-  data.tar.gz: fb5b1171f1fcab479e24b33dc7d7f37582b93741
+  metadata.gz: 64259796b3d4a9d134999b66cdbd9bf869340ee5
+  data.tar.gz: ab5a536ebc4841ab86d3f3a3e5d70a88c146b81b
 SHA512:
-  metadata.gz: 42624a99c66bc3fcfb53cff14ebe6a153b220901df9b9e5f49f3d8ec2c9378436cd7090446bb449fefc7320c8ff61fdd5375b551b015312858fac8b8bfa8b66c
-  data.tar.gz: 2f6bcc48dd8727a6b2b9665882cd3a809b849a7876a7a5303b7a8c3438c373fb3e25c28545889f70fcc14aa1724ea5febfbb5a78a555456ec99e44b5ca9de329
+  metadata.gz: a03e0a913ab6c41350a2305de482801abafa191a249e5fe73437e2a444e0e25c0be9f8479f7c442134ca7ed663d8fef63ef7f985d43aeb05d62e33706fe29f42
+  data.tar.gz: 3be018bbc1b8e64cae32bd810161237f50187a1f3e430489968ad865b771450b150ea28b59e3aea841a3c92d31b5f30bebd28c9e8b25ec8c4acf1de5a26565ae

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
+  - 2.2.2
+  - 2.3.0
   - 2.4.0
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -146,6 +146,6 @@ wrk -t 4 -c 100 -d 30s --timeout 2000 http://127.0.0.1:9292/?src=<list_of_ingred
 | exact matching     | aqua,parfum,zeolite      |           48863.58 |               0.31/0.55/10.82 |
 
 ## Ruby 2.4
-After upgrading to Ruby 2.4 i doubled the throughput of the matcher: i assume Ruby optimization to the [Hash access](#https://blog.heroku.com/ruby-2-4-features-hashes-integers-rounding) is the driving reason.  
+After upgrading to Ruby 2.4 i doubled the throughput of the matcher (24008.11 vs 48863.58 req/s): i assume Ruby optimization to the [Hash access](https://blog.heroku.com/ruby-2-4-features-hashes-integers-rounding) is the driving reason.  
 I also adopted the new #match? method to avoid creating a MatchData object when i am just checking for predicate.  
-In the end Ruby upgrade is a big deal for my gem, give it a try!
+In the end Ruby upgrade is a big deal for my gem and i recommend to give it a try!

data/inci_score.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables << "inci_score"
   s.require_paths = ["lib"]
   s.license = "MIT"
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 2.2.2"
 
   s.add_runtime_dependency "nokogiri", "~> 1.6"
   s.add_runtime_dependency "puma", "~> 3"

data/lib/inci_score/levenshtein.rb

@@ -44,12 +44,3 @@ module InciScore
   end
 end
 
-String::class_eval do
-  def distance_utf8(t)
-    InciScore::Levenshtein.new(self, t).call
-  end
-
-  def distance(t)
-    InciScore::LevenshteinC.new.call(self.downcase, self.size, t.downcase, t.size)
-  end
-end

data/lib/inci_score/recognizer_rules.rb

@@ -1,6 +1,7 @@
-require 'inci_score/levenshtein'
+require 'inci_score/refinements'
 
 module InciScore
+  using Refinements
   class Recognizer
     module Rules
       class Base
@@ -47,7 +48,7 @@ module InciScore
           return if @src.size < TOLERANCE
           digits = @src[0, MIN_MEANINGFUL]
           @catalog.detect do |component, _| 
-            component.match?(/^#{Regexp::escape(digits)}/)
+            component.matches?(/^#{Regexp::escape(digits)}/)
           end.to_a.first
         end
       end
@@ -58,7 +59,7 @@ module InciScore
         def call
           tokens.each do |token|
             @catalog.each do |component, _| 
-              return component if component.match?(/\b#{Regexp.escape(token)}\b/)
+              return component if component.matches?(/\b#{Regexp.escape(token)}\b/)
             end
           end
           nil

data/lib/inci_score/refinements.rb

@@ -0,0 +1,20 @@
+require 'inci_score/levenshtein' 
+
+module InciScore
+  module Refinements
+    refine(String) do
+      def distance_utf8(t)
+        InciScore::Levenshtein.new(self, t).call
+      end
+
+      def distance(t)
+        InciScore::LevenshteinC.new.call(self.downcase, self.size, t.downcase, t.size)
+      end
+
+      def matches?(re)
+        return match?(re) if defined?("".match?)
+        match(re)
+      end
+    end
+  end
+end

data/lib/inci_score/version.rb

@@ -1,3 +1,3 @@
 module InciScore
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inci_score
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - costajob
@@ -153,6 +153,7 @@ files:
 - lib/inci_score/normalizer_rules.rb
 - lib/inci_score/recognizer.rb
 - lib/inci_score/recognizer_rules.rb
+- lib/inci_score/refinements.rb
 - lib/inci_score/response.rb
 - lib/inci_score/score.rb
 - lib/inci_score/scorer.rb
@@ -170,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="