typohero 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e1601fa507395ff5380983659eb920e745028be
-  data.tar.gz: 9d4b8a981513c84ed843cdacc24956839ca18959
+  metadata.gz: 13d3687a6f31edadcea2ff02592d22225f5b0b19
+  data.tar.gz: 78d20a873b169e808800dbf6158ad93889f750d7
 SHA512:
-  metadata.gz: bcb638d198532592fafe7dede571f585c70d430b64a2a5814bcddadddda4955943c3db9f83caf216b4bfcb692d9c0c1109098b00c9085138c24de773e3d97b8a
-  data.tar.gz: c1e3e1f076b1cf66c12c6263de789c2d0ab755a020f436fb5b282205aab1773f6832f98ce8bea8541f0f6f90be15533f301b13e06b418f40a290d1c60b8d69a4
+  metadata.gz: 2404afeb00889cbbe73d21e5b64fc18cbcd74d7cf568baaa1eb9188f491876bfb9e618a46d701698b12f949d28ba0fb560e48460b574b638d83784ed63078b16
+  data.tar.gz: eb7d1528137c7a91a4f67b8a96e1295e8b72735bdf11faa0e7eb33ede2ae892b88ff09440fd41e9849982331a15b15d37b11ab4b06e91c29d3834296038dc772

data/lib/typohero.rb

@@ -27,8 +27,8 @@ module TypoHero
     '\`'    => '`',
   }
   UNESCAPE = Hash[ESCAPE.map {|k,v| [v,k[1..-1]] }]
-  ESCAPE_RE = Regexp.union(*ESCAPE.keys)
-  UNESCAPE_RE = Regexp.union(*UNESCAPE.keys)
+  ESCAPE_RE = Regexp.union ESCAPE.keys
+  UNESCAPE_RE = Regexp.union UNESCAPE.keys
 
   NBSP  = "\u00a0"
   NBSP_THIN = "\u202F"
@@ -68,8 +68,8 @@ module TypoHero
     '–'  => NDASH,
     '—'  => MDASH
   }
