bitclust-core 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9351ae4c31a9070629d3caca3ea7d7dbc1b323ca1b5840de4aa78d6fd482fe7b
-  data.tar.gz: b80b4414d21ee137c425025778ad750122835b5294ab55012ed7debba0d0ea89
+  metadata.gz: 31e60901f080112247e8bb929f914fdb65133ab75299a7a2c131439b51834a8b
+  data.tar.gz: 06cc3117a5652403207d78d42c40ee90e392a609887ffd0c2bc0dd5b77042ff9
 SHA512:
-  metadata.gz: def1f2a7b7b27922f0dfd2b3559a273e3289b46407be4e478a6af86a05a579ae7d3e6de8321474589fb29aa2a71359bd4dfb76691e73d27f972922b99edd1df3
-  data.tar.gz: 39af952569f246199ec9d258ede5faa937241aeb790368fb8d629aa31531ae0c6277e8c9b80f4e95b608d1131021dfebbd29c321f24519d8d8072d7820a465a2
+  metadata.gz: f1d6c5f6848e7aabc1f6c953f81eebca321985ca76db32af3dd8d054d3d4ae801a7741d2060bc70e9756354ea2cf94d9cd2fbea938aa9b00c631816da623b837
+  data.tar.gz: 60c1147eb9a1b64084518fd16244ac2561236c3d3a61f5de23c437744a6955af7b3c36d83e01092f7c4700a9adce238925154653af7d2795199b0b7cc1093303

data/data/bitclust/template.offline/class

@@ -146,18 +146,18 @@
 
 <%
 _myself, *ancestors = @entry.ancestors.reject { |c| %w[Object Kernel BasicObject].include?(c.name) }
-displayed_methods = Set.new(ents.instance_methods.map(&:name))
+displayed_methods = Set.new(ents.instance_methods.flat_map(&:names))
 %>
 
 <% unless ancestors.empty? %>
   <%= headline(_("Ancestor Methods")) %>
 <dl>
   <% ancestors.each do |c|
-       undefined_methods = @entry.partitioned_entries.undefined
+       undefined_instance_methods = @entry.partitioned_entries.undefined.select(&:instance_method?)
        methods = c.partitioned_entries(@alevel).instance_methods
          .flat_map { |m| m.names.map { |n| [n, m] } }
          .reject { |name,| displayed_methods.include?(name) }
-         .reject { |name,| undefined_methods.any? { |m| m.names.include?(name) } }
+         .reject { |name,| undefined_instance_methods.any? { |m| m.names.include?(name) } }
          .sort
        next if methods.empty? %>
 <dt><%= _('Ancestor Methods %s', c.name) %></dt>

data/lib/bitclust.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bitclust/requesthandler'
 require 'bitclust/screen'
 require 'bitclust/server'

data/lib/bitclust/app.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bitclust'
 require 'bitclust/interface'
 

data/lib/bitclust/classentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/classentry.rb
 #

data/lib/bitclust/compat.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Compatibility for older rubies
 #

data/lib/bitclust/completion.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/completion.rb
 #

data/lib/bitclust/crossrubyutils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/crossrubyutils.rb
 #

data/lib/bitclust/database.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/database.rb
 #

data/lib/bitclust/docentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/docentry.rb
 #

data/lib/bitclust/entry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/entry.rb
 #

data/lib/bitclust/exception.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/exception.rb
 #

data/lib/bitclust/functiondatabase.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/functiondatabase.rb
 #

data/lib/bitclust/functionentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/functionentry.rb
 #

data/lib/bitclust/functionreferenceparser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/functionreferenceparser.rb
 #

data/lib/bitclust/generators/epub.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'tmpdir'
 require 'erb'

data/lib/bitclust/htmlutils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/htmlutils.rb
 #

data/lib/bitclust/interface.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/interface.rb
 #

data/lib/bitclust/libraryentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/libraryentry.rb
 #

data/lib/bitclust/lineinput.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # $Id: lineinput.rb 3723 2007-03-28 21:34:13Z aamine $
 #

data/lib/bitclust/messagecatalog.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/messagecatalog.rb
 #

data/lib/bitclust/methoddatabase.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/methoddatabase.rb
 #

data/lib/bitclust/methodentry.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/methodentry.rb
 #
@@ -204,6 +205,10 @@ module BitClust
       kind() == :redefined
     end
 
+    def undefined?
+      kind() == :undefined
+    end
+
     def description
       source.split(/\n\n+/, 3)[1]
     end

data/lib/bitclust/methodid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/methodid.rb
 #

data/lib/bitclust/methodsignature.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/methodsignature.rb
 #

data/lib/bitclust/nameutils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/nameutils.rb
 #

data/lib/bitclust/parseutils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/parseutils.rb
 #

data/lib/bitclust/preprocessor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/preprocessor.rb
 #
@@ -47,7 +48,7 @@ module BitClust
       else
         io = wrap(fopen(path, 'r:UTF-8'), params)
       end
-      ret = ""
+      ret = +""
       while s = io.gets
         ret << s
       end
@@ -247,13 +248,13 @@ module BitClust
       description = description.strip
       samplecode_push(description)
       return unless current_cond.processing?
-      @buf.push("//emlist[#{description}][ruby]{\n")
+      @buf.push(+"//emlist[#{description}][ruby]{\n")
     end
 
     def samplecode_end
       samplecode_pop
       return unless current_cond.processing?
-      @buf.push("//}\n")
+      @buf.push(+"//}\n")
     end
 
     def samplecode_push(description)

data/lib/bitclust/progress_bar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 begin
   require 'progressbar'

data/lib/bitclust/rdcompiler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/rdcompiler.rb
 #
@@ -271,7 +272,7 @@ module BitClust
         line "<pre class=\"highlight #{lang}\">"
         line "<span class=\"caption\">#{escape_html(caption)}</span>" if caption
         line "<code>"
-        src = ""
+        src = +""
         @f.until_terminator(%r<\A//\}>) do |line|
           src << line
         end

data/lib/bitclust/refsdatabase.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/refsdatabase.rb
 #

data/lib/bitclust/requesthandler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # bitclust/requesthandler.rb
 #

data/lib/bitclust/ridatabase.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rdoc/ri/ri_reader'
 require 'rdoc/ri/ri_cache'
 require 'rdoc/ri/ri_paths'

data/lib/bitclust/rrdparser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/rrdparser.rb
 #

data/lib/bitclust/runner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'optparse'
 

data/lib/bitclust/screen.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/screen.rb
 #

data/lib/bitclust/searcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/searcher.rb
 #
@@ -402,7 +403,7 @@ module BitClust
 
     def print_packed_names(names)
       max = terminal_column()
-      buf = ''
+      buf = +''
       names.each do |name|
         if buf.size + name.size + 1 > max
           if buf.empty?
@@ -410,7 +411,7 @@ module BitClust
             next
           end
           puts buf
-          buf = ''
+          buf = +''
         end
         buf << name << ' '
       end

data/lib/bitclust/server.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/server.rb
 #
@@ -14,7 +15,6 @@ require 'bitclust/classentry'
 require 'bitclust/methodentry'
 require 'bitclust/docentry'
 require 'drb'
-require 'webrick/server'
 
 module BitClust
 
@@ -26,6 +26,11 @@ module BitClust
     end
 
     def listen(url, foreground = false)
+      begin
+        require 'webrick/server'
+      rescue LoadError
+        abort "webrick is not found. You may need to `gem install webrick` to install webrick."
+      end
       WEBrick::Daemon.start unless foreground
       DRb.start_service url, @db
       DRb.thread.join

data/lib/bitclust/silent_progress_bar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module BitClust
   # Null-object version of ProgressBar.

data/lib/bitclust/simplesearcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bitclust/nameutils'
 require 'bitclust/methodid'
 

data/lib/bitclust/subcommand.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 
 require 'bitclust'

data/lib/bitclust/subcommands/ancestors_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'bitclust'
 require 'bitclust/crossrubyutils'
 

data/lib/bitclust/subcommands/chm_command.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'bitclust'
 require 'bitclust/subcommand'

data/lib/bitclust/subcommands/classes_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'optparse'
 

data/lib/bitclust/subcommands/epub_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'fileutils'
 require 'date'
 

data/lib/bitclust/subcommands/extract_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'optparse'
 

data/lib/bitclust/subcommands/htmlfile_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2006-2007 Minero Aoki
 #
 # This program is free software.

data/lib/bitclust/subcommands/init_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/list_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/lookup_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/methods_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'optparse'
 

data/lib/bitclust/subcommands/preproc_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'optparse'
 

data/lib/bitclust/subcommands/property_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/query_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/server_command.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'
 require 'pp'
 require 'optparse'
 require 'yaml'
-require 'webrick'
 require 'uri'
 
 require 'bitclust'
@@ -15,7 +15,6 @@ module BitClust
     class ServerCommand < Subcommand
       def initialize
         super
-        require 'webrick'
         require 'uri'
 
         @params = {
@@ -117,6 +116,11 @@ module BitClust
       end
 
       def exec(argv, options)
+        begin
+          require 'webrick'
+        rescue LoadError
+          abort "webrick is not found. You may need to `gem install webrick` to install webrick."
+        end
         require 'bitclust/app'
         if @debugp
           @params[:Logger] = WEBrick::Log.new($stderr, WEBrick::Log::DEBUG)

data/lib/bitclust/subcommands/setup_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/subcommands/statichtml_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Copyright (c) 2006-2007 Minero Aoki
 #
 # This program is free software.
@@ -174,6 +175,8 @@ module BitClust
         db.transaction do
           methods = {}
           db.methods.each_with_index do |entry, i|
+            next if entry.undefined?
+
             entry.names.each do |name|
               method_name = entry.klass.name + entry.typemark + name
               (methods[method_name] ||= []) << entry

data/lib/bitclust/subcommands/update_command.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pathname'
 require 'erb'
 require 'find'

data/lib/bitclust/syntax_highlighter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "ripper"
 require "bitclust/htmlutils"
 
@@ -164,6 +165,8 @@ module BitClust
       when @stack.last == :method_call
         data << "<span class=\"nf\">#{token}</span>"
         @stack.pop
+      when @stack.last == :class
+        @name_buffer << token
       when BUILTINS_G.include?(token)
         data << "<span class=\"nb\">#{token}</span>"
       else
@@ -365,7 +368,7 @@ module BitClust
     end
 
     def highlight
-      parse("")
+      parse(+"")
     end
   end
 end

data/lib/bitclust/textutils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # bitclust/textutils
 #

data/lib/bitclust/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BitClust
-  VERSION = "1.2.6"
+  VERSION = "1.3.0"
 end

data/test/test_rdcompiler.rb

@@ -421,6 +421,37 @@ HERE
     assert_compiled_method_source(expected, src)
   end
 
+  def test_method_with_samplecode_singleton_class
+    src = <<'HERE'
+--- singleton_method(name) -> Method
+//emlist[][ruby]{
+class <<obj
+  def foo
+  end
+end
+p Foo.singleton_method(:foo)
+//}
+end
+HERE
+  expected = <<'HERE'
+<dt class="method-heading" id="dummy"><code>singleton_method(name) -&gt; Method</code><span class="permalink">[<a href="dummy/method/String/i/index">permalink</a>][<a href="https://docs.ruby-lang.org/en/2.0.0/String.html#method-i-index">rdoc</a>]</span></dt>
+<dd class="method-description">
+<pre class="highlight ruby">
+<code>
+<span class="k">class</span> <span class="o">&lt;&lt;</span><span class="nn"></span><span class="o"></span><span class="nc">obj</span>
+  <span class="k">def</span> <span class="nf">foo</span>
+  <span class="k">end</span>
+<span class="k">end</span>
+<span class="nb">p</span> <span class="no">Foo</span><span class="p">.</span><span class="nf">singleton_method</span><span class="p">(</span><span class="ss">:foo</span><span class="p">)</span>
+</code></pre>
+<p>
+end
+</p>
+</dd>
+HERE
+    assert_compiled_method_source(expected, src)
+  end
+
   def test_method2
     @c = BitClust::RDCompiler.new(@u, 1, {:database => @db, :force => true})
     src = <<'HERE'

data/test/test_searcher.rb

@@ -0,0 +1,21 @@
+require "test/unit"
+require "bitclust"
+require "bitclust/searcher"
+
+class TestTerminalView < Test::Unit::TestCase
+  include BitClust
+
+  def test_show_class
+    view = TerminalView.new(Plain.new, {})
+    db = Database.dummy
+    foo = ClassEntry.new(db, "Foo")
+    bar = ClassEntry.new(db, "Bar")
+    out, err = capture_output do
+      assert_nothing_raised do
+        view.show_class([foo, bar])
+      end
+    end
+    assert_equal %w[Bar Foo], out.split
+    assert_empty err
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitclust-core
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - https://github.com/rurema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -86,6 +86,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Rurema is a Japanese ruby documentation project, and
   bitclust is a rurema document processor.
@@ -218,6 +232,7 @@ files:
 - test/test_refsdatabase.rb
 - test/test_rrdparser.rb
 - test/test_runner.rb
+- test/test_searcher.rb
 - test/test_simplesearcher.rb
 - test/test_syntax_highlighter.rb
 - theme/default/images/external.png
@@ -254,24 +269,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: BitClust is a rurema document processor.
 test_files:
-- test/test_syntax_highlighter.rb
-- test/test_methodsignature.rb
-- test/test_functiondatabase.rb
 - test/test_preprocessor.rb
+- test/test_functionreferenceparser.rb
+- test/test_methoddatabase.rb
+- test/test_searcher.rb
+- test/test_bitclust.rb
 - test/test_refsdatabase.rb
+- test/test_functiondatabase.rb
+- test/test_rrdparser.rb
+- test/test_runner.rb
+- test/test_syntax_highlighter.rb
+- test/run_test.rb
 - test/test_nameutils.rb
-- test/test_bitclust.rb
-- test/test_simplesearcher.rb
 - test/test_rdcompiler.rb
 - test/test_libraryentry.rb
-- test/test_runner.rb
-- test/test_rrdparser.rb
-- test/test_methoddatabase.rb
-- test/test_functionreferenceparser.rb
-- test/run_test.rb
+- test/test_methodsignature.rb
+- test/test_simplesearcher.rb
 - test/test_entry.rb