rbook-gbip 0.5 → 0.6

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require "rake/gempackagetask"
 require 'spec/rake/spectask'
 
-PKG_VERSION = "0.5"
+PKG_VERSION = "0.6"
 PKG_NAME = "rbook-gbip"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBYFORGE_PROJECT = 'rbook'

data/lib/rbook/gbip/pos.rb

@@ -1,5 +1,6 @@
 require 'socket'
 require 'enumerator'
+require 'timeout'
 
 module RBook
 
@@ -24,15 +25,18 @@ module RBook
 
       # search for the specified ISBN on globalbooksinprint.com.
       # Accepts both ISBN10 and ISBN13's.
+      # 
+      # Supported options:
+      # :markets => only search the specified markets. comma sperated list
+      # :timeout => amount of time in seconds to wait for a reponse from the server before timing out. Defaults to 10.
       def find(type, isbn, options = {})
         case type
           when :first then default_return = nil
           when :all then default_return = []
           else raise ArgumentError, 'type must by :first or :all'
         end
-        #unless [:first, :all].include?(type)
-        #  raise ArgumentError, 'type must by :first or :all'
-        #end
+        
+        options = {:timeout => 10}.merge(options)
 
         # global only accepts ISBNs as 10 digits at this stage
         isbn = RBook::ISBN.convert_to_isbn10(isbn.to_s)
@@ -61,7 +65,8 @@ module RBook
 
         gbip = @socket_class.new(POS_SERVER, POS_PORT)
         gbip.print request_string
-        response = gbip.gets(nil).split("#")
+        response = Timeout::timeout(options[:timeout]) { gbip.gets(nil) }
+        response = response.split("#")
         gbip.close
         
         header = nil

data/specs/pos_class_spec.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'rbook/gbip'
 require File.dirname(__FILE__) + "/mock_tcpsocket"
+require File.dirname(__FILE__) + "/timeout_tcpsocket"
 
 include RBook
 
@@ -71,10 +72,15 @@ context "A new POS object" do
 
   specify "should perform a successful query if the ISBN is provided as a number" do
     pos = GBIP::POS.new(@valid_username, @valid_password, MockTCPSocket)
-    result = pos.find(:first, 1741146712)
+    result = pos.find(:first, @valid_isbn13)
     result.should be_a_kind_of(RBook::GBIP::Title)
   end
 
+  specify "should raise an exception if no reponse is received in a certain amount of time" do
+    pos = GBIP::POS.new(@valid_username, @valid_password, TimeoutTCPSocket)
+    lambda { pos.find(:first, @valid_isbn13, :timeout => 2) }.should raise_error(Timeout::Error)
+  end
+
   #####################
   #  :all searches
   #####################

data/specs/timeout_tcpsocket.rb

@@ -0,0 +1,19 @@
+class TimeoutTCPSocket
+
+  def initialize(host,port)
+    # do nothing
+  end
+
+  def print(query)
+    # do nothing
+  end
+
+  def gets(placeholder)
+    sleep 5
+    ""
+  end
+
+  def close
+    # do nothing
+  end
+end

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rbook-gbip
 version: !ruby/object:Gem::Version 
-  version: "0.5"
-date: 2007-07-03 00:00:00 +10:00
-summary: A library for access the globalbooksinprint.com API
-require_paths: 
-- lib
-email: jimmy@deefa.com
-homepage: http://rbook.rubyforge.org/
-rubyforge_project: rbook
-description: gbip is a small library to interact with the  globalbooksinprint.com API. The API is based  on raw TCP sockets.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.6"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - James Healy
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-06-06 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rbook-isbn
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+description: gbip is a small library to interact with the  globalbooksinprint.com API. The API is based  on raw TCP sockets.
+email: jimmy@deefa.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- COPYING
+- LICENSE
 files: 
 - examples/gbip.rb
 - lib/rbook
@@ -44,36 +47,42 @@ files:
 - specs/responses/no_warehouses.txt
 - specs/mock_tcpsocket.rb
 - specs/pos_class_spec.rb
+- specs/timeout_tcpsocket.rb
 - Rakefile
 - README
 - COPYING
 - LICENSE
-test_files: 
-- specs/mock_tcpsocket.rb
-- specs/pos_class_spec.rb
+has_rdoc: true
+homepage: http://rbook.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - --title
 - gbip Documentation
 - --main
 - README
 - -q
-extra_rdoc_files: 
-- README
-- COPYING
-- LICENSE
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rbook-isbn
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
+rubyforge_project: rbook
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: A library for access the globalbooksinprint.com API
+test_files: 
+- specs/mock_tcpsocket.rb
+- specs/pos_class_spec.rb
+- specs/timeout_tcpsocket.rb