voyager_oracle_api 0.1.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.3.0

data/lib/collection.rb

@@ -20,12 +20,14 @@ module Voyager
     private
     
     def parse_results
-      results = @connection.results['retrieve_holdings'][@bibid]
+      results = @connection.results['retrieve_holdings'][@bibid.to_s]
+      @holdings = {}
      
-      @holdings = results.reject { |r| r["MFHD_ID"].nil? }
-      status = Status.new(holdings)
+      @holdings = results.reject { |r| r["MFHD_ID"].nil? } if results
+
+      status = Status.new(@holdings)
       
-      @holdings_status = status.statuses
+      @holdings_status = status
 
     end
     

data/lib/oracle_connection.rb

@@ -38,9 +38,12 @@ module Voyager
         order by c.mfhd_id, c.item_id, item_status
       HERE
 
-
-      raw_results = execute_select_command(query, bibid: bibids)
-      parse_results(raw_results, name: 'retrieve_holdings', hash_by: 'BIB_ID')
+      unless bibids.empty?
+        raw_results = execute_select_command(query, bibid: bibids)
+        parse_results(raw_results, name: 'retrieve_holdings', hash_by: 'BIB_ID')
+      else
+        @results['retrieve_holdings'] ||= {}
+      end
     end
 
 
@@ -52,7 +55,8 @@ module Voyager
       result_hash = @results[options[:name]]
 
       results.each do |row|
-        if (key = row[options[:hash_by]])
+        if (key = row[options[:hash_by]].to_s)
+          
           result_hash[key] ||= []
           result_hash[key] << row
         end
@@ -91,4 +95,4 @@ module Voyager
 
 
   end
-end
+end

data/lib/request.rb

@@ -1,6 +1,6 @@
 module Voyager
   module Request
-    def simple_holdings_check(*bibids)
+    def self.simple_holdings_check(*bibids)
       
       con = OracleConnection.new()
       con.retrieve_holdings(*bibids)
@@ -8,11 +8,11 @@ module Voyager
       results = {}
 
       bibids.each do |bibid|
-        results[bibid] = Collection.new(bibid: bibid, connection: con).to_hash(args)
+        results[bibid] = Collection.new(bibid: bibid, connection: con).to_hash()
       end
 
       return results
 
     end
   end
-end
+end

data/test/test_complex.rb

@@ -10,8 +10,8 @@ class TestComplexHoldings < MiniTest::Unit::TestCase
     collection = Collection.new(bibid: 525807, connection: con)
     assert !collection.holdings.empty?
     
-    assert_kind_of Hash, collection.holdings_status
-    assert_equal "some_available", collection.holdings_status["690696"]
+    assert_kind_of Status, collection.holdings_status
+    assert_equal "some_available", collection.holdings_status.to_hash["690696"]
 
   end
   
@@ -22,9 +22,9 @@ class TestComplexHoldings < MiniTest::Unit::TestCase
     collection = Collection.new(bibid: 9538750, connection: con)
     assert !collection.holdings.empty?
     
-    assert_kind_of Hash, collection.holdings_status
-    assert_equal "available", collection.holdings_status["12589678"]
-    assert_equal "unavailable", collection.holdings_status["12703665"]
+    assert_kind_of Status, collection.holdings_status
+    assert_equal "available", collection.holdings_status.to_hash["12589678"]
+    assert_equal "unavailable", collection.holdings_status.to_hash["12703665"]
 
   end
 

data/test/test_simple.rb

@@ -10,8 +10,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
     collection = Collection.new(bibid: 989388, connection: con)
     assert !collection.holdings.empty?
     
-    assert_kind_of Hash, collection.holdings_status
-    assert_equal "none", collection.holdings_status["1246943"]
+    assert_equal "none", collection.holdings_status.to_hash["1246943"]
 
   end
 
@@ -22,8 +21,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
     collection = Collection.new(bibid: 187780, connection: con)
     assert !collection.holdings.empty?
 
-    assert_kind_of Hash, collection.holdings_status
-    assert_equal "available", collection.holdings_status["261307"]
+    assert_equal "available", collection.holdings_status.to_hash["261307"]
 
    end
 
