2007-12-24 09:09:57 -05:00
|
|
|
require 'fileutils'
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-12 22:13:37 -05:00
|
|
|
require 'rdoc/generator'
|
2008-01-13 22:34:05 -05:00
|
|
|
require 'rdoc/markup/to_html'
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-12 22:13:37 -05:00
|
|
|
module RDoc::Generator
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
##
|
|
|
|
# Build a hash of all items that can be cross-referenced.
|
2008-01-06 19:42:03 -05:00
|
|
|
# This is used when we output required and included names:
|
2003-12-01 02:12:49 -05:00
|
|
|
# if the names appear in this hash, we can generate
|
|
|
|
# an html cross reference to the appropriate description.
|
2008-01-06 19:42:03 -05:00
|
|
|
# We also use this when parsing comment blocks: any decorated
|
2003-12-01 02:12:49 -05:00
|
|
|
# words matching an entry in this list are hyperlinked.
|
|
|
|
|
|
|
|
class AllReferences
|
|
|
|
@@refs = {}
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def AllReferences::reset
|
|
|
|
@@refs = {}
|
|
|
|
end
|
|
|
|
|
|
|
|
def AllReferences.add(name, html_class)
|
|
|
|
@@refs[name] = html_class
|
|
|
|
end
|
|
|
|
|
|
|
|
def AllReferences.[](name)
|
|
|
|
@@refs[name]
|
|
|
|
end
|
2004-05-09 23:14:35 -04:00
|
|
|
|
|
|
|
def AllReferences.keys
|
|
|
|
@@refs.keys
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
##
|
2008-01-13 22:34:05 -05:00
|
|
|
# Subclass of the RDoc::Markup::ToHtml class that supports looking up words
|
|
|
|
# in the AllReferences list. Those that are found (like AllReferences in
|
|
|
|
# this comment) will be hyperlinked
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-13 22:34:05 -05:00
|
|
|
class HyperlinkHtml < RDoc::Markup::ToHtml
|
2008-01-06 19:42:03 -05:00
|
|
|
|
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# We need to record the html path of our caller so we can generate
|
|
|
|
# correct relative paths for any hyperlinks that we find
|
2008-01-07 01:56:46 -05:00
|
|
|
def initialize(from_path, context, options)
|
2003-12-01 02:12:49 -05:00
|
|
|
super()
|
2008-01-07 01:56:46 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
@from_path = from_path
|
|
|
|
|
|
|
|
@parent_name = context.parent_name
|
|
|
|
@parent_name += "::" if @parent_name
|
|
|
|
@context = context
|
2008-01-07 01:56:46 -05:00
|
|
|
|
|
|
|
@options = options
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# We're invoked when any text matches the CROSSREF pattern
|
|
|
|
# (defined in MarkUp). If we fine the corresponding reference,
|
|
|
|
# generate a hyperlink. If the name we're looking for contains
|
|
|
|
# no punctuation, we look for it up the module/class chain. For
|
2008-01-12 22:13:37 -05:00
|
|
|
# example, HyperlinkHtml is found, even without the Generator::
|
|
|
|
# prefix, because we look for it in module Generator first.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def handle_special_CROSSREF(special)
|
|
|
|
name = special.text
|
|
|
|
if name[0,1] == '#'
|
|
|
|
lookup = name[1..-1]
|
2008-01-07 01:56:46 -05:00
|
|
|
name = lookup unless @options.show_hash
|
2003-12-01 02:12:49 -05:00
|
|
|
else
|
|
|
|
lookup = name
|
|
|
|
end
|
|
|
|
|
2006-07-08 19:17:53 -04:00
|
|
|
# Find class, module, or method in class or module.
|
|
|
|
if /([A-Z]\w*)[.\#](\w+[!?=]?)/ =~ lookup
|
|
|
|
container = $1
|
|
|
|
method = $2
|
|
|
|
ref = @context.find_symbol(container, method)
|
|
|
|
elsif /([A-Za-z]\w*)[.\#](\w+(\([\.\w+\*\/\+\-\=\<\>]+\))?)/ =~ lookup
|
2003-12-01 02:12:49 -05:00
|
|
|
container = $1
|
|
|
|
method = $2
|
|
|
|
ref = @context.find_symbol(container, method)
|
|
|
|
else
|
|
|
|
ref = @context.find_symbol(lookup)
|
|
|
|
end
|
|
|
|
|
|
|
|
if ref and ref.document_self
|
|
|
|
"<a href=\"#{ref.as_href(@from_path)}\">#{name}</a>"
|
|
|
|
else
|
|
|
|
name
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2004-01-29 08:44:04 -05:00
|
|
|
# Generate a hyperlink for url, labeled with text. Handle the
|
|
|
|
# special cases for img: and link: described under handle_special_HYPEDLINK
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-01-29 08:44:04 -05:00
|
|
|
def gen_url(url, text)
|
2003-12-01 02:12:49 -05:00
|
|
|
if url =~ /([A-Za-z]+):(.*)/
|
|
|
|
type = $1
|
|
|
|
path = $2
|
|
|
|
else
|
|
|
|
type = "http"
|
|
|
|
path = url
|
|
|
|
url = "http://#{url}"
|
|
|
|
end
|
|
|
|
|
|
|
|
if type == "link"
|
|
|
|
if path[0,1] == '#' # is this meaningful?
|
|
|
|
url = path
|
|
|
|
else
|
2008-01-12 22:02:49 -05:00
|
|
|
url = HTML.gen_url(@from_path, path)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
if (type == "http" || type == "link") &&
|
2003-12-01 02:12:49 -05:00
|
|
|
url =~ /\.(gif|png|jpg|jpeg|bmp)$/
|
|
|
|
|
2006-01-13 05:27:52 -05:00
|
|
|
"<img src=\"#{url}\" />"
|
2003-12-01 02:12:49 -05:00
|
|
|
else
|
2004-07-13 08:37:40 -04:00
|
|
|
"<a href=\"#{url}\">#{text.sub(%r{^#{type}:/*}, '')}</a>"
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2004-01-29 08:44:04 -05:00
|
|
|
# And we're invoked with a potential external hyperlink mailto:
|
|
|
|
# just gets inserted. http: links are checked to see if they
|
|
|
|
# reference an image. If so, that image gets inserted using an
|
|
|
|
# <img> tag. Otherwise a conventional <a href> is used. We also
|
|
|
|
# support a special type of hyperlink, link:, which is a reference
|
|
|
|
# to a local file whose path is relative to the --op directory.
|
|
|
|
|
|
|
|
def handle_special_HYPERLINK(special)
|
|
|
|
url = special.text
|
|
|
|
gen_url(url, url)
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Here's a hypedlink where the label is different to the URL
|
2003-12-01 02:12:49 -05:00
|
|
|
# <label>[url]
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def handle_special_TIDYLINK(special)
|
|
|
|
text = special.text
|
2004-07-12 08:20:51 -04:00
|
|
|
# unless text =~ /(\S+)\[(.*?)\]/
|
2008-01-06 19:42:03 -05:00
|
|
|
unless text =~ /\{(.*?)\}\[(.*?)\]/ or text =~ /(\S+)\[(.*?)\]/
|
2003-12-01 02:12:49 -05:00
|
|
|
return text
|
|
|
|
end
|
|
|
|
label = $1
|
|
|
|
url = $2
|
2004-01-29 08:44:04 -05:00
|
|
|
gen_url(url, label)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Handle common markup tasks for the various Html classes
|
|
|
|
|
|
|
|
module MarkUp
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Convert a string in markup format into HTML. We keep a cached
|
2008-01-13 22:34:05 -05:00
|
|
|
# RDoc::Markup object lying around after the first time we're
|
2003-12-01 02:12:49 -05:00
|
|
|
# called per object.
|
|
|
|
|
|
|
|
def markup(str, remove_para=false)
|
|
|
|
return '' unless str
|
|
|
|
unless defined? @markup
|
2008-01-13 22:34:05 -05:00
|
|
|
@markup = RDoc::Markup.new
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2006-07-08 19:17:53 -04:00
|
|
|
# class names, variable names, or instance variables
|
2003-12-01 02:12:49 -05:00
|
|
|
@markup.add_special(/(
|
2006-07-08 19:17:53 -04:00
|
|
|
\w+(::\w+)*[.\#]\w+(\([\.\w+\*\/\+\-\=\<\>]+\))? # A::B.meth(**) (for operator in Fortran95)
|
|
|
|
| \#\w+(\([.\w\*\/\+\-\=\<\>]+\))? # meth(**) (for operator in Fortran95)
|
|
|
|
| \b([A-Z]\w*(::\w+)*[.\#]\w+) # A::B.meth
|
2003-12-01 02:12:49 -05:00
|
|
|
| \b([A-Z]\w+(::\w+)*) # A::B..
|
2008-01-06 19:42:03 -05:00
|
|
|
| \#\w+[!?=]? # #meth_name
|
2006-07-08 19:17:53 -04:00
|
|
|
| \b\w+([_\/\.]+\w+)*[!?=]? # meth_name
|
2008-01-06 19:42:03 -05:00
|
|
|
)/x,
|
2003-12-01 02:12:49 -05:00
|
|
|
:CROSSREF)
|
|
|
|
|
|
|
|
# external hyperlinks
|
2004-02-06 08:49:54 -05:00
|
|
|
@markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
# and links of the form <text>[<url>]
|
2004-07-12 08:20:51 -04:00
|
|
|
@markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
|
|
|
|
# @markup.add_special(/\b(\S+?\[\S+?\.\S+?\])/, :TIDYLINK)
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
end
|
|
|
|
unless defined? @html_formatter
|
2008-01-07 01:56:46 -05:00
|
|
|
@html_formatter = HyperlinkHtml.new(self.path, self, @options)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
# Convert leading comment markers to spaces, but only
|
|
|
|
# if all non-blank lines have them
|
|
|
|
|
|
|
|
if str =~ /^(?>\s*)[^\#]/
|
|
|
|
content = str
|
|
|
|
else
|
|
|
|
content = str.gsub(/^\s*(#+)/) { $1.tr('#',' ') }
|
|
|
|
end
|
|
|
|
|
|
|
|
res = @markup.convert(content, @html_formatter)
|
|
|
|
if remove_para
|
|
|
|
res.sub!(/^<p>/, '')
|
|
|
|
res.sub!(/<\/p>$/, '')
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Qualify a stylesheet URL; if if +css_name+ does not begin with '/' or
|
|
|
|
# 'http[s]://', prepend a prefix relative to +path+. Otherwise, return it
|
|
|
|
# unmodified.
|
|
|
|
|
|
|
|
def style_url(path, css_name=nil)
|
|
|
|
# $stderr.puts "style_url( #{path.inspect}, #{css_name.inspect} )"
|
|
|
|
css_name ||= CSS_NAME
|
|
|
|
if %r{^(https?:/)?/} =~ css_name
|
|
|
|
return css_name
|
|
|
|
else
|
2008-01-12 22:02:49 -05:00
|
|
|
return HTML.gen_url(path, css_name)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build a webcvs URL with the given 'url' argument. URLs with a '%s' in them
|
|
|
|
# get the file's path sprintfed into them; otherwise they're just catenated
|
|
|
|
# together.
|
|
|
|
|
|
|
|
def cvs_url(url, full_path)
|
|
|
|
if /%s/ =~ url
|
|
|
|
return sprintf( url, full_path )
|
|
|
|
else
|
|
|
|
return url + full_path
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# A Context is built by the parser to represent a container: contexts
|
|
|
|
# hold classes, modules, methods, require lists and include lists.
|
|
|
|
# ClassModule and TopLevel are the context objects we process here
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
class ContextUser
|
|
|
|
|
|
|
|
include MarkUp
|
|
|
|
|
|
|
|
attr_reader :context
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def initialize(context, options)
|
|
|
|
@context = context
|
|
|
|
@options = options
|
2008-01-12 22:02:49 -05:00
|
|
|
|
|
|
|
# HACK ugly
|
|
|
|
@template = options.template_class
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# convenience method to build a hyperlink
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def href(link, cls, name)
|
|
|
|
%{<a href="#{link}" class="#{cls}">#{name}</a>} #"
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Returns a reference to outselves to be used as an href= the form depends
|
|
|
|
# on whether we're all in one file or in multiple files
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def as_href(from_path)
|
|
|
|
if @options.all_one_file
|
|
|
|
"#" + path
|
|
|
|
else
|
2008-01-12 22:02:49 -05:00
|
|
|
HTML.gen_url(from_path, path)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Create a list of HtmlMethod objects for each method in the corresponding
|
|
|
|
# context object. If the @options.show_all variable is set (corresponding
|
|
|
|
# to the <tt>--all</tt> option, we include all methods, otherwise just the
|
|
|
|
# public ones.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def collect_methods
|
|
|
|
list = @context.method_list
|
|
|
|
unless @options.show_all
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
list = list.find_all {|m| m.visibility == :public || m.visibility == :protected || m.force_documentation }
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
@methods = list.collect {|m| HtmlMethod.new(m, self, @options) }
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build a summary list of all the methods in this context
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def build_method_summary_list(path_prefix="")
|
|
|
|
collect_methods unless @methods
|
|
|
|
meths = @methods.sort
|
|
|
|
res = []
|
|
|
|
meths.each do |meth|
|
2008-01-06 19:42:03 -05:00
|
|
|
res << {
|
2003-12-01 02:12:49 -05:00
|
|
|
"name" => CGI.escapeHTML(meth.name),
|
2008-01-06 19:42:03 -05:00
|
|
|
"aref" => "#{path_prefix}\##{meth.aref}"
|
2003-12-01 02:12:49 -05:00
|
|
|
}
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2004-01-20 00:04:31 -05:00
|
|
|
# Build a list of aliases for which we couldn't find a
|
|
|
|
# corresponding method
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def build_alias_summary_list(section)
|
|
|
|
values = []
|
|
|
|
@context.aliases.each do |al|
|
|
|
|
next unless al.section == section
|
2004-01-20 00:04:31 -05:00
|
|
|
res = {
|
2003-12-01 02:12:49 -05:00
|
|
|
'old_name' => al.old_name,
|
|
|
|
'new_name' => al.new_name,
|
|
|
|
}
|
2004-01-20 00:04:31 -05:00
|
|
|
if al.comment && !al.comment.empty?
|
|
|
|
res['desc'] = markup(al.comment, true)
|
|
|
|
end
|
2004-11-20 10:02:57 -05:00
|
|
|
values << res
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2004-11-20 10:02:57 -05:00
|
|
|
values
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build a list of constants
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def build_constants_summary_list(section)
|
|
|
|
values = []
|
|
|
|
@context.constants.each do |co|
|
|
|
|
next unless co.section == section
|
2003-12-01 02:12:49 -05:00
|
|
|
res = {
|
|
|
|
'name' => co.name,
|
2004-02-23 16:10:42 -05:00
|
|
|
'value' => CGI.escapeHTML(co.value)
|
2003-12-01 02:12:49 -05:00
|
|
|
}
|
|
|
|
res['desc'] = markup(co.comment, true) if co.comment && !co.comment.empty?
|
2004-11-20 10:02:57 -05:00
|
|
|
values << res
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2004-11-20 10:02:57 -05:00
|
|
|
values
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def build_requires_list(context)
|
|
|
|
potentially_referenced_list(context.requires) {|fn| [fn + ".rb"] }
|
|
|
|
end
|
|
|
|
|
|
|
|
def build_include_list(context)
|
|
|
|
potentially_referenced_list(context.includes)
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build a list from an array of <i>Htmlxxx</i> items. Look up each
|
|
|
|
# in the AllReferences hash: if we find a corresponding entry,
|
|
|
|
# we generate a hyperlink to it, otherwise just output the name.
|
|
|
|
# However, some names potentially need massaging. For example,
|
|
|
|
# you may require a Ruby file without the .rb extension,
|
|
|
|
# but the file names we know about may have it. To deal with
|
|
|
|
# this, we pass in a block which performs the massaging,
|
|
|
|
# returning an array of alternative names to match
|
|
|
|
|
|
|
|
def potentially_referenced_list(array)
|
|
|
|
res = []
|
|
|
|
array.each do |i|
|
2008-01-06 19:42:03 -05:00
|
|
|
ref = AllReferences[i.name]
|
2004-05-10 08:46:18 -04:00
|
|
|
# if !ref
|
|
|
|
# container = @context.parent
|
|
|
|
# while !ref && container
|
|
|
|
# name = container.name + "::" + i.name
|
2008-01-06 19:42:03 -05:00
|
|
|
# ref = AllReferences[name]
|
2004-05-10 08:46:18 -04:00
|
|
|
# container = container.parent
|
|
|
|
# end
|
|
|
|
# end
|
|
|
|
|
|
|
|
ref = @context.find_symbol(i.name)
|
|
|
|
ref = ref.viewer if ref
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
if !ref && block_given?
|
|
|
|
possibles = yield(i.name)
|
|
|
|
while !ref and !possibles.empty?
|
|
|
|
ref = AllReferences[possibles.shift]
|
|
|
|
end
|
|
|
|
end
|
|
|
|
h_name = CGI.escapeHTML(i.name)
|
|
|
|
if ref and ref.document_self
|
|
|
|
path = url(ref.path)
|
|
|
|
res << { "name" => h_name, "aref" => path }
|
|
|
|
else
|
|
|
|
res << { "name" => h_name }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build an array of arrays of method details. The outer array has up
|
|
|
|
# to six entries, public, private, and protected for both class
|
|
|
|
# methods, the other for instance methods. The inner arrays contain
|
|
|
|
# a hash for each method
|
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def build_method_detail_list(section)
|
2003-12-01 02:12:49 -05:00
|
|
|
outer = []
|
|
|
|
|
2003-12-23 23:24:29 -05:00
|
|
|
methods = @methods.sort
|
2003-12-01 02:12:49 -05:00
|
|
|
for singleton in [true, false]
|
2008-01-06 19:42:03 -05:00
|
|
|
for vis in [ :public, :protected, :private ]
|
2003-12-01 02:12:49 -05:00
|
|
|
res = []
|
2003-12-23 23:24:29 -05:00
|
|
|
methods.each do |m|
|
2004-11-20 10:02:57 -05:00
|
|
|
if m.section == section and
|
2008-01-06 19:42:03 -05:00
|
|
|
m.document_self and
|
|
|
|
m.visibility == vis and
|
2004-11-20 10:02:57 -05:00
|
|
|
m.singleton == singleton
|
2003-12-01 02:12:49 -05:00
|
|
|
row = {}
|
2003-12-23 23:24:29 -05:00
|
|
|
if m.call_seq
|
2004-07-12 12:03:11 -04:00
|
|
|
row["callseq"] = m.call_seq.gsub(/->/, '→')
|
2003-12-23 23:24:29 -05:00
|
|
|
else
|
|
|
|
row["name"] = CGI.escapeHTML(m.name)
|
|
|
|
row["params"] = m.params
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
desc = m.description.strip
|
|
|
|
row["m_desc"] = desc unless desc.empty?
|
|
|
|
row["aref"] = m.aref
|
|
|
|
row["visibility"] = m.visibility.to_s
|
|
|
|
|
2003-12-30 21:21:07 -05:00
|
|
|
alias_names = []
|
|
|
|
m.aliases.each do |other|
|
|
|
|
if other.viewer # won't be if the alias is private
|
|
|
|
alias_names << {
|
2003-12-01 02:12:49 -05:00
|
|
|
'name' => other.name,
|
|
|
|
'aref' => other.viewer.as_href(path)
|
2008-01-06 19:42:03 -05:00
|
|
|
}
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
2003-12-30 21:21:07 -05:00
|
|
|
unless alias_names.empty?
|
|
|
|
row["aka"] = alias_names
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
if @options.inline_source
|
|
|
|
code = m.source_code
|
|
|
|
row["sourcecode"] = code if code
|
|
|
|
else
|
|
|
|
code = m.src_url
|
|
|
|
if code
|
|
|
|
row["codeurl"] = code
|
|
|
|
row["imgurl"] = m.img_url
|
|
|
|
end
|
|
|
|
end
|
|
|
|
res << row
|
|
|
|
end
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
if res.size > 0
|
2003-12-01 02:12:49 -05:00
|
|
|
outer << {
|
2008-01-07 16:28:43 -05:00
|
|
|
"type" => vis.to_s.capitalize,
|
|
|
|
"category" => singleton ? "Class" : "Instance",
|
|
|
|
"methods" => res
|
2003-12-01 02:12:49 -05:00
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
outer
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Build the structured list of classes and modules contained
|
2008-01-06 19:42:03 -05:00
|
|
|
# in this context.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def build_class_list(level, from, section, infile=nil)
|
2003-12-01 02:12:49 -05:00
|
|
|
res = ""
|
|
|
|
prefix = " ::" * level;
|
|
|
|
|
|
|
|
from.modules.sort.each do |mod|
|
2004-11-20 10:02:57 -05:00
|
|
|
next unless mod.section == section
|
2003-12-01 02:12:49 -05:00
|
|
|
next if infile && !mod.defined_in?(infile)
|
|
|
|
if mod.document_self
|
2008-01-06 19:42:03 -05:00
|
|
|
res <<
|
2003-12-01 02:12:49 -05:00
|
|
|
prefix <<
|
|
|
|
"Module " <<
|
|
|
|
href(url(mod.viewer.path), "link", mod.full_name) <<
|
|
|
|
"<br />\n" <<
|
2004-11-20 10:02:57 -05:00
|
|
|
build_class_list(level + 1, mod, section, infile)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
from.classes.sort.each do |cls|
|
2004-11-20 10:02:57 -05:00
|
|
|
next unless cls.section == section
|
2003-12-01 02:12:49 -05:00
|
|
|
next if infile && !cls.defined_in?(infile)
|
|
|
|
if cls.document_self
|
|
|
|
res <<
|
2008-01-06 19:42:03 -05:00
|
|
|
prefix <<
|
2003-12-01 02:12:49 -05:00
|
|
|
"Class " <<
|
|
|
|
href(url(cls.viewer.path), "link", cls.full_name) <<
|
|
|
|
"<br />\n" <<
|
2004-11-20 10:02:57 -05:00
|
|
|
build_class_list(level + 1, cls, section, infile)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
res
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def url(target)
|
2008-01-12 22:02:49 -05:00
|
|
|
HTML.gen_url(path, target)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def aref_to(target)
|
|
|
|
if @options.all_one_file
|
|
|
|
"#" + target
|
|
|
|
else
|
|
|
|
url(target)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def document_self
|
|
|
|
@context.document_self
|
|
|
|
end
|
|
|
|
|
|
|
|
def diagram_reference(diagram)
|
|
|
|
res = diagram.gsub(/((?:src|href)=")(.*?)"/) {
|
|
|
|
$1 + url($2) + '"'
|
|
|
|
}
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Find a symbol in ourselves or our parent
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def find_symbol(symbol, method=nil)
|
|
|
|
res = @context.find_symbol(symbol, method)
|
|
|
|
if res
|
|
|
|
res = res.viewer
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
2004-11-20 10:02:57 -05:00
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2004-11-20 10:02:57 -05:00
|
|
|
# create table of contents if we contain sections
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def add_table_of_sections
|
|
|
|
toc = []
|
|
|
|
@context.sections.each do |section|
|
|
|
|
if section.title
|
|
|
|
toc << {
|
|
|
|
'secname' => section.title,
|
|
|
|
'href' => section.sequence
|
|
|
|
}
|
|
|
|
end
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
@values['toc'] = toc unless toc.empty?
|
|
|
|
end
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Wrap a ClassModule context
|
|
|
|
|
|
|
|
class HtmlClass < ContextUser
|
|
|
|
|
|
|
|
attr_reader :path
|
|
|
|
|
|
|
|
def initialize(context, html_file, prefix, options)
|
|
|
|
super(context, options)
|
|
|
|
|
|
|
|
@html_file = html_file
|
|
|
|
@is_module = context.is_module?
|
|
|
|
@values = {}
|
|
|
|
|
|
|
|
context.viewer = self
|
|
|
|
|
|
|
|
if options.all_one_file
|
|
|
|
@path = context.full_name
|
|
|
|
else
|
|
|
|
@path = http_url(context.full_name, prefix)
|
|
|
|
end
|
|
|
|
|
|
|
|
collect_methods
|
|
|
|
|
|
|
|
AllReferences.add(name, self)
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Returns the relative file name to store this class in, which is also its
|
|
|
|
# url
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def http_url(full_name, prefix)
|
|
|
|
path = full_name.dup
|
|
|
|
if path['<<']
|
|
|
|
path.gsub!(/<<\s*(\w*)/) { "from-#$1" }
|
|
|
|
end
|
|
|
|
File.join(prefix, path.split("::")) + ".html"
|
|
|
|
end
|
|
|
|
|
|
|
|
def name
|
|
|
|
@context.full_name
|
|
|
|
end
|
|
|
|
|
|
|
|
def parent_name
|
|
|
|
@context.parent.full_name
|
|
|
|
end
|
|
|
|
|
|
|
|
def index_name
|
|
|
|
name
|
|
|
|
end
|
|
|
|
|
|
|
|
def write_on(f)
|
|
|
|
value_hash
|
2008-01-12 22:02:49 -05:00
|
|
|
template = RDoc::TemplatePage.new(@template::BODY,
|
|
|
|
@template::CLASS_PAGE,
|
|
|
|
@template::METHOD_LIST)
|
2003-12-01 02:12:49 -05:00
|
|
|
template.write_html_on(f, @values)
|
|
|
|
end
|
|
|
|
|
|
|
|
def value_hash
|
|
|
|
class_attribute_values
|
2004-11-20 10:02:57 -05:00
|
|
|
add_table_of_sections
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
@values["charset"] = @options.charset
|
|
|
|
@values["style_url"] = style_url(path, @options.css)
|
|
|
|
|
|
|
|
d = markup(@context.comment)
|
|
|
|
@values["description"] = d unless d.empty?
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
ml = build_method_summary_list @path
|
2003-12-01 02:12:49 -05:00
|
|
|
@values["methods"] = ml unless ml.empty?
|
|
|
|
|
|
|
|
il = build_include_list(@context)
|
|
|
|
@values["includes"] = il unless il.empty?
|
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
@values["sections"] = @context.sections.map do |section|
|
|
|
|
|
|
|
|
secdata = {
|
|
|
|
"sectitle" => section.title,
|
|
|
|
"secsequence" => section.sequence,
|
|
|
|
"seccomment" => markup(section.comment)
|
|
|
|
}
|
|
|
|
|
|
|
|
al = build_alias_summary_list(section)
|
|
|
|
secdata["aliases"] = al unless al.empty?
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
co = build_constants_summary_list(section)
|
|
|
|
secdata["constants"] = co unless co.empty?
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
al = build_attribute_list(section)
|
|
|
|
secdata["attributes"] = al unless al.empty?
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
cl = build_class_list(0, @context, section)
|
|
|
|
secdata["classlist"] = cl unless cl.empty?
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
mdl = build_method_detail_list(section)
|
|
|
|
secdata["method_list"] = mdl unless mdl.empty?
|
|
|
|
|
|
|
|
secdata
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
@values
|
|
|
|
end
|
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def build_attribute_list(section)
|
2003-12-01 02:12:49 -05:00
|
|
|
atts = @context.attributes.sort
|
|
|
|
res = []
|
|
|
|
atts.each do |att|
|
2004-11-20 10:02:57 -05:00
|
|
|
next unless att.section == section
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
if att.visibility == :public || att.visibility == :protected || @options.show_all
|
2004-02-19 09:26:05 -05:00
|
|
|
entry = {
|
2008-01-06 19:42:03 -05:00
|
|
|
"name" => CGI.escapeHTML(att.name),
|
|
|
|
"rw" => att.rw,
|
2004-02-19 09:26:05 -05:00
|
|
|
"a_desc" => markup(att.comment, true)
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
unless att.visibility == :public || att.visibility == :protected
|
2004-02-19 09:26:05 -05:00
|
|
|
entry["rw"] << "-"
|
|
|
|
end
|
|
|
|
res << entry
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
|
|
|
def class_attribute_values
|
|
|
|
h_name = CGI.escapeHTML(name)
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
@values["path"] = @path
|
2003-12-01 02:12:49 -05:00
|
|
|
@values["classmod"] = @is_module ? "Module" : "Class"
|
|
|
|
@values["title"] = "#{@values['classmod']}: #{h_name}"
|
|
|
|
|
|
|
|
c = @context
|
|
|
|
c = c.parent while c and !c.diagram
|
|
|
|
if c && c.diagram
|
|
|
|
@values["diagram"] = diagram_reference(c.diagram)
|
|
|
|
end
|
|
|
|
|
|
|
|
@values["full_name"] = h_name
|
|
|
|
|
|
|
|
parent_class = @context.superclass
|
|
|
|
|
|
|
|
if parent_class
|
2008-01-06 19:42:03 -05:00
|
|
|
@values["parent"] = CGI.escapeHTML(parent_class)
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
if parent_name
|
|
|
|
lookup = parent_name + "::" + parent_class
|
|
|
|
else
|
|
|
|
lookup = parent_class
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
parent_url = AllReferences[lookup] || AllReferences[parent_class]
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
if parent_url and parent_url.document_self
|
|
|
|
@values["par_url"] = aref_to(parent_url.path)
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
files = []
|
|
|
|
@context.in_files.each do |f|
|
|
|
|
res = {}
|
|
|
|
full_path = CGI.escapeHTML(f.file_absolute_name)
|
|
|
|
|
|
|
|
res["full_path"] = full_path
|
|
|
|
res["full_path_url"] = aref_to(f.viewer.path) if f.document_self
|
|
|
|
|
|
|
|
if @options.webcvs
|
|
|
|
res["cvsurl"] = cvs_url( @options.webcvs, full_path )
|
|
|
|
end
|
|
|
|
|
|
|
|
files << res
|
|
|
|
end
|
|
|
|
|
|
|
|
@values['infiles'] = files
|
|
|
|
end
|
|
|
|
|
|
|
|
def <=>(other)
|
|
|
|
self.name <=> other.name
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2003-12-01 02:12:49 -05:00
|
|
|
# Handles the mapping of a file's information to HTML. In reality,
|
|
|
|
# a file corresponds to a +TopLevel+ object, containing modules,
|
|
|
|
# classes, and top-level methods. In theory it _could_ contain
|
|
|
|
# attributes and aliases, but we ignore these for now.
|
|
|
|
|
|
|
|
class HtmlFile < ContextUser
|
|
|
|
|
|
|
|
attr_reader :path
|
|
|
|
attr_reader :name
|
|
|
|
|
|
|
|
def initialize(context, options, file_dir)
|
|
|
|
super(context, options)
|
|
|
|
|
|
|
|
@values = {}
|
|
|
|
|
|
|
|
if options.all_one_file
|
|
|
|
@path = filename_to_label
|
|
|
|
else
|
|
|
|
@path = http_url(file_dir)
|
|
|
|
end
|
|
|
|
|
|
|
|
@name = @context.file_relative_name
|
|
|
|
|
|
|
|
collect_methods
|
|
|
|
AllReferences.add(name, self)
|
|
|
|
context.viewer = self
|
|
|
|
end
|
|
|
|
|
|
|
|
def http_url(file_dir)
|
|
|
|
File.join(file_dir, @context.file_relative_name.tr('.', '_')) +
|
|
|
|
".html"
|
|
|
|
end
|
|
|
|
|
|
|
|
def filename_to_label
|
2008-01-06 20:36:33 -05:00
|
|
|
@context.file_relative_name.gsub(/%|\/|\?|\#/) do |s|
|
|
|
|
'%%%x' % s[0].unpack('C')
|
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def index_name
|
|
|
|
name
|
|
|
|
end
|
|
|
|
|
|
|
|
def parent_name
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
|
|
|
|
def value_hash
|
|
|
|
file_attribute_values
|
2004-11-20 10:02:57 -05:00
|
|
|
add_table_of_sections
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
@values["charset"] = @options.charset
|
|
|
|
@values["href"] = path
|
|
|
|
@values["style_url"] = style_url(path, @options.css)
|
|
|
|
|
|
|
|
if @context.comment
|
|
|
|
d = markup(@context.comment)
|
|
|
|
@values["description"] = d if d.size > 0
|
|
|
|
end
|
|
|
|
|
|
|
|
ml = build_method_summary_list
|
|
|
|
@values["methods"] = ml unless ml.empty?
|
|
|
|
|
|
|
|
il = build_include_list(@context)
|
|
|
|
@values["includes"] = il unless il.empty?
|
|
|
|
|
|
|
|
rl = build_requires_list(@context)
|
|
|
|
@values["requires"] = rl unless rl.empty?
|
|
|
|
|
|
|
|
if @options.promiscuous
|
|
|
|
file_context = nil
|
|
|
|
else
|
|
|
|
file_context = @context
|
|
|
|
end
|
|
|
|
|
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
@values["sections"] = @context.sections.map do |section|
|
|
|
|
|
|
|
|
secdata = {
|
|
|
|
"sectitle" => section.title,
|
|
|
|
"secsequence" => section.sequence,
|
|
|
|
"seccomment" => markup(section.comment)
|
|
|
|
}
|
|
|
|
|
|
|
|
cl = build_class_list(0, @context, section, file_context)
|
|
|
|
@values["classlist"] = cl unless cl.empty?
|
|
|
|
|
|
|
|
mdl = build_method_detail_list(section)
|
|
|
|
secdata["method_list"] = mdl unless mdl.empty?
|
|
|
|
|
|
|
|
al = build_alias_summary_list(section)
|
|
|
|
secdata["aliases"] = al unless al.empty?
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
co = build_constants_summary_list(section)
|
|
|
|
@values["constants"] = co unless co.empty?
|
|
|
|
|
|
|
|
secdata
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
@values
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def write_on(f)
|
|
|
|
value_hash
|
2008-01-12 22:02:49 -05:00
|
|
|
|
|
|
|
template = RDoc::TemplatePage.new(@template::BODY,
|
|
|
|
@template::FILE_PAGE,
|
|
|
|
@template::METHOD_LIST)
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
template.write_html_on(f, @values)
|
|
|
|
end
|
|
|
|
|
|
|
|
def file_attribute_values
|
|
|
|
full_path = @context.file_absolute_name
|
|
|
|
short_name = File.basename(full_path)
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
@values["title"] = CGI.escapeHTML("File: #{short_name}")
|
|
|
|
|
|
|
|
if @context.diagram
|
|
|
|
@values["diagram"] = diagram_reference(@context.diagram)
|
|
|
|
end
|
|
|
|
|
|
|
|
@values["short_name"] = CGI.escapeHTML(short_name)
|
|
|
|
@values["full_path"] = CGI.escapeHTML(full_path)
|
|
|
|
@values["dtm_modified"] = @context.file_stat.mtime.to_s
|
|
|
|
|
|
|
|
if @options.webcvs
|
|
|
|
@values["cvsurl"] = cvs_url( @options.webcvs, @values["full_path"] )
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def <=>(other)
|
|
|
|
self.name <=> other.name
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
class HtmlMethod
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
include MarkUp
|
|
|
|
|
|
|
|
attr_reader :context
|
|
|
|
attr_reader :src_url
|
|
|
|
attr_reader :img_url
|
|
|
|
attr_reader :source_code
|
|
|
|
|
|
|
|
@@seq = "M000000"
|
|
|
|
|
|
|
|
@@all_methods = []
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
def self.reset
|
2003-12-01 02:12:49 -05:00
|
|
|
@@all_methods = []
|
|
|
|
end
|
|
|
|
|
|
|
|
def initialize(context, html_class, options)
|
|
|
|
@context = context
|
|
|
|
@html_class = html_class
|
|
|
|
@options = options
|
2008-01-12 22:02:49 -05:00
|
|
|
|
|
|
|
# HACK ugly
|
|
|
|
@template = options.template_class
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
@@seq = @@seq.succ
|
|
|
|
@seq = @@seq
|
|
|
|
@@all_methods << self
|
|
|
|
|
|
|
|
context.viewer = self
|
|
|
|
|
|
|
|
if (ts = @context.token_stream)
|
|
|
|
@source_code = markup_code(ts)
|
|
|
|
unless @options.inline_source
|
|
|
|
@src_url = create_source_code_file(@source_code)
|
2008-01-12 22:02:49 -05:00
|
|
|
@img_url = HTML.gen_url(path, 'source.png')
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
AllReferences.add(name, self)
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
|
|
|
##
|
|
|
|
# Returns a reference to outselves to be used as an href= the form depends
|
|
|
|
# on whether we're all in one file or in multiple files
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def as_href(from_path)
|
|
|
|
if @options.all_one_file
|
|
|
|
"#" + path
|
|
|
|
else
|
2008-01-12 22:02:49 -05:00
|
|
|
HTML.gen_url(from_path, path)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def name
|
|
|
|
@context.name
|
|
|
|
end
|
|
|
|
|
2004-11-20 10:02:57 -05:00
|
|
|
def section
|
|
|
|
@context.section
|
|
|
|
end
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def index_name
|
|
|
|
"#{@context.name} (#{@html_class.name})"
|
|
|
|
end
|
|
|
|
|
|
|
|
def parent_name
|
|
|
|
if @context.parent.parent
|
|
|
|
@context.parent.parent.full_name
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def aref
|
|
|
|
@seq
|
|
|
|
end
|
|
|
|
|
|
|
|
def path
|
|
|
|
if @options.all_one_file
|
2008-01-06 19:42:03 -05:00
|
|
|
aref
|
2003-12-01 02:12:49 -05:00
|
|
|
else
|
2008-01-06 19:42:03 -05:00
|
|
|
@html_class.path + "#" + aref
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def description
|
|
|
|
markup(@context.comment)
|
|
|
|
end
|
|
|
|
|
|
|
|
def visibility
|
|
|
|
@context.visibility
|
|
|
|
end
|
|
|
|
|
|
|
|
def singleton
|
|
|
|
@context.singleton
|
|
|
|
end
|
|
|
|
|
2003-12-23 23:24:29 -05:00
|
|
|
def call_seq
|
|
|
|
cs = @context.call_seq
|
|
|
|
if cs
|
|
|
|
cs.gsub(/\n/, "<br />\n")
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def params
|
2003-12-23 23:24:29 -05:00
|
|
|
# params coming from a call-seq in 'C' will start with the
|
|
|
|
# method name
|
|
|
|
if p !~ /^\w/
|
|
|
|
p = @context.params.gsub(/\s*\#.*/, '')
|
|
|
|
p = p.tr("\n", " ").squeeze(" ")
|
|
|
|
p = "(" + p + ")" unless p[0] == ?(
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-23 23:24:29 -05:00
|
|
|
if (block = @context.block_params)
|
2004-05-05 13:02:47 -04:00
|
|
|
# If this method has explicit block parameters, remove any
|
|
|
|
# explicit &block
|
|
|
|
|
|
|
|
p.sub!(/,?\s*&\w+/, '')
|
|
|
|
|
2003-12-23 23:24:29 -05:00
|
|
|
block.gsub!(/\s*\#.*/, '')
|
|
|
|
block = block.tr("\n", " ").squeeze(" ")
|
|
|
|
if block[0] == ?(
|
|
|
|
block.sub!(/^\(/, '').sub!(/\)/, '')
|
|
|
|
end
|
|
|
|
p << " {|#{block.strip}| ...}"
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
CGI.escapeHTML(p)
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def create_source_code_file(code_body)
|
|
|
|
meth_path = @html_class.path.sub(/\.html$/, '.src')
|
2007-12-24 09:09:57 -05:00
|
|
|
FileUtils.mkdir_p(meth_path)
|
2003-12-01 02:12:49 -05:00
|
|
|
file_path = File.join(meth_path, @seq) + ".html"
|
|
|
|
|
2008-01-12 22:02:49 -05:00
|
|
|
template = RDoc::TemplatePage.new(@template::SRC_PAGE)
|
2003-12-01 02:12:49 -05:00
|
|
|
File.open(file_path, "w") do |f|
|
|
|
|
values = {
|
|
|
|
'title' => CGI.escapeHTML(index_name),
|
|
|
|
'code' => code_body,
|
2004-05-26 01:02:55 -04:00
|
|
|
'style_url' => style_url(file_path, @options.css),
|
2003-12-01 02:12:49 -05:00
|
|
|
'charset' => @options.charset
|
|
|
|
}
|
|
|
|
template.write_html_on(f, values)
|
|
|
|
end
|
2008-01-12 22:02:49 -05:00
|
|
|
HTML.gen_url(path, file_path)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
def self.all_methods
|
2003-12-01 02:12:49 -05:00
|
|
|
@@all_methods
|
|
|
|
end
|
|
|
|
|
|
|
|
def <=>(other)
|
|
|
|
@context <=> other.context
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Given a sequence of source tokens, mark up the source code
|
|
|
|
# to make it look purty.
|
|
|
|
|
|
|
|
def markup_code(tokens)
|
|
|
|
src = ""
|
|
|
|
tokens.each do |t|
|
|
|
|
next unless t
|
|
|
|
# p t.class
|
|
|
|
# style = STYLE_MAP[t.class]
|
|
|
|
style = case t
|
|
|
|
when RubyToken::TkCONSTANT then "ruby-constant"
|
|
|
|
when RubyToken::TkKW then "ruby-keyword kw"
|
|
|
|
when RubyToken::TkIVAR then "ruby-ivar"
|
|
|
|
when RubyToken::TkOp then "ruby-operator"
|
|
|
|
when RubyToken::TkId then "ruby-identifier"
|
|
|
|
when RubyToken::TkNode then "ruby-node"
|
|
|
|
when RubyToken::TkCOMMENT then "ruby-comment cmt"
|
|
|
|
when RubyToken::TkREGEXP then "ruby-regexp re"
|
|
|
|
when RubyToken::TkSTRING then "ruby-value str"
|
|
|
|
when RubyToken::TkVal then "ruby-value"
|
|
|
|
else
|
|
|
|
nil
|
|
|
|
end
|
|
|
|
|
|
|
|
text = CGI.escapeHTML(t.text)
|
2003-12-23 23:24:29 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
if style
|
|
|
|
src << "<span class=\"#{style}\">#{text}</span>"
|
|
|
|
else
|
|
|
|
src << text
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-07 01:56:46 -05:00
|
|
|
add_line_numbers(src) if @options.include_line_numbers
|
2003-12-01 02:12:49 -05:00
|
|
|
src
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# We rely on the fact that the first line of a source code listing has
|
2003-12-01 02:12:49 -05:00
|
|
|
# # File xxxxx, line dddd
|
|
|
|
|
|
|
|
def add_line_numbers(src)
|
|
|
|
if src =~ /\A.*, line (\d+)/
|
|
|
|
first = $1.to_i - 1
|
|
|
|
last = first + src.count("\n")
|
|
|
|
size = last.to_s.length
|
|
|
|
real_fmt = "%#{size}d: "
|
|
|
|
fmt = " " * (size+2)
|
|
|
|
src.gsub!(/^/) do
|
2008-01-06 19:42:03 -05:00
|
|
|
res = sprintf(fmt, first)
|
2003-12-01 02:12:49 -05:00
|
|
|
first += 1
|
|
|
|
fmt = real_fmt
|
|
|
|
res
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def document_self
|
|
|
|
@context.document_self
|
|
|
|
end
|
|
|
|
|
|
|
|
def aliases
|
|
|
|
@context.aliases
|
|
|
|
end
|
|
|
|
|
|
|
|
def find_symbol(symbol, method=nil)
|
|
|
|
res = @context.parent.find_symbol(symbol, method)
|
|
|
|
if res
|
|
|
|
res = res.viewer
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# We're responsible for generating all the HTML files
|
|
|
|
# from the object tree defined in code_objects.rb. We
|
|
|
|
# generate:
|
|
|
|
#
|
|
|
|
# [files] an html file for each input file given. These
|
|
|
|
# input files appear as objects of class
|
|
|
|
# TopLevel
|
|
|
|
#
|
|
|
|
# [classes] an html file for each class or module encountered.
|
|
|
|
# These classes are not grouped by file: if a file
|
|
|
|
# contains four classes, we'll generate an html
|
|
|
|
# file for the file itself, and four html files
|
|
|
|
# for the individual classes.
|
|
|
|
#
|
|
|
|
# [indices] we generate three indices for files, classes,
|
|
|
|
# and methods. These are displayed in a browser
|
|
|
|
# like window with three index panes across the
|
|
|
|
# top and the selected description below
|
|
|
|
#
|
|
|
|
# Method descriptions appear in whatever entity (file, class,
|
|
|
|
# or module) that contains them.
|
|
|
|
#
|
|
|
|
# We generate files in a structure below a specified subdirectory,
|
|
|
|
# normally +doc+.
|
|
|
|
#
|
|
|
|
# opdir
|
|
|
|
# |
|
|
|
|
# |___ files
|
|
|
|
# | |__ per file summaries
|
|
|
|
# |
|
|
|
|
# |___ classes
|
|
|
|
# |__ per class/module descriptions
|
|
|
|
#
|
|
|
|
# HTML is generated using the Template class.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-12 22:02:49 -05:00
|
|
|
class HTML
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
include MarkUp
|
|
|
|
|
|
|
|
##
|
2008-01-06 19:42:03 -05:00
|
|
|
# Converts a target url to one that is relative to a given path
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
def self.gen_url(path, target)
|
2003-12-01 02:12:49 -05:00
|
|
|
from = File.dirname(path)
|
|
|
|
to, to_file = File.split(target)
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
from = from.split("/")
|
|
|
|
to = to.split("/")
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
while from.size > 0 and to.size > 0 and from[0] == to[0]
|
|
|
|
from.shift
|
|
|
|
to.shift
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
from.fill("..")
|
|
|
|
from.concat(to)
|
|
|
|
from << to_file
|
|
|
|
File.join(*from)
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
2008-01-12 22:13:37 -05:00
|
|
|
# Generator may need to return specific subclasses depending on the
|
2008-01-06 19:42:03 -05:00
|
|
|
# options they are passed. Because of this we create them using a factory
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-06 20:36:33 -05:00
|
|
|
def self.for(options)
|
2008-01-07 16:28:43 -05:00
|
|
|
AllReferences.reset
|
|
|
|
HtmlMethod.reset
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
if options.all_one_file
|
2008-01-12 22:02:49 -05:00
|
|
|
HTMLInOne.new(options)
|
2003-12-01 02:12:49 -05:00
|
|
|
else
|
2008-01-12 22:02:49 -05:00
|
|
|
HTML.new(options)
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class <<self
|
|
|
|
protected :new
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Set up a new HTML generator. Basically all we do here is load up the
|
|
|
|
# correct output temlate
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def initialize(options) #:not-new:
|
|
|
|
@options = options
|
|
|
|
load_html_template
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Build the initial indices and output objects
|
|
|
|
# based on an array of TopLevel objects containing
|
2008-01-06 19:42:03 -05:00
|
|
|
# the extracted information.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def generate(toplevels)
|
|
|
|
@toplevels = toplevels
|
|
|
|
@files = []
|
|
|
|
@classes = []
|
|
|
|
|
|
|
|
write_style_sheet
|
|
|
|
gen_sub_directories()
|
|
|
|
build_indices
|
|
|
|
generate_html
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
##
|
2004-03-23 21:14:18 -05:00
|
|
|
# Load up the HTML template specified in the options.
|
|
|
|
# If the template name contains a slash, use it literally
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def load_html_template
|
2004-03-23 21:14:18 -05:00
|
|
|
template = @options.template
|
2008-01-12 22:02:49 -05:00
|
|
|
|
|
|
|
unless template =~ %r{/|\\} then
|
2008-01-12 22:13:37 -05:00
|
|
|
template = File.join('rdoc', 'generator', @options.generator.key,
|
|
|
|
template)
|
2004-03-23 21:14:18 -05:00
|
|
|
end
|
2008-01-12 22:02:49 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
require template
|
2008-01-12 22:02:49 -05:00
|
|
|
|
|
|
|
@template = self.class.const_get @options.template.upcase
|
|
|
|
@options.template_class = @template
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
rescue LoadError
|
|
|
|
$stderr.puts "Could not find HTML template '#{template}'"
|
|
|
|
exit 99
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Write out the style sheet used by the main frames
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def write_style_sheet
|
2008-01-12 22:02:49 -05:00
|
|
|
return unless @template.constants.include? :STYLE or
|
|
|
|
@template.constants.include? 'STYLE'
|
|
|
|
|
|
|
|
template = RDoc::TemplatePage.new @template::STYLE
|
|
|
|
|
|
|
|
unless @options.css then
|
2003-12-01 02:12:49 -05:00
|
|
|
File.open(CSS_NAME, "w") do |f|
|
2008-01-12 22:02:49 -05:00
|
|
|
values = {}
|
|
|
|
|
|
|
|
if @template.constants.include? :FONTS or
|
|
|
|
@template.constants.include? 'FONTS' then
|
|
|
|
values["fonts"] = @template::FONTS
|
|
|
|
end
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
template.write_html_on(f, values)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
2008-01-06 19:42:03 -05:00
|
|
|
# See the comments at the top for a description of the directory structure
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def gen_sub_directories
|
2007-12-24 09:09:57 -05:00
|
|
|
FileUtils.mkdir_p(FILE_DIR)
|
|
|
|
FileUtils.mkdir_p(CLASS_DIR)
|
2008-01-06 19:42:03 -05:00
|
|
|
rescue
|
2003-12-01 02:12:49 -05:00
|
|
|
$stderr.puts $!.message
|
|
|
|
exit 1
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Generate:
|
|
|
|
#
|
|
|
|
# * a list of HtmlFile objects for each TopLevel object.
|
|
|
|
# * a list of HtmlClass objects for each first level
|
|
|
|
# class or module in the TopLevel objects
|
|
|
|
# * a complete list of all hyperlinkable terms (file,
|
|
|
|
# class, module, and method names)
|
|
|
|
|
|
|
|
def build_indices
|
|
|
|
@toplevels.each do |toplevel|
|
|
|
|
@files << HtmlFile.new(toplevel, @options, FILE_DIR)
|
|
|
|
end
|
|
|
|
|
|
|
|
RDoc::TopLevel.all_classes_and_modules.each do |cls|
|
|
|
|
build_class_list(cls, @files[0], CLASS_DIR)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def build_class_list(from, html_file, class_dir)
|
|
|
|
@classes << HtmlClass.new(from, html_file, class_dir, @options)
|
|
|
|
from.each_classmodule do |mod|
|
|
|
|
build_class_list(mod, html_file, class_dir)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Generate all the HTML
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def generate_html
|
|
|
|
# the individual descriptions for files and classes
|
|
|
|
gen_into(@files)
|
|
|
|
gen_into(@classes)
|
|
|
|
# and the index files
|
|
|
|
gen_file_index
|
|
|
|
gen_class_index
|
|
|
|
gen_method_index
|
|
|
|
gen_main_index
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
# this method is defined in the template file
|
|
|
|
write_extra_pages if defined? write_extra_pages
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_into(list)
|
|
|
|
list.each do |item|
|
|
|
|
if item.document_self
|
|
|
|
op_file = item.path
|
2007-12-24 09:09:57 -05:00
|
|
|
FileUtils.mkdir_p(File.dirname(op_file))
|
2003-12-01 02:12:49 -05:00
|
|
|
File.open(op_file, "w") { |file| item.write_on(file) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_file_index
|
2008-01-12 22:02:49 -05:00
|
|
|
gen_an_index @files, 'Files', @template::FILE_INDEX, "fr_file_index.html"
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
def gen_class_index
|
2008-01-12 22:02:49 -05:00
|
|
|
gen_an_index(@classes, 'Classes', @template::CLASS_INDEX,
|
2003-12-01 02:12:49 -05:00
|
|
|
"fr_class_index.html")
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_method_index
|
2008-01-12 22:02:49 -05:00
|
|
|
gen_an_index(HtmlMethod.all_methods, 'Methods', @template::METHOD_INDEX,
|
2003-12-01 02:12:49 -05:00
|
|
|
"fr_method_index.html")
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_an_index(collection, title, template, filename)
|
2008-01-12 22:02:49 -05:00
|
|
|
template = RDoc::TemplatePage.new @template::FR_INDEX_BODY, template
|
2003-12-01 02:12:49 -05:00
|
|
|
res = []
|
|
|
|
collection.sort.each do |f|
|
|
|
|
if f.document_self
|
|
|
|
res << { "href" => f.path, "name" => f.index_name }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
values = {
|
|
|
|
"entries" => res,
|
|
|
|
'list_title' => CGI.escapeHTML(title),
|
|
|
|
'index_url' => main_url,
|
|
|
|
'charset' => @options.charset,
|
|
|
|
'style_url' => style_url('', @options.css),
|
|
|
|
}
|
|
|
|
|
|
|
|
File.open(filename, "w") do |f|
|
|
|
|
template.write_html_on(f, values)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# The main index page is mostly a template frameset, but includes the
|
|
|
|
# initial page. If the <tt>--main</tt> option was given, we use this as
|
|
|
|
# our main page, otherwise we use the first file specified on the command
|
|
|
|
# line.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def gen_main_index
|
2008-01-12 22:02:49 -05:00
|
|
|
template = RDoc::TemplatePage.new @template::INDEX
|
2008-01-07 16:28:43 -05:00
|
|
|
|
|
|
|
open 'index.html', 'w' do |f|
|
|
|
|
classes = @classes.sort.map { |klass| klass.value_hash }
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
values = {
|
2008-01-07 16:28:43 -05:00
|
|
|
'main_page' => @main_page,
|
|
|
|
'initial_page' => main_url,
|
|
|
|
'style_url' => style_url('', @options.css),
|
|
|
|
'title' => CGI.escapeHTML(@options.title),
|
|
|
|
'charset' => @options.charset,
|
|
|
|
'classes' => classes,
|
2003-12-01 02:12:49 -05:00
|
|
|
}
|
2008-01-07 16:28:43 -05:00
|
|
|
|
|
|
|
values['inline_source'] = @options.inline_source
|
|
|
|
|
|
|
|
template.write_html_on f, values
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-06 19:42:03 -05:00
|
|
|
##
|
|
|
|
# Returns the url of the main page
|
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def main_url
|
2008-01-07 16:28:43 -05:00
|
|
|
@main_page = @options.main_page
|
|
|
|
@main_page_ref = nil
|
|
|
|
if @main_page
|
|
|
|
@main_page_ref = AllReferences[@main_page]
|
|
|
|
if @main_page_ref then
|
|
|
|
@main_page_path = @main_page_ref.path
|
2003-12-01 02:12:49 -05:00
|
|
|
else
|
2008-01-07 16:28:43 -05:00
|
|
|
$stderr.puts "Could not find main page #{@main_page}"
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
unless @main_page_path then
|
|
|
|
file = @files.find { |file| file.document_self }
|
|
|
|
@main_page_path = file.path if file
|
2004-02-23 23:07:46 -05:00
|
|
|
end
|
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
unless @main_page_path then
|
2004-02-23 23:07:46 -05:00
|
|
|
$stderr.puts "Couldn't find anything to document"
|
|
|
|
$stderr.puts "Perhaps you've used :stopdoc: in all classes"
|
2008-01-07 16:28:43 -05:00
|
|
|
exit 1
|
2004-02-23 23:07:46 -05:00
|
|
|
end
|
2003-12-01 02:12:49 -05:00
|
|
|
|
2008-01-07 16:28:43 -05:00
|
|
|
@main_page_path
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
end
|
|
|
|
|
2008-01-12 22:02:49 -05:00
|
|
|
class HTMLInOne < HTML
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def initialize(*args)
|
|
|
|
super
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Build the initial indices and output objects
|
|
|
|
# based on an array of TopLevel objects containing
|
2008-01-06 19:42:03 -05:00
|
|
|
# the extracted information.
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
def generate(info)
|
|
|
|
@toplevels = info
|
|
|
|
@files = []
|
|
|
|
@classes = []
|
|
|
|
@hyperlinks = {}
|
|
|
|
|
|
|
|
build_indices
|
|
|
|
generate_xml
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Generate:
|
|
|
|
#
|
|
|
|
# * a list of HtmlFile objects for each TopLevel object.
|
|
|
|
# * a list of HtmlClass objects for each first level
|
|
|
|
# class or module in the TopLevel objects
|
|
|
|
# * a complete list of all hyperlinkable terms (file,
|
|
|
|
# class, module, and method names)
|
|
|
|
|
|
|
|
def build_indices
|
|
|
|
|
|
|
|
@toplevels.each do |toplevel|
|
|
|
|
@files << HtmlFile.new(toplevel, @options, FILE_DIR)
|
|
|
|
end
|
|
|
|
|
|
|
|
RDoc::TopLevel.all_classes_and_modules.each do |cls|
|
|
|
|
build_class_list(cls, @files[0], CLASS_DIR)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def build_class_list(from, html_file, class_dir)
|
|
|
|
@classes << HtmlClass.new(from, html_file, class_dir, @options)
|
|
|
|
from.each_classmodule do |mod|
|
|
|
|
build_class_list(mod, html_file, class_dir)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
##
|
|
|
|
# Generate all the HTML. For the one-file case, we generate
|
|
|
|
# all the information in to one big hash
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
def generate_xml
|
2008-01-06 19:42:03 -05:00
|
|
|
values = {
|
2003-12-01 02:12:49 -05:00
|
|
|
'charset' => @options.charset,
|
|
|
|
'files' => gen_into(@files),
|
|
|
|
'classes' => gen_into(@classes),
|
|
|
|
'title' => CGI.escapeHTML(@options.title),
|
|
|
|
}
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
# this method is defined in the template file
|
|
|
|
write_extra_pages if defined? write_extra_pages
|
|
|
|
|
2008-01-12 22:02:49 -05:00
|
|
|
template = RDoc::TemplatePage.new @template::ONE_PAGE
|
2003-12-01 02:12:49 -05:00
|
|
|
|
|
|
|
if @options.op_name
|
|
|
|
opfile = File.open(@options.op_name, "w")
|
|
|
|
else
|
|
|
|
opfile = $stdout
|
|
|
|
end
|
|
|
|
template.write_html_on(opfile, values)
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_into(list)
|
|
|
|
res = []
|
|
|
|
list.each do |item|
|
|
|
|
res << item.value_hash
|
|
|
|
end
|
|
|
|
res
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_file_index
|
|
|
|
gen_an_index(@files, 'Files')
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_class_index
|
|
|
|
gen_an_index(@classes, 'Classes')
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_method_index
|
|
|
|
gen_an_index(HtmlMethod.all_methods, 'Methods')
|
|
|
|
end
|
|
|
|
|
|
|
|
def gen_an_index(collection, title)
|
|
|
|
res = []
|
|
|
|
collection.sort.each do |f|
|
|
|
|
if f.document_self
|
|
|
|
res << { "href" => f.path, "name" => f.index_name }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
return {
|
|
|
|
"entries" => res,
|
|
|
|
'list_title' => title,
|
|
|
|
'index_url' => main_url,
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|
2003-12-01 02:12:49 -05:00
|
|
|
end
|
2008-01-06 19:42:03 -05:00
|
|
|
|