olddoc 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23c5d6ab7ac1202af4b9831610a7e49acf23e633
-  data.tar.gz: cf125761aea6c4860794a68f9c63c8039532f403
+  metadata.gz: 5614f3a82bc35af87869f15255c7cc86c0d443fa
+  data.tar.gz: 43441e8910762cc4f34aeeecd760082c02ad4edb
 SHA512:
-  metadata.gz: 70640d38fd02f1df57e340d0535682462a71c1d409618051cf56118eb9bc5a827591d753d3793d89ce3b27b0b54b1b591ed64664c4abf0f645ce667d2ea7e9ff
-  data.tar.gz: 2db66bd166e5a4189803c09cfd72c3254b57bd42ff597010916acbcf1ef04933a9e01f1535e1f8887b1fad9165ed6cd98f562d2774030378e9ab74518ee844eb
+  metadata.gz: 435eaf60d26a2b554525bd35f966e64b4bff0a62ee8f8841179adc2462cd283233435d0bcae401b8f47726d3ee7ab907557d69b87c6c661478bf29bede7d6f82
+  data.tar.gz: 6a22ddf07bd04d73610955f960a355108beecc64c2d28e6f5c774575742ecc8d93a8ab8eec88d91ba4ec03348d932c2d7528275ba80ce60e79a3d35605aa027a

data/.olddoc.yml

@@ -1,8 +1,8 @@
 ---
-cgit_url: http://bogomips.org/olddoc.git
+cgit_url: https://80x24.org/olddoc.git
 git_url: git://80x24.org/olddoc.git
-rdoc_url: http://80x24.org/olddoc/
-ml_url: http://80x24.org/olddoc-public/
+rdoc_url: https://80x24.org/olddoc/
+ml_url: https://80x24.org/olddoc-public/
 nntp_url: nntp://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
 merge_html:
   olddoc_1: Documentation/olddoc.1.html

data/GIT-VERSION-GEN

@@ -5,7 +5,7 @@
 CONSTANT = "Olddoc::VERSION"
 RVF = "lib/olddoc/version.rb"
 GVF = "GIT-VERSION-FILE"
-DEF_VER = "v1.4.0"
+DEF_VER = "v1.5.0"
 vn = DEF_VER.dup
 
 # First see if there is a version file (included in release tarballs),

data/README

@@ -67,8 +67,9 @@ appreciated.
 
 Please send plain-text mail to the list at <olddoc-public@80x24.org>
 HTML will not be read.  olddoc is for GUI-phobes, by GUI-phobes.
-Mailing list archives available at http://80x24.org/olddoc-public/
-No subscription is necessary to post to the mailing list.
+Mailing list archives available at https://80x24.org/olddoc-public/
+and nntp://news.public-inbox.org/inbox.comp.lang.ruby.olddoc
+No subscription will ever be necessary to post to the mailing list.
 
 == License
 

data/lib/oldweb.rb

@@ -5,7 +5,6 @@ require 'rdoc'
 require 'erb'
 require 'pathname'
 require 'yaml'
-require 'cgi'
 require 'uri'
 
 # oldweb is an \RDoc template and not intended as a programming API.
@@ -31,6 +30,8 @@ class Oldweb
     RDoc::Text::TO_HTML_CHARACTERS[Encoding::UTF_8] =
       RDoc::Text::TO_HTML_CHARACTERS[Encoding::ASCII]
 
+    less_html!
+
     @store = store
     @options = options
     @base_dir = Pathname.pwd.expand_path
@@ -200,7 +201,7 @@ class Oldweb
     return unless @store
     @classes = @store.all_classes_and_modules.sort
     @files = @store.all_files.sort
-    @methods = @classes.map(&:method_list).flatten.sort
+    @methods = @classes.flat_map(&:method_list).sort
     @modsort = @classes.select(&:display?).sort
   end
 
@@ -286,7 +287,7 @@ class Oldweb
   # reach into RDoc internals to generate less HTML
   module LessHtml # :nodoc:
     def accept_verbatim(verbatim)
-      @res << "\n<pre>#{CGI.escapeHTML(verbatim.text.rstrip)}</pre>\n"
+      @res << "\n<pre>#{verbatim.text.rstrip.encode(xml: :text)}</pre>\n"
     end
 
     def accept_heading(heading)
@@ -298,12 +299,13 @@ class Oldweb
       @res << "</h#{level}>"
     end
   end
-end
 
-# :stopdoc:
-class RDoc::Markup::ToHtml # :nodoc:
-  remove_method :accept_heading
-  remove_method :accept_verbatim
-  include Oldweb::LessHtml
+  def less_html! # :nodoc:
+    klass = RDoc::Markup::ToHtml
+    return if klass.include?(Oldweb::LessHtml)
+    klass.__send__(:remove_method, :accept_heading)
+    klass.__send__(:remove_method, :accept_verbatim)
+    klass.__send__(:include, Oldweb::LessHtml)
+  end
 end
 # :startdoc:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olddoc
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - olddoc hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -85,7 +85,7 @@ files:
 - man/olddoc.1
 - man/olddoc.5
 - olddoc.gemspec
-homepage: http://80x24.org/olddoc/
+homepage: https://80x24.org/olddoc/
 licenses:
 - GPL-3.0+
 metadata: {}