groonga 0.0.7 → 0.9.0

data/NEWS.ja.rdoc

@@ -1,5 +1,61 @@
 = お知らせ
 
+== 0.9.0: 2010-02-09
+
+* groonga 0.1.5対応
+* APIの追加
+  * Groonga::Object#context
+  * Groonga::Record#n_sub_records
+  * Groonga::Context#send
+  * Groonga::Context#receive
+  * Groonga::PatriciaTrie#prefix_search [Tasuku SUENAGA]
+  * Groonga::Object#path [Ryo Onodera]
+  * Groonga::Object#lock [Tasuku SUENAGA]
+  * Groonga::Object#unlock [Tasuku SUENAGA]
+  * Groonga::Object#locked? [Tasuku SUENAGA]
+  * Groonga::Object#temporary?
+  * Groonga::Object#persistent?
+  * Groonga::ObjectClosed
+  * Groonga::Context.[]
+  * Groonga::Table#column_value
+  * Groonga::Table#set_column_value
+* APIの変更
+  * Groonga::Table#select, Groonga::Column#select
+    * Groonga::Expressionも受け付けるようになった
+    * grn式のシンタックスを指定する:syntaxオプションの追加
+  * Groonga::Table#open_cursor
+    * 開始位置を指定する:offsetオプションの追加
+    * 最大レコード数を指定する:limitオプションの追加
+  * Groonga::Expression.parseの引数を変更
+    * (nil (default) -> :column) -> (nil (default) -> :query)
+    * :column -> 廃止
+    * :table -> :query
+    * :table_query -> :query
+    * :expression -> :script
+    * :language -> :script
+  * Groonga::Table#define_column, Groonga::Table#define_index_column
+    * 永続テーブルをデフォルトにした
+  * Groonga::Table#[]をGroonga::Table#valueに変更
+  * Groonga::Table#[]=をGroonga::Table#set_valueに変更
+  * Groonga::Table#findをGroonga::Table#[]に変更
+  * Groonga::Table#findは非推奨
+  * Groonga::Table#[]=を削除
+  * Groonga::TableKeySupport#[]=はGroonga::TableKeySupport#addの別名
+  * Groonga::Recordで存在しないカラムにアクセスしたときの例外を
+    Groonga::InvalidArgumentからGroonga::NoSuchColumnに変更
+* バグ修正
+  * スキーマにコンテキストが伝搬されない問題の修正 [dara]
+  * Groonga::PatriciaTrie#tag_keysが最後のテキストを返さない問題の修正
+    [Ryo Onodera]
+* extconf.rbにデバッグモードでビルドする--with-debugオプションを追加
+* Ruby 1.9.1でextconf.rbが失敗する問題の修正
+
+=== 感謝
+
+* dara
+* Ryo Onodera
+* Tasuku SUENAGA
+
 == 0.0.7: 2009-10-02
 
 * groonga 0.1.4対応

data/NEWS.rdoc

@@ -1,5 +1,63 @@
 = NEWS
 
