aho_corasick_matcher 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc70023665fc36d0b86508ef0d7c3e330beda705
-  data.tar.gz: e22d0d38e7305f540a6aa3a6f07ca259931eba3a
+  metadata.gz: 22835eda3c317e6993083b400e28fd83c926ff33
+  data.tar.gz: e4cd6c29e23087dce59d4eb3989f1e9fcdeeb09a
 SHA512:
-  metadata.gz: 62ba80e800c76fd5bc0db9157746413659b9141f63e17e5d0d7b5c7a6736a13dee2e4aee20adcd41cbc8f57257fbd87646a3f6b93620ef0d2c27010d0548a8c3
-  data.tar.gz: 693edb06c4dfd18e8bcbeac19c723bfcf5ec75eaa752388e0cbb55a306f2cb1206581ca151067252646ac3c8c59eb19bf722678c700658703ab6f3b3a1e5b9f2
+  metadata.gz: bbd1e3bcf0709c2e55bd731d4fec5d8928773bd7b0d3b8fa45601f96d056970e1470386de8c85b687ea3572142814c2440752cc1fa4c1f956980e946ba2c79f0
+  data.tar.gz: de17ee446c5dff842e1eb299950eeae7e1200396e137df97b1a0b54d05e894173335074e6f26f960af4f2e11193034db652e9dd0c4ab7262c7003b06339ac2a7

data/README.md

@@ -1,4 +1,4 @@
-# AhoCorasickMatcher [![Build Status](https://travis-ci.org/altmetric/aho_corasick_matcher.svg?branch=master)](https://travis-ci.org/altmetric/aho_corasick_matcher)
+# Aho-Corasick Matcher [![Build Status](https://travis-ci.org/altmetric/aho_corasick_matcher.svg?branch=master)](https://travis-ci.org/altmetric/aho_corasick_matcher)
 
 A Ruby gem for finding strings in text using the [Aho-Corasick string matching search](http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.96.4671&rep=rep1&type=pdf).
 
@@ -10,8 +10,8 @@ increases only linearly.
 It's quite memory-intensive, and building a matcher is expensive – but once it's
 been built, matching terms is very fast.
 
-**Current version:** 1.0.0  
-**Supported Ruby versions:** 1.9.2, 1.9.3, 2.0, 2.1, 2.2, jruby-1.7, rbx-2.2, rbx-2.4
+**Current version:** 1.0.1  
+**Supported Ruby versions:** 1.8.7, 1.9.2, 1.9.3, 2.0, 2.1, 2.2, jruby-1.7, rbx-2.5
 
 ## Usage
 
@@ -22,14 +22,14 @@ matcher = AhoCorasickMatcher.new(['a', 'b', 'ab'])
 matcher.match('aba')
 #=> ['a', 'ab', 'b', 'a']
 
-matcher = AhoCorasickMatcher.new(["thistle", "sift", "thistles"])
-matcher.match("Theophilus thistle, the successful thistle sifter, in sifting a sieve full of un-sifted thistles, thrust three thousand thistles through the thick of his thumb.")
+matcher = AhoCorasickMatcher.new(['thistle', 'sift', 'thistles'])
+matcher.match('Theophilus thistle, the successful thistle sifter, in sifting a sieve full of un-sifted thistles, thrust three thousand thistles through the thick of his thumb.')
 #=> ["thistle", "thistle", "sift", "sift", "sift", "thistle", "thistles", "thistle", "thistles"]
 ```
 
 ## Thanks
 
-Loosely based on Tim Cowlishaw's implementation of the same algorithm https://github.com/timcowlishaw/aho_corasick
+Loosely based on [Tim Cowlishaw's implementation of the same algorithm](https://github.com/timcowlishaw/aho_corasick).
 
 ## License
 

data/lib/aho_corasick_matcher.rb

@@ -12,13 +12,16 @@ class AhoCorasickMatcher
   end
 
   def match(string)
-    [].tap do |matches|
-      string.each_char.reduce(root) do |node, char|
-        (node || root).search(char.intern).tap do |child|
-          matches.push(*child.matches) if child
-        end
-      end
+    matches = []
+    string.each_char.reduce(root) do |node, char|
+      child = (node || root).search(char.intern)
+      next unless child
+
+      matches.push(*child.matches)
+      child
     end
+
+    matches
   end
 
   private
@@ -47,8 +50,8 @@ class AhoCorasickMatcher
   end
 
   class Node
-    attr_reader :matches, :child_map, :suffix, :parent
-    attr_writer :suffix
+    attr_reader :matches, :child_map, :parent
+    attr_accessor :suffix
 
     def initialize(parent = nil)
       @matches = []
@@ -57,19 +60,19 @@ class AhoCorasickMatcher
     end
 
     def search(char)
-      @child_map[char] || suffix && suffix.search(char)
+      child_map[char] || (suffix && suffix.search(char))
     end
 
     def child_or_create(char)
-      @child_map[char] ||= self.class.new(self)
+      child_map[char] ||= self.class.new(self)
     end
 
     def children
-      @child_map.values
+      child_map.values
     end
 
     def root?
-      parent.nil?
+      !parent
     end
 
     def build_child_suffixes
@@ -89,6 +92,7 @@ class AhoCorasickMatcher
     def find_failure_node(char)
       failure = suffix
       failure = failure.suffix until failure.search(char) || failure.root?
+
       failure
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aho_corasick_matcher
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Matthew MacLeod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -64,3 +64,4 @@ summary: A library to search text for occurrences of a list of strings
 test_files:
 - spec/aho_corasick_matcher_spec.rb
 - spec/spec_helper.rb
+has_rdoc: