<!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">2015-04-14 20:49:05 +0900 (Tue, 14 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/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a">d07a8e8eec624cb21815efecbd5132ced172d41a</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">Accept "max_messages" option for subscriptions</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#diff-0">lib/droonga/client/connection/droonga-protocol/thread.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/client/connection/droonga-protocol/thread.rb (+15 -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/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L80">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L81">81</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L82">82</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L83">83</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L85">85</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L86">86</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L87">87</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L88">88</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L89">89</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L90">90</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L91">91</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L92">92</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L93">93</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-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L94">94</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L95">95</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L96">96</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L102">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L103">103</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L104">104</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L105">105</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L106">106</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-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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L107">107</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L108">108</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0L109">109</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R80">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R81">81</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R82">82</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R83">83</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R84">84</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R85">85</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R86">86</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R87">87</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R88">88</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R89">89</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R90">90</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R91">91</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R92">92</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R93">93</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R94">94</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R95">95</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R96">96</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R97">97</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R98">98</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R99">99</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R100">100</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R101">101</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R102">102</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R103">103</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R109">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R110">110</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R111">111</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R112">112</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/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R113">113</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R114">114</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R115">115</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R116">116</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R117">117</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R118">118</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R119">119</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/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R120">120</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R121">121</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R122">122</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/droonga/droonga-client-ruby/commit/d07a8e8eec624cb21815efecbd5132ced172d41a#L0R123">123</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">@@ -81,16 +81,23 @@ <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"> send(message, options)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> subscription_timeout = options[:subscription_timeout]</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ max_messages = options[:max_messages]</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> start = Time.now</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> receive_options = {</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> :timeout => options[:timeout] || DEFAULT_TIMEOUT_SECONDS,</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">+ n_messages = 0</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> sync = block.nil?</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if sync</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> Enumerator.new do |yielder|</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> loop do</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> receiver.receive(receive_options) do |object|</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> yielder << object</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ n_messages += 1</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">+ if max_messages and</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ n_messages >= max_messages</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ break</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"> if subscription_timeout</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> elapsed_seconds = Time.now - start</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -103,7 +110,14 @@ <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"> thread = ::Thread.new do</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> begin</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> loop do</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- receiver.receive(receive_options, &block)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ receiver.receive(receive_options) do |message|</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ block.call(message)</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ n_messages += 1</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">+ if max_messages and</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ n_messages >= max_messages</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ break</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ end</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if subscription_timeout</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> elapsed_seconds = Time.now - start</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> break if elapsed_seconds >= subscription_timeout</span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>