html_terminator 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bb5210795341af31d333be566cb6ff673a4dce3
-  data.tar.gz: 00589ce6418e7af7f0ef38670eaf3fce10abfbd2
+  metadata.gz: 7290d4a6c7f8e108d9df4b7e77e75b6069bc74f2
+  data.tar.gz: 4f0facdb558e55c8ff3edb0344b3758b62bcb38a
 SHA512:
-  metadata.gz: 9426fa5939c9b35d2bdc8b5c2944b02554fd005179db9b24c4312640aa6e8aa4cadd6c929a6a46eb813a514afae51074c3e58c2090020b79fc55710b75ac9d92
-  data.tar.gz: dd1f6ad48c8326aee8c3b22e5c2709ebba530e64e55200673ffecbd2212358e374f569eecffe49d8e6f2e4c47a0a932a13d2c09d53d795810c2f01a4d8d9fcfd
+  metadata.gz: 5688b605b7dfbf502da3393b394b7924ecb053458fc469cec30dfcfddac971271fe2e04a73a6fdb9199122caa3850b0e110dddb528f68f2e2d78e80449b6944f
+  data.tar.gz: d30608cee5cb486746e7428ce5a0801a5710bebe0601338b0049bfa69c110cdcd24b99af96ab0755ea4c3c17b31e6c30f157945f49d3ea2279523bbfc6ccf742

data/.travis.yml

@@ -1,4 +1,7 @@
 script: bundle exec rspec
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
+gemfile: Gemfile.ci

data/Gemfile.ci

@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in html_terminator.gemspec
+gemspec
+
+group :test do
+  gem "activerecord", "~> 4.2"
+  gem "sqlite3"
+  gem "rspec"
+end

data/html_terminator.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["steel@polleverywhere.com", "matt@polleverywhere.com"]
   spec.description   = %q{Terminate Active Records fields of html}
   spec.summary       = %q{Terminate Active Records fields of html}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/polleverywhere/html_terminator/"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/html_terminator.rb

@@ -11,7 +11,7 @@ module HtmlTerminator
     if val.is_a?(String)
       # Sanitize produces escaped content.
       # Unescape it to get the raw html
-      CGI.unescapeHTML(Sanitize.fragment(val, config).strip).html_safe
+      CGI.unescapeHTML(Sanitize.fragment(val, config).strip)
     else
       val
     end

data/lib/html_terminator/version.rb

@@ -1,3 +1,3 @@
 module HtmlTerminator
-  VERSION = "3.0.0"
-end
+  VERSION = "4.0.0"
+end

data/spec/html_terminator_spec.rb

@@ -5,60 +5,65 @@ describe HtmlTerminator do
     user = OnlyFirstName.new
 
     user.first_name = "Hello <img>"
-    user.first_name.should == "Hello"
+    expect(user.first_name).to eql("Hello")
 
     user.last_name = "Hello <img>"
-    user.last_name.should == "Hello <img>"
+    expect(user.last_name).to eql("Hello <img>")
 
     user.age = 3
-    user.age.should == 3
+    expect(user.age).to eql(3)
   end
 
   it "doesn't escape ampersands" do
     user = OnlyFirstName.new
 
     user.first_name = "A & B & C"
-    user.first_name.should == "A & B & C"
+    expect(user.first_name).to eql("A & B & C")
   end
 
   it "skips sanitize when only one bracket" do
     user = OnlyFirstName.new
 
     user.first_name = "1 < 2"
-    user.first_name.should == "1 < 2"
+    expect(user.first_name).to eql("1 < 2")
 
     user.first_name = "2 > 1"
-    user.first_name.should == "2 > 1"
+    expect(user.first_name).to eql("2 > 1")
   end
 
   it "handles ampersands" do
     user = OnlyFirstName.new
 
     user.first_name = "Mr. & Mrs. Smith"
-    user.first_name.should == "Mr. & Mrs. Smith"
+    expect(user.first_name).to eql("Mr. & Mrs. Smith")
   end
 
   it "doesn't blow up if value is not a string" do
     user = OnlyFirstName.new
     user.first_name = 1
-    user.first_name.should == "1"
+    expect(user.first_name).to eql("1")
   end
 
   it "honors options that are passed in" do
     user = FirstNameWithOptions.new
     user.first_name = "Hello <flexbox></flexbox><hr><br><img>"
-    user.first_name.should == "Hello <flexbox></flexbox>"
+    expect(user.first_name).to eql("Hello <flexbox></flexbox>")
   end
 
   describe "#sanitize" do
     it "strips out all html by default" do
       val = HtmlTerminator.sanitize "<flexbox></flexbox><hr><br><img>"
-      val.should == ""
+      expect(val).to eql("")
     end
 
-    it "marks the output as html_safe" do
+    it "does not mark the output as html_safe" do
       val = HtmlTerminator.sanitize "<flexbox></flexbox><hr><br><img>"
-      val.html_safe?.should == true
+      expect(val.html_safe?).to eql(false)
+    end
+
+    it "does not escape output that isn't stripped" do
+      val = HtmlTerminator.sanitize "<div>I said, \"Hello, John O'hare.\"</div>"
+      expect(val).to eql("I said, \"Hello, John O'hare.\"")
     end
   end
 
@@ -67,8 +72,8 @@ describe HtmlTerminator do
     user.first_name = "Hello <br><strong>strong</strong><em>em</em>"
     user.last_name = "Hello <br><strong>strong</strong><em>em</em>"
 
-    user.first_name.should == "Hello  <strong>strong</strong>em"
-    user.last_name.should == "Hello  strong<em>em</em>"
+    expect(user.first_name).to eql("Hello  <strong>strong</strong>em")
+    expect(user.last_name).to eql("Hello  strong<em>em</em>")
   end
 
   it "sanitizes on validation" do
@@ -77,7 +82,7 @@ describe HtmlTerminator do
     user.last_name = "Hello <br><strong>strong</strong><em>em</em>"
     user.valid?
 
-    user.read_attribute(:first_name).should == "Hello  <strong>strong</strong>em"
-    user.read_attribute(:last_name).should == "Hello  strong<em>em</em>"
+    expect(user.read_attribute(:first_name)).to eql("Hello  <strong>strong</strong>em")
+    expect(user.read_attribute(:last_name)).to eql("Hello  strong<em>em</em>")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: html_terminator
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Steel Fu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-04 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
+- Gemfile.ci
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -75,7 +76,7 @@ files:
 - spec/html_terminator_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_record.rb
-homepage: ''
+homepage: https://github.com/polleverywhere/html_terminator/
 licenses:
 - MIT
 metadata: {}
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Terminate Active Records fields of html