touch_up 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0e8e7732cb168af2fcebc057b581d3624cca0dd
-  data.tar.gz: 7a840cc995e6894e3626f0423d0399b979b574a9
+  metadata.gz: 21e2b827a0177d7b09510de6bddfdd1ece2d49d9
+  data.tar.gz: ff3e7c1f9f5515a14f2a2d160b8e9ae9cfba5381
 SHA512:
-  metadata.gz: 1d06a1c676356c0ac58ed6a1a00ab8117d730eec34db0a6fb922549ca2890e80a1adfb00b964e470118c2c8b6763ada0c1455f62958aba419e90c5224e154aef
-  data.tar.gz: 5b9ea08ad8b37e15819a4741719979789e5997b74e3d3f8f982b35daf2a89e168a2e7238bb56e087e6ab543dc34d772de1c66a123202e435dd1cc7efe6b33608
+  metadata.gz: 6b4fb2f52a70eccf56802c4798291dacf3ea1572994610e461560220afa7a7e5eb87e42e881daabd7ee56347c79c43c7313840d6b89a0f61ad34f78377f3b697
+  data.tar.gz: dc76871bc2ed6d0ceaf73864b964da5e0fa4cc25d7e02a453a5b5e382f6bd5ba0aa170a576ca74f3017c27587da738555fc1700f2eeff6da078449737c7c8a33

data/VERSION

@@ -1 +1 @@
-2.0.0
+3.0.0

data/lib/touch_up.rb

@@ -4,7 +4,9 @@ require 'twitter-text'
 
 class Touch_Up
 
