Merge branch 'master' of github.com:rdoc/rdoc into no-hoe

.travis.yml

@@ -9,13 +9,16 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - 2.1.0
-  - 2.2.0
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
   - rbx-2
+  - jruby-1.7.25
+  - jruby-9.1.0.0
 script: rake
 matrix:
   allow_failures:
-    - rvm: 1.8.7
+    - rvm: jruby-1.7.25
+    - rvm: jruby-9.1.0.0
     - rvm: rbx-2
-    - rvm: ruby-head

History.rdoc

@@ -2,6 +2,14 @@
 
 * Bug fixes
   * Ensure badge data is included in result of JsonIndex template.
+  * Ensure items in the nil section are displayed in HTML output.  Issue #399
+    by Daniel Svensson.
+  * Parse rb_intern_const correctly in C.  PR #381 by Sho Hashimoto.
+  * Fix broken assets caused by #335 when serving ri.  PR #360 by Alex Wood.
+  * Don't try to parse svg files.  Issue #350 by Sigurd Svela.
+
+* Minor enhancements
+  * Improve class name expansion/resolution in ri.  PR #400 by NARUSE, Yui
 
 === 4.2.2 / 2016-02-09
 
@@ -693,7 +701,7 @@ Changes since RDoc 4.0.0.rc.2:
 
 * Major enhancements
   * RDoc HTML output has been improved:
-    * The search from Володя Колесников's (Vladimir Kolesnikov) Sdoc has been
+    * The search from Володя Колесников's (Vladimir Kolesnikov) SDoc has been
       integrated.
 
       The search index generation is a reusable component through

LEGAL.rdoc

