typogruby 1.0.2 → 1.0.3

data/README.md

@@ -4,7 +4,7 @@ Helps you improve your web typograpbhy with some standard text filters.
 
 This project is based on Django's Typogrify, so the best introduction to read would be [Jeff Croft's][1].
 
-I created this gem to easily share these text filters in some tiny Ruby projects, including a TextMate bundle. For production code I recommend checking out the originals first.
+I created this gem to easily share these text filters in some tiny Ruby projects, including [a TextMate bundle][5]. For production code I recommend checking out the originals first.
 
 ## General Usage
 
@@ -23,6 +23,16 @@ Or, you can include the library in a helper or something:
     include Typogruby
     improve('Hello, world!')
 
+See the [full API documentation][4] for more information. You could also use [this Textmate Bundle][5].
+
+## From the command line
+
+You can also use typogruby directly from the command line:
+
+    typogruby MY_FILE
+
+This will output the contents of your file with all filters applied. Use `typogruby -h` for more information and options.
+
 ## References
 
 * Based on [typography-helper][2]
@@ -32,6 +42,25 @@ Or, you can include the library in a helper or something:
 [1]: http://jeffcroft.com/blog/2007/may/29/typogrify-easily-produce-web-typography-doesnt-suc/
 [2]: http://github.com/hunter/typography-helper
 [3]: http://code.google.com/p/typogrify
+[4]: http://avdgaag.github.com/typogruby
+[5]: http://github.com/avdgaag/Typography-tmbundle
+
+## Changelog
+
+### 1.0.3
+
+* Bugfix: caps also ignores unequal but same excepted tags
+* Feature: added command-line program
+* Improved documentation
+
+### 1.0.2
+
+* Bugfix: initial_quotes also wraps named HTML entities
+* Bugfix: caps no longer wraps consecutive numbers
+
+### 1.0
+
+* First release
 
 ## Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/bin/typogruby

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby -rubygems
+require 'typogruby'
+require 'optparse'
+
+operations = [:smartypants, :initial_quotes, :amp, :widont, :caps]
+explicit_on = []
+explicit_off = []
+
+OptionParser.new do |options|
+  options.banner = <<-EOS
+Improves web typography with text filters.
+
+By default all filters are applied. You can disable partical filters using
+the --no switch, or run only specified filters.
+
+Examples:
+
+  typogruby FILE              Runs all filters
+  typogruby --no-widows FILE  Runs all filters except for widows
+  typogruby -w FILE           Runs only the filter for widows
+  typogruby --widows FILE     Runs only the filter for widows
+
+Usage: typogruby [options] filename [filename, ...]
+EOS
+
+  options.separator ""
+  options.separator "Available options:"
+
+  options.on '-s', '--[no-]smartypants', 'Apply smartypants' do |v|
+    (v ? explicit_on : explicit_off) << :smartypants
+  end
+
+  options.on '-q', '--[no-]quotes', 'Wrap initial quotes' do |v|
+    (v ? explicit_on : explicit_off) << :initial_quotes
+  end
+
+  options.on '-a', '--[no-]amps', 'Wrap ampersands' do |v|
+    (v ? explicit_on : explicit_off) << :amp
+  end
+
+  options.on '-w', '--[no-]widows', 'Prevent widows' do |v|
+    (v ? explicit_on : explicit_off) << :widont
+  end
+
+  options.on '-c', '--[no-]caps', 'Wrap consecutive capitals' do |v|
+    (v ? explicit_on : explicit_off) << :caps
+  end
+
+  options.on_tail '-h', '--help', 'Show this message' do
+    $stderr.print options
+    exit
+  end
+
+  options.on_tail '-v', '--version', 'Display version information' do
+    $stderr.print Typogruby.version
+    exit
+  end
+  options.parse!
+end
+
+operations_todo = if explicit_off.any? && explicit_on.empty?
+  operations - explicit_off
+elsif explicit_off.empty? && explicit_on.any?
+  explicit_on
+else
+  operations
+end
+
+unless ARGV.any?
+  $stderr.puts 'No file specified'
+  exit 1
+end
+
+output = ARGV.inject('') do |output, filename|
+  begin
+    output + operations_todo.inject(File.read(filename)) { |t, o| Typogruby.send(o, t) }
+  rescue
+    $stderr.print "Error processing '#{filename}'"
+    output
+  end
+end
+
+$stdout.print output

data/lib/typogruby.rb

@@ -133,7 +133,7 @@ module Typogruby
   # @return [String] input text with caps wrapped
   def caps(text)
     # $1 is an excluded HTML tag, $2 is the part before the caps and $3 is the caps match
-    text.gsub(/<(code|pre).+?<\/\1>|(\s|&nbsp;|^|'|"|>)([A-Z\d][A-Z\d\.']{1,})(?!\w)/)  do |str|
+    text.gsub(/<(?i)(code|pre)(?-i).+?<(?i)\/\1(?-i)>|(\s|&nbsp;|^|'|"|>)([A-Z\d][A-Z\d\.']{1,})(?!\w)/)  do |str|
       excluded, before, caps = $1, $2, $3
       if excluded
         str

data/test/test_typogruby.rb

@@ -25,6 +25,7 @@ class TestTypogruby < Test::Unit::TestCase
   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 '<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")
     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.")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typogruby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 +02:00
-default_executable: 
+date: 2010-07-27 00:00:00 +02:00
+default_executable: typogruby
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -48,8 +48,8 @@ dependencies:
   version_requirements: *id002
 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: []
-
+executables: 
+- typogruby
 extensions: []
 
 extra_rdoc_files: 
@@ -62,6 +62,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/typogruby
 - lib/typogruby.rb
 - test/helper.rb
 - test/test_typogruby.rb