bri 0.1.3 → 0.1.4

data/Changelog

@@ -0,0 +1,16 @@
+0.1.4
+  - Better rendering of list items
+  - Bulleted Lists now have bullets in front of the list items
+  - Numbered Lists now have numbers in front of the list items
+  - Fix off-by-one bug in hrule output
+
+0.1.3
+  - New line wrapping algorithm
+  - Colorize <tt>, <code>, headers, +foo+ and _bar_
+  - Use arglists instead of callseq to show method signature in output since
+    callseq can be empty at times
+
+0.1.2
+  - Add --list-methods
+  - Add --list-names
+  - Add -w/--width and width evaluation from the COLUMNS environment variable

data/TODO

@@ -1,4 +1,3 @@
-- Prepend/markup list items properly
 - Extend unqualified search to include class methods and case insensitive searches
 - Misc. error handlings
 - Do more specs

data/lib/bri/renderer.rb

@@ -8,12 +8,32 @@ module Bri
     end
 
     def render( element, width = Bri.width )
-      text = extract_text( element, width )
-      styled_text = replace_markup( text )
-      element.kind_of?( RDoc::Markup::Verbatim ) ? 
-        wrapped_text = styled_text :
-        wrapped_text = wrap_to_width( styled_text, width )
-      indent( wrapped_text )
+      case element
+        when RDoc::Markup::Verbatim 
+          text = extract_text( element, width )
+          styled_text = replace_markup( text )
+          indent( styled_text )
+
+        when RDoc::Markup::List
+          item_width = width - INDENT.length
+          rendered_items = element.items.collect { |item| render item, item_width }
+          rendered_items.map! { |item| item.gsub( /\n/, "\n#{INDENT}" ) }
+          case element.type
+            when :BULLET 
+              rendered_items.map! { |item| ' *' + item }
+            when :NUMBER
+              i = 0
+              rendered_items.map! { |item| i+=1; sprintf "%d.%s", i, item }
+          end
+
+          rendered_items.join( "\n\n" ) + "\n"
+
+        else
+          text = extract_text( element, width )
+          styled_text = replace_markup( text )
+          wrapped_text = wrap_to_width( styled_text, width )
+          indent( wrapped_text )
+      end
     end
 
     def extract_text( element, width )
@@ -27,18 +47,9 @@ module Bri
                when RDoc::Markup::Verbatim
                  element.text
                when RDoc::Markup::Heading
-                 "<h>#{element.text}</h>"
+                 "<h>#{element.text}</h>" 
                when RDoc::Markup::ListItem
                  element.label.to_s + element.parts.collect { |part| extract_text part, width }.join
-               when RDoc::Markup::List
-                 prefix = case element.type
-                            when :NOTE, :LABEL then "Note:\n" 
-                            when :NUMBER       then "Numbered List:\n"
-                            when :BULLET       then "Bulletet List:\n"
-                            else 
-                              raise "Don't know how to handle list type #{element.type}: #{element.inspect}"
-                          end
-                 prefix + element.items.collect { |item| extract_text item, width }.join
                else  
                  raise "Don't know how to handle type #{element.class}: #{element.inspect}"
              end
@@ -63,12 +74,7 @@ module Bri
     end
 
     def printable_length( text )
-      embedded_ansi_codes = text.scan( Term::ANSIColor::COLORED_REGEXP )
-      if embedded_ansi_codes.empty?
-        text.length
-      else
-        text.length - embedded_ansi_codes.reduce( 0 ) { |total, code| code.length + total }
-      end
+      Term::ANSIColor.uncolored( text ).length
     end
 
     def wrap_to_width( styled_text, width )

data/lib/bri/templates.rb

@@ -64,9 +64,14 @@ module Bri
 
     module Helpers
       def hrule( text = '', width = Bri.width )
-        '-' * ( width - text.length - 1 ) + " " + 
-          Term::ANSIColor::bold + text + Term::ANSIColor::reset + 
-          "\n"
+        if text == ''
+          '-' * width + "\n"
+        else
+          text = " " + text if text != ''
+          '-' * ( width - text.length ) + 
+            Term::ANSIColor::bold + text + Term::ANSIColor::reset + 
+            "\n"
+        end
       end
       module_function :hrule
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Sven Riedel
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +02:00
+date: 2010-10-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ extra_rdoc_files:
 files: 
 - README
 - TODO
+- Changelog
 - bin/bri
 - lib/bri.rb
 - lib/bri/mall.rb