heredoc_unindent 1.1.0 → 1.1.1

data/History.rdoc

@@ -1,3 +1,12 @@
+=== 1.1.1 / 2011-01-29
+
+* 1 bugfix
+
+  * Replaced <tt>\s</tt>, which is equivalent to <tt>[ \t\r\n\f]</tt>,
+    by <tt>[ \t]</tt> in regular expression
+    * empty lines could lead to wrong behaviour
+  * Added tests to prevent the just-fixed bug to ever come back
+
 === 1.1.0 / 2011-01-29
 
 * 3 minor enhancements

data/README.rdoc

@@ -75,7 +75,7 @@ implement equivalent unindenting functionality:
 
 1. {outdent}[http://rubygems.org/gems/outdent] (formerly {unindentable}[http://rubygems.org/gems/unindentable])
 2. {unindent}[http://rubygems.org/gems/unindent]
-3. {indentation}[http://rubygems.org/gems/indentation] -- this gem has a broader scope, besides String#reset_indentation
+3. {indentation}[http://rubygems.org/gems/indentation] -- this gem has a broader scope, in addition to String#reset_indentation
 
 === So why another one?
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'hoe'
 Hoe.spec 'heredoc_unindent' do
   developer('Adriano Mitre', 'adriano.mitre@gmail.com')
   
-  self.version = '1.1.0'
+  self.version = '1.1.1'
   
   self.readme_file = 'README.rdoc'
   self.history_file = 'History.rdoc'

data/Wishlist.rdoc

@@ -1,10 +1,13 @@
 == SUGGESTIONS
 
-* Benchmark heredoc_unindent against alternatives:
-  * outdent
-  * unindent
-  * the code posted by Rene Saarsoo in his answer in StackOverflow.
-  and then
-  * if there are significant performance differences, contact the other authors
-    and suggest unifying gems, keeping the fastest implementation
-  * mention the results in README (table?)
+* added a mechanism for "ignoring" blank lines, i.e.,
+  * not include the margin of blank lines in the minimum calculation
+  * let them untouched (i.e., unprocessed)
+  * possible implementation:
+      re = Regexp.new '^\s{' + n.to_s + '}(\S+)$'
+      s.gsub(re,'\1')
+    instead of
+      re = Regexp.new '^\s{' + n.to_s + '}'
+      s.gsub(re, '')
+  * re-benchmark to make sure it does not hurt performance and performance
+    figures in README are still valid

data/lib/heredoc_unindent.rb

@@ -26,7 +26,7 @@ module CoreExt
       def unindent_base_new(in_place, warn_first_not_min)
         m_first = nil
         m_min = nil
-        self.scan(/^\s*/) do |m|
+        self.scan(/^[ \t]*/) do |m|
           ms = m.size
           m_first ||= ms
           m_min = ms if !m_min || ms < m_min
@@ -43,7 +43,7 @@ module CoreExt
       # about 10% faster in ree, 20% in ruby-1.8.7 (old vs new)
       #
       def unindent_base_old(in_place, warn_first_not_min)
-        margins = self.scan(/^\s*/).map(&:size)
+        margins = self.scan(/^[ \t]*/).map(&:size)
         margins_min = margins.min
         if margins.first != margins_min && warn_first_not_min
           puts "warning: margin of the first line differs from minimum margin"

data/test/test_heredoc_unindent.rb

@@ -41,6 +41,21 @@ EOS
       The third line    
     EOS
     
+    pretty  = <<EOS
+      The first line
+
+      The third line    
+EOS
+    return ugly, pretty
+  end
+
+  def prep_sing4
+    ugly = <<-EOS
+      The first line
+      
+      The third line    
+    EOS
+    
     pretty  = <<EOS
 The first line
 
@@ -64,8 +79,10 @@ EOS
   end
   
   def test_unindent
-    perform_tests(*prep_sing1)
-    perform_tests(*prep_sing2)
+    1.upto(4) do |n|
+      m = method "prep_sing#{n}"
+      perform_tests(*m.call)
+    end
     perform_tests(*prep_mult)
   end
 
@@ -74,11 +91,11 @@ EOS
     assert_equal pretty, ugly.unindent(false)
     assert_equal pretty, ugly.heredoc_unindent(false)
     assert_equal ugly_bak, ugly, '#unindent should have no side-effects'
-    assert_equal pretty, ugly.heredoc_unindent!(false)
+    assert_equal pretty, ugly.heredoc_unindent!(false) unless pretty == ugly
     assert_equal pretty, ugly
     assert_equal nil, ugly.heredoc_unindent!(false)
     ugly = ugly_bak.dup
-    assert_equal pretty, ugly.unindent!(false)
+    assert_equal pretty, ugly.unindent!(false) unless pretty == ugly
     assert_equal pretty, ugly
     assert_equal nil, ugly.unindent!(false)
     aux = pretty.unindent(false)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: heredoc_unindent
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Adriano Mitre
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: heredoc_unindent
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: This gem removes common margin from indented strings, such as the ones produced by indented heredocs