hparser 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e9c4a8998be7369d61c61260b30bda66092a2f
-  data.tar.gz: 4d466fc8d360d45fabf4ab2b9a10875271b92a47
+  metadata.gz: 66dc4ee0fd999bad870fd9f26d61d9055da7516e
+  data.tar.gz: 7dc748fef818067722c1cf438bbe25aa6e0278ce
 SHA512:
-  metadata.gz: e4f17441160d92e13b3c67a54014c3febc56ea9e83275061bc7d09b69f5a703269741044f9c3b45adda8bfeb0bdf7dcda999a4248304742156bf1611c7a5e21a
-  data.tar.gz: b8924948ed9c896b96158bab7c8bc8d49140983555c8bb45ad6f812d4b4c482a16fea512e516bdaf2be8a3750b7b9eb1235d45723de6aed4e46f2705457f9965
+  metadata.gz: 5b6a6bb3892c0ae65cea9fbb455c4b94b3f913984254cb6f87049d33d91e6db2a48f662d41b91a0ecd730fb701fd7f7b98876c879381b66d77988f5f54e2b95d
+  data.tar.gz: c2085b5618fb7a6ceca5b3f0b95d5ff1df1d16f5133802c70586283d1f8cb27c3eff1819851aca0a702d5d6e81a0b71ffce379b8d7e740dfc7adf29eca8d146e

data/.travis.yml

@@ -1,3 +1,5 @@
+before_install:
+ - gem install bundler
 rvm:
  - 1.8.7
  - 1.9.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/hparser.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_development_dependency "rake", ">= 0.9.2"
+  gem.add_development_dependency "test-unit", "1.2.3" # for ruby 1.8
   gem.add_development_dependency "pry"
 end
 

data/lib/hparser/html.rb

@@ -4,6 +4,8 @@
 # This file define +to_html+. +to_html+ is convert hatena format to html.
 #
 
+require 'cgi'
+
 module HParser
   # This module provide +to_html+ method.
   # This method is intended to convert  hatena format to html format.
