svn commit: r608687 - in /incubator/buildr/docter/trunk: CHANGELOG lib/docter.rb lib/docter/page.rb

[as...@apache.org]

Author: assaf
Date: Thu Jan  3 16:24:30 2008
New Revision: 608687

URL: http://svn.apache.org/viewvc?rev=608687&view=rev
Log:
Upgraded to Facets 2.2.1 to prevent conflict with Buildr.

Modified:
    incubator/buildr/docter/trunk/CHANGELOG
    incubator/buildr/docter/trunk/lib/docter.rb
    incubator/buildr/docter/trunk/lib/docter/page.rb

Modified: incubator/buildr/docter/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/CHANGELOG?rev=608687&r1=608686&r2=608687&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/CHANGELOG (original)
+++ incubator/buildr/docter/trunk/CHANGELOG Thu Jan  3 16:24:30 2008
@@ -1,3 +1,6 @@
+1.1.1 (2007-01-03)
+* Fixed: Upgraded to Facets 2.2.1 to prevent conflict with Buildr.
+
 1.1.0 (2007-01-03)
 * Changed: Now using YAML for nested ToC.
 * Fixed: Sleek upload with changelog for each release courtesy of Anatol Pomozov.

Modified: incubator/buildr/docter/trunk/lib/docter.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter.rb?rev=608687&r1=608686&r2=608687&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter.rb Thu Jan  3 16:24:30 2008
@@ -1,15 +1,11 @@
 # &:symbol goodness.
-require 'facet/symbol/to_proc'
-# blank? on string and nil
-require 'facet/string/blank'
-require 'facet/nilclass/blank'
-# x.in?(y) is better than y.include?(x)
-require 'facet/string/starts_with'
-require 'facets/core/kernel/tap'
-require 'facet/kernel/__DIR__'
+require 'facets/symbol/to_proc'
+require 'facets/string/blank'
+require 'facets/kernel/tap'
+require 'facets/kernel/__DIR__'
 
 module Docter
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end
 
 $LOAD_PATH.unshift __DIR__

Modified: incubator/buildr/docter/trunk/lib/docter/page.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/docter/trunk/lib/docter/page.rb?rev=608687&r1=608686&r2=608687&view=diff
==============================================================================
--- incubator/buildr/docter/trunk/lib/docter/page.rb (original)
+++ incubator/buildr/docter/trunk/lib/docter/page.rb Thu Jan  3 16:24:30 2008
@@ -202,7 +202,7 @@
         tag, attributes, text = $1.downcase, $2.to_s, inner_text_from($3)
         # Make sure all H2/H3 headers have a usable ID, create once if necessary.
         id = CGI.unescape($3) if attributes[regexp_attribute('id')]
-        if id.blank?
+        if id.to_s.blank?
           id = CGI.unescapeHTML(text.downcase.gsub(' ', '_'))
           header = %{<#{tag} #{attributes} id='#{id}'>#{text}</#{tag}>}
         end