rubypants 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9822934b5585190847395099959027911beb2f3
-  data.tar.gz: f12b3db11d8f4c77e3c48fadfc6a1360895b4f8e
+  metadata.gz: 505ccfdec7463152b84a66f2d0c0b6ee4df7d958
+  data.tar.gz: 8e04eed0de2037978c2733121d4021f96b6fffb7
 SHA512:
-  metadata.gz: 3cdf93d5b4c9bfc7d3343d5b55ca8474955b15f689529db1d639dfba292785db6c99b985c4456ec3c025735344d4ca27b4cc9e5febd70b53825182b95758c5d0
-  data.tar.gz: c9488f204e20f28cd8e7913a8bbda9b0e912c62fd167c873c6d7b24a7a5b9863c015f28f1a9d3c7fbc06bcd2c446da6f3b1c734eb926b23c3c849ff8c3a85b06
+  metadata.gz: d87f017e65610d9c582195716164ecfef7006d4125b1754f0901b269a32f54232fa139c06c6cd1797748222e303f007e32857cdf6b2b3133dc58f4e3a7588acc
+  data.tar.gz: 07b29cb1837778b5c54bc18e6345f8202c51366d42f51c6d5436008b2e54da9d79de6a7c5bb601fefe854f0f9c04da936f0abd1b87315b6649ac8d9f6d44b952

data/lib/rubypants/core.rb

@@ -84,7 +84,7 @@ class RubyPants < String
     tokens = tokenize
 
     # Keep track of when we're inside <pre> or <code> tags.
-    in_pre = false
+    in_pre = nil
 
     # Here is the result stored in.
     result = ""
@@ -98,8 +98,14 @@ class RubyPants < String
     tokens.each do |token|
       if token.first == :tag
         result << token[1]
-        if token[1] =~ %r!<(/?)(?:pre|code|kbd|script|style|math)[\s>]!
-          in_pre = ($1 != "/")  # Opening or closing tag?
+        if token[1].end_with? '/>'
+          # ignore self-closing tags
+        elsif token[1] =~ %r!\A<(/?)(pre|code|kbd|script|style|math)[\s>]!
+          if $1 == '' && ! in_pre
+            in_pre = $2
+          elsif $1 == '/' && $2 == in_pre
+            in_pre = nil
+          end
         end
       else
         t = token[1]
@@ -178,12 +184,23 @@ class RubyPants < String
       gsub('\`',   '&#96;')
   end
 