+== 0.9.0: 2010-02-09
+
+* Supported groonga 0.1.5
+* Added API
+  * Groonga::Object#context
+  * Groonga::Record#n_sub_records
+  * Groonga::Context#send
+  * Groonga::Context#receive
+  * Groonga::PatriciaTrie#prefix_search [Tasuku SUENAGA]
+  * Groonga::Object#path [Ryo Onodera]
+  * Groonga::Object#lock [Tasuku SUENAGA]
+  * Groonga::Object#unlock [Tasuku SUENAGA]
+  * Groonga::Object#locked? [Tasuku SUENAGA]
+  * Groonga::Object#temporary?
+  * Groonga::Object#persistent?
+  * Groonga::ObjectClosed
+  * Groonga::Context.[]
+  * Groonga::Table#column_value
+  * Groonga::Table#set_column_value
+* Changed API
+  * Groonga::Table#select, Groonga::Column#select
+    * They also accept Groonga::Expression
+    * Added :syntax option that specifies grn expression syntax
+  * Groonga::Table#open_cursor
+    * Added :offset option that specifies offset.
+    * Added :limit option that specifies max number of records.
+  * Changed Groonga::Expression.parse options:
+    * (nil (default) -> :column) -> (nil (default) -> :query)
+    * :column -> removed
+    * :table -> :query
+    * :table_query -> :query
+    * :expression -> :script
+    * :language -> :script
+  * Groonga::Table#define_column, Groonga::Table#define_index_column
+    * Defined column becomes persistent table by default
+  * Groonga::Table#[] -> Groonga::Table#value
+  * Groonga::Table#[]= -> Groonga::Table#set_value
+  * Groonga::Table#find -> Groonga::Table#[]
+  * Groonga::Table#find -> obsolete
+  * Groonga::Table#[]= -> removed
+  * Groonga::TableKeySupport#[]= is alias of Groonga::TableKeySupport#add
+  * Changed exception class to Groonga::NoSuchColumn from
+    Groonga::InvalidArgument when Groonga::Record accesses nonexistent
+    a column.
+* Bug fixes
+  * Fixed a bug that context isn't passed to schema [dara]
+  * Fixed a bug that Groonga::PatriciaTrie#tag_keys doesn't return
+    that last text.
+    [Ryo Onodera]
+* Added --with-debug option to extconf.rb for debug build.
+* Fixed a bug that Ruby 1.9.1 may fail extconf.rb.
+
+=== Thanks
+
+* dara
+* Ryo Onodera
+* Tasuku SUENAGA
+
 == 0.0.7: 2009-10-02
 
 * Supported groonga 0.1.4

data/Rakefile

@@ -51,7 +51,6 @@ manifest_contents = []
 base_dir_included_components = %w(AUTHORS Rakefile
                                   README.rdoc README.ja.rdoc
                                   NEWS.rdoc NEWS.ja.rdoc
-                                  TUTORIAL.ja.rdoc
                                   extconf.rb pkg-config.rb)
 excluded_components = %w(.cvsignore .gdb_history CVS depend Makefile pkg
                          .svn .git doc vendor data .test-result)
@@ -108,7 +107,7 @@ Hoe.spec('groonga') do |_project|
   project.spec_extras = {
     :extensions => ['extconf.rb'],
     :require_paths => ["lib", "ext"],
-    :extra_rdoc_files => Dir.glob("*.rdoc"),
+    :extra_rdoc_files => Dir.glob("**/*.rdoc"),
   }
   project.readme_file = "README.ja.rdoc"
 
@@ -145,7 +144,7 @@ ObjectSpace.each_object(Rake::RDocTask) do |rdoc_task|
 
   rdoc_task.rdoc_files = ["ext/rb-groonga.c"] + Dir.glob("ext/rb-grn-*.c")
   rdoc_task.rdoc_files += Dir.glob("lib/**/*.rb")
-  rdoc_task.rdoc_files += Dir.glob("*.rdoc")
+  rdoc_task.rdoc_files += Dir.glob("**/*.rdoc")
 end
 
 task :publish_docs => [:prepare_docs_for_publishing]

data/benchmark/read-write-many-small-items.rb

@@ -54,46 +54,30 @@ begin
   $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 
   require 'groonga'
-  @database = Groonga::Database.create
-  value_type = Groonga::Type.new("Text8", :size => 8)
+  tmp_dir = "/tmp/groonga"
+  FileUtils.rm_rf(tmp_dir)
+  FileUtils.mkdir(tmp_dir)
+  @database = Groonga::Database.create(:path => "#{tmp_dir}/db")
 
