<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Masafumi Yokoyama <yokoy****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2015-04-02 15:20:07 +0900 (Thu, 02 Apr 2015)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61">b1f2e9893010c6b96459491dc2ef85b5ffc11f61</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Merge</dt>
<dd style="margin-left: 8.5em">
<ul>
<li>Merged 6f52262: Merge pull request #72 from ranguba/normalize-token-regexp-type</li>
</ul>
</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Normalize TokenRegexp type</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#diff-0">lib/groonga/schema.rb</a></li>
<li><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#diff-1">test/test-schema-type.rb</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: lib/groonga/schema.rb (+3 -1)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L0">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L1">1</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L2">2</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L3">3</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L4">4</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L7">7</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L597">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L598">598</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L599">599</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L600">600</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L601">601</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L602">602</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0L603">603</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R0">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R1">1</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R2">2</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R3">3</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R7">7</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R597">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R598">598</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R599">599</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R600">600</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R601">601</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R602">602</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R603">603</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R604">604</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L0R605">605</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -1,7 +1,7 @@</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # -*- coding: utf-8 -*-</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # Copyright (C) 2009-2014 Kouhei Sutou <kou****@clear*****></span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-# Copyright (C) 2014 Masafumi Yokoyama <myoko****@gmail*****></span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+# Copyright (C) 2014-2015 Masafumi Yokoyama <yokoy****@clear*****></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> #</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # This library is free software; you can redistribute it and/or</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # modify it under the terms of the GNU Lesser General Public</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -598,6 +598,8 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">module Groonga</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "token_trigram" => "TokenTrigram",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "mecab" => "TokenMecab",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> "token_mecab"=> "TokenMecab",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "regexp" => "TokenRegexp",</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ "token_regexp"=> "TokenRegexp",</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> # @private</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> def normalize_type(type, options={})</span>
</pre>
</td>
</tr>
</tbody>
</table>
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: test/test-schema-type.rb (+6 -0)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L200">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L201">201</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L202">202</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L203">203</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L204">204</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L205">205</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1L206">206</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R200">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R201">201</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R202">202</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R203">203</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R204">204</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R205">205</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R206">206</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R207">207</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R208">208</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R209">209</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R210">210</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R211">211</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/ranguba/rroonga/commit/b1f2e9893010c6b96459491dc2ef85b5ffc11f61#L1R212">212</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -201,6 +201,12 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">class SchemaTypeTest < Test::Unit::TestCase</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> assert_normalize_type("TokenMecab", "TokenMecab")</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> end</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ def test_normalize_regexp</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ assert_normalize_type("TokenRegexp", "regexp")</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ assert_normalize_type("TokenRegexp", "token_regexp")</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ assert_normalize_type("TokenRegexp", "TokenRegexp")</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ end</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> private</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> def assert_normalize_type(expected, type)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> assert_equal(expected, Groonga::Schema.normalize_type(type))</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>