+  def self.n_of(n, x)
+    x = Regexp.escape(x)
+    /(?<!#{x})   # not preceded by x
+     #{x}{#{n}}  # n of x
+     (?!#{x})    # not followed by x
+    /x
+  end
+
+  DOUBLE_DASH = n_of(2, '-')
+  TRIPLE_DASH = n_of(3, '-')
+
   # The string, with each instance of "<tt>--</tt>" translated to an
   # em-dash HTML entity.
   #
   def educate_dashes(str)
     str.
-      gsub(/--/, entity(:em_dash))
+      gsub(DOUBLE_DASH, entity(:em_dash))
   end
 
   # The string, with each instance of "<tt>--</tt>" translated to an
@@ -192,8 +209,8 @@ class RubyPants < String
   #
   def educate_dashes_oldschool(str)
     str.
-      gsub(/---/, entity(:em_dash)).
-      gsub(/--/,  entity(:en_dash))
+      gsub(TRIPLE_DASH, entity(:em_dash)).
+      gsub(DOUBLE_DASH, entity(:en_dash))
   end
 
   # Return the string, with each instance of "<tt>--</tt>" translated
@@ -208,8 +225,8 @@ class RubyPants < String
   #
   def educate_dashes_inverted(str)
     str.
-      gsub(/---/, entity(:en_dash)).
-      gsub(/--/,  entity(:em_dash))
+      gsub(TRIPLE_DASH, entity(:en_dash)).
+      gsub(DOUBLE_DASH, entity(:em_dash))
   end
 
   # Return the string, with each instance of "<tt>...</tt>" translated
@@ -218,8 +235,8 @@ class RubyPants < String
   #
   def educate_ellipses(str)
     str.
-      gsub('...',   entity(:ellipsis)).
-      gsub('. . .', entity(:ellipsis))
+      gsub(RubyPants.n_of(3, '.'), entity(:ellipsis)).
+      gsub(/(?<!\.|\. )\. \. \.(?!\.| \.)/, entity(:ellipsis))
   end
 
   # Return the string, with "<tt>``backticks''</tt>"-style single quotes

data/lib/rubypants/version.rb

@@ -1,3 +1,3 @@
 class RubyPants
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/test/rubypants_test.rb

@@ -69,41 +69,51 @@ EOF
 
   def test_dashes
     assert_rp_equal "foo--bar", 'foo—bar', 1
-    assert_rp_equal "foo---bar", 'foo—-bar', 1
-    assert_rp_equal "foo----bar", 'foo——bar', 1
-    assert_rp_equal "foo-----bar", 'foo——-bar', 1
+    assert_rp_equal "foo---bar", 'foo---bar', 1
+    assert_rp_equal "foo----bar", 'foo----bar', 1
     assert_rp_equal "--foo--bar--quux--",
                     '—foo—bar—quux—', 1
 
     assert_rp_equal "foo--bar", 'foo–bar', 2
     assert_rp_equal "foo---bar", 'foo—bar', 2
-    assert_rp_equal "foo----bar", 'foo—-bar', 2
-    assert_rp_equal "foo-----bar", 'foo—–bar', 2
+    assert_rp_equal "foo----bar", 'foo----bar', 2
     assert_rp_equal "--foo--bar--quux--",
                     '–foo–bar–quux–', 2
 
     assert_rp_equal "foo--bar", 'foo—bar', 3
     assert_rp_equal "foo---bar", 'foo–bar', 3
-    assert_rp_equal "foo----bar", 'foo–-bar', 3
-    assert_rp_equal "foo-----bar", 'foo–—bar', 3
+    assert_rp_equal "foo----bar", 'foo----bar', 3
     assert_rp_equal "--foo--bar--quux--",
                     '—foo—bar—quux—', 3
+  end
 
-    # mixed with HTML comments
+  def test_html_comments
     assert_verbatim "<!-- comment -->"
     assert_verbatim "<!-- <p>foo bar</p> -->"
     assert_rp_equal "--<!-- -- -->--", '&#8211;<!-- -- -->&#8211;'
   end
 
+  def test_pre_tags
+    assert_verbatim "<pre>--</pre>"
+    assert_verbatim "<pre><code>--</code>--</pre>"
+    assert_rp_equal "--<pre>--</pre>", '&#8211;<pre>--</pre>'
+  end
+
   def test_ellipses
     assert_rp_equal "foo..bar", 'foo..bar'
     assert_rp_equal "foo...bar", 'foo&#8230;bar'
-    assert_rp_equal "foo....bar", 'foo&#8230;.bar'
+    assert_rp_equal "foo....bar", 'foo....bar'
+
+    # dots and spaces
+    assert_rp_equal "foo. . .bar", 'foo&#8230;bar'
+    assert_rp_equal "foo . . . bar", 'foo &#8230; bar'
+    assert_rp_equal "foo. . . .bar", 'foo. . . .bar'
+    assert_rp_equal "foo . . . . bar", 'foo . . . . bar'
 
     # Nasty ones
-    assert_rp_equal "foo. . ..bar", 'foo&#8230;.bar'
+    assert_rp_equal "foo. . ..bar", 'foo. . ..bar'
     assert_rp_equal "foo. . ...bar", 'foo. . &#8230;bar'
-    assert_rp_equal "foo. . ....bar", 'foo. . &#8230;.bar'
+    assert_rp_equal "foo. . ....bar", 'foo. . ....bar'
   end
 
   def test_backticks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubypants
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Gruber