-  SPECIAL_RE = Regexp.union(*SPECIAL.keys)
-  LATEX_RE = /(#{Regexp.union *LATEX.keys})(?=\p{Space}|$)/m
+  SPECIAL_RE = Regexp.union SPECIAL.keys
+  LATEX_RE = /(#{Regexp.union LATEX.keys})(?=\p{Space}|$)/m
 
   DASH_RE  = "[#{MDASH}#{NDASH}]"
   AMP_RE   = '&(?:amp;)?'
@@ -83,6 +83,9 @@ module TypoHero
   }
   ORDINAL_RE = /(?<=\d)(st|nd|rd|th)(?=\p{Space}|$)/
 
+  UNITS_RE = /(?<=\p{Space}|^)(-?\d+(?:\.\d+)?)\p{Space}*([mk]?m|km\/h|m\/s|[m]?l|[mk]g)(?=\p{Space}|\p{Punct}|$)/
+  UNITS = "\\1#{NBSP_THIN}\\2"
+
   MDASH_SPACE_RE = /\p{Space}*#{MDASH}\p{Space}*/
   NDASH_SPACE_RE = /\p{Space}*#{NDASH}\p{Space}*/
   MDASH_SPACE = "#{NBSP_THIN}#{MDASH}#{NBSP_THIN}"
@@ -90,10 +93,6 @@ module TypoHero
 
   REPLACE_AMP_RE = /(?<=\p{Space})#{AMP_RE}(?=\p{Space})/
 
-  CAPS_BEGIN_RE  = "(^|\\p{Space}|#{LEFT_QUOTE_RE})"
-  CAPS_INNER_RE  = "(?:#{AMP_RE}|[A-Z\\d\\.]|#{RSQUO})*" # right quote for posession (e.g. JIMMY'S)
-  CAPS_RE        = /#{CAPS_BEGIN_RE}([A-Z\d]#{CAPS_INNER_RE}[A-Z]#{CAPS_INNER_RE}|[A-Z]#{CAPS_INNER_RE}[A-Z\d]#{CAPS_INNER_RE})/m
-
   RIGHT_QUOTE_RE = %r{
     ^['"](?=\p{Punct})\B|                       # Very first character is a closing quote followed by punctuation at a non-word-break
     (?<!^|#{DASH_RE}|\p{Space}|[\[\{\(\-])['"]| # Not after dash, space or opening parentheses
@@ -103,6 +102,9 @@ module TypoHero
     '(?=(\d\d(?:s|\p{Space}|$)))                # Decade abbreviations (the '80s)
   }xm
 
+  CAPS_INNER_RE  = "(?:#{AMP_RE}|[A-Z\\d\\.\-]|#{RSQUO})*" # right quote for posession (e.g. JIMMY'S)
+  CAPS_RE        = /(?<=^|\p{Space}|#{LEFT_QUOTE_RE})([A-Z\d]#{CAPS_INNER_RE}[A-Z]#{CAPS_INNER_RE}|[A-Z]#{CAPS_INNER_RE}[A-Z\d]#{CAPS_INNER_RE})(?=$|\p{Space}|#{RIGHT_QUOTE_RE}|\p{Punct})/m
+
   LEFT_QUOTES = {
     "'" => LSQUO,
     '"' => LDQUO,
@@ -133,7 +135,7 @@ module TypoHero
   }
 
   def tokenize(input)
-    comment, excluded, latex, dollar = false, 0, 0, 0
+    excluded, latex, dollar = 0, 0, 0
     input.scan TOKENIZER_RE do |s|
       type =
         if s =~ /\A<!--/
@@ -198,7 +200,7 @@ module TypoHero
   def truncate(input, *max_words_or_separator)
     max_words = max_words_or_separator.select {|i| Fixnum === i }.first
     if separator = max_words_or_separator.reject {|i| Fixnum === i }.first
-      separator = Regexp.union(*separator) unless Regexp === separator
+      separator = Regexp.union(separator) unless Regexp === separator
       separator = nil unless input =~ separator
     end
     out, tail, truncated = '', '', false
@@ -254,6 +256,7 @@ module TypoHero
         last_char = s[-1]
         decode(s)
         escape(s)
+        units(s)
         primes(s)
         special(s)
         latex(s)
@@ -343,7 +346,7 @@ module TypoHero
   end
 
   def caps(s)
-    s.gsub!(CAPS_RE, '\1<span class="caps">\2</span>')
+    s.gsub!(CAPS_RE, '<span class="caps">\1</span>')
   end
 
   def initial_quotes(s)
@@ -351,7 +354,7 @@ module TypoHero
   end
 
   def nobr(s)
-    s.gsub!(/[\p{Digit}\p{Word}]+(-[\p{Digit}\p{Word}]+)+/, '<span class="nobr">\0</span>')
+    s.gsub!(/[\p{Word}]+(-[\p{Word}]+)+/, '<span class="nobr">\0</span>')
   end
 
   def primes(s)
@@ -375,4 +378,8 @@ module TypoHero
     s.gsub!(RIGHT_QUOTE_RE, RIGHT_QUOTES)
     s.gsub!(/['"]/,         LEFT_QUOTES)
   end
+
+  def units(s)
+    s.gsub!(UNITS_RE, UNITS)
+  end
 end

data/lib/typohero/version.rb

@@ -1,3 +1,3 @@
 module TypoHero
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/typohero_test.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+$VERBOSE = true
 require 'minitest/autorun'
 require 'typohero'
 
@@ -161,6 +162,7 @@ multiline
 
   def test_should_replace_caps
     assert_enhance "A message from KU", 'A message from&nbsp;<span class="caps">KU</span>'
+    assert_enhance "DG-1000", '<span class="caps"><span class="nobr">DG-1000</span></span>'
     assert_enhance 'Replace text <a href=".">IN</a> tags', 'Replace text <a href="."><span class="caps">IN</span></a>&nbsp;tags'
     assert_enhance 'Replace text <i>IN</i> tags', 'Replace text <i><span class="caps">IN</span></i>&nbsp;tags'
     assert_enhance 'AB, CD, EF', '<span class="caps">AB</span>, <span class="caps">CD</span>,&nbsp;<span class="caps">EF</span>'
@@ -253,6 +255,17 @@ multiline
     assert_enhance 'I am the 1st', 'I am the&nbsp;1<span class="ord">st</span>'
   end
 
+  def test_units
+    assert_enhance '-1m', "-1\u202Fm"
+    assert_enhance '1m', "1\u202Fm"
+    assert_enhance '100 m.', "100\u202Fm."
+    assert_enhance '1.2 m', "1.2\u202Fm"
+    assert_enhance '1.2 km', "1.2\u202Fkm"
+    assert_enhance '1.2 km/h', "1.2\u202Fkm/h"
+    assert_enhance 'text 1m text', "text 1\u202Fm text"
+    assert_enhance 'text 1.2 m text', "text 1.2\u202Fm text"
+  end
+
   def test_latex
     assert_enhance '\\textbackslash', '\\'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typohero
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Mendler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies: []
 description: TypoHero improves web typography by applying various filters (similar
   to rubypants, typogruby, typogrify).