From dba23d2cdb835b6aa423e70c85e16c4832121c14 Mon Sep 17 00:00:00 2001
From: Jordan Orelli <jordanorelli@gmail.com>
Date: Thu, 5 Nov 2015 17:39:23 -0500
Subject: [PATCH] cleaning

---
 bristlecode.rb                  | 19 ++++++++++---------
 spec/bristlecode/parser_spec.rb |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bristlecode.rb b/bristlecode.rb
index 1a5b02a..77d36a2 100644
--- a/bristlecode.rb
+++ b/bristlecode.rb
@@ -9,6 +9,15 @@ module Bristlecode
     tree.to_html
   end
 
+  def Bristlecode.clean(text)
+    text.gsub!('&', '&amp;')
+    text.gsub!('<', '&lt;')
+    text.gsub!('>', '&gt;')
+    text.gsub!('"', '&quot;')
+    text.gsub!("'", '&#x27;')
+    text.gsub!('/', '&#x2F;')
+  end
+
   class Parser < Parslet::Parser
     rule(:space) { match('\s').repeat(1) }
     rule(:space?) { space.maybe }
@@ -79,15 +88,7 @@ module Bristlecode
 
     def initialize(text)
       self.text = text.to_str.strip
-      clean
-    end
-
-    def clean
-      text.gsub!('&', '&amp;')
-      text.gsub!('<', '&lt;')
-      text.gsub!('>', '&gt;')
-      text.gsub!('"', '&quot;')
-      text.gsub!("'", '&apos;')
+      Bristlecode.clean(self.text)
     end
 
     def to_html
diff --git a/spec/bristlecode/parser_spec.rb b/spec/bristlecode/parser_spec.rb
index e948f62..4c81d9a 100644
--- a/spec/bristlecode/parser_spec.rb
+++ b/spec/bristlecode/parser_spec.rb
@@ -21,8 +21,9 @@ module Bristlecode
       expect(to_html('&')).to eq('&amp;')
       expect(to_html('>')).to eq('&gt;')
       expect(to_html('<')).to eq('&lt;')
-      expect(to_html("'")).to eq('&apos;')
+      expect(to_html("'")).to eq('&#x27;')
       expect(to_html('"')).to eq('&quot;')
+      expect(to_html('/')).to eq('&#x2F;')
     end
 
     it 'handles plain text just fine' do
@@ -66,7 +67,7 @@ module Bristlecode
 
     it 'passes simple url contents opaquely' do
       input = '[url]x[b]y[/b]z[/url]'
-      output = '<a href="x[b]y[/b]z">x[b]y[/b]z</a>'
+      output = '<a href="x[b]y[/b]z">x[b]y[&#x2F;b]z</a>'
       expect(to_html(input)).to eq(output)
     end