svn commit: r617038 - in /incubator/buildr/docter/trunk/lib/docter: common.rb server.rb template.rb

[assaf]

Author: assaf
Date: Thu Jan 31 00:03:53 2008
New Revision: 617038

URL: http://svn.apache.org/viewvc?rev=617038&view=rev
Log:
Bug fix to locating template files

Modified:
    incubator/buildr/docter/trunk/lib/docter/common.rb
    incubator/buildr/docter/trunk/lib/docter/server.rb
    incubator/buildr/docter/trunk/lib/docter/template.rb

Modified: incubator/buildr/docter/trunk/lib/docter/common.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter/common.rb?rev=617038&r1=617037&r2=617038&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter/common.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter/common.rb Thu Jan 31 00:03:53 2008
@@ -10,15 +10,15 @@
     # Returns the inner text from some HTML text, effectively stripping the 
tags, normalizing whitespaces
     # and stripping leading/trailing spaces.
     def inner_text_from(html)
-      html.gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, "\\2").strip.gsub(/\s+/m, ' ')
+      html.gsub(/<(\w*).*?>(.*?)<\/\1\s*>/m, '\2').strip.gsub(/\s+/m, ' ')
     end
 
     def regexp_element(name)
-      Regexp.new("<(#{name})(?:>|\s+(.*?)>)(.*?)<\\/\\1\\s*>", 
Regexp::MULTILINE + Regexp::IGNORECASE)
+      /<(#{name})(?:>|\s+(.*?)>)(.*?)<\/\1\s*>/mi
     end
 
     def regexp_attribute(name)
-      Regexp.new("(#{name})=([\"'])(.*?)\\2", Regexp::MULTILINE + 
Regexp::IGNORECASE)
+      /(#{name})=([\"'])(.*?)\2/mi
     end
 
   end
@@ -335,7 +335,7 @@
         end
       end
       if url
-        %{<li><a href="#{url}">#{title}</a>#{nested}</li>}
+        %{<li><a href='#{url}'>#{title}</a>#{nested}</li>}
       else
         %{<li>#{title}#{nested}</li>}
       end

Modified: incubator/buildr/docter/trunk/lib/docter/server.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter/server.rb?rev=617038&r1=617037&r2=617038&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter/server.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter/server.rb Thu Jan 31 00:03:53 2008
@@ -52,7 +52,7 @@
       rescue Exception=>error
         response.start(500) do |head, out|
           head['Content-Type'] = 'text/plain'
-          error = ["#{error.class}: #{error}", error.backtrace.join('\n')]
+          error = ["#{error.class}: #{error}", error.backtrace.join("\n")]
           out.puts *error
           puts *error
         end

Modified: incubator/buildr/docter/trunk/lib/docter/template.rb
URL: 
http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter/template.rb?rev=617038&r1=617037&r2=617038&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter/template.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter/template.rb Thu Jan 31 00:03:53 
2008
@@ -120,12 +120,13 @@
     #   map.find('images/logo.png') => 'images/logo.png'
     #   map.find('fancy.css') => 'css/fancy.css'
     def find(path)
-      @sources.find do |file|
-        if File.directory?(file)
-          base = File.dirname(file) + '/'
-          FileList["#{file}/**/*"].find { |file| file.sub(base, '') == path }
+      @sources.inject(nil) do |found, source|
+        break found if found
+        if File.directory?(source)
+          base = File.join(File.dirname(source), '')
+          Dir.glob(File.join(source, "/**/*")).find { |file| file.sub(base, 
'') == path }
         else
-          file if File.basename(file) == path
+          source if File.basename(source) == path
         end 
       end
     end