string_master 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dda1d7c572babaf90cfe7be2777a2b7668416f6
-  data.tar.gz: 81914454c060a63d1a57a5a77f542dc86bce209a
+  metadata.gz: 9014d6e022669d3f53cd4390ace1e70c6583087b
+  data.tar.gz: 445a71c28808806e006dee990fead2da4411dd12
 SHA512:
-  metadata.gz: 3979d5c8e3acd3eb1d6ce855200666322913981aa52cd29ec7374db75342f4378b6b7a57b08ccebc16ee3d8e3453e772fbe1b20d18a62290123109c553c14c1e
-  data.tar.gz: 36010284b756e6466badb3920f97567aed71b1af68ad65b204d5a0c05b67795564cd020e48ffa8f6e6bd9cb298d29221fd312e11f680672804be8e6ae603a8de
+  metadata.gz: 8a7dd75b86a3c35b2fbd90897fdcdb8a064a6f1650402dc4461548e893fe0761b084bd4ca34f8f35134b5927040cf30ae116eec6455888d58b49944b94bfeee4
+  data.tar.gz: f8b2bd2821bb6d6e07c4fda1fbe0b49f841424a463574efa4d4d068212756d6708667096be65222ded25626d6ed961555b3a11944895356fa6350920e58d0c95

data/Gemfile.lock

@@ -54,7 +54,7 @@ GEM
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/lib/string_master/string_master.rb

@@ -33,10 +33,12 @@ class StringMaster
   def html_escape(options={})
     except = options[:except] || %w()
     close_tags
-    @modified_string.gsub!(/<\/?([a-zA-Z0-9]*?)(\s[^>]*)?>/) do |tag|
+    @modified_string.gsub!(/<\/?([a-zA-Z0-9]*?)(\s[^>]*?)?>/) do |tag|
       if except.include?($1)
-        # Really sanitizes attributes only here
-        sanitize(tag, :tags => except, :attributes => %w(href src lang))
+        # sanitize attributes
+        tag.gsub(/(\s.+?)=('|").*?\2(?=.*?>)/) do |a|
+          ["href", "src", "lang"].include?($1) ? a : ""
+        end
       else
         h(tag)
       end

data/spec/lib/string_master/string_master_spec.rb

@@ -9,7 +9,9 @@ describe StringMaster do
 
   it "escapes html except for some of the allowed tags" do
     parser = StringMaster.new('<img src="#" style="border: solid 1px green;"><b>Hello</b>')
-    parser.html_escape(:except => %w(img)).string.should == '<img src="#">&lt;b&gt;Hello&lt;/b&gt;'
+    parser.html_escape(:except => %w(img)).string.should == '<img>&lt;b&gt;Hello&lt;/b&gt;'
+    parser = StringMaster.new('<i>hello</i> <b>world</b>')
+    parser.html_escape(:except => %w(b)).to_s.should == '&lt;i&gt;hello&lt;/i&gt; <b>world</b>'
   end
 
   it "makes images of urls that end with .jpg and other image extensions" do

data/string_master.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: string_master 0.3.8 ruby lib
+# stub: string_master 0.3.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "string_master"
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roman Snitko"]
-  s.date = "2015-07-29"
+  s.date = "2015-08-13"
   s.description = "Because every time I create a new webapp, I think about how I should process user-generated content. Should convert urls to links and images? Should I allow certain tags? Should I convert all new lines to *br* tags? Well, now all that is as simple as calling a single method."
   s.email = "roman.snitko@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: string_master
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Roman Snitko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack