gbip 0.7 → 0.7.1

data/README

@@ -19,7 +19,7 @@ puts gbip.find(:first, "0732282721").to_yaml
 
 = Disclaimer
 
-I am in no way affiliated with Bowker, ther operators of globalbooksinprint.com.
+I am in no way affiliated with Bowker, the operators of globalbooksinprint.com.
 Please contact them with questions about the service and how to obtain an account.
 
 = Contact

data/Rakefile

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

data/lib/gbip/pos.rb

@@ -23,7 +23,7 @@ module GBIP
 
     # 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.
@@ -36,8 +36,7 @@ module GBIP
 
       options = {:timeout => 10}.merge(options)
 
-      # global only accepts ISBNs as 10 digits at this stage
-      isbn = RBook::ISBN.convert_to_isbn10(isbn.to_s)
+      isbn = RBook::ISBN.convert_to_isbn13(isbn.to_s) || isbn.to_s
       return default_return if isbn.nil?
 
       request_format = "POS"
@@ -61,25 +60,34 @@ module GBIP
       request_string << "#{version}\t#{supplier}\t#{request}\t#{filters}\t#{records}\t#{sort_order}\t"
       request_string << "#{markets}\t"
 
-      gbip = @socket_class.new(POS_SERVER, POS_PORT)
-      gbip.print request_string
-      response = Timeout::timeout(options[:timeout]) { gbip.gets(nil) }
-      response = response.split("#")
-      gbip.close
-
-      header = nil
-      titles_arr = []
-      response.each do |arr|
-        if header.nil?
-          header = arr.split("\t")
+      sock = @socket_class.new(POS_SERVER, POS_PORT)
+      sock.print request_string
+      response = Timeout::timeout(options[:timeout]) { sock.gets(nil) }
+      sock.close
+
+      # split the response into header/body
+      idx = response.index("#")
+      if idx.nil?
+        header = response.split("\t")
+      else
+        header = response[0, idx - 1]
+        body   = response[idx, response.size - idx].split("\t")
+        body.shift
+      end
+
+      titles_arr = [[]]
+      body.each do |element|
+        if element == "#" && titles_arr.last.size > 15
+          titles_arr << []
         else
-          titles_arr << arr.split("\t")
-          titles_arr[-1] = titles_arr.last[1,titles_arr.last.size-1]
+          titles_arr.last << element
         end
+        #titles_arr << arr.split("\t")
+        #titles_arr[-1] = titles_arr.last[1,titles_arr.last.size-1]
       end
 
       # raise an exception if incorrect login details were provided
-      if header.first.eql?("66") 
+      if header.first.eql?("66")
         raise GBIP::InvalidLoginError, "Invalid username or password"
       end
 

data/specs/mock_tcpsocket.rb

@@ -8,7 +8,7 @@ class MockTCPSocket
     query = query.to_s.split("\t")
     @username = query[3]
     @password = query[4]
-    m, @isbn = *query[7].match(/bn=(\d\d\d\d\d\d\d\d\d[\dXx])/)
+    m, @isbn = *query[7].match(/bn=(\d\d\d\d\d\d\d\d\d\d\d\d\d)/)
   end
 
   def gets(placeholder)
@@ -19,21 +19,23 @@ class MockTCPSocket
     end
 
     # if the requested isbn isn't an isbn10
-    unless RBook::ISBN.valid_isbn10?(@isbn)
+    unless RBook::ISBN.valid_isbn13?(@isbn)
       return File.read(File.dirname(__FILE__) + "/responses/no_result.txt").strip
     end
 
     # if the isbn10 is one we have available
-    if @isbn.eql?("1741146712")
+    if @isbn.eql?("9781741146714")
       return File.read(File.dirname(__FILE__) + "/responses/single_result.txt").strip
-    elsif @isbn.eql?("0732282721")
+    elsif @isbn.eql?("9781590599358")
+      return File.read(File.dirname(__FILE__) + "/responses/single_result2.txt").strip
+    elsif @isbn.eql?("9780732282721")
       return File.read(File.dirname(__FILE__) + "/responses/no_warehouses.txt").strip
     else
       return File.read(File.dirname(__FILE__) + "/responses/no_result.txt").strip
     end
     @username = nil
     @password = nil
-    @isbn = nil
+    isbn = nil
   end
 
   def close

data/specs/pos_class_spec.rb

@@ -12,6 +12,7 @@ context "A new POS object" do
     @invalid_password = "word"
     @valid_isbn10 = "1741146712"
     @valid_isbn13 = "9781741146714"
+    @valid_isbn13_hash = "9781590599358"
     @notfound_isbn10 = "0571228526"
     @notfound_isbn13 = "9780571228522"
     @valid_isbn10_with_no_warehouses = "0732282721"
@@ -37,6 +38,20 @@ context "A new POS object" do
     result.should be_a_kind_of(GBIP::Title)
   end
 
+  specify "should return a GBIP::Title object when the response contains an extra #" do
+    pos = GBIP::POS.new(@valid_username, @valid_password, MockTCPSocket)
+    result = pos.find(:first, @valid_isbn13_hash)
+    result.should be_a_kind_of(GBIP::Title)
+    result.title.should eql("Pro EDI in BizTalk Server 2006 R2:Electronic Document Interchange Solutions")
+  end
+
+  specify "should return a GBIP::Title object when querying for a single valid ISBN10 that has no warehouse data" do
+    pos = GBIP::POS.new(@valid_username, @valid_password, MockTCPSocket)
+    result = pos.find(:first, @valid_isbn10_with_no_warehouses)
+    result.should be_a_kind_of(GBIP::Title)
+    result.warehouses.should be_empty
+  end
+
   specify "should return a GBIP::Title object when querying for a single valid ISBN10 that has no warehouse data" do
     pos = GBIP::POS.new(@valid_username, @valid_password, MockTCPSocket)
     result = pos.find(:first, @valid_isbn10_with_no_warehouses)

data/specs/responses/single_result2.txt

@@ -0,0 +1 @@
+3	rainbowbook	2	#	66797534	1	GBR	Pro EDI in BizTalk Server 2006 R2:Electronic Document Interchange Solutions	978-1-59059-935-8	Trade Paper	Active Record		Deshev, Hristo	Apress L. P.	112007	33.99	UNITED STATES	152887	#	DATA TRANSMISSION SYSTEMS	COMPUTERS / Data Transmission Systems / General		COMPUTER NETWORKING & COMMUNICATIONS		BLK,BNT,CLD,ING,POL	8	Blackwell, Lake Oswego, OR	In stock		0	10/07/2008	Baker & Taylor Books, Bridgewater, NJ			0	10/12/2008	Baker & Taylor Books, Commerce, GA		5	0	10/12/2008	Baker & Taylor Books, Momence, IL		2	4	10/12/2008	Baker & Taylor Books, Reno, NV			0	10/12/2008	Cromland, Allentown, PA	Available for order		0	10/10/2008	Ingram Book Company, La Vergne, TN	Available for order		0	10/12/2008	Powells.com, Portland, OR	In stock		0	02/01/2008	

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gbip
 version: !ruby/object:Gem::Version 
-  version: "0.7"
+  version: 0.7.1
 platform: ruby
 authors: 
 - James Healy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-02 00:00:00 +10:00
+date: 2008-10-14 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - specs/responses/no_result.txt
 - specs/responses/no_warehouses.txt
 - specs/responses/single_result.txt
+- specs/responses/single_result2.txt
 - specs/timeout_tcpsocket.rb
 - Rakefile
 - CHANGELOG