-  NOTHING = ''.freeze
+  NOTHING    = ''.freeze
+  HREFS      = %r@(\*([^\*]+)\*\s+)?([^\.\s]+\.[^\.\s]+[^\s]+[^\.\s])@
+  MARK_DOWNS = /(\&\#47\;|~~|\*)([^\1\<\>]+)(\1)/
 
   include Twitter::Extractor
 
@@ -16,36 +18,33 @@ class Touch_Up
   end
 
   def to_html
-    @origin.
+    splits = Escape_Escape_Escape.html(@origin).gsub(HREFS) { |full, match|
 
-      # "a" (anchor) tags, auto-linking
-      gsub(%r@(\*([^\*]+)\*\s+)?([^\.\s]+\.[^\.\s]+[^\s]+[^\.\s])@) { |full, match|
+      raw_text   = $2 ? Escape_Escape_Escape.decode_html($2) : nil
+      raw_append = Escape_Escape_Escape.decode_html $3
+      raw_link   = extract_urls(raw_append).first
 
-      text = $2
-      raw_link = Escape_Escape_Escape.decode_html($3)
-
-      link = extract_urls(raw_link).first
-
-      if !link
+      if !raw_link
         full
       else
 
-        append           = raw_link.sub(link, NOTHING)
-        short_link       = link
-        clean_short_link = Escape_Escape_Escape.html(short_link)
+        append   = Escape_Escape_Escape.html raw_append.sub(raw_link, NOTHING)
+        text     = if raw_text
+                     Escape_Escape_Escape.html(raw_text)
+                   else
+                     Escape_Escape_Escape.html(raw_link)
+                   end
+
+        raw_link = Escape_Escape_Escape.decode_html(raw_link)
 
-        if !link['://']
-          link = 'http://' + link
+        if !raw_link['://']
+          raw_link = 'http://' + raw_link
         end
 
         begin
-          clean_link = Escape_Escape_Escape.href(link)
+          link = Escape_Escape_Escape.href(raw_link)
 
-          if text
-            "<a href=\"#{clean_link}\">#{text}</a>#{append}"
-          else
-            "<a href=\"#{clean_link}\">#{clean_short_link}</a>#{append}"
-          end
+          "<a href=\"#{link}\">#{text}</a>#{append}"
 
         rescue Escape_Escape_Escape::Invalid_HREF
           full
@@ -54,22 +53,33 @@ class Touch_Up
       end # if
 
 
-    }.
-
+    }.split(/(\<[^\>]+\>[^\<]+\<\/[^\>]+\>)/)
 
     # "i", "del", "strong" tags
-    gsub(/([\*\/\-\~]{1,2})([^\1\<\>]+)(\1)/) { |full, match|
-      case
-      when $1 == $3 && $1 == '/'
-        "<i>#{$2}</i>"
-      when $1 == '~~' && $3 == '~~'
-        "<del>#{$2}</del>"
-      when $1 == $3 && $1 == '*'
-        "<strong>#{$2}</strong>"
-      else
-        full
+    final = ""
+    i = 0
+    while i < splits.size
+      final << (splits[i].gsub(MARK_DOWNS) { |full, match|
+        case
+        when $1 == $3 && $1 == '&#47;'
+          "<i>#{$2}</i>"
+        when $1 == '~~' && $3 == '~~'
+          "<del>#{$2}</del>"
+        when $1 == $3 && $1 == '*'
+          "<strong>#{$2}</strong>"
+        else
+          full
+        end
+      })
+
+      i += 1
+      if splits[i]
+        final << splits[i]
+        i += 1
       end
-    }
+    end
+
+    final
 
   end
 

data/specs/0010-it-runs.rb

@@ -2,12 +2,8 @@
 describe 'italics' do
 
   it "turns slash-ed text into italics: /slash/ <i>slash</i>" do
-    text = Touch_Up.new(<<-EOF)
-      This is my /slash/ text.
-    EOF
-    text.to_html.strip.should == <<-EOF.strip
-      This is my <i>slash</i> text.
-    EOF
+    Touch_Up.new("This is my /slash/ text.").
+      to_html.strip.should == "This is my <i>slash</i> text."
   end # === it turns slash-ed text into italics: /slash/ <i>slash</i>
 
   it "leaves surrounding chars alone: I am super-/slanted/." do
@@ -20,10 +16,8 @@ end # === describe 'italics'
 describe "strong" do
 
   it "turns star-ed text to strong: *bold* <strong>bold</strong>" do
-    text = Touch_Up.new(<<-EOF)
-      This is my brave and *bold* text.
-    EOF
-    text.to_html.strip.should == <<-EOF.strip
+    Touch_Up.new("This is my brave and *bold* text.").
+      to_html.strip.should == <<-EOF.strip
       This is my brave and <strong>bold</strong> text.
     EOF
   end # === it turns star-ed text to strong: *bold* <strong>bold</strong>
@@ -38,12 +32,8 @@ end # === describe "strong"
 describe "strikethrough" do
 
   it "turns strikethrough text to :del: ~~del~~ <del>del</del>" do
-    text = Touch_Up.new(<<-EOF)
-      This is my ~~old~~ text.
-    EOF
-    text.to_html.strip.should == <<-EOF.strip
-      This is my <del>old</del> text.
-    EOF
+    Touch_Up.new("This is my ~~old~~ text.").
+      to_html.strip.should == "This is my <del>old</del> text."
   end # === it "turns strikethrough-ed text to strong: ~~del~~ <del>del</del>" do
 
   it "leaves surrounding chars alone: I am re~~deleted~~ed." do
@@ -56,18 +46,24 @@ end # === describe "strikethrough"
 describe "linking" do
 
   it "turns text into links: *my link* google.com" do
-    text = Touch_Up.new "This is *my link* google.com."
-    text.to_html.should == "This is <a href=\"http:&#47;&#47;google.com\">my link</a>."
+    href="google.com"
+    Touch_Up.new("This is *my link* #{href}.").
+      to_html.should == "This is <a href=\"#{Escape_Escape_Escape.href "http://#{href}"}\">my link</a>."
   end
 
   it "turns only text with a period inside to links: text. vs my.text." do
-    text = Touch_Up.new "This is *bold* text. This is my *link* lewrockwell.com."
-    text.to_html.should == "This is <strong>bold</strong> text. This is my <a href=\"http:&#47;&#47;lewrockwell.com\">link</a>."
+    link  = "lewrockwell.com"
+    clean = Escape_Escape_Escape.href "http://#{link}"
+    Touch_Up.new(
+      "This is *bold* text. This is my *link* #{link}."
+    ).to_html.should ==
+      "This is <strong>bold</strong> text. This is my <a href=\"#{clean}\">link</a>."
   end
 
   it "does not create invalid links: javascript://alert('text.text')" do
-    Touch_Up.new("This is my *link* javascript://alert('text.text').").
-    to_html.should == "This is my <strong>link</strong> javascript://alert('text.text')."
+    link = "javascript://alert('text.text')"
+    Touch_Up.new("This is my *link* #{link}.").
+    to_html.should == "This is my <strong>link</strong> #{Escape_Escape_Escape.html link}."
   end
 
   it "ignores ending punctuation: .com." do
@@ -98,7 +94,7 @@ describe "linking" do
   it "does not auto-link invalid urls: http://www.yahoo.com/&" do
     txt = "This is invalid: http://кц.рф"
     Touch_Up.new(txt).
-      to_html.should == txt
+      to_html.should == Escape_Escape_Escape.html(txt)
   end
 
   it "does not double-escape hrefs" do

data/specs/0011-escaping.rb

@@ -0,0 +1,40 @@
+
+describe 'escaping' do
+
+  it "escapes text" do
+    text = "<strong>text</strong>"
+    actual = Touch_Up.new("#{text} *text*").to_html
+
+    actual.should == "#{Escape_Escape_Escape.html text} <strong>text</strong>"
+  end # === it escapes text
+
+  it "accepts escaped text, w/o double escaping it" do
+    text = "<strong>e</strong>"
+    actual = Touch_Up.new(
+      Escape_Escape_Escape.html "#{text} *text*"
+    ).to_html
+
+    actual.should == "#{Escape_Escape_Escape.html text} <strong>text</strong>"
+  end # === it accespts escaped text, w/o double escaping it
+
+  it "escapes :href, not just html" do
+    href = "http://www.example.com/?test='test"
+    e_href = Escape_Escape_Escape.href(href)
+    actual = Touch_Up.new("*my href* #{href}").to_html
+
+    actual.should == %^<a href="#{e_href}">my href</a>^
+  end # === it escapes :href, not just html
+
+  it "escapes content of :a tags" do
+    href = "http://www.example.com/"
+    e_href = Escape_Escape_Escape.href(href)
+
+    text = "my <href>"
+    e_text = Escape_Escape_Escape.html(text)
+    actual = Touch_Up.new("*#{text}* #{href}").to_html
+
+    actual.should == %^<a href="#{e_href}">#{e_text}</a>^
+  end # === it escapes content of :a tags
+
+end # === describe 'escaping'
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: touch_up
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -109,6 +109,7 @@ files:
 - VERSION
 - lib/touch_up.rb
 - specs/0010-it-runs.rb
+- specs/0011-escaping.rb
 - specs/lib/helpers.rb
 - touch_up.gemspec
 homepage: https://github.com/da99/touch_up