typogruby 1.0.3 → 1.0.4

data/README.md

@@ -47,6 +47,11 @@ This will output the contents of your file with all filters applied. Use `typogr
 
 ## Changelog
 
+### 1.0.4
+
+* Bugfix: no longer regard combination of digits and periods as caps.
+* Bugfix: do not add consecutive non-breaking spaces to prevent widows
+
 ### 1.0.3
 
 * Bugfix: caps also ignores unequal but same excepted tags

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/lib/typogruby.rb

@@ -105,11 +105,11 @@ module Typogruby
     text.gsub(%r{
       ((?:</?(?:a|em|span|strong|i|b)[^>]*>)|[^<>\s]) # must be proceeded by an approved inline opening or closing tag or a nontag/nonspace
       \s+                                             # the space to replace
-      ([^<>\s]+                                       # must be flollowed by non-tag non-space characters
+      (([^<>\s]+)                                     # must be flollowed by non-tag non-space characters
       \s*                                             # optional white space!
       (</(a|em|span|strong|i|b)>\s*)*                 # optional closing inline tags with optional white space after each
       ((</(p|h[1-6]|li|dt|dd)>)|$))                   # end with a closing p, h1-6, li or the end of the string
-    }x, '\1&nbsp;\2')
+    }x) { |match| $1 + (match.include?('&nbsp;') ? ' ' : '&nbsp;') + $2 } # Make sure to not add another nbsp before one already there
   end
 
   # surrounds two or more consecutive captial letters, perhaps with interspersed digits and periods
@@ -137,7 +137,7 @@ module Typogruby
       excluded, before, caps = $1, $2, $3
       if excluded
         str
-      elsif $3 =~ /^\d+$/
+      elsif $3 =~ /^[\d\.]+$/
         before + caps
       else
         before + '<span class="caps">' + caps + '</span>'

data/test/test_typogruby.rb

@@ -23,7 +23,7 @@ class TestTypogruby < Test::Unit::TestCase
   end
 
   def test_should_ignore_special_case_caps
-    assert_equal 'It should ignore just numbers like 1234', caps('It should ignore just numbers like 1234')
+    assert_equal 'It should ignore just numbers like 1234.', caps('It should ignore just numbers like 1234.')
     assert_equal '<pre>CAPS</pre> more <span class="caps">CAPS</span>', caps("<pre>CAPS</pre> more CAPS")
     assert_equal '<Pre>CAPS</PRE> with odd tag names <span class="caps">CAPS</span>', caps("<Pre>CAPS</PRE> with odd tag names CAPS")
     assert_equal 'A message from <span class="caps">2KU2</span> with digits', caps("A message from 2KU2 with digits")
@@ -65,6 +65,10 @@ class TestTypogruby < Test::Unit::TestCase
     assert_equal '<h1><a href="#">In a link</a> followed by other&nbsp;text</h1>', widont('<h1><a href="#">In a link</a> followed by other text</h1>')
   end
 
+  def test_should_not_add_nbsp_before_another
+    assert_equal 'Sentence with one&nbsp;nbsp', widont('Sentence with one&nbsp;nbsp')
+  end
+
   def test_should_not_error_on_empty_html
     assert_equal '<h1><a href="#"></a></h1>', widont('<h1><a href="#"></a></h1>')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typogruby
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +02:00
+date: 2010-07-28 00:00:00 +02:00
 default_executable: typogruby
 dependencies: 
 - !ruby/object:Gem::Dependency