typogruby 1.0.8 → 1.0.9

data/Gemfile

@@ -1,12 +1,10 @@
 source :rubyforge
 gem 'rubypants'
 
-group :development do
+group :development, :test do
   gem 'yard'
   gem 'jeweler'
-end
-
-group :test do
+  gem 'rake'
   gem 'aruba'
   gem 'cucumber'
 end

data/Gemfile.lock

@@ -24,6 +24,7 @@ GEM
       rubyforge (>= 2.0.0)
     json (1.4.6)
     json_pure (1.4.6)
+    rake (0.8.7)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
     rubypants (0.2.0)
@@ -37,5 +38,6 @@ DEPENDENCIES
   aruba
   cucumber
   jeweler
+  rake
   rubypants
   yard

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'rake'
-require 'bundler'
+require 'bundler/setup'
 
 begin
   require 'jeweler'
@@ -38,8 +38,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 begin

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/typogruby.rb

@@ -137,6 +137,10 @@ module Typogruby
   # caps("A message from 2KU2 with digits")
   # # => 'A message from <span class="caps">2KU2</span> with digits'
   #
+  # @example Ignores HTML attributes
+  # caps('Download <a href="file.doc" title="PDF document">this file</a>')
+  # # => 'Download <a href="file.doc" title="PDF document">this file</a>'
+  #
   # @example All caps with with apostrophes in them shouldn't break. Only handles dump apostrophes though.
   # caps("JIMMY'S")
   # # => '<span class="caps">JIMMY\\'S</span>'
@@ -147,10 +151,19 @@ module Typogruby
   # @return [String] input text with caps wrapped
   def caps(text)
     ignore_scripts(text) do |t|
-      # $1 is an excluded HTML tag, $2 is the part before the caps and $3 is the caps match
-      t.gsub(/(?i:<(:code|pre).+?<\/\1>)|(\s|&nbsp;|^|'|"|>)([A-Z\d][A-Z\d\.']{1,})(?!\w)/)  do |str|
-        excluded, before, caps = $1, $2, $3
-        if excluded
+      # $1 and $2 are excluded HTML tags, $3 is the part before the caps and $4 is the caps match
+      t.gsub(%r{
+          (?i:<(code|pre).+?</\1>)|     # Ignore the contents of code and pre elements
+          (<[^/][^>]+?>)|               # 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 captial words, with optional dots or numbers in between
+          (?!\w)                        # ...which must not be followed by a word character.
+        }x) do |str|
+        excluded, tag, before, caps = $1, $2, $3, $4
+
+        # Do nothing with the contents if ignored tags, the inside of an opening HTML element
+        # so we don't mess up attribute values, or if our capture is only digits.
+        if excluded || tag || caps =~ /^\d+\.?$/
           str
         elsif $3 =~ /^[\d\.]+$/
           before + caps

data/test/test_typogruby.rb

@@ -35,7 +35,7 @@ class TestTypogruby < Test::Unit::TestCase
     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")
     assert_equal 'Dotted caps followed by spaces should never include them in the wrap <span class="caps">D.O.T.</span>   like so.', caps("Dotted caps followed by spaces should never include them in the wrap D.O.T.   like so.")
-    assert_equal %Q{<script>\nvar x = "FOO BAR and BAZ";\n</script>"}, initial_quotes(%Q{<script>\nvar x = "FOO BAR and BAZ";\n</script>"})
+    assert_equal 'Caps in attributes (<span title="Example CAPS">example</span>) should be ignored', caps('Caps in attributes (<span title="Example CAPS">example</span>) should be ignored')
   end
 
   def test_should_not_break_caps_with_apostrophes
@@ -49,6 +49,7 @@ class TestTypogruby < Test::Unit::TestCase
     assert_equal '<a href="#"><span class="dquo">"</span>With primes and a link"</a>', initial_quotes('<a href="#">"With primes and a link"</a>')
     assert_equal '<span class="dquo">&#8220;</span>With smartypanted quotes&#8221;', initial_quotes('&#8220;With smartypanted quotes&#8221;')
     assert_equal '<span class="quo">&lsquo;</span>With manual quotes&rsquo;', initial_quotes('&lsquo;With manual quotes&rsquo;')
+    assert_equal %Q{<script>\nvar x = "FOO BAR and BAZ";\n</script>"}, initial_quotes(%Q{<script>\nvar x = "FOO BAR and BAZ";\n</script>"})
   end
 
   def test_should_not_replace_quotes_in_scripts

data/typogruby.gemspec

@@ -0,0 +1,79 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{typogruby}
+  s.version = "1.0.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Arjan van der Gaag"]
+  s.date = %q{2011-02-14}
+  s.default_executable = %q{typogruby}
+  s.description = %q{Improve web typography using various text filters. This gem prevents widows and applies markup to ampersans, consecutive capitals and initial quotes.}
+  s.email = %q{arjan@arjanvandergaag.nl}
+  s.executables = ["typogruby"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.md"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
+     "HISTORY.md",
+     "LICENSE",
+     "README.md",
+     "Rakefile",
+     "VERSION",
+     "bin/typogruby",
+     "features/ignoring.feature",
+     "features/inputs.feature",
+     "features/selective_filtering.feature",
+     "features/simple.feature",
+     "features/support/env.rb",
+     "lib/characters.txt",
+     "lib/typogruby.rb",
+     "test/test_typogruby.rb",
+     "typogrify.gemspec",
+     "typogruby.gemspec"
+  ]
+  s.homepage = %q{http://avdgaag.github.com/typogruby}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.0}
+  s.summary = %q{Improves web typography like Django's Typogrify}
+  s.test_files = [
+    "test/test_typogruby.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rubypants>, [">= 0"])
+      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<aruba>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, [">= 0"])
+    else
+      s.add_dependency(%q<rubypants>, [">= 0"])
+      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<aruba>, [">= 0"])
+      s.add_dependency(%q<cucumber>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rubypants>, [">= 0"])
+    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<aruba>, [">= 0"])
+    s.add_dependency(%q<cucumber>, [">= 0"])
+  end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typogruby
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,14 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: typogruby
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rubypants
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -31,12 +43,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
+  name: yard
+  version_requirements: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
+  version_requirements: *id003
   prerelease: false
-  name: yard
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,12 +71,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
+  name: rake
+  version_requirements: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: aruba
+  version_requirements: *id005
   prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,7 +99,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
+  name: cucumber
+  version_requirements: *id006
+  prerelease: false
 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: 
@@ -89,6 +131,7 @@ files:
 - lib/typogruby.rb
 - test/test_typogruby.rb
 - typogrify.gemspec
+- typogruby.gemspec
 has_rdoc: true
 homepage: http://avdgaag.github.com/typogruby
 licenses: []
@@ -119,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Improves web typography like Django's Typogrify