rroonga 1.0.4 → 1.0.5

data/NEWS.ja.rdoc

@@ -1,5 +1,16 @@
 = お知らせ
 
+== 1.0.5: 2010-11-29
+
+=== 改良
+
+* Groonga::Schemaでgroongaの組み込み型をshort_textなどのように
+  「小文字 + アンダースコア」でも指定できるようにした。
+
+=== 修正
+
+* GC時にクラッシュするバグを修正。 [Ryo Onodera]
+
 == 1.0.4: 2010-11-29
 
 === 改良

data/NEWS.rdoc

@@ -1,6 +1,17 @@
 = NEWS
 
-== 1.0.3: 2010-11-29
+== 1.0.5: 2010-11-29
+
+=== Improvements
+
+* Added snail_case type name aliases for built-in groonga types
+  to Groonga::Schema.
+
+=== Fixes
+
+* Fixed a crash bug on GC. [Ryo Onodera]
+
+== 1.0.4: 2010-11-29
 
 === Improvements
 

data/ext/groonga/rb-grn-object.c

@@ -331,7 +331,6 @@ rb_grn_object_bind_common (VALUE klass, VALUE self, VALUE rb_context,
 	rb_grn_object->range = grn_ctx_at(context, rb_grn_object->range_id);
 
     DATA_PTR(self) = rb_grn_object;
-    rb_iv_set(self, "@context", rb_context);
 }
 
 void
@@ -398,6 +397,8 @@ rb_grn_object_assign (VALUE klass, VALUE self, VALUE rb_context,
 		 object->header.type);
     }
 
+    rb_iv_set(self, "@context", rb_context);
+
     debug("assign: %p:%p:%p 0x%x\n", context, object, rb_grn_object,
 	   object->header.type);
 }

data/ext/groonga/rb-grn.h

@@ -69,7 +69,7 @@ RB_GRN_BEGIN_DECLS
 
 #define RB_GRN_MAJOR_VERSION 1
 #define RB_GRN_MINOR_VERSION 0
-#define RB_GRN_MICRO_VERSION 4
+#define RB_GRN_MICRO_VERSION 5
 
 typedef int rb_grn_boolean;
 #define RB_GRN_FALSE (0)

data/html/index.html

@@ -49,7 +49,7 @@
 
 	<h3>rroongaの最新リリース</h3>
 	<p>
-	  2010-11-29にリリースされた1.0.4が最新です。
+	  2010-11-29にリリースされた1.0.5が最新です。
         </p>
 
 	<h3 id="install-rroonga">rroongaのインストール</h3>
@@ -78,7 +78,6 @@
           ActiveGroongaは以下のようにActiveRecordのような機能を持っているため、こまでのRailsアプリケーションの知識を利用することができます。
           <ul>
             <li>マイグレーション</li>
-            <li>フィクスチャ</li>
             <li>バリデーション</li>
             <li>リレーション</li>
           </ul>
@@ -86,7 +85,7 @@
 
 	<h3>ActiveGroongaの最新リリース</h3>
 	<p>
-	  2009-10-02にリリースされた0.0.7が最新です。
+	  2010-11-29にリリースされた1.0.1が最新です。
         </p>
 
 	<h3 id="install-active-groonga">ActiveGroongaのインストール</h3>

data/lib/groonga/schema.rb

@@ -418,30 +418,66 @@ module Groonga
 	end
       end
 
+      NORMALIZE_TYPE_TABLE = {
+        "short_text" => "ShortText",
+        "string" => "ShortText",
+        "text" => "Text",
+        "binary" => "LongText",
+        "long_text" => "LongText",
+        "int" => "Int32",
+        "integer" => "Int32",
+        "int32" => "Int32",
+        "integer32" => "Int32",
+        "decimal" => "Int64",
+        "int64" => "Int64",
+        "integer64" => "Int64",
+        "uint" => "UInt32",
+        "unsigned_integer" => "UInt32",
+        "uint32" => "UInt32",
+        "unsigned_integer32" => "UInt32",
+        "uint64" => "UInt64",
+        "unsigned_integer64" => "UInt64",
+        "float" => "Float",
+        "datetime" => "Time",
+        "timestamp" => "Time",
+        "time" => "Time",
+        "date" => "Time",
+        "boolean" => "Bool",
+        "unigram" => "TokenUnigram",
+        "token_unigram" => "TokenUnigram",
+        "bigram" => "TokenBigram",
+        "token_bigram" => "TokenBigram",
+        "bigram_split_symbol" => "TokenBigramSplitSymbol",
+        "token_bigram_split_symbol" => "TokenBigramSplitSymbol",
+        "bigram_split_symbol_alpha" => "TokenBigramSplitSymbolAlpha",
+        "token_bigram_split_symbol_alpha" => "TokenBigramSplitSymbolAlpha",
+        "bigram_split_symbol_alpha_digit" => "TokenBigramSplitSymbolAlphaDigit",
+        "token_bigram_split_symbol_alpha_digit" =>
+          "TokenBigramSplitSymbolAlphaDigit",
+        "bigram_ignore_blank" => "TokenBigramIgnoreBlank",
+        "token_bigram_ignore_blank" => "TokenBigramIgnoreBlank",
+        "bigram_ignore_blank_split_symbol" =>
+          "TokenBigramIgnoreBlankSplitSymbol",
+        "token_bigram_ignore_blank_split_symbol" =>
+          "TokenBigramIgnoreBlankSplitSymbol",
+        "bigram_ignore_blank_split_symbol_alpha" =>
+          "TokenBigramIgnoreBlankSplitSymbolAlpha",
+        "token_bigram_ignore_blank_split_symbol_alpha" =>
+          "TokenBigramIgnoreBlankSplitSymbolAlpha",
+        "bigram_ignore_blank_split_symbol_alpha_digit" =>
+          "TokenBigramIgnoreBlankSplitSymbolAlphaDigit",
+        "token_bigram_ignore_blank_split_symbol_alpha_digit" =>
+          "TokenBigramIgnoreBlankSplitSymbolAlphaDigit",
+        "trigram" => "TokenTrigram",
+        "token_trigram" => "TokenTrigram",
+        "mecab" => "TokenMecab",
+        "token_mecab"=> "TokenMecab",
+      }
       def normalize_type(type) # :nodoc:
         return type if type.nil?
         return type if type.is_a?(Groonga::Object)
         type = type.to_s if type.is_a?(Symbol)
-        case type.to_s
-        when "string"
-          "ShortText"
-        when "text"
-          "Text"
-        when "int", "integer"
-          "Int32"
-        when "float"
-          "Float"
-        when "decimal"
-          "Int64"
-        when "datetime", "timestamp", "time", "date"
-          "Time"
-        when "binary"
-          "LongText"
-        when "boolean"
-          "Bool"
-        else
-          type
-        end
+        NORMALIZE_TYPE_TABLE[type] || type
       end
     end
 

data/test/test-schema-type.rb

