exlibris-primo 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82bc9dc99c48271e4b298fb3e17f85fba6a82d4
-  data.tar.gz: c0df376d0087a548c857f715531e3c78298b7b7f
+  metadata.gz: 31a29c3edd10e13805c5345c07630a58ac74e67a
+  data.tar.gz: 3857506c59bcc838bdc931f716dc651f87afb66e
 SHA512:
-  metadata.gz: a23d848ebdfefc254a0d12364584183130d0a2375afdcfe8b2007345ad9430a481a4f5cca78eaeccaac68524bdb897046b3a19b9c60db728c76d21e4572f35e2
-  data.tar.gz: 2c253dfc14fc47f65e9e628ad7161229a2f9011fa643a0ce7284a20af9239ea10c8567ed6284c1a871dab05072b8e73f1f1bb09070f0bc3e863d913641f40a95
+  metadata.gz: 0ebea32dd20698b07deca95642526b89b6b3faf0686c0daeda596cfe91bf4f60e6f03cad545d929ef51b99b25fb790964a086757ed7c3fa9fca9eac5e4271cbe
+  data.tar.gz: 1a56c4b8b19f7bece6f546221b697b6be782cacbfd6944d972891b1601b25dc38d34c600c5137859f05a2798744f6ae8fa19c624df35930398f06c6e38338705

data/README.md

