zfben_extend 0.0.2 → 0.0.3

data/lib/zfben_extend/string.rb

@@ -5,7 +5,7 @@ class ZfbenExtend::String < String
       link: true,
       link_regexp: /[a-zA-Z]{3,}:\/\/\S+/,
       tag: true,
-      tag_regexp: /#[a-zA-Z0-9]+/,
+      tag_regexp: /&?#[a-zA-Z0-9]+/,
       tag_url: '/tags/',
       mail: true,
       mail_regexp: /[a-zA-Z0-9.-]+@[a-zA-Z0-9]+\.[a-zA-Z0-9.]+/,
@@ -27,8 +27,12 @@ class ZfbenExtend::String < String
     if options[:tag]
       data[:tag] = []
       text = text.gsub(options[:tag_regexp]){ |tag|
-        data[:tag].push('<a href="' + options[:tag_url] + tag.gsub('#', '') + '">' + tag + '</a>')
-        'ZFBENTAG' + (data[:tag].length - 1).to_s + 'ZFBENTAG'
+        if tag[0] != '&'
+          data[:tag].push('<a href="' + options[:tag_url] + tag.gsub('#', '') + '">' + tag + '</a>')
+          'ZFBENTAG' + (data[:tag].length - 1).to_s + 'ZFBENTAG'
+        else
+          tag
+        end
       }
     end
     

data/test/string_test.rb

@@ -28,10 +28,12 @@ class TestToHtml < Test::Unit::TestCase
     assert_equal ZfbenExtend::String.to_html('#a', tag: false), '#a'
     assert_equal ZfbenExtend::String.to_html('#a'), '<a href="/tags/a">#a</a>'
     assert_equal ZfbenExtend::String.to_html('text #a #b'), 'text <a href="/tags/a">#a</a> <a href="/tags/b">#b</a>'
+    assert_equal ZfbenExtend::String.to_html('&#39;s'), '&#39;s'
     
     assert_equal ZfbenExtend::String.new('#a').to_html(tag: false), '#a'
     assert_equal ZfbenExtend::String.new('#a').to_html, '<a href="/tags/a">#a</a>'
     assert_equal ZfbenExtend::String.new('text #a #b').to_html, 'text <a href="/tags/a">#a</a> <a href="/tags/b">#b</a>'
+    assert_equal ZfbenExtend::String.new('&#39;s').to_html, '&#39;s'
   end
   
   def test_mail

data/zfben_extend.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'zfben_extend'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.authors     = ['Ben']
   s.email       = ['ben@zfben.com']
   s.homepage    = 'https://github.com/benz303/zfben_extend'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zfben_extend
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email: