<!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">YUKI Hiroshi <shimo****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2014-02-12 17:04:09 +0900 (Wed, 12 Feb 2014)</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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a">5b38fc9194e0664ec84d67d770c86fd2104a550a</a></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">Extract method to validate catalog itself</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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#diff-0">lib/droonga/catalog/base.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/droonga/catalog/base.rb (+8 -4)</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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L67">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L68">68</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L69">69</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L70">70</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L71">71</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L72">72</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L73">73</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L74">74</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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L75">75</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L76">76</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L77">77</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L188">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L189">189</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L190">190</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L191">191</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-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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L192">192</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L193">193</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0L194">194</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/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R67">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R68">68</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R69">69</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R70">70</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-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R71">71</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R72">72</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R73">73</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R74">74</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R185">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R186">186</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R187">187</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R188">188</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R189">189</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R190">190</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R191">191</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R192">192</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R193">193</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R194">194</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R195">195</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R196">196</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R197">197</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/fluent-plugin-droonga/commit/5b38fc9194e0664ec84d67d770c86fd2104a550a#L0R198">198</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">@@ -68,10 +68,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">module Droonga</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> @path = path</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> @base_path = File.dirname(path)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- validate_effective_date</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- validate_zones</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- validate_farms</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- validate_datasets</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ validate</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> @data["datasets"].each do |name, dataset|</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> number_of_partitions = dataset["number_of_partitions"]</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -189,6 +186,13 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">module Droonga</span></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"> 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 validate</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ validate_effective_date</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ validate_zones</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ validate_farms</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ validate_datasets</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"> def validate_parameter_type(expected, value, name)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> unless value.is_a?(expected)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> raise MismatchedParameterType.new(name,</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>