poliqarpr 0.1.0 → 0.1.1

data/changelog.txt

@@ -1,3 +1,8 @@
+0.1.1
+- remove messy debug message
+- raise IndexOutOfBounds exception when the excerpt index is larger than the
+  buffer size or is larger than the result count
+
 0.1.0
 - synchronization on ansync call without handler done via internal mutex
   instead of call to STATUS

data/lib/poliqarpr/client.rb

@@ -340,9 +340,12 @@ protected
 
     # Reads number stored in the message received from the server.
     def read_number
-      msg = @connector.read_message
-      puts "XXX #{msg}" if @debug
-      msg.match(/\d+/)[0].to_i
+      @connector.read_message.match(/\d+/)[0].to_i
+    end
+
+    # Reads string stored in the last message received from server
+    def read_word
+      @connector.read_message
     end
 
     # Counts number of results for given answer
@@ -368,15 +371,12 @@ protected
         if handler.nil?
           @last_result = result
         end
+      else
+        stop_waiting
       end
       @last_result
     end
 
-    # Reads string stored in the last message received from server
-    def read_word
-      @connector.read_message
-    end
-
     private
     # Wait for the assynchronous answer, if some synchronous query
     # was sent without handler.
@@ -415,6 +415,7 @@ protected
     end
 
     def make_async_query(query,answer_offset)
+      raise IndexOutOfBounds if answer_offset > config.buffer_size
       start_waiting
       # we access the result count through BUFFER-STATE call
       make_query(query){|msg| stop_waiting}

data/lib/poliqarpr/connector.rb

@@ -84,8 +84,14 @@ module Poliqarp
       message = @message_queue.shift
       if message =~ /^ERR/
         code = message.match(/\d+/)[0].to_i
-        raise JobInProgress.new() if code == 15
-        raise RuntimeError.new("Poliqarp Error: "+ERRORS[code])
+        case code
+        when 15
+          raise JobInProgress.new()
+        when 17
+          raise IndexOutOfBounds.new()
+        else
+          raise RuntimeError.new("Poliqarp Error: "+ERRORS[code])
+        end
       else
         message
       end

data/lib/poliqarpr/exceptions.rb

@@ -6,4 +6,8 @@ module Poliqarp
   # to the server which haven't finished, which is interrupted by another
   # asynchronous call.
   class JobInProgress < Exception; end
+
+  # The IndexOutOfBounds exception is raised if the index of given excerpt
+  # is larger than the size of query buffer.
+  class IndexOutOfBounds < Exception; end
 end

data/poliqarpr.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "poliqarpr"
-  s.version = "0.1.0"
-  s.date = "2011-01-17"
+  s.version = "0.1.1"
+  s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = "Ruby client for Poliqarp"
   s.email = "apohllo@o2.pl"
   s.homepage = "http://www.github.com/apohllo/poliqarpr"

data/spec/client.rb

@@ -146,6 +146,20 @@ describe Poliqarp::Client do
       it "should fetch the same excerpt as in find without index " do
         @result.to_s.should == @client.find("nachalny")[0].to_s
       end
+
+      it "should raise IndexOutOfBounds if the index is larger than the results count" do
+        count = @client.count("nachalny")
+        (proc do
+          @client.find("nachalny",:index => count+1)
+        end).should raise_error(Poliqarp::IndexOutOfBounds)
+      end
+
+      it "should raise IndexOutOfBounds error if the index is larger than the buffer size" do
+        @client.config.buffer_size = 1
+        (proc do
+          @client.find("nachalny",:index => 2)
+        end).should raise_error(Poliqarp::IndexOutOfBounds)
+      end
     end
 
     describe("(with lemmata flags set to true)") do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Aleksander Pohl
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: []