@@ -1,9 +1,9 @@
 # Exlibris::Primo
 [![Gem Version](https://badge.fury.io/rb/exlibris-primo.png)](http://badge.fury.io/rb/exlibris-primo)
-[![Build Status](https://api.travis-ci.org/scotdalton/exlibris-primo.png?branch=master)](https://travis-ci.org/scotdalton/exlibris-primo)
-[![Dependency Status](https://gemnasium.com/scotdalton/exlibris-primo.png)](https://gemnasium.com/scotdalton/exlibris-primo)
-[![Code Climate](https://codeclimate.com/github/scotdalton/exlibris-primo.png)](https://codeclimate.com/github/scotdalton/exlibris-primo)
-[![Coverage Status](https://coveralls.io/repos/scotdalton/exlibris-primo/badge.png?branch=master)](https://coveralls.io/r/scotdalton/exlibris-primo)
+[![Build Status](https://api.travis-ci.org/NYULibraries/exlibris-primo.png?branch=master)](https://travis-ci.org/NYULibraries/exlibris-primo)
+[![Dependency Status](https://gemnasium.com/NYULibraries/exlibris-primo.png)](https://gemnasium.com/NYULibraries/exlibris-primo)
+[![Code Climate](https://codeclimate.com/github/NYULibraries/exlibris-primo.png)](https://codeclimate.com/github/NYULibraries/exlibris-primo)
+[![Coverage Status](https://coveralls.io/repos/github/NYULibraries/exlibris-primo/badge.svg?branch=master)](https://coveralls.io/github/NYULibraries/exlibris-primo?branch=master)
 
 Exlibris::Primo offers a set of classes for interacting with the ExLibris Primo APIs.
 
@@ -83,7 +83,7 @@ Exlibris::Primo::Config can also read in from a YAML file that specifies the var
     end
 
 ## Exlibris::Primo::EShelf
-The Exlibris::Primo::EShelf class provides methods for reading a given user's Primo eshelf 
+The Exlibris::Primo::EShelf class provides methods for reading a given user's Primo eshelf
 and eshelf structure as well as adding and removing records.
 
 ## Example of Exlibris::Primo::EShelf in action
@@ -95,7 +95,7 @@ and eshelf structure as well as adding and removing records.
     eshelf.add_records(["PrimoRecordId","PrimoRecordId2"], basket_id)
 
 ## Exlibris::Primo::Reviews
-The Exlibris::Primo::Reviews class provides methods for reading a given user's Primo reviews 
+The Exlibris::Primo::Reviews class provides methods for reading a given user's Primo reviews
 features.
 
 ## Example of Exlibris::Primo::Reviews in action
@@ -104,7 +104,7 @@ features.
     user_record_reviews = reviews.reviews #=> Array of Primo reviews
 
 ## Exlibris::Primo::Tags
-The Exlibris::Primo::Tags class provides methods for reading a given user's Primo tags 
+The Exlibris::Primo::Tags class provides methods for reading a given user's Primo tags
 features.
 
 ## Example of Exlibris::Primo::Tags in action

data/lib/exlibris/primo/config.rb

@@ -7,7 +7,7 @@ module Exlibris
     module Config
       class << self
         include WriteAttributes
-        attr_accessor :base_url, :institution, :institutions, :libraries, :availability_statuses, :sources,
+        attr_accessor :base_url, :proxy_url, :institution, :institutions, :libraries, :availability_statuses, :sources,
           :facet_labels, :facet_top_level, :facet_collections, :facet_resource_types, :load_time
 
         def load_yaml file
@@ -29,6 +29,10 @@ module Exlibris
           @base_url ||= String.new config.base_url.to_s
         end
 
+        def proxy_url
+          @proxy_url ||= config.proxy_url
+        end
+
         def institution
           @institution ||= String.new config.institution.to_s
         end

data/lib/exlibris/primo/holding.rb

@@ -100,13 +100,14 @@ module Exlibris
 
       # Return the attribute accessible instance variables as a hash.
       def to_h
-        { :availlibrary => availlibrary, :record_id => record_id, :original_id => original_id, 
+        { 
+          :availlibrary => availlibrary, :record_id => record_id, :original_id => original_id, 
           :title => title, :author => author, :display_type => display_type, :source_id => source_id,
           :original_source_id => original_source_id, :source_record_id => source_record_id,
           :ils_api_id => ils_api_id, :institution_code => institution_code, :library_code => library_code,
           :availability_status_code => availability_status_code, :collection => collection,
           :call_number => call_number, :coverage => coverage, :notes => notes, :subfields => subfields,
-          :source_id => source_id, :source_class => source_class, :source_data => source_data }
+          :source_class => source_class, :source_data => source_data }
       end
     end
   end

data/lib/exlibris/primo/version.rb

@@ -1,5 +1,5 @@
 module Exlibris
   module Primo
-    VERSION = '2.0.0'
+    VERSION = '2.1.0'
   end
 end

data/lib/exlibris/primo/web_service/client/base/savon_client.rb

@@ -11,9 +11,20 @@ module Exlibris
             # we don't want to make an extra HTTP call.
             # 
             # @client ||= Savon.client(wsdl: wsdl)
-            @client ||= Savon.client(endpoint: endpoint, namespace: endpoint, log: false, log_level: :warn)
+            @client ||= Savon.client(client_options)
           end
           protected :client
+          
+          def client_options
+            {
+              proxy: proxy_url, 
+              endpoint: endpoint, 
+              namespace: endpoint, 
+              log: false, 
+              log_level: :warn
+            }.delete_if { |k, v| v.blank? }
+          end
+          private :client_options
         end
       end
     end

data/test/config_test.rb

@@ -17,9 +17,10 @@ class ConfigTest < Test::Unit::TestCase
 
   def test_config_from_yaml
     reset_primo_configuration
-    yaml_primo_configuration
+    yaml_primo_configuration(false)
     assert_equal "yaml_url", Exlibris::Primo::Config.base_url
     assert_equal "YAML_INSTITUTION", Exlibris::Primo::Config.institution
+    assert_equal "yaml_proxy_url", Exlibris::Primo::Config.proxy_url
     assert_nil(Exlibris::Primo::Config.institutions)
       assert_equal({ "LIB_CODE1" => "Library Decoded 1", "LIB_CODE2" => "Library Decoded 2",
         "LIB_CODE3" => "Library Decoded 3" }, Exlibris::Primo::Config.libraries)
@@ -44,10 +45,12 @@ class ConfigTest < Test::Unit::TestCase
 
   def test_config_attributes
     reset_primo_configuration
-    yaml_primo_configuration
+    yaml_primo_configuration(false)
     search = Exlibris::Primo::Search.new
     assert_equal "yaml_url", search.base_url
     assert_equal "YAML_INSTITUTION", search.institution
+    assert_equal "yaml_proxy_url", search
+                                     .proxy_url
     assert_equal({}, search.institutions)
     assert_equal({ "LIB_CODE1" => "Library Decoded 1", "LIB_CODE2" => "Library Decoded 2",
       "LIB_CODE3" => "Library Decoded 3" }, search.libraries)

data/test/support/config.yml

@@ -1,5 +1,6 @@
 base_url: "yaml_url"
 institution: "YAML_INSTITUTION"
+proxy_url: "yaml_proxy_url"
 libraries:
   "LIB_CODE1": "Library Decoded 1"
   "LIB_CODE2": "Library Decoded 2"

data/test/test_helper.rb

@@ -66,15 +66,17 @@ class Test::Unit::TestCase
   end
   protected :assert_request
 
-  def yaml_primo_configuration
+  def yaml_primo_configuration(overide_proxy_url = true)
     Exlibris::Primo.configure do |config|
       config.load_yaml File.expand_path("../support/config.yml",  __FILE__)
+      config.proxy_url = nil if overide_proxy_url
     end
   end
 
   def reset_primo_configuration
     Exlibris::Primo.configure do |config|
       config.base_url = nil
+      config.proxy_url = nil
       config.institution = nil
       config.institutions = nil
       config.libraries = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exlibris-primo
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Scot Dalton
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.1
 - !ruby/object:Gem::Dependency
   name: iso-639
   requirement: !ruby/object:Gem::Requirement