@@ -0,0 +1,167 @@
+# Copyright (C) 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
+# License version 2.1 as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+class SchemaTypeTest < Test::Unit::TestCase
+  include GroongaTestUtils
+
+  def test_normalize_short_text
+    assert_normalize_type("ShortText", "short_text")
+    assert_normalize_type("ShortText", "string")
+    assert_normalize_type("ShortText", "ShortText")
+  end
+
+  def test_normalize_text
+    assert_normalize_type("Text", "text")
+    assert_normalize_type("Text", "Text")
+  end
+
+  def test_normalize_long_text
+    assert_normalize_type("LongText", "binary")
+    assert_normalize_type("LongText", "long_text")
+    assert_normalize_type("LongText", "LongText")
+  end
+
+  def test_normalize_integer32
+    assert_normalize_type("Int32", "int")
+    assert_normalize_type("Int32", "integer")
+    assert_normalize_type("Int32", "int32")
+    assert_normalize_type("Int32", "integer32")
+    assert_normalize_type("Int32", "Int32")
+  end
+
+  def test_normalize_integer64
+    assert_normalize_type("Int64", "int64")
+    assert_normalize_type("Int64", "integer64")
+    assert_normalize_type("Int64", "Int64")
+  end
+
+  def test_normalize_unsigned_integer32
+    assert_normalize_type("UInt32", "uint")
+    assert_normalize_type("UInt32", "unsigned_integer")
+    assert_normalize_type("UInt32", "uint32")
+    assert_normalize_type("UInt32", "unsigned_integer32")
+    assert_normalize_type("UInt32", "UInt32")
+  end
+
+  def test_normalize_unsigned_integer64
+    assert_normalize_type("UInt64", "uint64")
+    assert_normalize_type("UInt64", "unsigned_integer64")
+    assert_normalize_type("UInt64", "UInt64")
+  end
+
+  def test_normalize_float
+    assert_normalize_type("Float", "float")
+    assert_normalize_type("Float", "Float")
+  end
+
+  def test_normalize_time
+    assert_normalize_type("Time", "datetime")
+    assert_normalize_type("Time", "timestamp")
+    assert_normalize_type("Time", "time")
+    assert_normalize_type("Time", "date")
+    assert_normalize_type("Time", "Time")
+  end
+
+  def test_normalize_boolean
+    assert_normalize_type("Bool", "boolean")
+    assert_normalize_type("Bool", "Bool")
+  end
+
+  def test_normalize_unigram
+    assert_normalize_type("TokenUnigram", "unigram")
+    assert_normalize_type("TokenUnigram", "token_unigram")
+    assert_normalize_type("TokenUnigram", "TokenUnigram")
+  end
+
+  def test_normalize_bigram
+    assert_normalize_type("TokenBigram", "bigram")
+    assert_normalize_type("TokenBigram", "token_bigram")
+    assert_normalize_type("TokenBigram", "TokenBigram")
+  end
+
+  def test_normalize_bigram_split_symbol
+    assert_normalize_type("TokenBigramSplitSymbol", "bigram_split_symbol")
+    assert_normalize_type("TokenBigramSplitSymbol", "token_bigram_split_symbol")
+    assert_normalize_type("TokenBigramSplitSymbol", "TokenBigramSplitSymbol")
+  end
+
+  def test_normalize_bigram_split_symbol_alpha
+    assert_normalize_type("TokenBigramSplitSymbolAlpha",
+                          "bigram_split_symbol_alpha")
+    assert_normalize_type("TokenBigramSplitSymbolAlpha",
+                          "token_bigram_split_symbol_alpha")
+    assert_normalize_type("TokenBigramSplitSymbolAlpha",
+                          "TokenBigramSplitSymbolAlpha")
+  end
+
+  def test_normalize_bigram_split_symbol_alpha_digit
+    assert_normalize_type("TokenBigramSplitSymbolAlphaDigit",
+                          "bigram_split_symbol_alpha_digit")
+    assert_normalize_type("TokenBigramSplitSymbolAlphaDigit",
+                          "token_bigram_split_symbol_alpha_digit")
+    assert_normalize_type("TokenBigramSplitSymbolAlphaDigit",
+                          "TokenBigramSplitSymbolAlphaDigit")
+  end
+
+  def test_normalize_bigram_ignore_blank
+    assert_normalize_type("TokenBigramIgnoreBlank", "bigram_ignore_blank")
+    assert_normalize_type("TokenBigramIgnoreBlank", "token_bigram_ignore_blank")
+    assert_normalize_type("TokenBigramIgnoreBlank", "TokenBigramIgnoreBlank")
+  end
+
+  def test_normalize_bigram_ignore_blank_split_symbol
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbol",
+                          "bigram_ignore_blank_split_symbol")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbol",
+                          "token_bigram_ignore_blank_split_symbol")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbol",
+                          "TokenBigramIgnoreBlankSplitSymbol")
+  end
+
+  def test_normalize_bigram_ignore_blank_split_symbol_alpha
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlpha",
+                          "bigram_ignore_blank_split_symbol_alpha")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlpha",
+                          "token_bigram_ignore_blank_split_symbol_alpha")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlpha",
+                          "TokenBigramIgnoreBlankSplitSymbolAlpha")
+  end
+
+  def test_normalize_bigram_ignore_blank_split_symbol_alpha_digit
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlphaDigit",
+                          "bigram_ignore_blank_split_symbol_alpha_digit")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlphaDigit",
+                          "token_bigram_ignore_blank_split_symbol_alpha_digit")
+    assert_normalize_type("TokenBigramIgnoreBlankSplitSymbolAlphaDigit",
+                          "TokenBigramIgnoreBlankSplitSymbolAlphaDigit")
+  end
+
+  def test_normalize_trigram
+    assert_normalize_type("TokenTrigram", "trigram")
+    assert_normalize_type("TokenTrigram", "token_trigram")
+    assert_normalize_type("TokenTrigram", "TokenTrigram")
+  end
+
+  def test_normalize_mecab
+    assert_normalize_type("TokenMecab", "mecab")
+    assert_normalize_type("TokenMecab", "token_mecab")
+    assert_normalize_type("TokenMecab", "TokenMecab")
+  end
+
+  private
+  def assert_normalize_type(expected, type)
+    assert_equal(expected, Groonga::Schema.normalize_type(type))
+  end
+end

data/text/tutorial.ja.rdoc

@@ -133,8 +133,8 @@ N-gramを利用した全文検索では、分解したN文字とその出現位
 るかの文字数になります。groongaは1文字で分解するユニグラム、
 2文字のバイグラム、3文字のトリグラムをサポートしています。
 
-また、大文字小文字の区別なく検索するために<tt>:key_normalize
-=> true</tt>も指定しています。
+また、大文字小文字の区別なく検索するために
+<tt>:key_normalize => true</tt>も指定しています。
 
 単語格納用テーブルの準備ができたので、<tt>Items</tt>テーブ
 ルの+title+カラムに対するインデックスを定義します。

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rroonga
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +09:00
+date: 2010-11-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -242,6 +242,7 @@ files:
 - test/test-record.rb
 - test/test-remote.rb
 - test/test-schema-create-table.rb
+- test/test-schema-type.rb
 - test/test-schema-view.rb
 - test/test-schema.rb
 - test/test-snippet.rb