typogruby 1.0.13 → 1.0.14

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    typogruby (1.0.13)
+    typogruby (1.0.14)
       rubypants
 
 GEM

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.14
+
+* Bugfix: ignore multi-line HTML attributes in widont filter
+
 ## 1.0.13
 
 * Be smart about periods in abbreviations. Capitalise LA, L.A. and L.A, but not L. or L. A. (by Brad Weslake)

data/README.md

@@ -14,14 +14,18 @@ First, install the Ruby gem:
 
 Then require the library to get started:
 
-    require 'typogruby'
-    Typogruby.improve('Hello, world!')
+```ruby
+require 'typogruby'
+Typogruby.improve('Hello, world!')
+```
 
 Or, you can include the library in a helper or something:
 
-    require 'typogruby'
-    include Typogruby
-    improve('Hello, world!')
+```ruby
+require 'typogruby'
+include Typogruby
+improve('Hello, world!')
+```
 
 See the [full API documentation][4] for more information. You could also use [this Textmate Bundle][5].
 

data/lib/typogruby.rb

@@ -112,13 +112,14 @@ module Typogruby
   def widont(text)
     exclude_sensitive_tags(text) do |t|
       t.gsub(%r{
+        (<[^/][^>]*?>)|                                 # Ignore any opening tag, so we don't mess up attribute values
         ((?:</?(?: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*                                             # 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) { |match| $1 + (match.include?('&nbsp;') ? ' ' : '&nbsp;') + $2 } # Make sure to not add another nbsp before one already there
+      }xm) { |match| $1 ? match : $2 + (match.include?('&nbsp;') ? ' ' : '&nbsp;') + $3 } # Make sure to not add another nbsp before one already there
     end
   end
 
@@ -155,10 +156,10 @@ module Typogruby
     exclude_sensitive_tags(text) do |t|
       # $1 and $2 are excluded HTML tags, $3 is the part before the caps and $4 is the caps match
       t.gsub(%r{
-          (<[^/][^>]+?>)|                     # Ignore any opening tag, so we don't mess up attribute values
-          (\s|&nbsp;|^|'|"|>)                 # Make sure our capture is preceded by whitespace or quotes
-          ([A-Z\d]([\.']?[A-Z\d][\.']?){1,})  # Capture capital words, with optional dots or numbers in between
-          (?!\w)                              # ...which must not be followed by a word character.
+          (<[^/][^>]*?>)|                      # Ignore any opening tag, so we don't mess up attribute values
+          (\s|&nbsp;|^|'|"|>|)                 # Make sure our capture is preceded by whitespace or quotes
+          ([A-Z\d](?:[\.']?[A-Z\d][\.']?){1,}) # Capture capital words, with optional dots or numbers in between
+          (?!\w)                               # ...which must not be followed by a word character.
         }x) do |str|
         tag, before, caps = $1, $2, $3
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Typogruby
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

data/test/test_typogruby.rb

@@ -1,9 +1,6 @@
-require 'rubygems'
-require 'bundler'
+# -*- encoding: utf-8 -*-
 require 'test/unit'
 require 'typogruby'
-Bundler.setup
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 class TestTypogruby < Test::Unit::TestCase
   include Typogruby
@@ -27,6 +24,8 @@ class TestTypogruby < Test::Unit::TestCase
 
   def test_should_replace_caps
     assert_equal 'A message from <span class="caps">KU</span>', caps("A message from KU")
+    assert_equal 'Replace text <a href="."><span class="caps">IN</span></a> tags', caps('Replace text <a href=".">IN</a> tags')
+    assert_equal 'Replace text <i><span class="caps">IN</span></i> tags', caps('Replace text <i>IN</i> tags')
   end
 
   def test_should_ignore_special_case_caps
@@ -93,6 +92,11 @@ class TestTypogruby < Test::Unit::TestCase
     assert_equal '<div><p>But divs with paragraphs&nbsp;do!</p></div>', widont('<div><p>But divs with paragraphs do!</p></div>')
   end
 
+  def test_should_ignore_attributes_across_mutliple_lines_when_preventing_widows
+    assert_equal %Q{<div id="aniver" style="\nbackground-image:url('/static/colorfulbackground.png');\nbackground-repeat:no-repeat;\ntext-align:center;\nmargin:0;\npadding:0;\nbackground-size: 100% 100%;">},
+      widont(%Q{<div id="aniver" style="\nbackground-image:url('/static/colorfulbackground.png');\nbackground-repeat:no-repeat;\ntext-align:center;\nmargin:0;\npadding:0;\nbackground-size: 100% 100%;">})
+  end
+
   def test_should_convert_entities
     assert_equal "Vari&euml;ren&hellip;", entities('Variëren…')
     assert_equal "<p>Ol&eacute;</p>", entities('<p>Olé</p>')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typogruby
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 14
+  version: 1.0.14
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-23 00:00:00 Z
+date: 2012-01-26 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -29,10 +29,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
+  type: :runtime
   name: rubypants
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -43,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
+  type: :development
   name: yard
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,10 +57,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
+  type: :development
   name: rake
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -71,10 +71,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
+  type: :development
   name: aruba
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -85,10 +85,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
+  type: :development
   name: cucumber
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -99,10 +99,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
+  type: :development
   name: rcov
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -113,10 +113,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
+  type: :development
   name: rspec
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -127,8 +127,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
+  type: :development
   name: bluecloth
+  version_requirements: *id008
 description: Improve web typography using various text filters. This gem prevents widows and applies markup to ampersans, consecutive capitals and initial quotes.
 email: arjan@arjanvandergaag.nl
 executables: 
@@ -160,6 +161,7 @@ files:
 - lib/version.rb
 - test/test_typogruby.rb
 - typogruby.gemspec
+has_rdoc: true
 homepage: http://avdgaag.github.com/typogruby
 licenses: []
 
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Improves web typography like Django's Typogrify