sdoc 2.0.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 234ba541d36b61d2b4bb680ab8df4e2463d4cc63f0517f160270a3e7a48f0f81
-  data.tar.gz: afae81f60c7f9218da174c06cb4d5799f7c0db8e5188c6dc49c54ea3bacb5dc3
+  metadata.gz: 70eb2edc18b9ea26f3e275f9e7cbe89b1ce69af8c94fe4e0757ade7d39585d65
+  data.tar.gz: 9358e5e14fc3e26fd5c39f9ff348c4e5ee0cf569921256de2234006b5055ff68
 SHA512:
-  metadata.gz: 3b24a3309f283113f8b0f0cd1e2e0d7711a40a293612599499f09b6d6793f25669e9aa0f9925ef9d844a31a89be30f296fdd8f47d3161a8f24629d5d2f41b99c
-  data.tar.gz: f5355d4fd9d7aa0478db5c6aa398502c1480ece246f811b795721471e15eddc74dafe7640cca5de2e32751a65d5fcea0d156933aa2eabc691d1daba222428fdd
+  metadata.gz: d001cb3198db3cdd7db808a56d7c06325d126a73b93de6240e1826abc6a0b7ad7743b21b67e289289ed35346192164e44900702191def749a5c22ec833f39569
+  data.tar.gz: 731ad61d0e0ac791e02050d173cc97eab604634c3e9252ed691d2714142b97c0e7f19a30fa9eddda56516fc2e3f46f7d393f0c36d3a3aaad49c28dddcbbca14c

data/.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: Tests
+
+on:
+  push:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby:
+          - '2.1'
+          - '2.2'
+          - '2.3'
+          - '2.4'
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - 'ruby-head'
+          - 'jruby-head'
+          - 'truffleruby-head'
+
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+          cache-version: 1
+
+      - name: Test
+        run: |
+          bundle exec rake

