Changeset 87

Timestamp:

09/01/08 15:24:13 (3 months ago)

Author:

deveiant

Message:

• Checkpoint commit of MarkdownTest? integration

Location:

trunk

Files:

• LICENSE (added)
• README (modified) (1 diff)
• Rakefile (modified) (3 diffs)
• lib/bluecloth.rb (modified) (2 diffs)
• spec/bluecloth_spec.rb (modified) (1 diff)
• spec/bugfix_spec.rb (modified) (1 diff)
• spec/contributions_spec.rb (modified) (1 diff)
• spec/lib/helpers.rb (added)
• spec/lib/matchers.rb (modified) (4 diffs)
• spec/markdowntest_spec.rb (modified) (2 diffs)
• tests (deleted)

trunk/README

@@ -106 +106 @@
 
 Ruby version:  
-  This module is Open Source Software which is Copyright (c) 2004 by The FaerieMUD
-  Consortium.
-
-  You may use, modify, and/or redistribute this software under the same terms as
-  Ruby itself.
-
-  BlueCloth is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-
+  See the LICENSE file for details.
 
 [1]: http://daringfireball.net/projects/markdown/

trunk/Rakefile

@@ -40 +40 @@
 PKGDIR        = BASEDIR + 'pkg'
 
-PKG_NAME      = 'bluecloth'
+PROJECT_NAME  = 'BlueCloth'
+PKG_NAME      = PROJECT_NAME.downcase
 PKG_SUMMARY   = 'BlueCloth is a Ruby implementation of Markdown'
 VERSION_FILE  = LIBDIR + 'bluecloth.rb'
@@ -108 +109 @@
 
 # Documentation constants
+RDOCDIR = DOCSDIR + 'api'
 RDOC_OPTIONS = [
     '-w', '4',
@@ -174 +176 @@
     end
 end
+
+# Manual-generation config
+MANUALDIR = DOCSDIR + 'manual'
 
 $trace = Rake.application.options.trace ? true : false

trunk/lib/bluecloth.rb

@@ -131 +131 @@
 
     # The tag-closing string -- set to '>' for HTML
-    EMPTY_ELEMENT_SUFFIX = "/>";
+    EMPTY_ELEMENT_SUFFIX = " />";
 
     # Table of MD5 sums for escaped characters
@@ -942 +942 @@
 
     # Pattern to match strong emphasis in Markdown text
-    BoldRegexp = %r{ (\*\*|__) (\S|\S.+?\S) \1 }x
+    BoldRegexp = %r{ (\*\*|__) (\S|\S.*?\S) \1 }x
 
     # Pattern to match normal emphasis in Markdown text
-    ItalicRegexp = %r{ (\*|_) (\S|\S.+?\S) \1 }x
+    ItalicRegexp = %r{ (\*|_) (\S|\S.*?\S) \1 }x
 
     ### Transform italic- and bold-encoded text in a copy of the specified +str+

trunk/spec/bluecloth_spec.rb

@@ -32 +32 @@
 describe BlueCloth, "-- Markdown" do
     include BlueCloth::TestConstants,
-        BlueClothMatchers
+        BlueCloth::Matchers
 
 

trunk/spec/bugfix_spec.rb

@@ -32 +32 @@
 describe BlueCloth, "bugfixes" do
     include BlueCloth::TestConstants,
-        BlueClothMatchers
+        BlueCloth::Matchers
 
     before( :all ) do

trunk/spec/contributions_spec.rb

@@ -32 +32 @@
 describe BlueCloth, " contributed features" do
     include BlueCloth::TestConstants,
-        BlueClothMatchers
+        BlueCloth::Matchers
 
     ### HTML filter options contributed by Florian Gross.

trunk/spec/lib/matchers.rb

@@ -1 +1 @@
 #!/usr/bin/env ruby
 
-require 'bluecloth'
-require 'spec/matchers'
+begin
+    require 'bluecloth'
+    require 'diff/lcs'
+    require 'diff/lcs/callbacks'
+    require 'spec/lib/constants'
+rescue LoadError
+    unless Object.const_defined?( :Gem )
+        require 'rubygems'
+        retry
+    end
+    raise
+end
+
 
 ### Fixturing functions
-module BlueClothMatchers
+module BlueCloth::Matchers
 
     class TransformMatcher
@@ -19 +30 @@
             @bluecloth = bluecloth
             @output_html = bluecloth.to_html
-            return @output_html == @html
+            return @output_html.strip == @html.strip
         end
         
         ### Build a failure message for the matching case.
         def failure_message
-            return "Expected the generated html:\n\n  %p\n\nto be the same as:\n\n  %p\n\n" %
-                [ @output_html, @html ]
+            patch = self.make_patch( @html, @output_html )
+            return "Expected the generated html:\n\n  %p\n\nto be the same as:\n\n  %p\n\nDiffs:\n\n%s" %
+                [ @output_html, @html, patch ]
         end
         
@@ -33 +45 @@
                 [ @output_html, @html ]
         end
+        
+        ### Compute a patch between the given +expected+ output and the +actual+ output
+        ### and return it as a string.
+        def make_patch( expected, actual )
+            diffs = Diff::LCS.sdiff( expected.split("\n"), actual.split("\n"),
+                Diff::LCS::ContextDiffCallbacks )
+
+            maxcol = diffs.flatten.
+                collect {|d| [d.old_element.to_s.length, d.new_element.to_s.length ] }.
+                flatten.max || 0
+            maxcol += 4
+
+            patch = "              %#{maxcol}s | %s\n" % [ "Expected", "Actual" ]
+            patch << diffs.collect do |changeset|
+                changeset.collect do |change|
+                    "%s [%03d, %03d]: %#{maxcol}s | %-#{maxcol}s" % [
+                        change.action,
+                        change.old_position,
+                        change.new_position,
+                        change.old_element.inspect,
+                        change.new_element.inspect,
+                    ]
+                end.join("\n")
+            end.join("\n---\n")
+        end
+        
     end
 
@@ -87 +125 @@
         end
         
-        return BlueClothMatchers::TransformMatcher.new( html )
+        return BlueCloth::Matchers::TransformMatcher.new( html )
     end
     
     ### Generate a matcher that expects to match the given +regexp+.
     def be_transformed_into_html_matching( regexp )
-        return BlueClothMatchers::TransformMatcher.new( regexp )
+        return BlueCloth::Matchers::TransformMatcher.new( regexp )
     end
     
-end
+end # module BlueCloth::Matchers
 
-

trunk/spec/markdowntest_spec.rb

@@ -12 +12 @@
 begin
     require 'spec/runner'
-    require 'logger'
+
     require 'bluecloth'
     require 'spec/lib/constants'
+    require 'spec/lib/helpers'
     require 'spec/lib/matchers'
 rescue LoadError
@@ -32 +33 @@
 describe BlueCloth, "-- MarkdownTest 1.0: " do
     include BlueCloth::TestConstants,
-        BlueClothMatchers
+        BlueCloth::Matchers
 
     markdowntest_dir = Pathname.new( __FILE__ ).dirname + 'data/markdowntest'