voyager_api 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/holdings/collection.rb

@@ -113,7 +113,7 @@ module Voyager
               :location_name => holding[:location_name],
               :call_number => holding[:call_number],
               :status => '',
-              :holding_id => holding[:holding_id],
+              :holding_id => [],
               :copies => [],
               :services => []
             }
@@ -121,6 +121,9 @@ module Voyager
             entries << entry
           end
 
+          # add holding_id
+          entry[:holding_id] << holding[:holding_id]
+
           # for simple holdings put consolidated status information in the first copy
           if complexity == :simple
             item_status = holding[:item_status]
@@ -262,10 +265,11 @@ module Voyager
           entries
         when :brief
           entries.collect do |entry|
-            {:location_name => entry[:location_name],
+            { :holding_id => entry[:holding_id],
+              :location_name => entry[:location_name],
               :call_number => entry[:call_number],
               :status => entry[:status],
-              :services => entry[:services]}
+              :services => entry[:services] }
           end
         end
         

data/lib/holdings/record.rb

@@ -342,12 +342,16 @@ module Voyager
         if location_name.match(/^Offsite/) &&
             HTTPClient.new.get_content("http://www.columbia.edu/cgi-bin/cul/lookupNBX?" + bibid) == "1"
           return ['offsite']
-        end
         # precat
-        if location_name.match(/^Precat/)
-           return ['precat']
+        elsif location_name.match(/^Precat/)
+          return ['precat']
+        #doc delivery
+        elsif ['Butler Stacks', 'Butler Reference', 'African', 'Comp Lit', 'Early Modern', 'Islamic', 'Latin American',
+          'Ancient', 'Moral', 'Papyrus', 'Edward Said', 'South Asian', 'US History'].any? { |loc| location_name.match(/^#{loc}/) }
+          return ['doc_delivery']
+        else
+          return []
         end
-        return []
       end
       
       def process_some_available(location_name,bibid,messages)
@@ -357,6 +361,13 @@ module Voyager
         if location_name.match(/^Offsite/) &&
             HTTPClient.new.get_content("http://www.columbia.edu/cgi-bin/cul/lookupNBX?" + bibid) == "1"
           services << 'offsite'
+        # precat
+        elsif location_name.match(/^Precat/)
+           services << 'precat'
+        # doc delivery
+        elsif ['Butler Stacks', 'Butler Reference', 'African', 'Comp Lit', 'Early Modern', 'Islamic', 'Latin American',
+          'Ancient', 'Moral', 'Papyrus', 'Edward Said', 'South Asian', 'US History'].any? { |loc| location_name.match(/^#{loc}/) }
+          services << 'doc_delivery'
         end
         
         services << scan_messages(messages)

data/test/holdings/test_collection_output.rb

@@ -17,7 +17,7 @@ class TestCollectionOutput < HoldingsTestCase
 
     coll = load_fixture("holdings_5351573.xml")
     output = coll.to_hash
-    coll = load_fixture("holdings_8430339.xml")
+    coll = load_fixture("holdings_8661671.xml")
     output = coll.to_hash
 #    assert_equal '', output
   end
@@ -49,6 +49,11 @@ class TestCollectionOutput < HoldingsTestCase
     output = coll.to_hash(:output_type => :condensed)
     assert_kind_of Array, output[:condensed_holdings_full]
     assert_equal 'Order Information: In the Pre-Order Process. Try Borrow Direct or ILL.', output[:condensed_holdings_full].first[:copies].first[:orders]
+ 
+    coll = load_fixture("holdings_8661671.xml")
+    output = coll.to_hash(:output_type => :condensed)
+    assert_kind_of Array, output[:condensed_holdings_full]
+    assert_equal ["11739902", "11739903", "11740343"], output[:condensed_holdings_full][1][:holding_id]
     
   end
   
@@ -63,7 +68,7 @@ class TestCollectionOutput < HoldingsTestCase
     assert_equal 'Butler Stacks (Enter at the Butler Circulation Desk)', output[:condensed_holdings_brief].first[:location_name]
     assert_equal 'BL80.3 .D74 2011', output[:condensed_holdings_brief].first[:call_number]
     assert_equal 'available', output[:condensed_holdings_brief].first[:status]
-    assert_equal [], output[:condensed_holdings_brief].first[:services]
+    assert_equal ["doc_delivery"], output[:condensed_holdings_brief].first[:services]
     
     coll = load_fixture("holdings_2606957.xml")
     output = coll.to_hash(:output_type => :condensed, :content_type => :brief)

data/test/holdings/test_record.rb

@@ -166,7 +166,7 @@ class TestHoldings < HoldingsTestCase
     
     record = load_fixture("holdings_4191079.xml").records[2]
     assert_equal 'some_available', record.item_status[:status]
-    assert_equal ["recall_hold", "borrow_direct", "ill"], record.services, 'recall, BD, ILL'
+    assert_equal ["doc_delivery", "recall_hold", "borrow_direct", "ill"], record.services, 'recall, BD, ILL'
   end
 
   def test_services_checkout_status_patron
@@ -176,7 +176,7 @@ class TestHoldings < HoldingsTestCase
 
     record = load_fixture("holdings_4191079.xml").records[3]
     assert_equal 'some_available', record.item_status[:status]
-    assert_equal ["borrow_direct", "ill"], record.services, 'BD, ILL'
+    assert_equal ["doc_delivery", "borrow_direct", "ill"], record.services, 'BD, ILL'
   end
   
   def test_services_offsite

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voyager_api
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000Z
+date: 2011-10-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70112004706100 !ruby/object:Gem::Requirement
+  requirement: &2153202080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112004706100
+  version_requirements: *2153202080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70112004705360 !ruby/object:Gem::Requirement
+  requirement: &2153201440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112004705360
+  version_requirements: *2153201440
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70112004704220 !ruby/object:Gem::Requirement
+  requirement: &2153200720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112004704220
+  version_requirements: *2153200720
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70112004703640 !ruby/object:Gem::Requirement
+  requirement: &2153200040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70112004703640
+  version_requirements: *2153200040
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70112004703020 !ruby/object:Gem::Requirement
+  requirement: &2153199460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004703020
+  version_requirements: *2153199460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70112004702100 !ruby/object:Gem::Requirement
+  requirement: &2153198940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70112004702100
+  version_requirements: *2153198940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70112004701300 !ruby/object:Gem::Requirement
+  requirement: &2153198400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70112004701300
+  version_requirements: *2153198400
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70112004700400 !ruby/object:Gem::Requirement
+  requirement: &2153197780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004700400
+  version_requirements: *2153197780
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &70112004699660 !ruby/object:Gem::Requirement
+  requirement: &2153196980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004699660
+  version_requirements: *2153196980
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70112004699060 !ruby/object:Gem::Requirement
+  requirement: &2153196320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004699060
+  version_requirements: *2153196320
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70112004698500 !ruby/object:Gem::Requirement
+  requirement: &2153195480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004698500
+  version_requirements: *2153195480
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70112004698000 !ruby/object:Gem::Requirement
+  requirement: &2153193920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70112004698000
+  version_requirements: *2153193920
 description: ! 'Middleware gem for Voyager 7 API calls, specificially holdings information '
 email: github@jamesstuart.org
 executables: []
@@ -225,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -629818808494470836
+      hash: -943639021231407938
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -234,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Columbia University Voyager 7 API wrapper