typogruby 1.0.11 → 1.0.12

data/Gemfile.lock

@@ -1,45 +1,45 @@
 PATH
   remote: .
   specs:
-    typogruby (1.0.11)
+    typogruby (1.0.12)
       rubypants
 
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.2)
-      childprocess (~> 0.1.6)
-      cucumber (~> 0.10.0)
-      rspec (~> 2.3.0)
-    bluecloth (2.0.11)
+    aruba (0.3.6)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
+    bluecloth (2.1.0)
     builder (3.0.0)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    cucumber (0.10.0)
+    childprocess (0.1.8)
+      ffi (~> 1.0.6)
+    cucumber (0.10.2)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
+      diff-lcs (>= 1.1.2)
+      gherkin (>= 2.3.5)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    ffi (0.6.3)
+    ffi (1.0.7)
       rake (>= 0.8.7)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
-    json (1.4.6)
+    gherkin (2.3.7)
+      json (>= 1.4.6)
+    json (1.5.1)
     rake (0.8.7)
     rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.2)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.5.0)
     rubypants (0.2.0)
     term-ansicolor (1.0.5)
-    yard (0.6.4)
+    yard (0.6.8)
 
 PLATFORMS
   ruby

data/HISTORY.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.0.12
+
+* Fixed aruba deprecation warnings
+* Ensure duplicate sensitive tags are properly rendered (thanks Justin Hileman)
+* Removed obsolete tag-ignoring clauses from regexes
+
 ## 1.0.11
 
 * Excluded more typography-sensitive tags from filtering (thanks Justin Hileman)

data/features/ignoring.feature

@@ -12,7 +12,7 @@ Feature: ignoring parts of a file
         </script>
         <p>"This IS a simple file!</p>
         """
-        When I run "typogruby input.html"
+        When I run `typogruby input.html`
         Then the output should contain exactly:
         """
         <script>

data/features/inputs.feature

@@ -16,7 +16,7 @@ Feature: various inputs
 
     @wip
     Scenario: take input from STDIN
-        When I run "typogruby < input.html"
+        When I run `typogruby < input.html`
         Then the output should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This <span class="caps">IS</span> a simple&nbsp;file!</p>
@@ -24,7 +24,7 @@ Feature: various inputs
         And the exit status should be 0
 
     Scenario: multiple input files
-        When I run "typogruby input.html input2.html"
+        When I run `typogruby input.html input2.html`
         Then the output should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This <span class="caps">IS</span> a simple&nbsp;file!</p><p>This is another&nbsp;file</p>

data/features/selective_filtering.feature

@@ -11,7 +11,7 @@ Feature: selective filtering
         """
 
     Scenario: using just one filter
-        When I run "typogruby -w input.html"
+        When I run `typogruby -w input.html`
         Then the output should contain exactly:
         """
         <p>"This IS a simple&nbsp;file!</p>
@@ -19,7 +19,7 @@ Feature: selective filtering
         And the exit status should be 0
 
     Scenario: using just several filters
-        When I run "typogruby -cw input.html"
+        When I run `typogruby -cw input.html`
         Then the output should contain exactly:
         """
         <p>"This <span class="caps">IS</span> a simple&nbsp;file!</p>
@@ -27,7 +27,7 @@ Feature: selective filtering
         And the exit status should be 0
 
     Scenario: excluding a single filter
-        When I run "typogruby --no-widows input.html"
+        When I run `typogruby --no-widows input.html`
         Then the output should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This <span class="caps">IS</span> a simple file!</p>
@@ -35,7 +35,7 @@ Feature: selective filtering
         And the exit status should be 0
 
     Scenario: excluding multiple filters
-        When I run "typogruby --no-widows --no-caps input.html"
+        When I run `typogruby --no-widows --no-caps input.html`
         Then the output should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This IS a simple file!</p>

data/features/simple.feature

@@ -5,12 +5,12 @@ Feature: Simple usage
     I want to apply typogruby to a file
 
     Scenario: getting help
-        When I run "typogruby -h"
+        When I run `typogruby -h`
         Then the output should contain "Usage: typogruby [options] filename [filename, ...]"
         And the exit status should be 0
 
     Scenario: getting the version number
-        When I run "typogruby -v"
+        When I run `typogruby -v`
         Then the output should contain "Typogruby "
 
     Scenario: filtering a file
@@ -18,7 +18,7 @@ Feature: Simple usage
         """
         <p>"This IS a simple file!</p>
         """
-        When I run "typogruby input.html"
+        When I run `typogruby input.html`
         Then the output should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This <span class="caps">IS</span> a simple&nbsp;file!</p>
@@ -30,7 +30,7 @@ Feature: Simple usage
         """
         <p>"This IS a simple file!</p>
         """
-        When I run "typogruby -o output.html input.html"
+        When I run `typogruby -o output.html input.html`
         Then the file "output.html" should contain exactly:
         """
         <p><span class="dquo">&#8220;</span>This <span class="caps">IS</span> a simple&nbsp;file!</p>