@@ -34,8 +32,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 245, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "unavailable", collection.holdings_status["356"]
+     assert_equal "unavailable", collection.holdings_status.to_hash["356"]
 
    end
 
@@ -46,8 +43,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 9835, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "available", collection.holdings_status["15217"]
+     assert_equal "available", collection.holdings_status.to_hash["15217"]
 
    end
 
@@ -58,8 +54,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 1812, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "available", collection.holdings_status["2895"]
+     assert_equal "available", collection.holdings_status.to_hash["2895"]
 
    end
 
@@ -70,8 +65,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 2656, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "available", collection.holdings_status["4278"]
+     assert_equal "available", collection.holdings_status.to_hash["4278"]
 
    end
 
@@ -82,8 +76,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 24981, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "unavailable", collection.holdings_status["38212"]
+     assert_equal "unavailable", collection.holdings_status.to_hash["38212"]
 
    end
 
@@ -94,8 +87,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 54865, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "unavailable", collection.holdings_status["80701"]
+     assert_equal "unavailable", collection.holdings_status.to_hash["80701"]
 
    end
 
@@ -107,8 +99,7 @@ class TestSimpleHoldings < MiniTest::Unit::TestCase
      collection = Collection.new(bibid: 39, connection: con)
      assert !collection.holdings.empty?
 
-     assert_kind_of Hash, collection.holdings_status
-     assert_equal "some_available", collection.holdings_status["46"]
+     assert_equal "some_available", collection.holdings_status.to_hash["46"]
 
    end
 

data/voyager_oracle_api.gemspec

@@ -0,0 +1,110 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "voyager_oracle_api"
+  s.version = "0.3.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["James Stuart", "Gary Bertchume"]
+  s.date = "2012-10-03"
+  s.description = "Middleware gem for Voyager Oracle API calls, specificially holdings information "
+  s.email = "github@jamesstuart.org"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "config/item_status_codes.yml",
+    "config/order_status_codes.yml",
+    "lib/collection.rb",
+    "lib/oracle_connection.rb",
+    "lib/request.rb",
+    "lib/status.rb",
+    "lib/voyager_oracle_api.rb",
+    "tasks/build_tests.rake",
+    "test/fixtures/complex_2c_1in_1out.json",
+    "test/fixtures/complex_some_available_2_3_4_14_17.json",
+    "test/fixtures/fixture_test.json",
+    "test/fixtures/simple_1_available_item.json",
+    "test/fixtures/simple_1_available_item_returned.json",
+    "test/fixtures/simple_1_available_item_review.json",
+    "test/fixtures/simple_1_available_item_withdrawal.json",
+    "test/fixtures/simple_1_unavailable_item_2.json",
+    "test/fixtures/simple_1_unavailable_lost.json",
+    "test/fixtures/simple_1_unavailable_missing.json",
+    "test/fixtures/simple_no_items.json",
+    "test/fixtures/simple_some_available_1_2.json",
+    "test/helper.rb",
+    "test/test_complex.rb",
+    "test/test_fixtures.rb",
+    "test/test_simple.rb",
+    "test/test_voyager_connection.rb",
+    "voyager_api.gemspec",
+    "voyager_oracle_api.gemspec"
+  ]
+  s.homepage = "http://github.com/cul/voyager_oracle_api"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Columbia University Voyager Oracle API wrapper"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<ruby-oci8>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<guard-minitest>, [">= 0"])
+      s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<growl>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<ruby-oci8>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<guard-minitest>, [">= 0"])
+      s.add_dependency(%q<rb-fsevent>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<growl>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<ruby-oci8>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<guard-minitest>, [">= 0"])
+    s.add_dependency(%q<rb-fsevent>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<growl>, [">= 0"])
+  end
+end
+

metadata

@@ -2,7 +2,7 @@
 name: voyager_oracle_api
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Stuart
@@ -200,6 +200,7 @@ files:
 - test/test_simple.rb
 - test/test_voyager_connection.rb
 - voyager_api.gemspec
+- voyager_oracle_api.gemspec
 homepage: http://github.com/cul/voyager_oracle_api
 licenses: 
 - MIT
@@ -213,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1056935341
+      hash: -614486029
       segments: 
       - 0
       version: "0"