hanna-bootstrap 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,4 +1,4 @@
-= Hanna Bootstrap — a better RDoc template, now for RDoc 2.5 and 3.0.
+= Hanna Bootstrap — Twitter Bootstrap theme for RDoc
 
 Based on the original Hanna by Mislav, Hanna Nouveau by Erik.
 
@@ -9,25 +9,18 @@ wiki}[http://github.com/mislav/hanna/wikis/home].)
 
 Hanna gem is available from http://rubygems.org:
 
-    gem install hanna-nouveau
+    gem install hanna-bootstrap
 
-The template was created by {Mislav}[http://mislav.caboo.se/] and since then
+The template was created by {Atsushi Nagase}[http://ngs.io/] and since then
 has seen contributions from:
 
-1. {Tony Strauss}[http://github.com/DesigningPatterns], who participated from
-   the early start and made tons of fixes and enhancements to the template;
-2. {Hongli Lai}[http://blog.phusion.nl/] with the search filter for methods.
-3. {Erik Hollensbe}[http://github.com/erikh] a serious refactoring and up to
-   date with RDoc 2.5.x and 3.x, now named 'hanna-nouveau'.
-4. {James Tucker}[http://github.com/raggi] minor cleanups for Erik.
-
 == Usage
 
-    rdoc -o doc -f hanna lib/*.rb
+    rdoc -o doc -f bootstrap lib/*.rb
 
 An alternative is to set the `RDOCOPT` environment variable:
 
-    RDOCOPT="-f hanna"
+    RDOCOPT="-f bootstrap"
 
 This will make RDoc always use Hanna unless it is explicitly overridden.
 
@@ -36,10 +29,10 @@ This will make RDoc always use Hanna unless it is explicitly overridden.
 Another neat trick is to put the following line in your .gemrc, this will make
 RubyGems use Hanna for all rdoc generation:
 
-    rdoc: -f hanna
+    rdoc: -f bootstrap
 
 This will make RubyGems use Hanna when generating documentation for installed
-gems. Remember, if you wish to have all your gems be formatted in hanna:
+gems. Remember, if you wish to have all your gems be formatted in bootstrap:
 
     gem rdoc --all --overwrite
 
@@ -50,15 +43,15 @@ The first time. To easily browse your newly created documentation, use:
 == Rake task
 
 For repeated generation of API docs, it's better to set up a Rake task. Simply
-add the hanna format argument to your RDoc::Task options:
+add the bootstrap format argument to your RDoc::Task options:
 
     gem 'rdoc'
     require 'rdoc/task'
     RDoc::Task.new do |rdoc|
       # this only works with RDoc 3.1 or greater
-      rdoc.generator = 'hanna'
+      rdoc.generator = 'bootstrap'
       # this is what you use pre RDoc 3.1:
-      rdoc.options.push '-f', 'hanna'
+      rdoc.options.push '-f', 'bootstrap'
     end
 
 Tip: you can do this in the Rakefile of your Rails project before running
@@ -72,7 +65,7 @@ library}[http://github.com/rdbi/rdbi/tree/master/Rakefile]:
     RDoc::Task.new do |rdoc|
       version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
-      rdoc.generator = 'hanna'
+      rdoc.generator = 'bootstrap'
       rdoc.main = 'README.rdoc'
       rdoc.rdoc_dir = 'rdoc'
       rdoc.title = "RDBI #{version} Documentation"

data/Rakefile

@@ -13,5 +13,6 @@ RDoc::Task.new do |rdoc|
   rdoc.main       = "README.rdoc"
   rdoc.rdoc_dir   = 'doc'
   rdoc.title      = 'hanna-bootstrap'
+  rdoc.options   << '--line-numbers'
 
 end

data/hanna-bootstrap.gemspec

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-
-require 'hanna-bootstrap'
+require 'hanna-bootstrap/version'
 
 Gem::Specification.new do |s|
   s.name = %q{hanna-bootstrap}
@@ -9,23 +8,25 @@ Gem::Specification.new do |s|
 
   s.authors = ["Atsushi Nagase", "Erik Hollensbe", "James Tucker", "Mislav Marohnic"]
   s.date = Time.now.strftime("%Y-%m-%d")
+  s.summary = %q{Twitter Boostrap theme for RDoc}
   s.description = %q{}
   s.email = %q{a@ngs.io}
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-  s.files        = `git ls-files`.split("\n").reject{|f| f =~ /^(\..+|Gemfile.*|Guardfile|)$/}
   s.homepage = %q{http://github.com/ngs/hanna-bootstrap}
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.summary = %q{Twitter Boostrap theme for RDoc}
 
-  s.add_development_dependency 'bundler'
-  s.add_development_dependency 'coffee-script'
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'json'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'sass'
+  s.add_dependency 'bundler'
+  s.add_dependency 'coderay'
+  s.add_dependency 'coffee-script'
+  s.add_dependency 'haml'
+  s.add_dependency 'json'
+  s.add_dependency 'rake'
+  s.add_dependency 'sass'
+
+  s.files        = `git ls-files`.split("\n").reject{|f| f =~ /^(\..+|Gemfile.*|Guardfile|)$/}
+  s.require_paths = ["lib"]
 end
 

data/lib/hanna-bootstrap.rb

@@ -10,18 +10,19 @@
 #   Tony Strauss (http://github.com/DesigningPatterns)
 #   Michael Granger <ged@FaerieMUD.org>, who had maintained the original RDoc template
 
-require 'pathname'
-require 'haml'
-require 'sass'
-require 'rdoc/rdoc'
-require 'rdoc/generator'
+require 'coderay'
+require 'coderay/helpers/file_type'
 require 'coffee-script'
+require 'haml'
+require 'hanna-bootstrap/version'
 require 'json'
+require 'pathname'
+require 'rdoc/generator'
+require 'rdoc/rdoc'
+require 'sass'
 
 class RDoc::Generator::Bootstrap
 
-  VERSION = '0.0.1'
-
   LAYOUT           = 'layout.haml'
 
   CLASS_PAGE       = 'page.haml'
@@ -52,8 +53,7 @@ class RDoc::Generator::Bootstrap
 
   def initialize( options )
     @options = options
-
-    @templatedir = Pathname.new File.expand_path('../hanna-bootstrap/template_files', __FILE__)
+    @templatedir = Pathname.new(options.template_dir || File.expand_path('../hanna-bootstrap/template_files', __FILE__))
 
     @files      = nil
     @classes    = nil
@@ -65,16 +65,17 @@ class RDoc::Generator::Bootstrap
 
   def default_values( path )
     {
-      stylesheets: [
-        outpath(File.join('css', 'bootstrap.min.css'  ), path),
-        outpath(File.join('css', 'application.css'    ), path)
-      ],
-      javascripts: [
-        outpath(File.join('js',  'jquery.js'          ), path),
-        outpath(File.join('js',  'bootstrap.min.js'   ), path),
-        outpath(File.join('js',  'index.js'           ), path),
-        outpath(File.join('js',  'application.js'     ), path)
-      ],
+      stylesheets: %w{
+        bootstrap.min
+        application
+        coderay
+      }.map {|f|outpath(File.join('css', "#{f}.css"), path)},
+      javascripts: %w{
+        jquery
+        bootstrap.min
+        index
+        application
+      }.map {|f|outpath(File.join('js', "#{f}.js"), path)},
       mainpage:   outpath('', path),
       files:      @files,
       classes:    @classes,
@@ -96,7 +97,7 @@ class RDoc::Generator::Bootstrap
 
     # Now actually write the output
     write_static_files
-    
+
     generate_class_files
     generate_file_files
     generate_indexes
@@ -139,6 +140,7 @@ class RDoc::Generator::Bootstrap
 
     FileUtils.cp %w{
       bootstrap.min.css
+      coderay.css
     }.map{|f| templjoin f }, css_dir
 
   end
@@ -162,7 +164,7 @@ class RDoc::Generator::Bootstrap
 
     index = haml_file(templjoin(templfile))
 
-    File.open(path, 'w') do |f| 
+    File.open(path, 'w') do |f|
       f << with_layout(values) do
         index.to_html(binding, values)
       end
@@ -183,18 +185,18 @@ class RDoc::Generator::Bootstrap
     method_list_page = haml_file(templjoin(METHOD_LIST_PAGE))
 
     path = Pathname.new(path || file.path)
-    values = default_values(path).merge({ 
-      :file => file, 
+    values = default_values(path).merge({
+      :file => file,
       :entry => file,
-      :classmod => nil, 
-      :title => file.base_name, 
+      :classmod => nil,
+      :title => file.base_name,
       :list_title => nil,
       :description => file.description
     })
 
-    result = with_layout(values) do 
-      file_page.to_html(binding, :values => values) do 
-        method_list_page.to_html(binding, values) 
+    result = with_layout(values) do
+      file_page.to_html(binding, :values => values) do
+        method_list_page.to_html(binding, values)
       end
     end
 
@@ -232,8 +234,8 @@ class RDoc::Generator::Bootstrap
 
       path = Pathname.new(klass.path)
 
-      values = default_values(path).merge({ 
-        :file => klass.path, 
+      values = default_values(path).merge({
+        :file => klass.path,
         :entry => klass,
         :classmod => klass.type,
         :title => klass.full_name,
@@ -242,9 +244,9 @@ class RDoc::Generator::Bootstrap
         :sections => sections
       })
 
-      result = with_layout(values) do 
+      result = with_layout(values) do
         h = {:values => values}
-        class_page.to_html(binding, h) do 
+        class_page.to_html(binding, h) do
           method_list_page.to_html(binding, h) + sections_page.to_html(binding, h)
         end
       end
@@ -312,7 +314,7 @@ class RDoc::Generator::Bootstrap
       out
     end
   end
-    
+
   def build_javascript_search_index(entries)
     'var searchIndex = ' + (entries.map { |entry|
       method_name = entry.name
@@ -365,4 +367,34 @@ class RDoc::Generator::Bootstrap
   def haml_file(file)
     Haml::Engine.new(File.read(file))
   end
-end 
+
+  def highlighted_code_block(method)
+    lang = CodeRay::FileType.fetch(method.file.name, :text, true)
+    src = method.token_stream.map(&:text).join
+
+    # from RDoc::Generator::Markup#markup_code
+    indent = src.length
+    lines = src.lines.to_a
+    start = 0
+    if src =~ /\A.*#\ *File/i # remove '# File' comment
+      line = lines.shift
+      line.sub!(/\A(.*)(, line (\d+))/, '\1')
+      start = $3.to_i
+    end
+    lines.each do |line|
+      if line =~ /^ *(?=\S)/
+        n = $&.length
+        indent = n if n < indent
+        break if n == 0
+      end
+    end
+    src = lines.join
+    src.gsub!(/^#{' ' * indent}/, '') if indent > 0
+
+    CodeRay.highlight(src, lang,
+      :line_numbers        => @options.line_numbers ? :table : nil,
+      :line_number_anchors => "#{method.aref}-source-",
+      :line_number_start   => start
+      )
+  end
+end

data/lib/hanna-bootstrap/template_files/application.coffee

@@ -3,7 +3,7 @@ do(window, $) -> $ ->
   resultList  = $ '#search-results'
   searchIndex = window.searchIndex
   input       = $ '#search-query'
-  base        = $("script[src$='index.js']").attr('src').replace(/^([^j]+)js.*/, (a, b) -> b)
+  base        = $("script[src$='index.js']").attr('src').replace(/^([^j]*)js.*/, (a, b) -> b)
 
   search = ->
     val = input.val()
@@ -42,4 +42,5 @@ do(window, $) -> $ ->
   $('navbar-search').bind('submit', -> false)
 
 
-      
+
+

data/lib/hanna-bootstrap/template_files/application.sass

@@ -1,8 +1,4 @@
-body
-  background: #eee
-
 #main
-  background: #fff
   @media (min-width: 980px)
     padding: 80px 0
   padding: 0 0 50px 0
@@ -13,6 +9,12 @@ body
       .parent
         opacity: 0.5
 
+
+.navbar
+  .dropdown-menu
+    max-height: 400px
+    overflow: auto
+
 #search-results
   li
     strong, span
@@ -27,4 +29,40 @@ footer
   a
     color: #999
   text-align: right
-  padding: 20px 0
+  padding: 20px 0
+
+#methods
+  section, article
+    padding-top: 50px
+    margin-top: -30px
+    h2, h3
+      margin: 0
+  .synopsis
+    .arguments
+      font-size: 80%
+      font-weight: normal
+      color: #999
+  .source
+    .collapse
+      overflow: auto
+    .source-toggle
+      margin-bottom: 10px
+      .hide, &.collapsed .show
+        display: inline
+      .show, &.collapsed .hide
+        display: none
+      
+h1.name
+  .type
+    font-size: 80%
+    font-weight: normal
+    color: #999
+
+#class-list
+  .type
+    font-size: 15px
+    color: #999
+  a
+    font-weight: bold
+    font-size: 18px
+

data/lib/hanna-bootstrap/template_files/coderay.css

@@ -0,0 +1,141 @@
+.CodeRay pre {
+  margin: 0px;
+  font-size: 11px;
+  line-height: 15px;
+}
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px; }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px; }
+table.CodeRay td { padding: 2px 4px; vertical-align: top; }
+
+.CodeRay .line-numbers {
+  color: gray;
+  text-align: right;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+  padding-right: 0;
+}
+
+.CodeRay .line-numbers strong {
+  font-weight: normal;
+}
+
+.CodeRay .line-numbers pre {
+  border-radius: 4px 0 0 4px;
+  border-right: 0;
+  background-color: #eee;
+}
+
+.CodeRay td.code {
+  padding-left: 0;
+  overflow: auto;
+}
+
+.CodeRay td.code pre {
+  border-radius: 0 4px 4px 0;
+  border-left: 0;
+  white-space: pre;
+}
+
+.CodeRay .line-numbers a {
+  color: #ccc;
+  text-decoration: none !important;
+  white-space: nowrap;
+}
+.CodeRay .line-numbers a:target { color: blue !important; }
+.CodeRay .line-numbers .highlighted { color: red !important; }
+.CodeRay .line-numbers .highlighted a { color: red !important; }
+.CodeRay span.line-numbers { padding: 0px 4px; }
+.CodeRay .line { display: block; float: left; width: 100%; }
+.CodeRay .code { width: 100%; }
+
+.CodeRay .debug { color: white !important; background: blue !important; }
+
+.CodeRay .annotation { color:#007 }
+.CodeRay .attribute-name { color:#b48 }
+.CodeRay .attribute-value { color:#700 }
+.CodeRay .binary { color:#509 }
+.CodeRay .char .content { color:#D20 }
+.CodeRay .char .delimiter { color:#710 }
+.CodeRay .char { color:#D20 }
+.CodeRay .class { color:#B06; font-weight:bold }
+.CodeRay .class-variable { color:#369 }
+.CodeRay .color { color:#0A0 }
+.CodeRay .comment { color:#777 }
+.CodeRay .comment .char { color:#444 }
+.CodeRay .comment .delimiter { color:#444 }
+.CodeRay .complex { color:#A08 }
+.CodeRay .constant { color:#036; font-weight:bold }
+.CodeRay .decorator { color:#B0B }
+.CodeRay .definition { color:#099; font-weight:bold }
+.CodeRay .delimiter { color:black }
+.CodeRay .directive { color:#088; font-weight:bold }
+.CodeRay .doc { color:#970 }
+.CodeRay .doc-string { color:#D42; font-weight:bold }
+.CodeRay .doctype { color:#34b }
+.CodeRay .entity { color:#800; font-weight:bold }
+.CodeRay .error { color:#F00; background-color:#FAA }
+.CodeRay .escape  { color:#666 }
+.CodeRay .exception { color:#C00; font-weight:bold }
+.CodeRay .float { color:#60E }
+.CodeRay .function { color:#06B; font-weight:bold }
+.CodeRay .global-variable { color:#d70 }
+.CodeRay .hex { color:#02b }
+.CodeRay .imaginary { color:#f00 }
+.CodeRay .include { color:#B44; font-weight:bold }
+.CodeRay .inline { background-color: hsla(0,0%,0%,0.07); color: black }
+.CodeRay .inline-delimiter { font-weight: bold; color: #666 }
+.CodeRay .instance-variable { color:#33B }
+.CodeRay .integer  { color:#00D }
+.CodeRay .key .char { color: #60f }
+.CodeRay .key .delimiter { color: #404 }
+.CodeRay .key { color: #606 }
+.CodeRay .keyword { color:#080; font-weight:bold }
+.CodeRay .label { color:#970; font-weight:bold }
+.CodeRay .local-variable { color:#963 }
+.CodeRay .namespace { color:#707; font-weight:bold }
+.CodeRay .octal { color:#40E }
+.CodeRay .operator { }
+.CodeRay .predefined { color:#369; font-weight:bold }
+.CodeRay .predefined-constant { color:#069 }
+.CodeRay .predefined-type { color:#0a5; font-weight:bold }
+.CodeRay .preprocessor { color:#579 }
+.CodeRay .pseudo-class { color:#00C; font-weight:bold }
+.CodeRay .regexp .content { color:#808 }
+.CodeRay .regexp .delimiter { color:#404 }
+.CodeRay .regexp .modifier { color:#C2C }
+.CodeRay .regexp { background-color:hsla(300,100%,50%,0.06); }
+.CodeRay .reserved { color:#080; font-weight:bold }
+.CodeRay .shell .content { color:#2B2 }
+.CodeRay .shell .delimiter { color:#161 }
+.CodeRay .shell { background-color:hsla(120,100%,50%,0.06); }
+.CodeRay .string .char { color: #b0b }
+.CodeRay .string .content { color: #D20 }
+.CodeRay .string .delimiter { color: #710 }
+.CodeRay .string .modifier { color: #E40 }
+.CodeRay .string { background-color:hsla(0,100%,50%,0.05); }
+.CodeRay .symbol .content { color:#A60 }
+.CodeRay .symbol .delimiter { color:#630 }
+.CodeRay .symbol { color:#A60 }
+.CodeRay .tag { color:#070 }
+.CodeRay .type { color:#339; font-weight:bold }
+.CodeRay .value { color: #088; }
+.CodeRay .variable  { color:#037 }
+
+.CodeRay .insert { background: hsla(120,100%,50%,0.12) }
+.CodeRay .delete { background: hsla(0,100%,50%,0.12) }
+.CodeRay .change { color: #bbf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+.CodeRay .head .filename { color: white; }
+
+.CodeRay .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
+.CodeRay .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
+
+.CodeRay .insert .insert { color: #0c0; background:transparent; font-weight:bold }
+.CodeRay .delete .delete { color: #c00; background:transparent; font-weight:bold }
+.CodeRay .change .change { color: #88f }
+.CodeRay .head .head { color: #f4f }
+
+table.CodeRay { width: auto }

data/lib/hanna-bootstrap/template_files/file_index.haml

@@ -3,10 +3,4 @@
 
 %ol#index-entries{ :class => 'files' }
   - values[:files].each do |file|
-    - hide = file.name =~ /\.rb$/
-    - any_hidden = true if hide
-    %li{ :class => hide ? 'other' : nil }= link_to file.name, file.path
-
-  - if any_hidden
-    %li
-      %a.show{ :href => '#', :onclick => 'this.parentNode.parentNode.className += " expanded"; this.parentNode.removeChild(this); return false' } show all
+    %li= link_to file.name, '../' + file.path

data/lib/hanna-bootstrap/template_files/layout.haml

@@ -9,7 +9,7 @@
       %link{ :rel => "stylesheet", :href => f, :type => "text/css", :media => "screen" }
     - values[:javascripts].each do |f|
       %script{ :type => 'text/javascript', :src => f }
-        
+
   %body{ :class => values[:classmod] ? 'class' : 'file' }
     .navbar.navbar-fixed-top
       .navbar-inner
@@ -52,5 +52,5 @@
           \.
         %p
           Generated with the
-          = link_to "Hanna Bootstrap RDoc Generator #{RDoc::Generator::Bootstrap::VERSION}", 'http://github.com/ngs/hanna-boostrap'
+          = link_to "Hanna Bootstrap RDoc Generator #{RDoc::Generator::Bootstrap::VERSION}", 'http://github.com/ngs/hanna-bootstrap'
           \.

data/lib/hanna-bootstrap/template_files/method_list.haml

@@ -1,51 +1,27 @@
 - entry = values[:entry]
 - sections = values[:sections].keys if values.has_key?(:sections)
-- methods = entry.method_list + entry.attributes
-- unless methods.empty?
-  #method-list
-    %h2 Methods
-    - %w[attr attr_accessor attr_reader attr_writer class instance].each do |type|
-      - (RDoc::VISIBILITIES rescue RDoc::Context::VISIBILITIES).each do |vis|
-        -# FIXME ugly
-        - list = methods.reject { |x| x.respond_to?(:is_alias_for) && x.is_alias_for }.select { |x| x.visibility == vis && x.type == type.to_s }.sort
-        - unless list.empty?
-          - type_result = ""
-          - if type =~ /^attr_/
-            - type_result += type.sub(/^attr_/, '').capitalize
-          - else
-            - type_result += type.capitalize
-          - type_result = "#{vis.to_s.capitalize} #{type_result}"
-          %h3= type_result
-          %ol
-            - list.each do |method|
-              - if method.respond_to?(:aref)
-                - if method.name.to_s.empty? && method.call_seq
-                  %li= link_to method.call_seq.gsub(/<br\s*\/?>/, "").split(/[\r\n]+/).map{ |s| s.split(/([({]+|\[\{|\s+(#?=>|&rarr;)\s+)/).first.sub(/^[A-Za-z0-9_:]+\./, "").sub(/\s+=\s+.*/, "=").strip }.uniq.join("<br />\n"), '#' + method.aref
-                - else
-                  %li= link_to method.name, '#' + method.aref
-              - elsif method.respond_to?(:html_name)
-                %li= link_to method.name, "#method-#{method.html_name}"
-              - else
-                %li= method.name
 
 - if entry.requires or sections or entry.includes
   #context
     - unless entry.requires.empty?
-      #requires
+      - no_content = false
+      %section#requires
         %h2 Required files
         %ol
           - entry.requires.each do |req|
             %li= req.name
 
     - if sections && (sections.length > 1 || sections.first.title.to_s != '')
-      #contents
+      - no_content = false
+      %section#contents
         %h2 Contents
         %ol
           - sections.sort_by{|s| s.title.to_s}.each do |section|
             %li= link_to section.title, "##{section.aref}"
 
     - unless entry.includes.empty?
-      #includes
+      - no_content = false
+      %section#includes
         %h2 Included modules
         %ol
           - entry.includes.each do |inc|
@@ -53,4 +29,3 @@
               %li= inc.name
             - else
               %li= link_to inc.name, entry.aref_to(mod.path)
-

data/lib/hanna-bootstrap/template_files/page.haml

@@ -1,46 +1,77 @@
+- entry = values[:entry]
 - file_page = !values[:classmod]
-- title_in_description = values[:entry].description && values[:entry].description =~ /^\s*<h1>/m
+- methods = entry.method_list + entry.attributes
+- description = entry.description
+- title_in_description = description && (description =~ /<h(1|2[^>]*?)>/i)
+- description.gsub!(%r{<h(1|2)[^>]*?>(?<tag>.*?)</h(1|2)>}){|m| %Q[<div class="page-header">#{m}</div>] }
+- title = capture_haml do
+  - if file_page
+    = values[:title]
+  - else
+    %span.type= values[:classmod]
+    = values[:entry].full_name
 
-%header
-  .well
-    - title = capture_haml do
-      - if file_page
-        = values[:file].name
-      - else
-        %span.type= values[:classmod]
-        = values[:entry].full_name
+.row
+  .span9
     - if title_in_description
       .name= title
     - else
-      %h1.name= title
-    
-    - if file_page
-      .paths
-        = values[:file].relative_name
-    - else
-      %ol.paths
+      .page-header
+        %h1.name
+          = title
+    %section#content
+      #text
+        - if values[:description]
+          #description~ sanitize_code_blocks values[:description]
+        = content = yield
+        -# empty = content.gsub(/[\s\n]/, '').gsub(%r{</?[^>]+?>}, '').empty? && values[:description].empty?
+
+  .span3
+    %ul.nav.nav-list
+
+      - if file_page
+        %li.nav-header Path
+        %li= values[:file].relative_name
+
+      - else
+        %li.nav-header Defined IN
         - values[:entry].in_files.each_with_index do |file, index|
-          %li{ :class => index > 0 ? 'other' : nil }
-            -# FIXME cleanup
-            = link_to file.full_name, Pathname.new(file.path).relative_path_from(Pathname.new(values[:entry].path).dirname)
-        - if values[:entry].in_files.size > 1
           %li
-            %a.show{ :href => '#', :onclick => 'this.parentNode.parentNode.className += " expanded"; this.parentNode.removeChild(this); return false' } show all
-            
-    - if values[:entry].parent 
-      .parent
-        Parent:
-        -# FIXME helper method
-        %strong= link_to values[:entry].parent.name, Pathname.new(class_dir) + Pathname.new(values[:entry].parent.path).relative_path_from(Pathname.new values[:entry].path)
-
-    - if values[:entry].respond_to?(:last_modified) and values[:entry].last_modified
-      .last-update
-        Last Update:
-        %span.datetime= values[:entry].last_modified
-    
-%section#content
-  #text
-    - if values[:description]
-      #description~ sanitize_code_blocks values[:description]
-
-    = yield
+            = link_to file.full_name, Pathname.new(file.path).relative_path_from(Pathname.new(values[:entry].path).dirname)
+
+      - if values[:entry].parent
+        %li.nav-header Parent
+        %li
+          %strong
+            = link_to values[:entry].parent.name, Pathname.new(class_dir) + Pathname.new(values[:entry].parent.path).relative_path_from(Pathname.new values[:entry].path)
+
+      - if values[:entry].respond_to?(:last_modified) and values[:entry].last_modified
+        %li.nav-header Last Update
+        %li
+          %span.datetime= values[:entry].last_modified
+
+      - unless methods.empty?
+        %li.divider
+        - %w[attr attr_accessor attr_reader attr_writer class instance].each do |type|
+          - (RDoc::VISIBILITIES rescue RDoc::Context::VISIBILITIES).each do |vis|
+            - list = methods.reject { |x| x.respond_to?(:is_alias_for) && x.is_alias_for }.select { |x| x.visibility == vis && x.type == type.to_s }.sort
+            - unless list.empty?
+              - type_result = ""
+              - if type =~ /^attr_/
+                - type_result += type.sub(/^attr_/, '').capitalize
+              - else
+                - type_result += type.capitalize
+              - type_result = "#{vis.to_s.capitalize} #{type_result}"
+              %li.nav-header= type_result
+              - list.each do |method|
+                - if method.respond_to?(:aref)
+                  - if method.name.to_s.empty? && method.call_seq
+                    %li= link_to method.call_seq.gsub(/<br\s*\/?>/, "").split(/[\r\n]+/).map{ |s| s.split(/([({]+|\[\{|\s+(#?=>|&rarr;)\s+)/).first.sub(/^[A-Za-z0-9_:]+\./, "").sub(/\s+=\s+.*/, "=").strip }.uniq.join("<br />\n"), '#' + method.aref
+                  - else
+                    %li= link_to method.name, '#' + method.aref
+                - elsif method.respond_to?(:html_name)
+                  %li= link_to method.name, "#method-#{method.html_name}"
+                - else
+                  %li= method.name
+
+

data/lib/hanna-bootstrap/template_files/sections.haml

@@ -1,33 +1,39 @@
 - unless values[:entry].classes_and_modules.empty?
   #class-list
     %h2 Classes and Modules
-    %ol
-      - (values[:entry].modules.sort + values[:entry].classes.sort).each do |mod|
-        %li= link_to mod.full_name, values[:entry].aref_to(mod.path)
+    %ul
+      - values[:entry].modules.sort.each do |mod|
+        %li
+          %span.type MODULE
+          = link_to mod.full_name, values[:entry].aref_to(mod.path)
+      - values[:entry].classes.sort.each do |mod|
+        %li
+          %span.type CLASS
+          = link_to mod.full_name, values[:entry].aref_to(mod.path)
 
 - values[:sections].sort_by{|s, h| s.title.to_s}.each do |section, h|
   - constants, attributes, alias_types, method_types = h.values_at(:constants, :attributes, :alias_types, :method_types)
   #section
     - if section.title.to_s != ''
-      %h2 
+      %h2
         %a{ :name =>section.aref }= section.title
         - if section.comment
           .section-comment= section.description
-        
+
     - unless constants.empty?
       #constants-list
         %h2 Constants
         .name-list
-          %table{ :summary => "Constants" }
+          %table.table-striped.table{ :summary => "Constants" }
             - constants.each do |const|
               %tr.top-aligned-row.context-row
-                %td.context-item-name= const.name
+                %th.context-item-name= const.name
                 %td =
                 %td.context-item-value= const.value
                 - if const.description then
                   %td  
                   %td.context-item-desc= const.description
-                    
+
     - unless alias_types.empty?
       - alias_types.each do |type, aliases|
         #aliases-list
@@ -41,7 +47,7 @@
                   %td.context-item-value= link_to alia.is_alias_for.name, "##{alia.is_alias_for.aref}"
                   - unless alia.description.empty?
                     %td.context-item-desc= alia.description
-                    
+
     - unless attributes.empty?
       #attribute-list
         %h2.section-bar Attributes
@@ -53,36 +59,44 @@
                   %a{:name => attrib.aref}=attrib.name
                 %td.context-item-value= attrib.rw ? "[#{attrib.rw}]" : ' '
                 %td.context-item-desc~ sanitize_code_blocks(attrib.description)
-    
+
     - unless method_types.empty?
       #methods
         - method_types.each do |type, list|
           - unless list.empty?
-            %h2== #{type} methods
-            
-            - list.each do |method|
-              .method{ :id => "method-#{method.aref}", :class => "#{type.gsub(/\s+/, '-')}".downcase }
+            %article{ id: "#{type.downcase}-methods" }
+              %h2== #{type} methods
+
+              - list.each do |method|
                 %a{ :name => method.aref }
-                .synopsis
-                  - method_html = capture_haml do
-                    - if method.call_seq
-                      %span.name
-                        - method.call_seq.split(/\r?\n/).each do |seq|
-                          %div=seq
-                    - else
-                      %span.name= method.name
-                      %span.arguments= method.params
-                  -#- if method[:codeurl]
-                    -#%a.method-signature{ :href => method[:codeurl], :onclick => "popupCode(this.href); return false", :target => "Code" }
-                      -#= method_html
-                  -#- else
-                  = method_html
-                - if method.description
-                  .description
-                    ~ sanitize_code_blocks method.description
-                - if method.markup_code
-                  .source
-                    - name = "#{method.aref}-source"
-                    %a.source-toggle{ :href => "#", :onclick => "toggleCode('#{name}'); return false" }
-                      [show source]
-                    ~ "<pre id='#{name}'>#{method.markup_code}</pre>"
+                %section.method{ :id => "method-#{method.aref}", :class => "#{type.gsub(/\s+/, '-')}".downcase }
+                  %h3.synopsis
+                    - method_html = capture_haml do
+                      - if method.call_seq
+                        %span.name
+                          - method.call_seq.split(/\r?\n/).each do |seq|
+                            %div=seq
+                      - else
+                        %span.name= method.name
+                        %span.arguments= method.params
+                    -#- if method[:codeurl]
+                      -#%a.method-signature{ :href => method[:codeurl], :onclick => "popupCode(this.href); return false", :target => "Code" }
+                        -#= method_html
+                    -#- else
+                    = method_html
+                  - if method.description
+                    .description
+                      ~ sanitize_code_blocks method.description
+                  - if method.markup_code
+                    .source
+                      - name = "#{method.aref}-source"
+                      %a.btn.btn-mini.source-toggle.collapsed{ href: "##{name}", data: { toggle: 'collapse' } }
+                        %span.show
+                          %span.icon-resize-full
+                          Show
+                        %span.hide
+                          %span.icon-resize-small
+                          Hide
+                        Source
+                      %div.collapse{ id: name }
+                        = highlighted_code_block method

data/lib/hanna-bootstrap/version.rb

@@ -0,0 +1,7 @@
+module RDoc
+  module Generator
+    class Bootstrap
+      VERSION = '0.0.2'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hanna-bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -22,7 +22,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -38,7 +54,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -54,7 +70,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -70,7 +86,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -86,7 +102,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -102,7 +118,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -129,6 +145,7 @@ files:
 - lib/hanna-bootstrap/template_files/bootstrap.min.css
 - lib/hanna-bootstrap/template_files/bootstrap.min.js
 - lib/hanna-bootstrap/template_files/class_index.haml
+- lib/hanna-bootstrap/template_files/coderay.css
 - lib/hanna-bootstrap/template_files/file_index.haml
 - lib/hanna-bootstrap/template_files/glyphicons-halflings-white.png
 - lib/hanna-bootstrap/template_files/glyphicons-halflings.png
@@ -138,6 +155,7 @@ files:
 - lib/hanna-bootstrap/template_files/method_list.haml
 - lib/hanna-bootstrap/template_files/page.haml
 - lib/hanna-bootstrap/template_files/sections.haml
+- lib/hanna-bootstrap/version.rb
 - lib/rdoc/discover.rb
 homepage: http://github.com/ngs/hanna-bootstrap
 licenses: