Merge remote-tracking branch 'clear-code/master' into merge-upstream

Author: znz

.gitignore

@@ -2,6 +2,7 @@
 /groonga-database
 /public/1.*
 /public/2.*
+/public/3.*
 /test-unit
 /webrat.log
 /test/db-*

Gemfile

@@ -1,6 +1,6 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- ruby -*-
 #
-# Copyright (C) 2011-2016  Kouhei Sutou <[email protected]>
+# Copyright (C) 2011-2020  Sutou Kouhei <[email protected]>
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,8 +19,8 @@ source "https://rubygems.org/"
 
 gem "rroonga"
 gem "racknga"
-gem "bitclust-core"
-gem "bitclust-dev"
+gem "bitclust-core", github: "rurema/bitclust"
+gem "bitclust-dev", github: "rurema/bitclust"
 
 gem 'rack-protection'
 

README.rdoc

@@ -54,6 +54,34 @@ license/lgpl-3.0.txtを見てください。
   % rackup > /dev/null 2>&1 &
   % open http://localhost:9292/
 
+==== WSL Ubuntu-20.04(Windows) + rbenv
+
+First, install Groonga in advance.
+Groonga installation is easy and convenient to {install from Ubuntu PPA}[https://groonga.org/ja/docs/install/ubuntu.html#ubuntu].
+
+Depending on your environment, you may need to install additional `zsh` package.
+
+  $ sudo apt install zsh
+
+Enter the following command lines in the terminal of WSL:
+
+  $ mkdir rurema
+  $ cd rurema
+  $ git clone https://github.com/rurema/doctree.git
+  $ git clone https://github.com/rurema/bitclust.git
+  $ git clone https://github.com/ranguba/racknga.git
+  $ git clone https://github.com/clear-code/rurema-search.git
+  $ rbenv local 2.6.6
+  $ cd rurema-search
+  $ gem install groonga
+  $ gem install bitclust-core bitclust-dev refe2
+  $ bundle install
+  $ ./update.sh
+  $ rackup
+
+Finally, open http://localhost:9292/ by your Web browser.
+
+
 === サーバ利用の場合
 
 ==== Debian GNU/Linux wheezy

config.ru

@@ -141,13 +141,19 @@ urls = [
   "/css/",
   "/images/",
   "/javascripts/",
-  "/1.8.",
-  "/1.9.",
-  "/2.0.",
-  "/2.1.",
-  "/2.2.",
+  "/1.",
+  "/2.",
+  "/3.",
 ]
 
+case environment
+when "development"
+  use Rack::Static,
+      :urls => urls,
+      :root => (base_dir + "public").to_s,
+      :index => "index.html"
+end
+
 use Racknga::Middleware::Deflater
 use Rack::Lint
 use Rack::Head

lib/rurema_search/groonga_indexer.rb

@@ -210,37 +210,44 @@ def extract_attributes(source)
 
     class RDAttributesExtractor < BitClust::RDCompiler
       def initialize
-        super(nil)
+        opt = {:stop_on_syntax_error => false}
+        super(nil, 1, opt)
       end
 
       def extract(src)
         @related_names = []
         compile(src)
         {
           :summary => src.split(/\n\n/, 2).first,
-          :related_names => @related_names.compact.uniq,
+          :related_names => @related_names.uniq,
         }
       end
 
       private
-      def library_link(name, label=nil, fragment=nil)
+      def add_related_name(name)
+        return if name.nil?
+        return if name.empty?
         @related_names << name
       end
 
+      def library_link(name, label=nil, fragment=nil)
+        add_related_name(name)
+      end
+
       def class_link(name, label=nil, fragment=nil)
-        @related_names << name
+        add_related_name(name)
       end
 
       def method_link(spec, label=nil, fragment=nil)
-        @related_names << spec
+        add_related_name(name)
       end
 
       def function_link(name, label=nil, fragment=nil)
-        @related_names << name
+        add_related_name(name)
       end
 
       def document_link(name, label=nil, fragment=nil)
-        @related_names << name
+        add_related_name(name)
       end
     end
   end

lib/rurema_search/groonga_suggest_database.rb

@@ -71,9 +71,9 @@ def register_keyword(keyword, related_keywords)
       @context.receive
 
       item_values = []
-      item_values << {"_key" => keyword, "kana" => keyword}
+      item_values << {"_key" => keyword, "kana" => [keyword]}
       related_keywords.each do |related_keyword|
-        item_values << {"_key" => related_keyword, "kana" => related_keyword}
+        item_values << {"_key" => related_keyword, "kana" => [related_keyword]}
       end
       @context.send("load --table #{table_name('item')}")
       @context.send(JSON.generate(item_values))

public/robots.txt

@@ -1,5 +1,8 @@
 User-agent: bingbot
 Disallow: /
 
+User-agent: cotoba_bot
+Disallow: /
+
 User-agent: *
 Clawl-Delay: 5

update.sh

@@ -2,7 +2,7 @@
 
 base_dir=$(cd "$(dirname "$0")" && pwd)
 : ${RUBY:=ruby}
-bitclust_dir=$($RUBY -rubygems -e 'print Gem::Specification.find_by_name("bitclust-core").gem_dir')
+bitclust_dir=$($RUBY -rrubygems -e 'print Gem::Specification.find_by_name("bitclust-core").gem_dir')
 doctree_dir=${base_dir}/../doctree
 
 PATH=${base_dir}/local/bin:$PATH
@@ -67,13 +67,16 @@ update_rurema()
 	--database ${base_dir}/db-${version} \
 	statichtml \
 	--quiet \
+	--no-stop-on-syntax-error \
 	--fs-casesensitive \
 	--outputdir ${base_dir}/public/${version}.new \
 	--catalog ${bitclust_dir}/data/bitclust/catalog \
 	--template ${bitclust_dir}/data/bitclust/template
-    mv ${base_dir}/public/${version}{,.old}
-    mv ${base_dir}/public/${version}{.new,}
-    rm -rf ${base_dir}/public/${version}.old
+    if [ $? -eq 0 ]; then
+	mv ${base_dir}/public/${version}{,.old}
+	mv ${base_dir}/public/${version}{.new,}
+	rm -rf ${base_dir}/public/${version}.old
+    fi
 }
 
 if [ "$update_rurema" = "yes" ]; then
@@ -83,7 +86,7 @@ if [ "$update_rurema" = "yes" ]; then
 	git clone https://github.com/rurema/doctree.git ${doctree_dir}
     fi
 
-    for version in 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0; do
+    for version in 2.1.0 2.2.0 2.3.0 2.4.0 2.5.0 2.6.0 2.7.0 3.0.0; do
 	update_rurema $version
     done
     wait

views/index.html.erb

@@ -22,15 +22,14 @@
   <form method="POST" action="./">
     <p class="input-form">
       <input id="query-input" type="text" class="query ui-autocomplete-input"
-             name="query" autocomplete="off"
+             name="query" autocomplete="off" autofocus
              value="<%= default_query_form_value %>" />
     </p>
     <p class="button">
       <input type="submit" value="検索" />
     </p>
   </form>
   <script type="text/javascript">
-    $("#query-input").focus();
     $("#query-input").autocomplete({
       source: <%= auto_complete_api_path.to_json %>
     });