RubyGems - berkeley_library-alma - Versions diffs - 0.0.2 → 0.0.5 - Mend

berkeley_library-alma 0.0.2 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/.idea/alma.iml +17 -15
data/CHANGES.md +18 -0
data/README.md +43 -5
data/bin/alma-mms-lookup +1 -3
data/lib/berkeley_library/alma/barcode.rb +33 -0
data/lib/berkeley_library/alma/bib_number.rb +3 -4
data/lib/berkeley_library/alma/constants.rb +1 -1
data/lib/berkeley_library/alma/module_info.rb +1 -1
data/lib/berkeley_library/alma/record_id.rb +12 -26
data/lib/berkeley_library/alma/sru.rb +79 -0
data/spec/data/C084093187-sru.xml +299 -0
data/spec/data/availability-sru.xml +109 -0
data/spec/data/{b11082434-sru.xml → b110824349-sru.xml} +0 -0
data/spec/lib/berkeley_library/alma/barcode_spec.rb +67 -0
data/spec/lib/berkeley_library/alma/bib_number_spec.rb +10 -1
data/spec/lib/berkeley_library/alma/mms_id_spec.rb +3 -3
data/spec/lib/berkeley_library/alma/record_id_spec.rb +20 -0
data/spec/lib/berkeley_library/alma/sru_spec.rb +29 -0
data/spec/spec_helper.rb +6 -15
metadata +14 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f75f54a66128a500d0bc512b7077ac20f1287d44a41ef418ad63bc20e1ec970
-  data.tar.gz: 321aac3f7709f68098d0014165114536856281645a02773766744b08f6ba1f60
+  metadata.gz: '0805d8fb305dd644ede89efb0c71845c479df3cc8b69334bbfc4e747312c229d'
+  data.tar.gz: 80b1576c6dc7d5bbfd5bd5a0a53985167c4c3929668d505dae92ffcac196988e
 SHA512:
-  metadata.gz: 603cdb1c13e5a2a169690ccf1ca2f99af82c5dcd2e2f6b99e09fa9dc897a57643b0957f22e88b35eb48aa52eb048f8f0b93e2f721f5ecac27351777a713a713d
-  data.tar.gz: f239d7f6626d4e57c455c6dc2a32dffbbe1b32c1aea8eaf958409f096bf5350181df993f8eb45b2f2fd8b400a59d8b719d59b9dc144f7ab164f8470b110c710f
+  metadata.gz: 879cb4ef386caa8543bf883ac3b62888c4ca810ef431562618ad456c9d560ee81f6dada5b9ae850ca15523cd6f58d5487919c3e782c817313deaff346912c257
+  data.tar.gz: b10240d0571733f28f90ab099da879647cdd670da05c5af5aa396f0fcd8c9ae026d2ec9b4c1246764a6b919bc594c665ff0096140b400cb2626af893bdcd3b21

data/.idea/alma.iml CHANGED Viewed

@@ -8,12 +8,13 @@
       <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/artifacts" />
