linky 0.0.1 → 0.0.2

data/lib/linky/linky.rb

@@ -24,13 +24,13 @@ class Linky
     def real_link(needle, haystack, &block)
       # if we've drilled down all the way to a raw text node,
       # and it contains the needle we're looking for
-      if haystack.text? && (match = haystack.content.match(/(#{needle})/i))
+      if haystack.text? && (match = haystack.content.match(/^.*?\b(#{needle})(?:\b.*)?$/i))
         
         # call the block to determine what we'll replace the needle with
-        new_needle = block.call match[0]
+        new_needle = block.call match[1]
        
         # break the string into three parts
-        prefix, keyword, postfix = break_on_boundary match[0], haystack.to_s 
+        prefix, keyword, postfix = break_on_boundary match[1], haystack.to_s 
         
         haystack.content = prefix
         haystack.add_next_sibling Nokogiri::HTML::DocumentFragment.parse(new_needle)
@@ -38,15 +38,18 @@ class Linky
           haystack.next_sibling.add_next_sibling Nokogiri::HTML::DocumentFragment.parse(postfix)
           haystack.next_sibling.next_sibling.content = postfix
         end
+        true
       elsif haystack.name != "a" && haystack.respond_to?(:children)
+        found = false
         haystack.children.each do |child|
-          real_link needle, child, &block 
+          found = real_link needle, child, &block unless found
         end
+        found
       end
     end
 
     def break_on_boundary(boundary, string)
-      match = string.match /^(.*)(#{boundary})(.*)$/
+      match = string.match /^(.*?\b)(#{boundary})(\b.*)?$/
       return match[1], match[2], match[3]
     end
   end

data/spec/linky_spec.rb

@@ -18,4 +18,10 @@ describe Linky, "#link" do
     new_html = Linky.link(@keyword, "http://link.to.somewhere", @html, :class => "autolinked")
     new_html.should == "<p>some html with <a href=\"http://link.to.somewhere\" class=\"autolinked\">keyword</a> and Keyword and <a href=\"#\">keyword</a></p>"
   end
+
+  it "should match on whole words (i.e., don't link partial words within words)" do
+    html = "hi there, he is funny and he is a he.<div>more he stuff.</div>"
+    new_html = Linky.link "he", "#he", html
+    new_html.should == "hi there, <a href=\"#he\">he</a> is funny and he is a he.<div>more he stuff.</div>"
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: linky
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matt Parker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 -05:00
+date: 2010-12-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,8 +53,8 @@ homepage: http://github.com/moonmaster9000/linky
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement