bitclust-core 0.5.0 → 0.5.1

data/data/bitclust/template.offline/library

@@ -13,7 +13,7 @@
     headline_push
     required_classes = (@entry.sublibraries & @entry.requires).map{|lib| lib.classes }.flatten
     all_classes = (@entry.classes + required_classes).uniq.sort
-    err_classes = all_classes.select {|c| c.ancestors.any?{|k| k.name == 'Exception' }}.sort
+    err_classes = all_classes.select {|c| c.error_class? }.sort
     modules = all_classes.select{|c| c.module? }.sort
     objects = all_classes.select{|c| c.object? }.sort
     classes = (all_classes - err_classes - modules - objects).sort

data/data/bitclust/template.offline/library-index

@@ -7,26 +7,41 @@
     headline_init
 %>
 <%= headline(_("Library Index")) %>
-<table class="entries libraries">
 <%
     headline_push
-    lib = @entries.detect {|lib| lib.id == '_builtin' }
+    weight = {"Builtin" => "", "" => "\x7f\x7f"}
+    entry_table = @entries.group_by{|lib| lib.category }.to_a
+    entry_table.sort_by! do |pair|
+      category = pair[0]
+      pair.last.sort!
+      pair[0] = "Other" if category == ""
+      weight[category] || category
+    end
+    first = true
+    entry_table.each do |category, libs|
 %>
-<tr>
-<td class="signature"><%= library_link(lib.name, _('Builtin Library')) %></td>
-<td class="description"><%= compile_rd(lib.synopsis_source) %></td>
-</tr>
+<% if first then first = false else %> / <% end %>
+<a href="#<%= category %>"><%= h _(category) %></a>
 <%
-    @entries.each do |lib|
-      next if lib.id == '_builtin'
-      next if lib.is_sublibrary
+    end
+    entry_table.each do |category, libs|
+%>
+<span id="<%= category %>"><%= headline(_(category)) %></span>
+<table class="entries libraries">
+<%
+      libs.each do |lib|
+        next if lib.is_sublibrary
+        label = _('Builtin Library') if lib.id == '_builtin'
 %>
 <tr>
-<td class="signature"><%= library_link(lib.name) %></td>
+<td class="signature"><%= library_link(lib.name, label) %></td>
 <td class="description"><%= compile_rd(lib.synopsis_source) %></td>
 </tr>
+<%
+      end
+%>
+</table>
 <%
     end
     headline_pop
 %>
-</table>

data/lib/bitclust/classentry.rb

@@ -87,6 +87,16 @@ module BitClust
       property :source,     'String'
     }
 
+    # FIXME: do not use superclass property aliasing (#6826)
+    alias orig_superclass superclass
+    def superclass
+      if alias?
+        aliasof.superclass
+      else
+        orig_superclass
+      end
+    end
+
     def save
       super
       save_index
@@ -116,6 +126,14 @@ module BitClust
       !! aliasof()
     end
 
+    def error_class?
+      if alias?
+        aliasof.error_class?
+      else
+        ancestors.any?{|k| k.name == 'Exception' }
+      end
+    end
+    
     def include(m)
       included().push m
     end

data/lib/bitclust/docentry.rb

@@ -68,7 +68,7 @@ module BitClust
     end
 
     def error_classes
-      classes.select{|c| c.ancestors.any?{|k| k.name == 'Exception' }}
+      classes.select{|c| c.error_class? }
     end
     
     def methods

data/lib/bitclust/libraryentry.rb

@@ -71,6 +71,7 @@ module BitClust
       property :source,   'String'
       property :sublibraries, '[LibraryEntry]'
       property :is_sublibrary,   'bool'
+      property :category, 'String'
     }
 
     def inspect
@@ -106,11 +107,11 @@ module BitClust
     end
 
     def error_classes
-      @error_classes ||= classes.select{|c| c.ancestors.any?{|k| k.name == 'Exception' }}
+      @error_classes ||= classes.select{|c| c.error_class? }
     end
 
     def all_error_classes
-      @all_error_classes ||= all_classes.select{|c| c.ancestors.any?{|k| k.name == 'Exception' }}
+      @all_error_classes ||= all_classes.select{|c| c.error_class? }
     end
 
     def require(lib)

data/lib/bitclust/lineinput.rb

@@ -80,12 +80,13 @@ class LineInput
     n
   end
 
-  def gets_if(re)
+  def gets_if(re, index = nil)
     line = gets()
     if not line or not (re =~ line)
       ungets line
       return nil
     end
+    return $~[index] if index
     line
   end
 

data/lib/bitclust/rrdparser.rb

@@ -83,6 +83,8 @@ module BitClust
     private
 
     def do_parse(f)
+      f.skip_blank_lines
+      @context.categorize f.gets_if(/\Acategory\s(.*)/, 1)
       f.skip_blank_lines
       f.while_match(/\Arequire\s/) do |line|
         @context.require line.split[1]
@@ -332,6 +334,10 @@ end
       attr_accessor :type
       attr_accessor :visibility
 
+      def categorize(category)
+        @library.category = category
+      end
+
       def require(libname)
         @library.require @db.get_library(libname)
       end

data/lib/bitclust/searcher.rb

@@ -194,6 +194,11 @@ module BitClust
       [ "#{datadir}/refe2", "#{datadir}/bitclust" ].each do |path|
         return path if MethodDatabase.datadir?(path)
       end
+      config_path = Pathname(ENV['HOME']) + ".bitclust" + "config"
+      if config_path.exist?
+        config = YAML.load_file(config_path)
+        return "#{config[:database_prefix]}-#{config[:default_version]}"
+      end
       nil
     end
 

data/lib/bitclust/subcommand.rb

@@ -495,7 +495,7 @@ module BitClust
         :default_version => @versions.max,
         :stdlibtree => (rubydoc_dir + "refm/api/src").to_s,
         :capi_src => (rubydoc_dir + "refm/capi/src/").to_s,
-        :beseurl => "http://localhost:10080",
+        :baseurl => "http://localhost:10080",
         :port => "10080",
         :pid_file => "/tmp/bitclust.pid",
       }

data/lib/bitclust/version.rb

@@ -1,3 +1,3 @@
 module BitClust
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/test_entry.rb

@@ -12,6 +12,8 @@ alias HogeHogeHoge
 = class Bar < Hoge
 == Class Methods
 --- bar
+= class Err < Exception
+alias ErrErr
 HERE
     @lib, = BitClust::RRDParser.parse(s, 'hoge')
   end
@@ -35,5 +37,17 @@ HERE
     assert_equal('Hoge', @lib.fetch_class("Hoge").realname)
     assert_equal('Hoge', @lib.fetch_class("HogeHoge").realname)
   end
+
+  def test_error_class_p
+    assert(!@lib.fetch_class("Hoge").error_class?)
+    assert(@lib.fetch_class("Err").error_class?)
+    assert(!@lib.fetch_class("HogeHoge").error_class?)
+    assert(@lib.fetch_class("ErrErr").error_class?)
+  end
+
+  def test_superclass
+    assert('Exception', @lib.fetch_class("Err").superclass.name)
+    assert('Exception', @lib.fetch_class("ErrErr").superclass.name)
+  end
 end
 

data/test/test_libraryentry.rb

@@ -17,6 +17,9 @@ require hoge/bar
 = class Bar < Hoge
 == Class Methods
 --- bar
+= class Err < Exception
+= class Err2 < Err
+alias Err2Alias
 DOC
     @lib_entry, @db = BitClust::RRDParser.parse(s, 'hoge')
     @sublibrary = LibraryEntry.new(@db, 'testsub')
@@ -28,4 +31,9 @@ DOC
     @lib_entry.sublibrary(@sublibrary)
     assert_equal(['testsub'], @lib_entry.sublibraries.map(&:name))
   end
+
+  def test_error_classes
+    assert_equal(["Err", "Err2", "Err2Alias"],
+                 @lib_entry.error_classes.map(&:name).sort)
+  end
 end

data/tools/bc-tohtmlpackage.rb

@@ -123,13 +123,22 @@ def main
   db.transaction do
     methods = {}
     db.methods.each_with_index do |entry, i|
-      method_name = entry.klass.name + entry.typemark + entry.name
-      (methods[method_name] ||= []) << entry
+      entry.names.each do |name|
+        method_name = entry.klass.name + entry.typemark + name
+        (methods[method_name] ||= []) << entry
+      end
     end
-    entries = db.docs + db.libraries.sort + db.classes.sort + methods.values
+    entries = db.docs + db.libraries.sort + db.classes.sort
+    n = entries.length + methods.length
     entries.each_with_index do |c, i|
       create_html_file(c, manager, outputdir, db)
-      $stderr.puts("#{i}/#{entries.size} done") if i % 100 == 0 and verbose
+      $stderr.puts("#{i}/#{n} done") if i % 100 == 0 and verbose
+    end
+    i = entries.length
+    methods.each do |s, ents|
+      create_html_method_file(s, ents, manager, outputdir, db)
+      $stderr.puts("#{i}/#{n} done") if i % 100 == 0 and verbose
+      i += 1
     end
   end
   fdb.transaction do
@@ -191,8 +200,6 @@ def create_html_file(entry, manager, outputdir, db)
     path = outputdir + e.type_id.to_s + (encodename_package(e.name) + '.html')
     create_html_file_p(entry, manager, path, db)
     path.relative_path_from(outputdir).to_s
-  when :method
-    create_html_method_file(entry, manager, outputdir, db)
   when :function
     create_html_function_file(entry, manager, outputdir, db)
   else
@@ -201,15 +208,14 @@ def create_html_file(entry, manager, outputdir, db)
   e.unload
 end
 
-def create_html_method_file(entry, manager, outputdir, db)
+def create_html_method_file(method_name, entries, manager, outputdir, db)
   path = nil
   $bitclust_html_base = '../../..'
-  e = entry.is_a?(Array) ? entry.sort.first : entry
-  e.names.each{|name|
-    path = outputdir + e.type_id.to_s + encodename_package(e.klass.name) +
-           e.typechar + (encodename_package(name) + '.html')
-    create_html_file_p(entry, manager, path, db)
-  }
+  e = entries.sort.first
+  name = method_name.sub(e.klass.name + e.typemark, "")
+  path = outputdir + e.type_id.to_s + encodename_package(e.klass.name) +
+    e.typechar + (encodename_package(name) + '.html')
+  create_html_file_p(entries, manager, path, db)
   path.relative_path_from(outputdir).to_s
 end
 

data/vendor/bundle/ruby/1.9.1/bin/bc-ancestors.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-ancestors.rb', version)

data/vendor/bundle/ruby/1.9.1/bin/bc-checkparams.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-checkparams.rb', version)

data/vendor/bundle/ruby/1.9.1/bin/bc-classes.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-classes.rb', version)

data/vendor/bundle/ruby/1.9.1/bin/bc-convert.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-convert.rb', version)

data/vendor/bundle/ruby/1.9.1/bin/bc-list.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-list.rb', version)

data/vendor/bundle/ruby/1.9.1/bin/bc-methods.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by RubyGems.
+#
+# The application 'bitclust-dev' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+version = ">= 0"
+
+if ARGV.first
+  str = ARGV.first
+  str = str.dup.force_encoding("BINARY") if str.respond_to? :force_encoding
+  if str =~ /\A_(.*)_\z/
+    version = $1
+    ARGV.shift
+  end
+end
+
+gem 'bitclust-dev', version
+load Gem.bin_path('bitclust-dev', 'bc-methods.rb', version)