From d09e8a375876081334cf96775ba6ddff8aceb550 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@online.de>
Date: Fri, 13 Feb 2015 02:39:21 +0100
Subject: [PATCH] Bump markdown-it-sanitizer

---
 Gemfile                                             | 4 ++--
 Gemfile.lock                                        | 8 ++++----
 spec/javascripts/app/helpers/text_formatter_spec.js | 9 +++++++++
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index dda521947..b04ae88b1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,10 +89,10 @@ gem 'rails-assets-jquery',                              '1.11.1' # Should be kep
 gem 'js_image_paths',                                   '0.0.1'
 gem 'js-routes',                                        '0.9.9'
 gem 'rails-assets-punycode',                            '1.3.2'
-gem 'rails-assets-markdown-it',                         '3.0.5'
+gem 'rails-assets-markdown-it',                         '3.0.6'
 gem 'rails-assets-markdown-it-hashtag',                 '0.2.3'
 gem 'rails-assets-markdown-it-diaspora-mention',        '0.2.0'
-gem 'rails-assets-markdown-it-sanitizer',               '0.2.0'
+gem 'rails-assets-markdown-it-sanitizer',               '0.2.1'
 gem 'rails-assets-markdown-it--markdown-it-for-inline', '0.1.0'
 gem 'rails-assets-markdown-it-sub',                     '0.1.0'
 gem 'rails-assets-markdown-it-sup',                     '0.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 12d8a969f..c828e38c1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -444,10 +444,10 @@ GEM
     rails-assets-jquery.slimscroll (1.3.3)
       rails-assets-jquery (>= 1.7)
     rails-assets-markdown-it--markdown-it-for-inline (0.1.0)
-    rails-assets-markdown-it (3.0.5)
+    rails-assets-markdown-it (3.0.6)
     rails-assets-markdown-it-diaspora-mention (0.2.0)
     rails-assets-markdown-it-hashtag (0.2.3)
-    rails-assets-markdown-it-sanitizer (0.2.0)
+    rails-assets-markdown-it-sanitizer (0.2.1)
     rails-assets-markdown-it-sub (0.1.0)
     rails-assets-markdown-it-sup (0.1.0)
     rails-assets-perfect-scrollbar (0.5.7)
@@ -698,11 +698,11 @@ DEPENDENCIES
   rails-assets-jquery-idletimer (= 1.0.1)
   rails-assets-jquery-placeholder (= 2.0.8)
   rails-assets-jquery-textchange (= 0.2.3)
-  rails-assets-markdown-it (= 3.0.5)
+  rails-assets-markdown-it (= 3.0.6)
   rails-assets-markdown-it--markdown-it-for-inline (= 0.1.0)
   rails-assets-markdown-it-diaspora-mention (= 0.2.0)
   rails-assets-markdown-it-hashtag (= 0.2.3)
-  rails-assets-markdown-it-sanitizer (= 0.2.0)
+  rails-assets-markdown-it-sanitizer (= 0.2.1)
   rails-assets-markdown-it-sub (= 0.1.0)
   rails-assets-markdown-it-sup (= 0.1.0)
   rails-assets-perfect-scrollbar (= 0.5.7)
diff --git a/spec/javascripts/app/helpers/text_formatter_spec.js b/spec/javascripts/app/helpers/text_formatter_spec.js
index 1e7c7ac04..a236b2620 100644
--- a/spec/javascripts/app/helpers/text_formatter_spec.js
+++ b/spec/javascripts/app/helpers/text_formatter_spec.js
@@ -111,6 +111,15 @@ describe("app.helpers.textFormatter", function(){
         expect(linkElement.text()).toContain(link);
         expect(linkElement.attr("target")).toContain("_blank");
       });
+
+      expect(this.formatter('<http://google.com>')).toContain('<a href');
+      expect(this.formatter('<http://google.com>')).toContain('_blank');
+    });
+
+    it("respects code blocks", function() {
+      var content = '`<unknown tag>`';
+      var wrapper = $('<div>').html(this.formatter(content));
+      expect(wrapper.find('code').text()).toEqual('<unknown tag>');
     });
 
     context("symbol conversion", function() {