-  item("groonga: Hash: memory") do
-    @hash = Groonga::Hash.create(:key_type => "<shorttext>",
-                                 :value_type => value_type)
-    values.each do |value|
-      @hash[value] = value
-      @hash[value]
-    end
-  end
-
-  item("groonga: Trie: memory") do
-    @hash = Groonga::PatriciaTrie.create(:key_type => "<shorttext>",
-                                         :value_type => value_type)
-    values.each do |value|
-      @hash[value] = value
-      @hash[value]
-    end
-  end
-
-  @hash_file = Tempfile.new("groonga-hash")
   item("groonga: Hash: file") do
-    @hash = Groonga::Hash.create(:key_type => "<shorttext>",
-                                 :value_type => value_type,
-                                 :path => @hash_file.path)
+    @hash = Groonga::Hash.create(:name => "Hash",
+                                 :key_type => "ShortText")
+    column_name = "value"
+    @column = @hash.define_column(column_name, "ShortText")
     values.each do |value|
-      @hash[value] = value
-      @hash[value]
+      @hash.set_column_value(value, column_name, value)
+      @hash.column_value(value, column_name)
     end
   end
 
-  trie_file = Tempfile.new("groonga-trie")
   item("groonga: Trie: file") do
-    @hash = Groonga::PatriciaTrie.create(:key_type => "<shorttext>",
-                                         :value_type => value_type,
-                                         :path => trie_file.path)
+    @trie = Groonga::PatriciaTrie.create(:name => "PatriciaTrie",
+                                         :key_type => "ShortText")
+    column_name = "value"
+    @column = @trie.define_column(column_name, "ShortText")
     values.each do |value|
-      @hash[value] = value
-      @hash[value]
+      @trie.set_column_value(value, column_name, value)
+      @trie.column_value(value, column_name)
     end
   end
 rescue LoadError

data/benchmark/write-many-small-items.rb

@@ -53,42 +53,28 @@ begin
   $LOAD_PATH.unshift(File.join(base_dir, "lib"))
 
   require 'groonga'
-  @database = Groonga::Database.create
-  value_type = Groonga::Type.new("Text8", :size => 8)
+  tmp_dir = "/tmp/groonga"
+  FileUtils.rm_rf(tmp_dir)
+  FileUtils.mkdir(tmp_dir)
+  @database = Groonga::Database.create(:path => "#{tmp_dir}/db")
 
-  item("groonga: Hash: memory") do
-    @hash = Groonga::Hash.create(:key_type => "<shorttext>",
-                                 :value_type => value_type)
-    values.each do |value|
-      @hash[value] = value
-    end
-  end
-
-  item("groonga: Trie: memory") do
-    @hash = Groonga::PatriciaTrie.create(:key_type => "<shorttext>",
-                                         :value_type => value_type)
-    values.each do |value|
-      @hash[value] = value
-    end
-  end
-
-  @hash_file = Tempfile.new("groonga-hash")
   item("groonga: Hash: file") do
-    @hash = Groonga::Hash.create(:key_type => "<shorttext>",
-                                 :value_type => value_type,
-                                 :path => @hash_file.path)
+    @hash = Groonga::Hash.create(:name => "Hash",
+                                 :key_type => "ShortText")
+    column_name = "value"
+    @column = @hash.define_column(column_name, "ShortText")
     values.each do |value|
-      @hash[value] = value
+      @hash.set_column_value(value, column_name, value)
     end
   end
 
-  trie_file = Tempfile.new("groonga-trie")
   item("groonga: Trie: file") do
-    @hash = Groonga::PatriciaTrie.create(:key_type => "<shorttext>",
-                                         :value_type => value_type,
-                                         :path => trie_file.path)
+    @trie = Groonga::PatriciaTrie.create(:name => "PatriciaTrie",
+                                         :key_type => "ShortText")
+    column_name = "value"
+    @column = @trie.define_column(column_name, "ShortText")
     values.each do |value|
-      @hash[value] = value
+      @trie.set_column_value(value, column_name, value)
     end
   end
 rescue LoadError

data/example/bookmark.rb

@@ -36,46 +36,48 @@ persistent = true
 
 p Groonga::Database.create(:path => path)
 