data/.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 /.rake_tasks~
 /*.gem
 /rails/
+/ruby/

data/CHANGELOG.md

@@ -1,7 +1,44 @@
+Master
+======
+
+2.3.0
+=====
+
+* #178 Don't use rdoc 6.4.0 for now [@p8](https://github.com/p8)
+* #177 Remove rake version constraint for ruby head [@p8](https://github.com/p8)
+* #176 Make sidepanel work with relative paths/URLs [@p8](https://github.com/p8)
+* #175 Avoid displaying source toggler for ghost methods [Robin Dupret](https://github.com/robin850)
+* #174 Suppress unused variable warnings [Masataka Pocke Kuwabara](https://github.com/pocke)
+
+2.2.0
+=====
+
+* #161 Add 'skip to content' link and improve shortcut keys [@MikeRogers0](https://github.com/MikeRogers0)
+* #170 Fix link hovers in headings [@tlatsas](https://github.com/tlatsas)
+* #169 Fix clearing search results [@mikdiet](https://github.com/mikdiet)
+* #167 Update Merge script to work with sdoc v2 [@mikdiet](https://github.com/mikdiet)
+* #160 Remove outline from reset stylesheet [@p8](https://github.com/p8)
+* #159 Remove TAB override in panel [@p8](https://github.com/p8)
+* #157 Move to GitHub action for tests [@MikeRogers0](https://github.com/MikeRogers0)
+* #155 Fix Ctrl+C copying [Jan Schär](https://github.com/jscissr)
+
+2.1.0
+=====
+
+* #154 Make panel responsive for mobile [@MikeRogers0](https://github.com/MikeRogers0) and [@p8](https://github.com/p8)
+* #153 Add viewport metatag to views for improved Lighthouse score. [@MikeRogers0](https://github.com/MikeRogers0)
+* #150 Use semantic headers for better SEO [@p8](https://github.com/p8)
+
+2.0.4
+=====
+
+* #149 Using HTML5 doctype accross all HTML files. [@MikeRogers0](https://github.com/MikeRogers0)
+* #148 Fix overflow CSS property of panel elements. [@cveneziani](https://github.com/cveneziani)
+
 2.0.3
 =====
 
-* Use @options.title for the index
+* #147 Use @options.title for the index [@p8](https://github.com/p8)
 
 2.0.2
 =====
@@ -11,14 +48,14 @@
 2.0.1
 =====
 
-* #142 Fix arrow icons for selected panel items
-* #141 Always use only one metatag for keywords
-* #140 Use h2 instead of h1 for banner header
+* #142 Fix arrow icons for selected panel items [@p8](https://github.com/p8)
+* #141 Always use only one metatag for keywords [@p8](https://github.com/p8)
+* #140 Use h2 instead of h1 for banner header [@p8](https://github.com/p8)
 
 2.0.0
 =====
 
-* #137 Replace frames based implementation with a css
+* #137 Replace frames based implementation with a css [@p8](https://github.com/p8)
 * #132 Deprecate safe_level of ERB.new in Ruby 2.6
 
 1.1.0
@@ -78,4 +115,3 @@ Bug Fixes
 [Compare v0.3.20...v0.4.0](https://github.com/voloko/sdoc/compare/v0.3.20...v0.4.0)
 
 No friendly log for this version yet, but PRs are welcome!
-

data/Gemfile

@@ -2,9 +2,15 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake", "< 11"
-gem "minitest"
+gem "rack"
+gem "rake"
 gem "hoe"
+gem "minitest"
+
+
+if RUBY_VERSION.to_f <= 2.5
+  gem "psych", "< 4.0"
+end
 
 if ENV["rdoc"] == "master"
   gem "rdoc", :github => "ruby/rdoc"

data/README.md

@@ -1,6 +1,6 @@
 # SDoc
 
-[![Build Status](https://travis-ci.org/zzak/sdoc.svg?branch=master)](https://travis-ci.org/zzak/sdoc)
+[![Tests](https://github.com/zzak/sdoc/actions/workflows/test.yml/badge.svg)](https://github.com/zzak/sdoc/actions/workflows/test.yml)
 
 **Powering http://api.rubyonrails.org/**
 
@@ -92,15 +92,25 @@ As maintainer of both projects, I'll see if I can identify the root of the cause
 
 ## Contributing
 
-If you'd like to contribute you can generate the Rails documentation by running:
+If you'd like to contribute you can generate the Rails main branch documentation by running:
 
 ```bash
 rake test:rails
 ```
 
-This task will generate documentation for the Rails master branch.
-Since the task doesn't do any file filtering it contains a lot of extra pages.
+You can generate the Ruby default branch documentation by running:
 
+```bash
+rake test:ruby
+```
+
+You can generate merged Rails and Ruby documentation by running:
+
+```bash
+rake test:merged
+```
+
+The generated documentation will be put into `doc/public` directory.
 To view the just generated documentation start up a rack application by running:
 
 ```bash

data/Rakefile

@@ -12,22 +12,74 @@ task :default => :test
 task :spec => :test
 
 require 'sdoc'
+require 'sdoc/merge'
 require 'rdoc/task'
 
 rails = File.expand_path "rails"
+ruby = File.expand_path "ruby"
 
 directory rails do
   sh "git clone --depth=1 https://github.com/rails/rails"
 end
 
+directory ruby do
+  sh "git clone --depth=1 https://github.com/ruby/ruby"
+end
+
 namespace :test do
-  task :rails => rails
+  desc 'Deletes all generated test documentation'
+  task :reset_docs do
+    FileUtils.remove_dir(File.expand_path('doc'), force: true)
+  end
+
+  desc 'Generates test rails documentation'
+  task :rails => [rails, :generate_rails] do
+    FileUtils.mv(
+      File.expand_path('doc/rails'),
+      File.expand_path('doc/public')
+    )
+  end
 
-  RDoc::Task.new(:rails) do |rdoc|
+  RDoc::Task.new(:generate_rails) do |rdoc|
     rdoc.rdoc_dir = 'doc/rails'
     rdoc.generator = 'sdoc'
     rdoc.template = 'rails'
+    rdoc.title = 'Ruby on Rails'
+    rdoc.main = 'rails/README.md'
+    rdoc.options << '--exclude=test'
 
     rdoc.rdoc_files.include("rails/")
   end
+
+  desc 'Generates test ruby documentation'
+  task :ruby => [ruby, :generate_ruby] do
+    FileUtils.mv(
+      File.expand_path('doc/ruby'),
+      File.expand_path('doc/public')
+    )
+  end
+
+  RDoc::Task.new(:generate_ruby) do |rdoc|
+    rdoc.rdoc_dir = 'doc/ruby'
+    rdoc.generator = 'sdoc'
+    rdoc.template = 'rails'
+    rdoc.title = 'Ruby'
+    rdoc.main = 'ruby/README.md'
+
+    rdoc.rdoc_files.include("ruby/")
+  end
+
+  desc 'Generates merged test documentation'
+  task :merged => [rails, :generate_rails, ruby, :generate_ruby, :merge]
+
+  task :merge do
+    SDoc::Merge.new.merge(
+      [
+        '--title', 'Rails + Ruby',
+        '--op', 'doc/public',
+        '--names', 'rails, ruby',
+        'doc/rails', 'doc/ruby'
+      ]
+    )
+  end
 end

data/config.ru

@@ -5,7 +5,7 @@
 #
 require 'bundler/setup'
 
-root = "doc/rails"
+root = "doc/public"
 unless Dir.exists?(root)
   puts <<~MESSAGE
     Could not find any docs in #{root}.
@@ -16,12 +16,12 @@ unless Dir.exists?(root)
 end
 
 use Rack::Static,
-  :urls => ["/files", "/images", "/js", "/css", "/panel", "/i", "/classes"],
+  :urls => ["/files", "/images", "/js", "/css", "/panel", "/i", "/classes", "/ruby", "/rails"],
   :root => root
 run lambda { |env|
   [
     200,
-    { 
+    {
       'Content-Type'  => 'text/html',
       'Cache-Control' => 'public, max-age=86400'
     },

data/lib/rdoc/generator/template/rails/_context.rhtml

@@ -101,7 +101,7 @@
 
     <% unless constants.empty? %>
       <!-- Section constants -->
-      <div class="sectiontitle">Constants</div>
+      <h2 class="sectiontitle">Constants</h2>
       <table border='0' cellpadding='5'>
         <% constants.each do |const| %>
           <tr valign='top'>
@@ -122,7 +122,7 @@
 
     <% unless attributes.empty? %>
       <!-- Section attributes -->
-      <div class="sectiontitle">Attributes</div>
+      <h2 class="sectiontitle">Attributes</h2>
       <table border='0' cellpadding='5'>
         <% attributes.each do |attrib| %>
           <tr valign='top'>
@@ -145,17 +145,17 @@
         visibilities.each do |visibility, methods|
           next if methods.empty?
     %>
-      <div class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> methods</div>
+      <h2 class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> methods</h2>
       <% methods.each do |method| %>
         <div class="method">
-          <div class="title method-title" id="<%= method.aref %>">
+          <h3 class="title method-title" id="<%= method.aref %>">
             <% if method.call_seq %>
               <b><%= method.call_seq.gsub(/->/, '&rarr;').gsub(/\n(.)/, '<br />\1') %></b>
             <% else %>
               <b><%= h method.name %></b><%= h method.params %>
             <% end %>
             <a href="<%= "#{rel_prefix}/#{context.path}##{method.aref}"%>" name="<%= method.aref %>" class="permalink">Link</a>
-          </div>
+          </h3>
 
           <% if method.comment %>
             <div class="description">
@@ -195,12 +195,20 @@
                 else
                   false
                 end
+
+                ghost = method.instance_of?(RDoc::GhostMethod)
               %>
               <p class="source-link">
-                Source:
-                <a href="javascript:toggleSource('<%= method.aref %>_source')" id="l_<%= method.aref %>_source">show</a>
+                <% if !ghost || github %> Source: <% end %>
+
+                <% unless ghost %>
+                  <a href="javascript:toggleSource('<%= method.aref %>_source')" id="l_<%= method.aref %>_source">show</a>
+                <% end %>
+
+                <% if !ghost && github %> | <% end %>
+
                 <% if github %>
-                  | <a href="<%= "#{github}#L#{line}" %>" target="_blank" class="github_url">on GitHub</a>
+                  <a href="<%= "#{github}#L#{line}" %>" target="_blank" class="github_url">on GitHub</a>
                 <% end %>
               </p>
               <div id="<%= method.aref %>_source" class="dyn-source">

data/lib/rdoc/generator/template/rails/_head.rhtml

@@ -1,39 +1,14 @@
-<%
-  # Turbolinks does not consider relative urls similar, resulting in page
-  # reloads and losing the context of the panel. Emptying the rel_prefix makes
-  # asset paths absolute. This breaks opening the docs locally. Maybe all
-  # generated docs should be in the same folder?
-  rel_prefix = ''
-%>
-<link rel="stylesheet" href="<%= "#{rel_prefix}/css/reset.css" %>" type="text/css" media="screen" data-turbolinks-track="reload" />
-<link rel="stylesheet" href="<%= "#{rel_prefix}/css/panel.css" %>" type="text/css" media="screen" data-turbolinks-track="reload" />
-<link rel="stylesheet" href="<%= "#{rel_prefix}/css/main.css" %>" type="text/css" media="screen" data-turbolinks-track="reload" />
-<link rel="stylesheet" href="<%= "#{rel_prefix}/css/github.css" %>" type="text/css" media="screen" data-turbolinks-track="reload" />
-<script src="<%= "#{rel_prefix}/js/jquery-3.5.1.min.js" %>" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= "#{rel_prefix}/js/main.js" %>" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= "#{rel_prefix}/js/highlight.pack.js" %>" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= rel_prefix %>/js/turbolinks.js" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= rel_prefix %>/js/search_index.js" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= rel_prefix %>/js/searcher.js" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= rel_prefix %>/panel/tree.js" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script src="<%= rel_prefix %>/js/searchdoc.js" type="text/javascript" charset="utf-8" data-turbolinks-track="reload"></script>
-<script type="text/javascript" charset="utf-8">
-document.addEventListener("turbolinks:load", function() {
-  // Only initialize panel if not yet initialized
-  if(!$('#panel .tree ul li').length) {
-    $('#links').hide();
-    var panel = new Searchdoc.Panel($('#panel'), search_data, tree, '<%= rel_prefix %>/');
-    $('#search').focus();
-    var s = window.location.search.match(/\?q=([^&]+)/);
-    if (s) {
-      s = decodeURIComponent(s[1]).replace(/\+/g, ' ');
-      if (s.length > 0) {
-        $('#search').val(s);
-        panel.search(s, true);
-      }
-    }
-    panel.toggle(<%= tree_keys %>);
-  }
-})
-</script>
-
+<link rel="stylesheet" href="<%= rel_prefix %>/css/reset.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="<%= rel_prefix %>/css/panel.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="<%= rel_prefix %>/css/main.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="<%= rel_prefix %>/css/github.css" type="text/css" media="screen" />
+<script src="<%= rel_prefix %>/js/jquery-3.5.1.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/main.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/highlight.pack.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/turbolinks.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/search_index.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/searcher.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/panel/tree.js" type="text/javascript" charset="utf-8"></script>
+<script src="<%= rel_prefix %>/js/searchdoc.js" type="text/javascript" charset="utf-8"></script>
+<meta name="data-rel-prefix" content="<%= rel_prefix %>/">
+<meta name="data-tree-keys" content='<%= tree_keys %>'>

data/lib/rdoc/generator/template/rails/_panel.rhtml

@@ -1,6 +1,9 @@
-<div class="panel panel_tree" id="panel" data-turbolinks-permanent>
+<input type="checkbox" id="hamburger" class="panel_checkbox">
+<label class="panel_mobile_button" for="hamburger"><span></span> Menu</label>
+<nav class="panel panel_tree" id="panel" data-turbolinks-permanent>
   <div class="header">
-    <input type="text" placeholder="Search for a class, method, ..." autosave="searchdoc" results="10" id="search" autocomplete="off" />
+    <input type="text" placeholder="Search (/) for a class, method, ..." autosave="searchdoc" results="10" id="search" autocomplete="off" tabindex="-1" />
+    <label class="panel_mobile_button_close" for="hamburger"><span></span> Close</label>
   </div>
   <div class="tree">
     <ul>
@@ -11,4 +14,4 @@
     </ul>
   </div>
   <a href="links.html" id="links">index</a>
-</div>
+</nav>

data/lib/rdoc/generator/template/rails/class.rhtml

@@ -3,6 +3,7 @@
 <head>
     <title><%= h klass.full_name %></title>
     <meta charset="<%= @options.charset %>" />
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= include_template '_head.rhtml', {:rel_prefix => rel_prefix, :tree_keys => klass.full_name.split('::') } %>
 
     <meta property="og:title" value="<%= klass.full_name %>">
@@ -17,6 +18,8 @@
 </head>
 
 <body>
+    <a class="sr-only sr-only-focusable" href="#content" data-turbolinks="false">Skip to Content</a>
+    <a class="sr-only sr-only-focusable" href="#search" data-turbolinks="false">Skip to Search</a>
 
     <%= include_template '_panel.rhtml' %>
 
@@ -44,8 +47,8 @@
         </ul>
     </div>
 
-    <div id="bodyContent">
+    <main id="bodyContent">
         <%= include_template '_context.rhtml', {:context => klass, :rel_prefix => rel_prefix} %>
-    </div>
+    </main>
   </body>
 </html>

data/lib/rdoc/generator/template/rails/file.rhtml

@@ -3,10 +3,13 @@
 <head>
     <title><%= h file.name %></title>
     <meta charset="<%= @options.charset %>" />
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= include_template '_head.rhtml', {:rel_prefix => rel_prefix, :tree_keys => [] } %>
 </head>
 
 <body>
+    <a class="sr-only sr-only-focusable" href="#content" data-turbolinks="false">Skip to Content</a>
+    <a class="sr-only sr-only-focusable" href="#search" data-turbolinks="false">Skip to Search</a>
 
     <%= include_template '_panel.rhtml' %>
 
@@ -31,8 +34,8 @@
         </ul>
     </div>
 
-    <div id="bodyContent">
+    <main id="bodyContent">
         <%= include_template '_context.rhtml', {:context => file, :rel_prefix => rel_prefix} %>
-    </div>
+    </main>
   </body>
 </html>

data/lib/rdoc/generator/template/rails/index.rhtml

@@ -1,14 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
     <title><%= @options.title %></title>
     <meta http-equiv="Content-Type" content="text/html; charset=<%= @options.charset %>" />
+    <meta name="viewport" content="width=device-width,initial-scale=1">
     <%= include_template '_head.rhtml', {:rel_prefix => rel_prefix, tree_keys: []} %>
 </head>
 
 <body>
+    <a class="sr-only sr-only-focusable" href="#content" data-turbolinks="false">Skip to Content</a>
+    <a class="sr-only sr-only-focusable" href="#search" data-turbolinks="false">Skip to Search</a>
 
     <%= include_template '_panel.rhtml' %>
 
@@ -25,9 +26,8 @@
         </ul>
     </div>
 
-    <div id="bodyContent">
+    <main id="bodyContent">
         <%= include_template '_context.rhtml', {:context => index } %>
-    </div>
+    </main>
   </body>
 </html>
-

data/lib/rdoc/generator/template/rails/resources/css/main.css

@@ -7,8 +7,10 @@ body {
   line-height: 1.25em;
 }
 
-.banner, #bodyContent {
-  margin-left: 300px;
+@media (min-width: 40em) {
+  .banner, #bodyContent {
+    margin-left: 300px;
+  }
 }
 
 a:link, a:active, a:visited, a:hover {
@@ -29,10 +31,6 @@ h1 a, h2 a, .banner a {
   color: #fff;
 }
 
-h1 a:hover, h2 a:hover {
-  color: #fff;
-}
-
 p {
   margin-bottom: 1em;
   text-align: justify;
@@ -376,3 +374,32 @@ p code {
   margin-bottom: 1px;
   padding: 0 5px;
 }
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  white-space: nowrap;
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: fixed;
+  top: 10%;
+  width: auto;
+  height: auto;
+  overflow: visible;
+  clip: auto;
+  white-space: normal;
+  padding: 2rem;
+  border: 4px solid #990000;
+  border-radius: 1rem;
+  box-shadow: 0 0.5rem 1rem rgb(0 0 0 / 15%) !important;
+  left: 40%;
+  z-index: 100;
+  background: #fff;
+  font-size: 2rem;
+}