+      <excludeFolder url="file://$MODULE_DIR$/doc" />
     </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.7.5" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="actionpack (v6.1.4.4, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="actionview (v6.1.4.4, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.1.4.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionpack (v6.1.4.6, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v6.1.4.6, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.1.4.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.8.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="amazing_print (v1.4.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.2, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -22,7 +23,7 @@
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-util (v0.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundle-audit (v0.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.2.31, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler-audit (v0.9.0.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ci_reporter (v2.0.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ci_reporter_rspec (v1.0.0, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -37,13 +38,14 @@
     <orderEntry type="library" scope="PROVIDED" name="hashdiff (v1.0.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-accept (v1.7.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="http-cookie (v1.0.4, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.9.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.10.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="lograge (v0.11.2, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.13.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.14.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="marc (v1.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="method_source (v1.0.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.4.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2022.0105, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="mini_portile2 (v2.7.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.15.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="netrc (v0.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.13.1, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -58,23 +60,23 @@
     <orderEntry type="library" scope="PROVIDED" name="rack-test (v1.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v2.0.3, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.4.2, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="railties (v6.1.4.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v6.1.4.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="regexp_parser (v2.2.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="request_store (v1.5.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rest-client (v2.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.10.0, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.10.1, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.10.2, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.10.2, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.10.3, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop (v1.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-ast (v1.15.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-rake (v0.6.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v2.4.0, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-marc-spec (v0.1.1, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="ruby-marc-spec (v0.1.3, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.11.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="scrub_rb (v1.0.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.21.2, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -90,7 +92,7 @@
     <orderEntry type="library" scope="PROVIDED" name="webmock (v3.14.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="webrick (v1.7.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="yard (v0.9.27, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.5.3, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.5.4, RVM: ruby-2.7.5) [gem]" level="application" />
   </component>
   <component name="RModuleSettingsStorage">
     <LOAD_PATH number="2" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" />
@@ -107,7 +109,7 @@
           </RakeTaskImpl>
           <RakeTaskImpl description="Run all specs in spec directory, with coverage" fullCommand="coverage" id="coverage" />
           <RakeTaskImpl description="Run tests, check test coverage, check code style, check for vulnerabilities, build gem" fullCommand="default" id="default" />
-          <RakeTaskImpl description="Build berkeley_library-alma.gemspec as berkeley_library-alma-0.0.2.gem" fullCommand="gem" id="gem" />
+          <RakeTaskImpl description="Build berkeley_library-alma.gemspec as berkeley_library-alma-0.0.3.gem" fullCommand="gem" id="gem" />
           <RakeTaskImpl description="Run RuboCop with auto-correct, and output results to console" fullCommand="ra" id="ra" />
           <RakeTaskImpl description="Run rubocop with HTML output" fullCommand="rubocop" id="rubocop" />
           <RakeTaskImpl id="rubocop">

data/CHANGES.md CHANGED Viewed

@@ -1,3 +1,21 @@
+# 0.0.5 (4 May 2022)
+- extracts `SRU` module for performing SRU queries.
+- MARCXML parsing now uses `MARC::NokogiriReader` rather than the `REXML` default.
+# 0.0.4 (15 February 2022)
+- adds `BarCode` subclass of `RecordId`, to look up bibliographic records by
+  item barcode. Note that since barcodes have no consistent format, `BarCode`
+  objects need to be constructed deliberately with `BarCode#new`, not with
+  `RecordId#parse`.
+# 0.0.3 (3 February 2022)
+- use `local_field_996` instead of `other_system_number` when making SRU queries
+  for Millennium records
+- accept leading upper-case B in bib numbers
 # 0.0.2 (26 January 2022)
 - update to [berkeley_library-marc](https://github.com/BerkeleyLibrary/marc) 0.3.1

data/README.md CHANGED Viewed

@@ -41,10 +41,34 @@ options to either:
 ## Retrieving Alma records
-The [`RecordId`](lib/berkeley_library/alma/record_id.rb) class encapsulates
-an ID that can be used to look up records in Alma via
-[SRU](https://developers.exlibrisgroup.com/alma/integrations/sru/).
-This can be either an Alma MMS ID:
+### Via `SRU`
+The [`SRU`](lib/berkeley_library/alma/sru.rb) module encapsulates Alma
+[SRU](https://developers.exlibrisgroup.com/alma/integrations/sru/) queries.
+Retrieving MARC records:
+```ruby
+reader = BerkeleyLibrary::Alma::SRU.get_marc_records('991005668209706532', '991005668359706532')
+# => #<MARC::XMLReader:0x0000000135b940e8 @freeze=false, @handle=#<StringIO:0x0000000135b94160>...
+```
+Making arbitrary SRU queries:
+```ruby
+BerkeleyLibrary::Alma::SRU.make_sru_query('alma.other_system_number=UCB-b123230470-01ucs_ber')
+# => "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?><searchRetrieveResponse xmlns=...
+```
+### Via `RecordId`
+In addition, individual records can be retrieved from an instance of the
+[`RecordId`](lib/berkeley_library/alma/record_id.rb) class, which encapsulates
+an Alma MMS ID, Millennium bib number, or item barcode.
+#### Initializing `RecordID` objects
+Alma MMS ID:
 ```ruby
 mms_id_str = '991054360089706532'
@@ -52,7 +76,7 @@ record_id = BerkeleyLibrary::Alma::RecordId.parse(mms_id_str)
 # => #<BerkeleyLibrary::Alma::MMSID:0x0000000138949830 @institution="6532", @mms_id="991054360089706532", @type_prefix="99", @unique_part="105436008970">
 ```
-Or a Millennium bib number:
+Millennium bib number:
 ```ruby
 bib_number_str = 'b11082434'
@@ -60,6 +84,20 @@ record_id = BerkeleyLibrary::Alma::RecordId.parse(bib_number_str)
 # => #<BerkeleyLibrary::Alma::BibNumber:0x0000000118815038 @check_str="9", @digit_str="11082434">
 ```
+Item barcode:
+```ruby
+barcode_str = 'C084093187'
+barcode = BerkeleyLibrary::Alma::BarCode.new(barcode_str)
+#  => #<BerkeleyLibrary::Alma::BarCode:0x000000013fac4c08 @barcode="C084093187">
+```
+⚠️ Note that because of the free-form nature of barcodes, they cannot be auto-detected,
+and hence are **not** supported by the `RecordId#parse` method; they must be instantiated
+directly.
+#### Using `RecordId` objects to make SRU queries
 Given a `RecordId` object, you can get the SRU query URI for the corresponding MARC record:
 ```ruby

data/bin/alma-mms-lookup CHANGED Viewed

@@ -25,9 +25,7 @@ require 'berkeley_library/alma'
 # Configuration
 # Configure Alma URLs etc.
-BerkeleyLibrary::Alma.configure do
-  Config.default!
-end
+BerkeleyLibrary::Alma::Config.default!
 # Set log level
 BerkeleyLibrary::Logging.logger.level = Logger::Severity::WARN

data/lib/berkeley_library/alma/barcode.rb ADDED Viewed

@@ -0,0 +1,33 @@
+require 'berkeley_library/alma/record_id'
+module BerkeleyLibrary
+  module Alma
+    # {RecordId} subclass representing an item barcode.
+    class BarCode
+      include RecordId
+      attr_reader :barcode
+      # Initialize a barcode. Since we purchase barcodes of varied formats and accept vendor
+      # barcodes as well we are only validating whether it's a string or not.
+      def initialize(barcode)
+        string?(barcode)
+        @barcode = barcode
+      end
+      # Returns the SRU query value for this Barcode.
+      #
+      # @return [String] the Barcode query value
+      def sru_query_value
+        "alma.barcode=#{@barcode}"
+      end
+      private
+      def string?(barcode)
+        raise ArgumentError, "Barcode must be a string: #{barcode.inspect}" unless barcode.is_a?(String)
+      end
+    end
+  end
+end

data/lib/berkeley_library/alma/bib_number.rb CHANGED Viewed

@@ -18,7 +18,8 @@ module BerkeleyLibrary
       # ------------------------------------------------------------
       # Initializer
-      # Initializes a new {BibNumber} from the specified string.
+      # Initializes a new {BibNumber} from the specified string. Note that a bib number
+      # may start with an upper-case B, but it will be converted to lower case.
       #
       # @param [String] bib_number The bib number, with or without check digit
       # @raise [ArgumentError] if the specified string is not an 8- or 9-digit bib number,
@@ -51,9 +52,7 @@ module BerkeleyLibrary
       #
       # @return [String] the SRU query value
       def sru_query_value
-        # TODO: stop hard-coding `UCB-`
-        other_system_number = "UCB-#{self}-#{Config.alma_institution_code.downcase}"
-        "alma.other_system_number=#{other_system_number}"
+        "alma.local_field_996=#{full_bib}"
       end
       # ------------------------------------------------------------

data/lib/berkeley_library/alma/constants.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module BerkeleyLibrary
   module Alma
     module Constants
       # 'x' represents a calculated check digit of 10; 'a' is a wildcard
-      MILLENNIUM_RECORD_RE = /^b(?<digits>[0-9]{8})(?<check>[0-9ax])?$/.freeze
+      MILLENNIUM_RECORD_RE = /^[Bb](?<digits>[0-9]{8})(?<check>[0-9ax])?$/.freeze
       # '99' is the Alma prefix for a Metadata Management System ID
       # see https://knowledge.exlibrisgroup.com/Alma/Product_Documentation/010Alma_Online_Help_(English)/Metadata_Management/005Introduction_to_Metadata_Management/020Record_Numbers

data/lib/berkeley_library/alma/module_info.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module BerkeleyLibrary
       SUMMARY = 'Alma/Primo utilities for the UC Berkeley Library'.freeze
       DESCRIPTION = 'A gem providing Alma/Primo-related utility code for the UC Berkeley Library'.freeze
       LICENSE = 'MIT'.freeze
-      VERSION = '0.0.2'.freeze
+      VERSION = '0.0.5'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/alma'.freeze
     end
   end

data/lib/berkeley_library/alma/record_id.rb CHANGED Viewed

@@ -2,6 +2,7 @@ require 'berkeley_library/logging'
 require 'berkeley_library/marc'
 require 'berkeley_library/util/uris'
 require 'berkeley_library/alma/constants'
+require 'berkeley_library/alma/sru'
 module BerkeleyLibrary
   module Alma
@@ -22,6 +23,9 @@ module BerkeleyLibrary
         # also accepts a {RecordId} and simply returns it, so it can be used in
         # situations where it may not be clear whether the ID has already been parsed.
         #
+        # **Note:** Use the {BarCode} class for barcodes, which don't have a consistent
+        # format and hence can't be auto-detected.
+        #
         # @param id [String, RecordId] the ID to parse
         # @return [RecordId, nil] an {MMSID} or {BibNumber}, depending on the type of ID,
         #         or `nil` if the specified `id` is neither an MMS ID nor a bib number
@@ -44,13 +48,7 @@ module BerkeleyLibrary
       #
       # @return [URI] the MARC URI
       def marc_uri
-        query_string = URI.encode_www_form(
-          'version' => '1.2',
-          'operation' => 'searchRetrieve',
-          'query' => sru_query_value
-        )
-        URIs.append(Config.alma_sru_base_uri, '?', query_string)
+        SRU.sru_query_uri(sru_query_value)
       end
       # Makes an SRU query for this record and returns a MARC record, or nil if the
@@ -62,8 +60,12 @@ module BerkeleyLibrary
       # @return [MARC::Record, nil] the MARC record
       # rubocop:disable Naming/AccessorMethodName
       def get_marc_record
-        marc_xml = get_marc_xml
-        logger.warn("GET #{marc_uri} did not return a MARC record") unless (marc_record = parse_marc_xml(marc_xml))
+        unless (marc_reader = SRU.marc_records_for(sru_query_value))
+          logger.warn("GET #{marc_uri} did not return a MARC record")
+          return nil
+        end
+        logger.warn("GET #{marc_uri} did not return a MARC record") unless (marc_record = marc_reader.first)
         marc_record
       end
       # rubocop:enable Naming/AccessorMethodName
@@ -74,10 +76,7 @@ module BerkeleyLibrary
       # @return [String, nil] the SRU query response body, or nil in the event of an error.
       # rubocop:disable Naming/AccessorMethodName
       def get_marc_xml
-        URIs.get(marc_uri, headers: { user_agent: DEFAULT_USER_AGENT })
-      rescue RestClient::Exception => e
-        logger.warn("GET #{marc_uri} failed", e)
-        nil
+        SRU.make_sru_query(sru_query_value)
       end
       # rubocop:enable Naming/AccessorMethodName
@@ -95,19 +94,6 @@ module BerkeleyLibrary
         to_s <=> other.to_s
       end
-      # ------------------------------------------------------------
-      # Private methods
-      private
-      def parse_marc_xml(xml)
-        return unless xml
-        input = StringIO.new(xml.scrub)
-        reader = MARC::XMLReader.new(input)
-        reader.first
-      end
     end
   end
 end

data/lib/berkeley_library/alma/sru.rb ADDED Viewed

@@ -0,0 +1,79 @@
+require 'uri'
+require 'berkeley_library/alma/config'
+require 'berkeley_library/alma/constants'
+require 'berkeley_library/alma/record_id'
+require 'berkeley_library/util/uris'
+module BerkeleyLibrary
+  module Alma
+    module SRU
+      include BerkeleyLibrary::Logging
+      include Constants
+      class << self
+        include SRU
+      end
+      # Given a list of record IDs, returns the MARC records for each ID (if found).
+      #
+      # @param record_ids [Array<String, RecordId>] the record IDs to look up
+      # @return [MARC::XMLReader, nil] a reader for the MARC records, or nil if
+      #   the records could not be read
+      def get_marc_records(*record_ids)
+        # noinspection RubyMismatchedReturnType
+        parsed_ids = record_ids.filter_map { |id| RecordId.parse(id) }
+        raise ArgumentError, "Argument #{record_ids.inspect} contain no valid record IDs" if parsed_ids.empty?
+        sru_query_value = parsed_ids.map(&:sru_query_value).join(' or ')
+        SRU.marc_records_for(sru_query_value)
+      end
+      # Returns a URI for retrieving records for the specified query
+      # via SRU. Requires {Config#alma_sru_base_uri} to be set.
+      #
+      # @return [URI] the MARC URI
+      def sru_query_uri(sru_query_value)
+        query_string = URI.encode_www_form(
+          'version' => '1.2',
+          'operation' => 'searchRetrieve',
+          'query' => sru_query_value
+        )
+        Util::URIs.append(Config.alma_sru_base_uri, '?', query_string)
+      end
+      # Makes an SRU query for the specified query value and returns the query response
+      # as a string.
+      #
+      # @param query_value [String] the value of the SRU query parameter
+      # @return [String, nil] the SRU query response body, or nil in the event of an error.
+      def make_sru_query(query_value)
+        uri = sru_query_uri(query_value)
+        do_get(uri)
+      end
+      # Makes an SRU query for the specified query value and returns the query response
+      # as MARC records.
+      #
+      # @param query_value [String] the value of the SRU query parameter
+      # @return [MARC::XMLReader, nil] a reader for the MARC records, or nil if
+      #   the records could not be read
+      def marc_records_for(query_value)
+        return unless (xml = make_sru_query(query_value))
+        input = StringIO.new(xml.scrub)
+        MARC::XMLReader.new(input, parser: 'nokogiri')
+      end
+      private
+      def do_get(uri)
+        # TODO: can we get the XML as an IO rather than as a string?
+        Util::URIs.get(uri, headers: { user_agent: DEFAULT_USER_AGENT })
+      rescue RestClient::Exception => e
+        logger.warn("GET #{uri} failed", e)
+        nil
+      end
+    end
+  end
+end

data/spec/data/C084093187-sru.xml ADDED Viewed

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><searchRetrieveResponse xmlns="http://www.loc.gov/zing/srw/">
+  <version>1.2</version>
+  <numberOfRecords>1</numberOfRecords>
+  <records>
+    <record>
+      <recordSchema>marcxml</recordSchema>
+      <recordPacking>xml</recordPacking>
+      <recordData>
+        <record xmlns="http://www.loc.gov/MARC21/slim">
+          <leader>03480cgm a2200781Mi 4500</leader>
+          <controlfield tag="001">991039354509706532</controlfield>
+          <controlfield tag="005">20210615124013.0</controlfield>
+          <controlfield tag="007">vd cvaizs</controlfield>
+          <controlfield tag="008">050601p19971996quc135            vleng d</controlfield>
+          <datafield ind1="1" ind2=" " tag="024">
+            <subfield code="a">774212007033</subfield>
+          </datafield>
+          <datafield ind1="4" ind2="2" tag="028">
+            <subfield code="a">20070</subfield>
+            <subfield code="b">Seville Pictures</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="035">
+            <subfield code="a">(OCoLC)613118288</subfield>
+            <subfield code="z">(OCoLC)800045975</subfield>
+            <subfield code="z">(OCoLC)811619021</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="035">
+            <subfield code="a">(CLU)8266514-ucladb-Voyager</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="035">
+            <subfield code="a">(EXLNZ-01UCS_NETWORK)9912724001006531</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="040">
+            <subfield code="a">W2U</subfield>
+            <subfield code="b">eng</subfield>
+            <subfield code="c">W2U</subfield>
+            <subfield code="d">OCLCF</subfield>
+            <subfield code="d">OCLCO</subfield>
+            <subfield code="d">TOH</subfield>
+            <subfield code="d">GK8</subfield>
+            <subfield code="d">OCL</subfield>
+            <subfield code="d">OCLCQ</subfield>
+            <subfield code="d">OCLCO</subfield>
+            <subfield code="e">rda</subfield>
+            <subfield code="d">CDS</subfield>
+            <subfield code="d">OCLCA</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="041">
+            <subfield code="a">eng</subfield>
+            <subfield code="a">fre</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="043">
+            <subfield code="a">n-us---</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="044">
+            <subfield code="a">quc</subfield>
+            <subfield code="a">xxu</subfield>
+            <subfield code="a">fr</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="046">
+            <subfield code="k">1996</subfield>
+          </datafield>
+          <datafield ind1="1" ind2="4" tag="050">
+            <subfield code="a">PN1997</subfield>
+            <subfield code="b">.L735 1997</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="090">
+            <subfield code="b">DVD 3916</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1="0" ind2="0" tag="245">
+            <subfield code="a">Lost highway /</subfield>
+            <subfield code="c">October Films presents a CIBY 2000/Asymmetrical production ; a David Lynch film ; produced by Deepak Nayar, Tom Sternberg, Mahy Sweeney ; written by David Lynch &amp; Barry Gifford ; directed by David Lynch.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="257">
+            <subfield code="a">United States</subfield>
+            <subfield code="a">France</subfield>
+            <subfield code="2">naf</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="1" tag="264">
+            <subfield code="a">[Montreal] :</subfield>
+            <subfield code="b">Seville Pictures,</subfield>
+            <subfield code="c">1997.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="300">
+            <subfield code="a">1 videodisc (135 min.) :</subfield>
+            <subfield code="b">sound, color ;</subfield>
+            <subfield code="c">4 3/4 in.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="336">
+            <subfield code="a">two-dimensional moving image</subfield>
+            <subfield code="b">tdi</subfield>
+            <subfield code="2">rdacontent</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="337">
+            <subfield code="a">video</subfield>
+            <subfield code="b">v</subfield>
+            <subfield code="2">rdamedia</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="338">
+            <subfield code="a">videodisc</subfield>
+            <subfield code="b">vd</subfield>
+            <subfield code="2">rdacarrier</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="344">
+            <subfield code="a">digital</subfield>
+            <subfield code="b">optical</subfield>
+            <subfield code="g">stereo</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="346">
+            <subfield code="b">NTSC</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="347">
+            <subfield code="a">video file</subfield>
+            <subfield code="b">DVD video</subfield>
+            <subfield code="e">Region 1</subfield>
+            <subfield code="2">rda</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="380">
+            <subfield code="a">Motion picture</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="500">
+            <subfield code="a">Pan and scan version.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="500">
+            <subfield code="a">Special features include: theatrical trailer; interactive menus; scene selection.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="500">
+            <subfield code="a">Originally released as a motion picture in 1996.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="508">
+            <subfield code="a">Music, Angelo Badalamenti ; editor, Mary Sweeney ; director of photography, Peter Deming.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="511">
+            <subfield code="a">Bill Pullman, Patricia Arquette, Balthazar Getty, Robert Blake, Natasha Gregson Wagner, Gary Busey, Robert Loggia.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="520">
+            <subfield code="a">A successful jazz musician whose marriage is on the rocks, a man in black who threatens to expose him, a young mechanic with links to a mobster, and the mobster's moll are all riders on the lost highway, trapped in their worlds of desire, destiny and unknown destination where the truth is always a short way further down the road.</subfield>
+          </datafield>
+          <datafield ind1="8" ind2=" " tag="521">
+            <subfield code="a">Canadian home video rating: R.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="538">
+            <subfield code="a">DVD, Dolby stereo; Region 1; NTSC.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="546">
+            <subfield code="a">In English or dubbed French.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="0" tag="650">
+            <subfield code="a">Jazz musicians</subfield>
+            <subfield code="z">United States</subfield>
+            <subfield code="v">Drama.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="650">
+            <subfield code="a">Jazz musicians.</subfield>
+            <subfield code="2">fast</subfield>
+            <subfield code="0">(OCoLC)fst00982205</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="651">
+            <subfield code="a">United States.</subfield>
+            <subfield code="2">fast</subfield>
+            <subfield code="0">(OCoLC)fst01204155</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="655">
+            <subfield code="a">Drama.</subfield>
+            <subfield code="2">fast</subfield>
+            <subfield code="0">(OCoLC)fst01423879</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="655">
+            <subfield code="a">Feature films.</subfield>
+            <subfield code="2">fast</subfield>
+            <subfield code="0">(OCoLC)fst01710384</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="655">
+            <subfield code="a">Fiction films.</subfield>
+            <subfield code="2">fast</subfield>
+            <subfield code="0">(OCoLC)fst01710264</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="655">
+            <subfield code="a">Feature films.</subfield>
+            <subfield code="2">lcgft</subfield>
+          </datafield>
+          <datafield ind1=" " ind2="7" tag="655">
+            <subfield code="a">Fiction films.</subfield>
+            <subfield code="2">lcgft</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Pullman, Bill,</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Arquette, Patricia,</subfield>
+            <subfield code="d">1968-</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Getty, Balthazar,</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Blake, Robert,</subfield>
+            <subfield code="d">1933-</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Wagner, Natasha Gregson,</subfield>
+            <subfield code="d">1970-</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Busey, Gary,</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Loggia, Robert,</subfield>
+            <subfield code="e">actor.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Nayar, Deepak.</subfield>
+            <subfield code="e">film producer.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Sternberg, Tom.</subfield>
+            <subfield code="e">film producer.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Sweeney, Mahy.</subfield>
+            <subfield code="e">film produer</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Lynch, David,</subfield>
+            <subfield code="d">1946-</subfield>
+            <subfield code="e">screenwriter,</subfield>
+            <subfield code="e">director.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="700">
+            <subfield code="a">Gifford, Barry,</subfield>
+            <subfield code="d">1946-</subfield>
+            <subfield code="e">screenwriter.</subfield>
+          </datafield>
+          <datafield ind1="2" ind2=" " tag="710">
+            <subfield code="a">Séville Pictures.</subfield>
+          </datafield>
+          <datafield ind1="2" ind2=" " tag="710">
+            <subfield code="a">Asymmetrical (Firm)</subfield>
+          </datafield>
+          <datafield ind1="2" ind2=" " tag="710">
+            <subfield code="a">CIBY 2000 (Firm)</subfield>
+          </datafield>
+          <datafield ind1="2" ind2=" " tag="710">
+            <subfield code="a">October Films.</subfield>
+          </datafield>
+          <datafield ind1="4" ind2="2" tag="956">
+            <subfield code="z">Credits from Internet Movie Database</subfield>
+            <subfield code="u">http://www.imdb.com/title/tt0116922/</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="968">
+            <subfield code="a">Reclvl: f Addate: 050601 Addid: SMI Moddate: 090214 Modid: MRC</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="996">
+            <subfield code="e">GLADN151847889</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="996">
+            <subfield code="a">b111084751</subfield>
+            <subfield code="b">Updated: 06-14-21</subfield>
+            <subfield code="c">Created: 03-17-09</subfield>
+            <subfield code="d">CatDate: 06-01-05</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="AVA">
+            <subfield code="0">991039354509706532</subfield>
+            <subfield code="8">22725145850006532</subfield>
+            <subfield code="a">01UCS_BER</subfield>
+            <subfield code="b">MRC</subfield>
+            <subfield code="c">Media Resources Center</subfield>
+            <subfield code="d">DVD 3916</subfield>
+            <subfield code="e">available</subfield>
+            <subfield code="f">1</subfield>
+            <subfield code="g">0</subfield>
+            <subfield code="i">UCB_Campus</subfield>
+            <subfield code="j">mc</subfield>
+            <subfield code="k">8</subfield>
+            <subfield code="p">1</subfield>
+            <subfield code="q">Media Resources Center</subfield>
+          </datafield>
+        </record>
+      </recordData>
+      <recordIdentifier>991039354509706532</recordIdentifier>
+      <recordPosition>1</recordPosition>
+    </record>
+  </records>
+  <extraResponseData xmlns:xb="http://www.exlibris.com/repository/search/xmlbeans/">
+    <xb:exact>true</xb:exact>
+    <xb:responseDate>2022-02-10T12:40:32-0800</xb:responseDate>
+  </extraResponseData>
+</searchRetrieveResponse>

data/spec/data/availability-sru.xml ADDED Viewed

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><searchRetrieveResponse xmlns="http://www.loc.gov/zing/srw/">
+  <version>1.2</version>
+  <numberOfRecords>2</numberOfRecords>
+  <records>
+    <record>
+      <recordSchema>marcxml</recordSchema>
+      <recordPacking>xml</recordPacking>
+      <recordData>
+        <record xmlns="http://www.loc.gov/MARC21/slim">
+          <leader>00307nam a2200085 a 4500</leader>
+          <controlfield tag="001">991005668359706532</controlfield>
+          <controlfield tag="008">^^</controlfield>
+          <datafield ind1=" " ind2=" " tag="035">
+            <subfield code="a">(CUY)UCB-b207766733-01ucs_ber</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="100">
+            <subfield code="a">Fukazawa, Yukio,</subfield>
+            <subfield code="d">1924-2017.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2="0" tag="245">
+            <subfield code="a">Blue Doors</subfield>
+            <subfield code="h">[graphic]</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="300">
+            <subfield code="a">1 relief etching and aquatint :</subfield>
+            <subfield code="b">col.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="996">
+            <subfield code="a">b207766733</subfield>
+            <subfield code="b">Updated: 01-09-19</subfield>
+            <subfield code="c">Created: 11-01-13</subfield>
+            <subfield code="d">CatDate:   -  -</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="AVA">
+            <subfield code="0">991005668359706532</subfield>
+            <subfield code="8">22928381510006532</subfield>
+            <subfield code="a">01UCS_BER</subfield>
+            <subfield code="b">MORR</subfield>
+            <subfield code="c">Morrison</subfield>
+            <subfield code="e">unavailable</subfield>
+            <subfield code="f">1</subfield>
+            <subfield code="g">1</subfield>
+            <subfield code="i">UCB_Campus</subfield>
+            <subfield code="j">mo</subfield>
+            <subfield code="k">#</subfield>
+            <subfield code="p">1</subfield>
+            <subfield code="q">Morrison Library</subfield>
+          </datafield>
+        </record>
+      </recordData>
+      <recordIdentifier>991005668359706532</recordIdentifier>
+      <recordPosition>1</recordPosition>
+    </record>
+    <record>
+      <recordSchema>marcxml</recordSchema>
+      <recordPacking>xml</recordPacking>
+      <recordData>
+        <record xmlns="http://www.loc.gov/MARC21/slim">
+          <leader>00273nam a2200085 a 4500</leader>
+          <controlfield tag="001">991005668209706532</controlfield>
+          <controlfield tag="008">^^</controlfield>
+          <datafield ind1=" " ind2=" " tag="035">
+            <subfield code="a">(CUY)UCB-b207766708-01ucs_ber</subfield>
+          </datafield>
+          <datafield ind1="1" ind2=" " tag="100">
+            <subfield code="a">Beutlich, Tadek.</subfield>
+          </datafield>
+          <datafield ind1="1" ind2="0" tag="245">
+            <subfield code="a">River</subfield>
+            <subfield code="h">[graphic]</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="300">
+            <subfield code="a">1 lithograph :</subfield>
+            <subfield code="b">col.</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="996">
+            <subfield code="a">b207766708</subfield>
+            <subfield code="b">Updated: 11-01-13</subfield>
+            <subfield code="c">Created: 11-01-13</subfield>
+            <subfield code="d">CatDate:   -  -</subfield>
+            <subfield code="9">LOCAL</subfield>
+          </datafield>
+          <datafield ind1=" " ind2=" " tag="AVA">
+            <subfield code="0">991005668209706532</subfield>
+            <subfield code="8">22928389410006532</subfield>
+            <subfield code="a">01UCS_BER</subfield>
+            <subfield code="b">MORR</subfield>
+            <subfield code="c">Morrison</subfield>
+            <subfield code="e">available</subfield>
+            <subfield code="f">1</subfield>
+            <subfield code="g">0</subfield>
+            <subfield code="i">UCB_Campus</subfield>
+            <subfield code="j">mo</subfield>
+            <subfield code="k">#</subfield>
+            <subfield code="p">1</subfield>
+            <subfield code="q">Morrison Library</subfield>
+          </datafield>
+        </record>
+      </recordData>
+      <recordIdentifier>991005668209706532</recordIdentifier>
+      <recordPosition>2</recordPosition>
+    </record>
+  </records>
+  <extraResponseData xmlns:xb="http://www.exlibris.com/repository/search/xmlbeans/">
+    <xb:exact>true</xb:exact>
+    <xb:responseDate>2022-05-04T14:31:01-0700</xb:responseDate>
+  </extraResponseData>
+</searchRetrieveResponse>

data/spec/data/{b11082434-sru.xml → b110824349-sru.xml} RENAMED Viewed

File without changes

data/spec/lib/berkeley_library/alma/barcode_spec.rb ADDED Viewed

@@ -0,0 +1,67 @@
+require 'spec_helper'
+module BerkeleyLibrary
+  module Alma
+    describe BarCode do
+      before(:each) do
+        BerkeleyLibrary::Alma.configure do
+          Config.alma_sru_host = 'berkeley.alma.exlibrisgroup.com'
+          Config.alma_institution_code = '01UCS_BER'
+          Config.alma_primo_host = 'search.library.berkeley.edu'
+          Config.alma_permalink_key = 'iqob43'
+        end
+      end
+      after(:each) do
+        BerkeleyLibrary::Alma::Config.send(:clear!)
+      end
+      describe :new do
+        bad_barcode = 1234
+        it "raises an error for input that's not an string" do
+          expect { BarCode.new(bad_barcode) }.to raise_error(ArgumentError), "#{bad_barcode}: No error raised for #{bad_barcode}"
+        end
+      end
+      describe :marc_record do
+        it 'returns the MARC record' do
+          barcode_id = 'C084093187'
+          stub_sru_request('alma.barcode', barcode_id)
+          barcode = BerkeleyLibrary::Alma::BarCode.new(barcode_id)
+          marc_record = barcode.get_marc_record
+          expect(marc_record).not_to be_nil
+        end
+        it 'returns nil for an empty response' do
+          empty_sru_response = <<~XML.strip
+            <?xml version="1.0" encoding="UTF-8"?>
+            <searchRetrieveResponse>
+              <version>1.2</version>
+              <numberOfRecords>0</numberOfRecords>
+              <records/>
+            </searchRetrieveResponse>
+          XML
+          barcode_id = '991054360089706532doesntexist'
+          sru_url = sru_url_for('alma.barcode', barcode_id)
+          stub_request(:get, sru_url).to_return(status: 200, body: empty_sru_response)
+          barcode = BarCode.new(barcode_id)
+          marc_record = barcode.get_marc_record
+          expect(marc_record).to be_nil
+        end
+        it 'returns nil for an HTTP error response' do
+          barcode_id = '991054360089706532934j3h'
+          sru_url = sru_url_for('alma.barcode', barcode_id)
+          stub_request(:get, sru_url).to_return(status: 404)
+          barcode = BarCode.new(barcode_id)
+          marc_record = barcode.get_marc_record
+          expect(marc_record).to be_nil
+        end
+      end
+    end
+  end
+end

data/spec/lib/berkeley_library/alma/bib_number_spec.rb CHANGED Viewed

@@ -40,6 +40,14 @@ module BerkeleyLibrary
           end
         end
+        it 'accepts an upper-case B, but treats it as lower case' do
+          raw_bib = 'B11082434'
+          expected_bib = 'b110824349'
+          bib_number = BibNumber.new(raw_bib)
+          expect(bib_number.full_bib).to eq(expected_bib)
+          expect(bib_number.to_s).to eq(expected_bib)
+        end
         it 'produces the expected check digit' do
           aggregate_failures do
             expected_check_digits_by_bib.each do |bib_expected, cd_expected|
@@ -82,7 +90,8 @@ module BerkeleyLibrary
       describe :marc_record do
         it 'returns the MARC record' do
           raw_bib_number = 'b11082434'
-          stub_sru_request(raw_bib_number)
+          full_bib_number = 'b110824349'
+          stub_sru_request('alma.local_field_996', full_bib_number)
           bib_number = BibNumber.new(raw_bib_number)
           marc_record = bib_number.get_marc_record

data/spec/lib/berkeley_library/alma/mms_id_spec.rb CHANGED Viewed

@@ -58,7 +58,7 @@ module BerkeleyLibrary
       describe :marc_record do
         it 'returns the MARC record' do
           raw_mms_id = '991054360089706532'
-          stub_sru_request(raw_mms_id)
+          stub_sru_request('alma.mms_id', raw_mms_id)
           mms_id = MMSID.new(raw_mms_id)
           marc_record = mms_id.get_marc_record
@@ -77,7 +77,7 @@ module BerkeleyLibrary
           XML
           raw_mms_id = '991054360089706532'
-          sru_url = sru_url_for(raw_mms_id)
+          sru_url = sru_url_for('alma.mms_id', raw_mms_id)
           stub_request(:get, sru_url).to_return(status: 200, body: empty_sru_response)
           mms_id = MMSID.new(raw_mms_id)
@@ -87,7 +87,7 @@ module BerkeleyLibrary
         it 'returns nil for an HTTP error response' do
           raw_mms_id = '991054360089706532'
-          sru_url = sru_url_for(raw_mms_id)
+          sru_url = sru_url_for('alma.mms_id', raw_mms_id)
           stub_request(:get, sru_url).to_return(status: 404)
           mms_id = MMSID.new(raw_mms_id)

data/spec/lib/berkeley_library/alma/record_id_spec.rb CHANGED Viewed

@@ -36,6 +36,26 @@ module BerkeleyLibrary
           end
         end
       end
+      describe 'SRU methods' do
+        before { Config.default! }
+        after { Config.send(:clear!) }
+        describe :get_marc_xml do
+          let(:record_id) { RecordId.parse('991054360089706532') }
+          let(:expected_body) { File.read('spec/data/991054360089706532-sru.xml') }
+          before do
+            sru_query_uri = record_id.marc_uri
+            stub_request(:get, sru_query_uri).to_return(body: expected_body)
+          end
+          it 'returns the MARC XML' do
+            marc_xml = record_id.get_marc_xml
+            expect(marc_xml).to eq(expected_body)
+          end
+        end
+      end
     end
   end
 end

data/spec/lib/berkeley_library/alma/sru_spec.rb ADDED Viewed

@@ -0,0 +1,29 @@
+require 'spec_helper'
+module BerkeleyLibrary
+  module Alma
+    describe SRU do
+      before { Config.default! }
+      after { Config.send(:clear!) }
+      describe :get_marc_records do
+        let(:mms_ids) { %w[991005668209706532 991005668359706532] }
+        before do
+          sru_query_value = mms_ids.map { |id| RecordId.parse(id) }.map(&:sru_query_value).join(' or ')
+          sru_query_uri = SRU.sru_query_uri(sru_query_value)
+          stub_request(:get, sru_query_uri).to_return(body: File.read('spec/data/availability-sru.xml'))
+        end
+        it 'returns the MARC records' do
+          reader = SRU.get_marc_records(*mms_ids)
+          expect(reader).to be_a(MARC::XMLReader)
+          marc_records = reader.to_a
+          expect(marc_records.size).to eq(mms_ids.size)
+          expect(marc_records.map(&:record_id)).to contain_exactly(*mms_ids)
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb CHANGED Viewed

@@ -31,26 +31,17 @@ require 'berkeley_library/alma'
 # ------------------------------------------------------------
 # Utility methods
-def sru_url_for(record_id)
-  sru_url_base = 'https://berkeley.alma.exlibrisgroup.com/view/sru/01UCS_BER?version=1.2&operation=searchRetrieve&query='
-  if BerkeleyLibrary::Alma::Constants::ALMA_RECORD_RE =~ record_id
-    "#{sru_url_base}alma.mms_id%3D#{record_id}"
-  elsif BerkeleyLibrary::Alma::Constants::MILLENNIUM_RECORD_RE =~ record_id
-    full_bib_number = BerkeleyLibrary::Alma::BibNumber.new(record_id).to_s
-    "#{sru_url_base}alma.other_system_number%3DUCB-#{full_bib_number}-01ucs_ber"
-  else
-    raise ArgumentError, "Unknown record ID type: #{record_id}"
-  end
+def sru_url_for(index, value)
+  "https://berkeley.alma.exlibrisgroup.com/view/sru/01UCS_BER?version=1.2&operation=searchRetrieve&query=#{index}%3D#{value}"
 end
 def sru_data_path_for(record_id)
   "spec/data/#{record_id}-sru.xml"
 end
-def stub_sru_request(record_id)
-  sru_url = sru_url_for(record_id)
-  marc_xml_path = sru_data_path_for(record_id)
+def stub_sru_request(index, value)
+  sru_url_ = sru_url_for(index, value)
+  marc_xml_path = sru_data_path_for(value)
-  stub_request(:get, sru_url).to_return(status: 200, body: File.read(marc_xml_path))
+  stub_request(:get, sru_url_).to_return(status: 200, body: File.read(marc_xml_path))
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: berkeley_library-alma
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.5
 platform: ruby
 authors:
 - David Moles
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkeley_library-logging
@@ -269,12 +269,14 @@ files:
 - bin/alma-mms-lookup
 - docker-compose.yml
 - lib/berkeley_library/alma.rb
+- lib/berkeley_library/alma/barcode.rb
 - lib/berkeley_library/alma/bib_number.rb
 - lib/berkeley_library/alma/config.rb
 - lib/berkeley_library/alma/constants.rb
 - lib/berkeley_library/alma/mms_id.rb
 - lib/berkeley_library/alma/module_info.rb
 - lib/berkeley_library/alma/record_id.rb
+- lib/berkeley_library/alma/sru.rb
 - rakelib/bundle.rake
 - rakelib/coverage.rake
 - rakelib/gem.rake
@@ -282,12 +284,16 @@ files:
 - rakelib/spec.rake
 - spec/.rubocop.yml
 - spec/data/991054360089706532-sru.xml
-- spec/data/b11082434-sru.xml
+- spec/data/C084093187-sru.xml
+- spec/data/availability-sru.xml
+- spec/data/b110824349-sru.xml
 - spec/data/bibs_with_check_digits.txt
+- spec/lib/berkeley_library/alma/barcode_spec.rb
 - spec/lib/berkeley_library/alma/bib_number_spec.rb
 - spec/lib/berkeley_library/alma/config_spec.rb
 - spec/lib/berkeley_library/alma/mms_id_spec.rb
 - spec/lib/berkeley_library/alma/record_id_spec.rb
+- spec/lib/berkeley_library/alma/sru_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BerkeleyLibrary/alma
 licenses:
@@ -315,10 +321,14 @@ summary: Alma/Primo utilities for the UC Berkeley Library
 test_files:
 - spec/.rubocop.yml
 - spec/data/991054360089706532-sru.xml
-- spec/data/b11082434-sru.xml
+- spec/data/C084093187-sru.xml
+- spec/data/availability-sru.xml
+- spec/data/b110824349-sru.xml
 - spec/data/bibs_with_check_digits.txt
+- spec/lib/berkeley_library/alma/barcode_spec.rb
 - spec/lib/berkeley_library/alma/bib_number_spec.rb
 - spec/lib/berkeley_library/alma/config_spec.rb
 - spec/lib/berkeley_library/alma/mms_id_spec.rb
 - spec/lib/berkeley_library/alma/record_id_spec.rb
+- spec/lib/berkeley_library/alma/sru_spec.rb
 - spec/spec_helper.rb