-p(items = Groonga::Hash.create(:name => "<items>", :persistent => persistent))
+p(items = Groonga::Hash.create(:name => "Items",
+                               :key_type => "ShortText",
+                               :persistent => persistent))
 
 p items.add("http://ja.wikipedia.org/wiki/Ruby")
 p items.add("http://www.ruby-lang.org/")
 
-p items.define_column("title", "<text>", :persistent => persistent)
+p items.define_column("title", "Text", :persistent => persistent)
 
-p(terms = Groonga::Hash.create(:name => "<terms>",
-                               :key_type => "<shorttext>",
+p(terms = Groonga::Hash.create(:name => "Terms",
+                               :key_type => "ShortText",
                                :persistent => persistent,
-                               :default_tokenizer => "<token:bigram>"))
+                               :default_tokenizer => "TokenBigram"))
 p terms.define_index_column("item_title", items,
                             :persistent => persistent,
                             :with_weight => true,
                             :with_section => true,
                             :with_position => true,
-                            :source => "<items>.title")
+                            :source => "Items.title")
 
 p items.find("http://ja.wikipedia.org/wiki/Ruby")["title"] = "Ruby"
 p items.find("http://www.ruby-lang.org/")["title"] = "オブジェクト指向スクリプト言語Ruby"
 
