typogruby 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58814b4ae083a7ad0c1347e8726480573c987d4e
-  data.tar.gz: 37b177ddacad1c32a4a3ba3f31ade38f56bf328d
+  metadata.gz: da19ab76a8cf4a14d847a7a7aa60ecce3cec196d
+  data.tar.gz: cc8b80624af026ed7cff5b4c3627ec3e8deed6f2
 SHA512:
-  metadata.gz: 9e127eeff35b15ee6d48d14a1b9f38a22ba16fb32570aaef47930d40a4293abe08d462f115495a2543553afa13c052a7ddfe535c2a7424f0b174355946d4388b
-  data.tar.gz: 3257122f1f0ee80f70bf8c1a25fe9a8a641784ea425491c102dd893128f13e9a148c9a85048fd4bd947675e37020af4e6c4c85ca29f107aa4a2ff1aa89e077d7
+  metadata.gz: c44b8842370ea8c280db66b8c16cc23639e08b1d8daf30387dda0377e5c2b4d5fa1d2dfc7c350b6835cfc354162bb4580328127ddcc83250760e164f09c20e95
+  data.tar.gz: c3fe4fccdf6610464f85aea2939704d11205624da18d2ad2dd0a71a69e2fe5336aeb246aff29639a90c05802651e3fd9d108f6c95649d38e34449f5f9073ceb4

data/Gemfile.lock

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

data/HISTORY.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.0.17
+
+* Allow ampersands in capitalised words (thanks Paul Robert Lloyd)
+
 ## 1.0.16
 
 * Added textarea to list of ignored elements (thanks Juan Antonio Navarro Pérez)

data/lib/typogruby.rb

@@ -134,6 +134,10 @@ module Typogruby
   #   caps("A message from 2KU2 with digits")
   #   # => 'A message from <span class="caps">2KU2</span> with digits'
   #
+  # @example Allows ampersands
+  #   caps("A phone bill from AT&T")
+  #   # => 'A phone bill from <span class="caps">AT&amp;T</span>'
+  #
   # @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>'
@@ -156,10 +160,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](?:(\.|'|&|&amp;|&\#38;)?[A-Z\d][\.']?){1,}) # Capture capital words, with optional dots, numbers or ampersands 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.16'
+  VERSION = '1.0.17'
 end

data/test/test_typogruby.rb

@@ -43,6 +43,12 @@ class TestTypogruby < Test::Unit::TestCase
     assert_equal '<i><span class="caps">D.O.T.</span></i><span class="caps">HE34T</span><b><span class="caps">RFID</span></b>', caps("<i>D.O.T.</i>HE34T<b>RFID</b>")
   end
 
+  def test_should_not_break_caps_with_ampersands
+    assert_equal '<span class="caps">AT&T</span>', caps("AT&T")
+    assert_equal '<span class="caps">AT&amp;T</span>', caps("AT&amp;T")
+    assert_equal '<span class="caps">AT&#38;T</span>', caps("AT&#38;T")
+  end
+
   def test_should_replace_quotes
     assert_equal '<span class="dquo">"</span>With primes"', initial_quotes('"With primes"')
     assert_equal '<span class="quo">\'</span>With single primes\'', initial_quotes("'With single primes'")

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: typogruby
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Arjan van der Gaag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Improve web typography using various text filters. This gem prevents
@@ -105,9 +105,9 @@ extra_rdoc_files:
 - README.md
 - HISTORY.md
 files:
-- .document
-- .gitignore
-- .travis.yml
+- ".document"
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - HISTORY.md
@@ -132,22 +132,22 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Improves web typography like Django's Typogrify