@@ -39,15 +41,8 @@ module HParser
       %(<#{html_tag}>#{content}</#{html_tag}>)
     end
 
-    ESCAPE_TABLE = {
-      '&' => '&amp;',
-      '"' => '&quot;',
-      '<' => '&lt;',
-      '>' => '&gt;'
-    }
-
     def escape(str)
-      str.gsub(/[&"<>]/n) {|c| ESCAPE_TABLE[c] }
+      CGI.escapeHTML(str)
     end
   end
 
@@ -284,22 +279,26 @@ module HParser
 
   module Inline
     class Text
+      include Html
       def to_html
-        self.text
+        # escape < > & " except for HTML tag and HTML entity
+        tag_regex = /(<\/?[a-z]+(?:\s[^>]+)?\/?>|&#\d+;|&#x[0-9a-z]+;|&[a-z]+;)/i
+        self.text.split(tag_regex).map {|e|
+          e.match(tag_regex) ? e : escape(e)
+        }.join
       end
     end
 
     class Url
       include Html
-      require "cgi"
       def to_html
         if @bookmark then
             require 'uri'
-            enc_url = URI.encode(url)
+            enc_url = escape(URI.encode(url))
             bookmark = %( <a href="http://b.hatena.ne.jp/entry/#{enc_url}" class="http-bookmark">) + 
                        %(<img src="http://b.hatena.ne.jp/entry/image/#{enc_url}" alt="" class="http-bookmark"></a>)
         end
-        %(<a href="#{self.url}">#{CGI.escapeHTML(self.title)}</a>#{bookmark})
+        %(<a href="#{escape(self.url)}">#{escape(self.title)}</a>#{bookmark})
       end
     end
 
@@ -329,10 +328,10 @@ module HParser
     end
 
     class Tex
+      include Html
       def to_html
-        require "cgi"
         url = "http://chart.apis.google.com/chart?cht=tx&chf=bg,s,00000000&chl=" + CGI.escape(self.text)
-        %(<img src="#{url}" class="tex" alt="#{CGI.escapeHTML(self.text)}">)
+        %(<img src="#{escape(url)}" class="tex" alt="#{escape(self.text)}">)
       end
     end
 

data/test/test_inline_html.rb

@@ -27,6 +27,10 @@ class HtmlInlineTest < Test::Unit::TestCase
     assert_same '<img src="http://example.com/" />'
     assert_same '<iframe src="http://example.com/"></iframe>'
     assert_same '<a href="http://example.com/"></a>'
+    assert_same '<br/>'
+    assert_same 'a &amp; &#39;b&#x3a;'
+    assert_html 'a &lt; &quot;b&quot; <img src="http://example.com/"/> c &lt;&gt; d',
+                'a < "b" <img src="http://example.com/"/> c <> d'
   end
 
   def test_id
@@ -40,14 +44,16 @@ class HtmlInlineTest < Test::Unit::TestCase
   def test_url
     assert_html '<a href="http://mzp.sakura.ne.jp">http://mzp.sakura.ne.jp</a>',
                 'http://mzp.sakura.ne.jp'
+    assert_html '<a href="http://example.com/?a=b&amp;c=d">http://example.com/?a=b&amp;c=d</a>',
+                'http://example.com/?a=b&c=d'
     assert_html '<a href="http://example.com/">TITLE</a>',
                 '[http://example.com/:title=TITLE]'
     assert_html '<a href="http://example.com/">A&amp;B</a>',
                 '[http://example.com/:title=A&B]'
-    assert_html '<a href="http://example.com/#a">TITLE</a> ' + 
-                '<a href="http://b.hatena.ne.jp/entry/http://example.com/%23a" class="http-bookmark">' + 
-                '<img src="http://b.hatena.ne.jp/entry/image/http://example.com/%23a" alt="" class="http-bookmark"></a>',
-                '[http://example.com/#a:title=TITLE:bookmark]'
+    assert_html '<a href="http://example.com/?a=b&amp;c=d#a">TITLE</a> ' + 
+                '<a href="http://b.hatena.ne.jp/entry/http://example.com/?a=b&amp;c=d%23a" class="http-bookmark">' + 
+                '<img src="http://b.hatena.ne.jp/entry/image/http://example.com/?a=b&amp;c=d%23a" alt="" class="http-bookmark"></a>',
+                '[http://example.com/?a=b&c=d#a:title=TITLE:bookmark]'
   end
 
   def test_fotolife
@@ -57,7 +63,7 @@ class HtmlInlineTest < Test::Unit::TestCase
   end
 
   def test_tex
-    assert_html '<img src="http://chart.apis.google.com/chart?cht=tx&chf=bg,s,00000000&chl=e%5E%7Bi%5Cpi%7D+%3D+-1"' +
+    assert_html '<img src="http://chart.apis.google.com/chart?cht=tx&amp;chf=bg,s,00000000&amp;chl=e%5E%7Bi%5Cpi%7D+%3D+-1"' +
                 ' class="tex" alt="e^{i\pi} = -1">',
                 '[tex:e^{i\pi} = -1]'
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hparser
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - HIROKI Mizuno
@@ -10,34 +10,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Hatena Syntax parser for Ruby
@@ -46,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - ChangeLog
 - Gemfile
 - README.rdoc
@@ -122,45 +136,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Hatena Syntax parser for Ruby
-test_files:
-- test/integration_texts/error1.ok.hatena
-- test/test_block.rb
-- test/test_bruteforce.rb
-- test/test_dl.rb
-- test/test_footnote.rb
-- test/test_fotolife.rb
-- test/test_from_perl/01_module.t
-- test/test_from_perl/02_module_extend.t
-- test/test_from_perl/10_autolink.t
-- test/test_from_perl/11_autolink_extend.t
-- test/test_hatena.rb
-- test/test_head.rb
-- test/test_helper.rb
-- test/test_html.rb
-- test/test_id.rb
-- test/test_inline.rb
-- test/test_inline_html.rb
-- test/test_integration.rb
-- test/test_latex.rb
-- test/test_p.rb
-- test/test_pair.rb
-- test/test_quote.rb
-- test/test_see_more.rb
-- test/test_table.rb
-- test/test_tex.rb
-- test/test_text.rb
-- test/test_url.rb
+test_files: []