@@ -14,7 +14,7 @@ Darkfish::
   * lib/rdoc/generator/template/darkfish/*
   * lib/rdoc/generator/template/darkfish/images
 
-Sdoc::
+SDoc::
   Portions of SDoc by (Володя Колесников) Vladimir Kolesnikov are included
   under the MIT license as RDoc::Generator::JsonIndex.  See
   lib/rdoc/generator/json_index.rb for license information.
@@ -23,7 +23,7 @@ Sdoc::
   * lib/rdoc/generator/template/json_index/*
   * The +#search_index+ methods on RDoc::CodeObject subclasses were derived
     from sdoc.
-  * RDoc::ClassModule#document_self_or_methods comes from Sdoc.
+  * RDoc::ClassModule#document_self_or_methods comes from SDoc.
 
 peg-markdown::
   RDoc's Markdown support is derived from peg-markdown by John MacFarlane.  It

Rakefile

@@ -133,4 +133,3 @@ task :diff_rubinius do
   sh "diff #{diff_options} lib/rdoc #{rubinius_dir}/lib/rdoc; true"
   sh "diff #{diff_options} test #{rubinius_dir}/test/rdoc; true"
 end
-

lib/rdoc.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 $DEBUG_RDOC = nil
 
 # :main: README.rdoc
@@ -64,7 +65,7 @@ class Error < RuntimeError; end
   ##
   # RDoc version you are using
 
-  VERSION = '4.3.0-alpha'
+  VERSION = '4.2.3'
 
   ##
   # Method visibilities

lib/rdoc/alias.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Represent an alias, which is an old_name/new_name pair associated with a
 # particular context

lib/rdoc/anon_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # An anonymous class like:
 #

lib/rdoc/any_method.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # AnyMethod is the base class for objects representing methods
 

lib/rdoc/attr.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # An attribute created by \#attr, \#attr_reader, \#attr_writer or
 # \#attr_accessor

lib/rdoc/class_module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # ClassModule is the base class for objects representing either a class or a
 # module.

lib/rdoc/code_object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Base class for the RDoc code tree.
 #

lib/rdoc/code_objects.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # This file was used to load all the RDoc::CodeObject subclasses at once.  Now
 # autoload handles this.
 

lib/rdoc/comment.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A comment holds the text comment for a RDoc::CodeObject and provides a
 # unified way of cleaning it up and parsing it into an RDoc::Markup::Document.

lib/rdoc/constant.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A constant
 

lib/rdoc/context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'cgi'
 
 ##
@@ -788,7 +789,9 @@ def find_class_method_named(name)
   # Finds a constant with +name+ in this context
 
   def find_constant_named(name)
-    @constants.find {|m| m.name == name}
+    @constants.find do |m|
+      m.name == name || m.full_name == name
+    end
   end
 
   ##

lib/rdoc/context/section.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A section of documentation like:
 #
@@ -57,6 +58,8 @@ def == other
     self.class === other and @title == other.title
   end
 
+  alias eql? ==
+
   ##
   # Adds +comment+ to this section
 
@@ -127,6 +130,10 @@ def inspect # :nodoc:
     "#<%s:0x%x %p>" % [self.class, object_id, title]
   end
 
+  def hash # :nodoc:
+    @title.hash
+  end
+
   ##
   # The files comments in this section come from
 

lib/rdoc/cross_reference.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # RDoc::CrossReference is a reusable way to create cross references for names.
 

lib/rdoc/encoding.rb

@@ -1,4 +1,5 @@
 # coding: US-ASCII
+# frozen_string_literal: false
 
 ##
 # This class is a wrapper around File IO and Encoding that helps RDoc load

lib/rdoc/erb_partial.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Allows an ERB template to be rendered in the context (binding) of an
 # existing ERB template evaluation.

lib/rdoc/erbio.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'erb'
 
 ##

lib/rdoc/extend.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A Module extension to a class with \#extend
 #

lib/rdoc/generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # RDoc uses generators to turn parsed source code in the form of an
 # RDoc::CodeObject tree into some form of output.  RDoc comes with the HTML

lib/rdoc/generator/darkfish.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
 
 require 'erb'

lib/rdoc/generator/json_index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'json'
 begin
   require 'zlib'

lib/rdoc/generator/markup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Handle common RDoc::Markup tasks for various CodeObjects
 #

lib/rdoc/generator/pot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Generates a POT file.
 #

lib/rdoc/generator/pot/message_extractor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Extracts message from RDoc::Store
 

lib/rdoc/generator/pot/po.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Generates a PO format text
 

lib/rdoc/generator/pot/po_entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A PO entry in PO
 

lib/rdoc/generator/ri.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # Generates ri data files
 

lib/rdoc/generator/template/darkfish/_head.rhtml

@@ -3,7 +3,8 @@
 <title><%= h @title %></title>
 
 <script type="text/javascript">
-  var rdoc_rel_prefix = "<%= rel_prefix %>/";
+  var rdoc_rel_prefix = "<%= asset_rel_prefix %>/";
+  var index_rel_prefix = "<%= rel_prefix %>/";
 </script>
 
 <script src="<%= asset_rel_prefix %>/js/jquery.js"></script>

lib/rdoc/generator/template/darkfish/css/fonts.css

@@ -17,7 +17,7 @@
   font-weight: 400;
   src: local("Source Code Pro"),
        local("SourceCodePro-Regular"),
-       url("fonts/SourceCodePro-Regular.ttf") format("truetype");
+       url("../fonts/SourceCodePro-Regular.ttf") format("truetype");
 }
 
 @font-face {
@@ -26,7 +26,7 @@
   font-weight: 700;
   src: local("Source Code Pro Bold"),
        local("SourceCodePro-Bold"),
-       url("fonts/SourceCodePro-Bold.ttf") format("truetype");
+       url("../fonts/SourceCodePro-Bold.ttf") format("truetype");
 }
 
 /*
@@ -46,7 +46,7 @@
   font-weight: 300;
   src: local("Lato Light"),
        local("Lato-Light"),
-       url("fonts/Lato-Light.ttf") format("truetype");
+       url("../fonts/Lato-Light.ttf") format("truetype");
 }
 
 @font-face {
@@ -55,7 +55,7 @@
   font-weight: 300;
   src: local("Lato Light Italic"),
        local("Lato-LightItalic"),
-       url("fonts/Lato-LightItalic.ttf") format("truetype");
+       url("../fonts/Lato-LightItalic.ttf") format("truetype");
 }
 
 @font-face {
@@ -64,7 +64,7 @@
   font-weight: 700;
   src: local("Lato Regular"),
        local("Lato-Regular"),
-       url("fonts/Lato-Regular.ttf") format("truetype");
+       url("../fonts/Lato-Regular.ttf") format("truetype");
 }
 
 @font-face {
@@ -73,7 +73,7 @@
   font-weight: 700;
   src: local("Lato Italic"),
        local("Lato-Italic"),
-       url("fonts/Lato-RegularItalic.ttf") format("truetype");
+       url("../fonts/Lato-RegularItalic.ttf") format("truetype");
 }
 
 /*

lib/rdoc/generator/template/darkfish/js/darkfish.js

@@ -59,7 +59,7 @@ function hookSearch() {
     var html = '';
 
     // TODO add relative path to <script> per-page
-    html += '<p class="search-match"><a href="' + rdoc_rel_prefix + result.path + '">' + this.hlt(result.title);
+    html += '<p class="search-match"><a href="' + index_rel_prefix + result.path + '">' + this.hlt(result.title);
     if (result.params)
       html += '<span class="params">' + result.params + '</span>';
     html += '</a>';
@@ -121,9 +121,9 @@ function highlightClickTarget( event ) {
   };
 };
 
-function loadAsync(path, success) {
+function loadAsync(path, success, prefix) {
   $.ajax({
-    url: rdoc_rel_prefix + path,
+    url: prefix + path,
     dataType: 'script',
     success: success,
     cache: true
@@ -154,8 +154,8 @@ $(document).ready( function() {
     });
   }
 
-  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'));
-  loadAsync('js/search.js',       search_success_function('search_loaded'));
-  loadAsync('js/search_index.js', search_success_function('search_index_loaded'));
-  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'));
+  loadAsync('js/navigation.js',   search_success_function('navigation_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search.js',       search_success_function('search_loaded'), rdoc_rel_prefix);
+  loadAsync('js/search_index.js', search_success_function('search_index_loaded'), index_rel_prefix);
+  loadAsync('js/searcher.js',     search_success_function('searcher_loaded'), rdoc_rel_prefix);
 });

lib/rdoc/ghost_method.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # GhostMethod represents a method referenced only by a comment
 

lib/rdoc/i18n.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # This module provides i18n realated features.
 

lib/rdoc/i18n/locale.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A message container for a locale.
 #

lib/rdoc/i18n/text.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # An i18n supported text.
 #

lib/rdoc/include.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # A Module included in a class with \#include
 #

lib/rdoc/known_classes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module RDoc
 
   ##

lib/rdoc/markdown.kpeg

@@ -17,7 +17,7 @@
 #
 #     data = File.read("README.md")
 #     formatter = RDoc::Markup::ToHtml.new(RDoc::Options.new, nil)
-#     html = RDoc::Markdown.parse(data).accept(@formatter)
+#     html = RDoc::Markdown.parse(data).accept(formatter)
 #
 #     # do something with html
 #

lib/rdoc/markdown/entities.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # HTML entity name map for RDoc::Markdown
 

lib/rdoc/markdown/literals_1_8.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 # :markup: markdown
 
 ##

lib/rdoc/markdown/literals_1_9.rb

@@ -1,4 +1,5 @@
 # coding: UTF-8
+# frozen_string_literal: false
 # :markup: markdown
 
 ##

lib/rdoc/markup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 ##
 # RDoc::Markup parses plain text documents and attempts to decompose them into
 # their constituent parts.  Some of these parts are high-level: paragraphs,