data/lib/typogruby.rb

@@ -56,10 +56,10 @@ module Typogruby
   # @param [String] text input text
   # @return [String] input text with ampersands wrapped
   def amp(text)
-    # $1 is an excluded HTML tag, $2 is the part before the caps and $3 is the amp match
+    # $1 is the part before the caps and $2 is the amp match
     exclude_sensitive_tags(text) do |t|
-      t.gsub(/<(code|pre).+?<\/\1>|(\s|&nbsp;)&(?:amp;|#38;)?(\s|&nbsp;)/) { |str|
-        $1 ? str : $2 + '<span class="amp">&amp;</span>' + $3
+      t.gsub(/(\s|&nbsp;)&(?:amp;|#38;)?(\s|&nbsp;)/) { |str|
+        $1 + '<span class="amp">&amp;</span>' + $2
       }.gsub(/(\w+)="(.*?)<span class="amp">&amp;<\/span>(.*?)"/, '\1="\2&amp;\3"')
     end
   end
@@ -147,17 +147,16 @@ 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{
-          (?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
+        tag, before, caps = $1, $2, $3
 
         # 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+\.?$/
+        if tag || caps =~ /^\d+\.?$/
           str
         elsif $3 =~ /^[\d\.]+$/
           before + caps
@@ -254,7 +253,7 @@ private
     end
   end
 
-  # Hackish text filter that will make sure our text filters leave 
+  # Hackish text filter that will make sure our text filters leave
   # sensitive tags alone without resorting to a full-blown HTML parser.
   #
   # Sensitive tags are tags with literal contents, which we do not
@@ -278,7 +277,7 @@ private
       hash
     end
     yield(modified_text).gsub(/#{@exluded_sensitive_tags.keys.join('|')}/) do |h|
-      @exluded_sensitive_tags.delete(h)
+      @exluded_sensitive_tags[h]
     end
   end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Typogruby
-  VERSION = '1.0.11'
+  VERSION = '1.0.12'
 end

data/test/test_typogruby.rb

@@ -104,4 +104,11 @@ class TestTypogruby < Test::Unit::TestCase
       assert_equal test_string, improve(test_string)
     end
   end
+
+  def test_should_not_forget_about_duplicate_sensitive_tags
+    %w{script pre code kbd math}.each do |tag_name|
+      test_string = "<#{tag_name}>this</#{tag_name}>==<#{tag_name}>this</#{tag_name}>"
+      assert_equal test_string, improve(test_string)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typogruby
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 0
-  - 11
-  version: 1.0.11
+  - 12
+  version: 1.0.12
 platform: ruby
 authors: 
 - Arjan van der Gaag
@@ -15,13 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +01:00
-default_executable: 
+date: 2011-05-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  name: rubypants
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,10 +28,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
-- !ruby/object:Gem::Dependency 
+  name: rubypants
   prerelease: false
-  type: :development
-  name: yard
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,10 +42,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
-- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
   type: :development
-  name: rake
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,10 +56,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
   type: :development
-  name: aruba
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,10 +70,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: aruba
   prerelease: false
   type: :development
-  name: cucumber
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,10 +84,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
   type: :development
-  name: rcov
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,10 +98,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id006
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
   type: :development
-  name: rspec
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,10 +112,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
   type: :development
-  name: bluecloth
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,6 +126,9 @@ dependencies:
         - 0
         version: "0"
   requirement: *id008
+  name: bluecloth
+  prerelease: false
+  type: :development
 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,7 +159,6 @@ files:
 - lib/version.rb
 - test/test_typogruby.rb
 - typogruby.gemspec
-has_rdoc: true
 homepage: http://avdgaag.github.com/typogruby
 licenses: []
 
@@ -190,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Improves web typography like Django's Typogrify