boyer_moore 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 303f4624a20a48f5b2f8ea4784426ae186143943
-  data.tar.gz: 7c7bc24d1d32a05c138fbf614928ca63e27db592
+  metadata.gz: 7de6b2a49229c15b9f3ab4a7311bcbd77789d02b
+  data.tar.gz: 21c26b9a7476405f08eaef5fc76f614496664850
 SHA512:
-  metadata.gz: bb1abf64fd6b1cd88a721cc0cef3b7f19a80001865e112f2c599b290a22e79075a8516e8479aecded4a4b3ae27cfcfd6d94515748d1a96299f806ff2c0e596ce
-  data.tar.gz: 16540ebe1554a24bfe620ae3dba30137ff96539e8887844f7545a30c2ef33d4ea08ca84b4f6abfc4a67ee4e249547c1beb708a030bc92b7dc038d7d71d6ebfff
+  metadata.gz: 6199a53c8228caded86afe336064ee3f0ae98008fba3786861f38b021f184c369efcd0bb9528fe86b26c1f03790599806483be4c89129258d845ec269193da86
+  data.tar.gz: acadd4c9f7de76fdc4e25e3208403eba5704949d177eccb41ee7f02eda772421851f13b010192b44388b2486d6728b2036f982d3dfa608ea44f11d9f154978e4

data/boyer_moore.gemspec

@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/lib/boyer_moore.rb

@@ -1,108 +1,100 @@
-require "boyer_moore/version"
+require_relative "./boyer_moore/version"
 
-class RichHash
-
-  def initialize
-    @regexps = {}
-    @regular = {}
-  end
+module BoyerMoore
+  def self.search(haystack, needle_string)
+    needle = Needle.new(needle_string)
 
-  def [](k)
-    regular = @regular[k]
-    return regular if regular
-    if @regexps.size > 0
-      @regexps.each do |regex,v|
-        return v if regex.match(k)
+    haystack_index = 0
+    while haystack_index <= haystack.size - needle.size
+      if skip_by = needle.match_or_skip_by(haystack, haystack_index)
+        haystack_index += skip_by
+      else
+        break haystack_index # Found a match at haystack_index!
       end
     end
-    nil
   end
 
-  def []=(k,v)
-    if k.kind_of?(Regexp)
-      @regexps[k] = v
-    else
-      @regular[k] = v
+  class Needle
+    def initialize(needle)
+      needle.size > 0 or raise "Must pass needle with size > 0"
+      @needle = needle
     end
-  end
-
-end
 
-module BoyerMoore
+    def size
+      @needle.size
+    end
 
-  def self.search(haystack, needle)
-    needle_len = needle.size
-    haystack_len = haystack.size
-    return nil if haystack_len == 0
-    return haystack if needle_len == 0
-    badcharacter = self.prepare_badcharacter_heuristic(needle)
-    goodsuffix   = self.prepare_goodsuffix_heuristic(needle)
-    s = 0
-    while s <= haystack_len - needle_len
-      j = needle_len
-      while (j > 0) && self.needle_matches?(needle[j-1], haystack[s+j-1])
-        j -= 1
+    def match_or_skip_by(haystack, haystack_index)
+      if mismatch_idx = mismatch_index(haystack, haystack_index)
+        mismatch_char_index = character_index(haystack[haystack_index + mismatch_idx])
+        skip_by(mismatch_char_index, mismatch_idx)
       end
-      if(j > 0)
-        k = badcharacter[haystack[s+j-1]]
-        k = -1 unless k
-        if (k < j) && (m = j-k-1) > goodsuffix[j]
-          s += m
-        else
-          s += goodsuffix[j]
-        end
-      else
-        return s
+    end
+
+  private
+
+    def mismatch_index(haystack, haystack_index)
+      compare_index = size - 1
+      while @needle[compare_index] == haystack[haystack_index + compare_index]
+        compare_index -= 1
+        compare_index < 0 and return nil
       end
+      compare_index
     end
-    return nil
-  end
 
-  def self.prepare_badcharacter_heuristic(str)
-    result = RichHash.new
-    0.upto(str.length - 1) do |i|
-      result[str[i]] = i
+    def character_index(char)
+      character_indexes[char] || -1
     end
-    result
-  end
 
-  def self.prepare_goodsuffix_heuristic(normal)
-    size = normal.size
-    result = []
-    reversed = normal.dup.reverse
-    prefix_normal = compute_prefix(normal)
-    prefix_reversed = compute_prefix(reversed)
-    0.upto(size) do |i|
-      result[i] = size - prefix_normal[size-1]
+    def good_suffix(compare_index)
+      good_suffixes[compare_index]
     end
-    0.upto(size-1) do |i|
-      j = size - prefix_reversed[i]
-      k = i - prefix_reversed[i]+1
-      result[j] = k if result[j] > k
+
+    def skip_by(mismatch_char_index, compare_index)
+      suffix_index = good_suffix(compare_index + 1)
+      if mismatch_char_index <= compare_index && (m = compare_index - mismatch_char_index) > suffix_index
+        m
+      else
+        suffix_index
+      end
     end
-    result
-  end
 
-  def self.needle_matches?(needle, haystack)
-    if needle.kind_of?(Regexp)
-      needle.match(haystack) ? true : false
-    else
-      needle == haystack
+    def character_indexes
+      @char_indexes ||=
+        (0...@needle.length).reduce({}) do |hash, i|
+          hash[@needle[i]] = i
+          hash
+        end
+    end
+
+    def good_suffixes
+      @good_suffixes ||=
+        begin
+          prefix_normal   = self.class.prefix(@needle)
+          prefix_reversed = self.class.prefix(@needle.reverse)
+          result = []
+          (0..@needle.size).each do |i|
+            result[i] = @needle.size - prefix_normal[@needle.size-1]
+          end
+          (0...@needle.size).each do |i|
+            j = @needle.size - prefix_reversed[i]
+            k = i - prefix_reversed[i] + 1
+            result[j] > k and result[j] = k
+          end
+          result
+        end
     end
-  end
 
-  def self.compute_prefix(str)
-    size = str.length
-    k = 0
-    result = [0]
-    1.upto(size - 1) do |q|
-      while (k > 0) && (str[k] != str[q])
-        k = result[k-1]
+    def self.prefix(string)
+      k = 0
+      (1...string.length).reduce([0]) do |prefix, q|
+        while k > 0 && string[k] != string[q]
+          k = prefix[k - 1]
+        end
+        string[k] == string[q] and k += 1
+        prefix[q] = k
+        prefix
       end
-      k += 1 if(str[k] == str[q])
-      result[q] = k
     end
-    result
   end
-
 end

data/lib/boyer_moore/version.rb

@@ -1,3 +1,3 @@
 module BoyerMoore
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/test_file

@@ -0,0 +1 @@
+123456

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: boyer_moore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sri Harsha Kappala
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Ruby wrapper for Boyer-Moore - The fastest search strategy, ever!
 email:
 - sriharsha.kappala@hotmail.com
@@ -55,6 +55,7 @@ files:
 - boyer_moore.gemspec
 - lib/boyer_moore.rb
 - lib/boyer_moore/version.rb
+- test_file
 homepage: https://github.com/sriharshakappala/boyer_moore
 licenses:
 - MIT
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for BoyerMoore algorithm - The fastest search strategy, ever!