-p(users = Groonga::Hash.create(:name => "<users>",
-                               :key_type => "<shorttext>",
+p(users = Groonga::Hash.create(:name => "Users",
+                               :key_type => "ShortText",
                                :persistent => persistent))
-p users.define_column("name", "<text>",
+p users.define_column("name", "Text",
                       :persistent => persistent)
 
-p(comments = Groonga::Array.create(:name => "<comments>",
+p(comments = Groonga::Array.create(:name => "Comments",
                                    :persistent => persistent))
 p comments.define_column("item", items)
 p comments.define_column("author", users)
-p comments.define_column("content", "<text>")
-p comments.define_column("issued", "<time>")
+p comments.define_column("content", "Text")
+p comments.define_column("issued", "Time")
 
 p terms.define_index_column("comment_content", comments,
                             :persistent => persistent,
                             :with_weight => true,
                             :with_section => true,
                             :with_position => true,
-                            :source => "<comments>.content")
+                            :source => "Comments.content")
 
 p users.add("moritan", :name => "モリタン")
 p users.add("taporobo", :name => "タポロボ")
@@ -145,15 +147,15 @@ end
 
 records.group([".item"]).each do |record|
   item = record.key
-  p [record[".:nsubrecs"],
+  p [record.n_sub_records,
      item.key,
      item[".title"]]
 end
 
 p ruby_comments = @comments.select {|record| record["content"] =~ "Ruby"}
-p ruby_items = @items.select("*W1:50 title:%Ruby")
+p ruby_items = @items.select("*W1:50 title:@Ruby")
 
 p ruby_items = ruby_comments.group([".item"]).union!(ruby_items)
-ruby_items.sort([{:key => ".:score", :order => "descending"}]).each do |record|
-  p [record[".:score"], record[".title"]]
+ruby_items.sort([{:key => "._score", :order => "descending"}]).each do |record|
+  p [record["._score"], record[".title"]]
 end

data/example/index-html.rb

@@ -65,9 +65,19 @@ targets.each do |target|
         html_document.css("title").each do |title|
           values[:title] = title.text
         end
+        contents = []
         html_document.css("body").each do |body|
-          values[:content] = body.text
+          contents << body.text
         end
+        html_document.css("img").each do |image|
+          image_content = []
+          title = image['title']
+          alt = image['alt']
+          image_content << title if title and !title.empty?
+          image_content << alt if alt and !alt.empty?
+          contents.concat(image_content) unless image_content.empty?
+        end
+        values[:content] = contents.join("\n")
         values["last-modified"] = path.mtime
 
         values.each do |key, value|

data/example/search/config.ru

@@ -23,14 +23,20 @@ class Searcher
   def call(env)
     request = Rack::Request.new(env)
     response = Rack::Response.new
-    response["Content-Type"] = "text/html"
+    response["Content-Type"] = "text/html; charset=UTF-8"
+    if /\/\z/ !~ request.path_info
+      request.path_info += "/"
+      response.redirect(request.url)
+      return response.to_a
+    end
 
     response.write(<<-EOH)
+<?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="ja" lang="ja">
 <head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
   <meta name="robot" content="noindex,nofollow" />
   <title>groongaで全文検索</title>
   <link rel="stylesheet" href="css/groonga.css" type="text/css" media="all" />
@@ -117,9 +123,9 @@ EOS
       <span class="keyword">#{escape_html(query(request))}</span>の検索結果:
       <span class="total-entries">#{total_records}</span>件中
       <span class="display-range">
-        #{total_records.zero? ? 0 : _page + 1}
+        #{total_records.zero? ? 0 : (_page * limit) + 1}
         -
-        #{_page + records.size}
+        #{(_page * limit) + records.size}
       </span>
       件（#{elapsed}秒）
     </p>
@@ -133,7 +139,7 @@ EOS
     end
     response.write("  </div>\n")
 
-    # render_pagination(request, response, _page, limit)
+    render_pagination(request, response, _page, limit, total_records)
   end
 
   def render_record(request, response, record)
@@ -168,14 +174,13 @@ EOM
 EOS
   end
 
-  def render_pagination(request, response, page, limit)
+  def render_pagination(request, response, page, limit, total_records)
     _query = query(request)
     return if _query.empty?
 
-    total_records = @documents.size
     return if total_records < limit
 
-    last_page = total_records / limit
+    last_page = (total_records / limit.to_f).ceil
     response.write("<div class='pagination'>\n")
     if page > 0
       render_pagination_link(request, response, _query, page - 1, "<<")
@@ -187,7 +192,7 @@ EOS
         render_pagination_link(request, response, _query, i, i)
       end
     end
-    if page < last_page
+    if page < (last_page - 1)
       render_pagination_link(request, response, _query, page + 1, ">>")
     end
     response.write("</div>\n")

data/ext/rb-grn-array.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby" -*- */
 /*
-  Copyright (C) 2009  Kouhei Sutou <kou@clear-code.com>
+  Copyright (C) 2009-2010  Kouhei Sutou <kou@clear-code.com>
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -70,7 +70,7 @@ VALUE rb_cGrnArray;
  *
  * [+:sub_records+]
  *   +true+を指定すると#groupでグループ化したときに、
- *   <tt>record[".:nsubrecs"]</tt>でグループに含まれるレコー
+ *   Groonga::Record#n_sub_recordsでグループに含まれるレコー
  *   ドの件数を取得できる。
  *
  * 使用例:
@@ -141,7 +141,7 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
 	rb_grn_context_check(context, rb_ary_new4(argc, argv));
     rb_table = GRNOBJECT2RVAL(klass, context, table, RB_GRN_TRUE);
     rb_grn_context_check(context, rb_table);
-    rb_iv_set(rb_table, "context", rb_context);
+    rb_iv_set(rb_table, "@context", rb_context);
 
     if (rb_block_given_p())
         return rb_ensure(rb_yield, rb_table, rb_grn_object_close, rb_table);
@@ -163,9 +163,9 @@ rb_grn_array_s_create (int argc, VALUE *argv, VALUE klass)
  *
  * 使用例では、以下のようなユーザを格納するGroonga::Arrayが
  * 定義されているものとする。
- *   users = Groonga::Array.create(:name => "<users>")
- *   users.define_column("name", "<shorttext>")
- *   users.define_column("uri", "<shorttext>")
+ *   users = Groonga::Array.create(:name => "Users")
+ *   users.define_column("name", "ShortText")
+ *   users.define_column("uri", "ShortText")
  *
  * ユーザを追加する。
  *   user = users.add