berkeley_library-alma 0.0.5 → 0.0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0805d8fb305dd644ede89efb0c71845c479df3cc8b69334bbfc4e747312c229d'
-  data.tar.gz: 80b1576c6dc7d5bbfd5bd5a0a53985167c4c3929668d505dae92ffcac196988e
+  metadata.gz: 75af9a35d41937d5f783bb9ef9bca06e2896692b17289ed2d226213268525b8d
+  data.tar.gz: a19bf19c4d06f4453f1a1deab67967f9a8109e558e3f93a3222232bcf131dd8e
 SHA512:
-  metadata.gz: 879cb4ef386caa8543bf883ac3b62888c4ca810ef431562618ad456c9d560ee81f6dada5b9ae850ca15523cd6f58d5487919c3e782c817313deaff346912c257
-  data.tar.gz: b10240d0571733f28f90ab099da879647cdd670da05c5af5aa396f0fcd8c9ae026d2ec9b4c1246764a6b919bc594c665ff0096140b400cb2626af893bdcd3b21
+  metadata.gz: 15a42332adcabc623f442b8dbe9139fc81eecf4a724dae5b7c6f59e9f3dea6611de8901105eea70391f7921440020e5042db71c569b65fb4fb95b09c5106a1f1
+  data.tar.gz: 60fa24417122d3847c89013c0d0b7d20cee77953d87170b515b1b25f6635a279166acf7f8e76b1f6e1f322f7a7c7c351de51f5d6f92fec8c5834a116710ada49

data/.idea/alma.iml

@@ -12,15 +12,15 @@
     </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.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="actionpack (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="actionview (v7.0.2.4, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activesupport (v7.0.2.4, 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" />
-    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.5, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="berkeley_library-logging (v0.2.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="berkeley_library-marc (v0.3.1, RVM: ruby-2.7.5) [gem]" level="application" />
-    <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="berkeley_library-util (v0.1.2, 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.1.4, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -28,7 +28,7 @@
     <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" />
     <orderEntry type="library" scope="PROVIDED" name="colorize (v0.8.1, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.9, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.10, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crack (v0.4.5, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="crass (v1.0.6, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -39,16 +39,15 @@
     <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.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.14.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="lograge (v0.12.0, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="loofah (v2.17.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" />
+    <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.13.5, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="oj (v3.13.11, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ougai (v1.9.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="parallel (v1.21.0, RVM: ruby-2.7.5) [gem]" level="application" />
@@ -60,7 +59,7 @@
     <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.6, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="railties (v7.0.2.4, 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" />
@@ -87,7 +86,7 @@
     <orderEntry type="library" scope="PROVIDED" name="typesafe_enum (v0.3.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="tzinfo (v2.0.4, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unf (v0.1.4, RVM: ruby-2.7.5) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.8, RVM: ruby-2.7.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unf_ext (v0.0.8.1, RVM: ruby-2.7.5) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.1.0, RVM: ruby-2.7.5) [gem]" level="application" />
     <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" />
@@ -109,7 +108,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.3.gem" fullCommand="gem" id="gem" />
+          <RakeTaskImpl description="Build berkeley_library-alma.gemspec as berkeley_library-alma-0.0.5.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/.idea/inspectionProfiles/Project_Default.xml

@@ -7,6 +7,7 @@
     <inspection_tool class="GoUnusedGlobalVariable" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="GoUnusedVariable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="GrazieInspection" enabled="false" level="TYPO" enabled_by_default="false" />
+    <inspection_tool class="HttpUrlsUsage" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="LanguageDetectionInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="Rubocop" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="RubyCaseWithoutElseBlockInspection" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -15,6 +16,7 @@
     </inspection_tool>
     <inspection_tool class="RubyNilAnalysis" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="RubyStringKeysInHashInspection" enabled="true" level="INFORMATION" enabled_by_default="true" />
+    <inspection_tool class="RubyTooManyInstanceVariablesInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="RubyUnnecessaryReturnStatement" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
     <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />

data/CHANGES.md

@@ -1,3 +1,19 @@
+# 0.0.7.1 (24 May 2022)
+
+- Set minimum Nokogiri version to address
+  [CVE-2022-29181](https://nvd.nist.gov/vuln/detail/CVE-2022-29181)
+
+# 0.0.7 (6 May 2022)
+
+- `SRU#get_marc_records` now accepts a `max_records` parameter corresponding to the SRU
+  `maximumRecords` query parameter for page size.
+- `BerkeleyLibrary::Alma::Config.default!` now returns the `Config` singleton rather than
+  an arbitrary config value.
+
+# 0.0.6 (5 May 2022)
+
+- `SRU#get_marc_records` now supports paginated results. 
+
 # 0.0.5 (4 May 2022)
 
 - extracts `SRU` module for performing SRU queries.

data/berkeley_library-alma.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'berkeley_library-logging', '~> 0.2'
   spec.add_dependency 'berkeley_library-marc', '~> 0.3.1'
-  spec.add_dependency 'berkeley_library-util', '~> 0.1', '>= 0.1.1'
-  spec.add_dependency 'nokogiri', '~> 1.12'
+  spec.add_dependency 'berkeley_library-util', '~> 0.1', '>= 0.1.2'
+  spec.add_dependency 'nokogiri', '~> 1.13', '>= 1.13.6'
 
   spec.add_development_dependency 'bundle-audit', '~> 0.1'
   spec.add_development_dependency 'ci_reporter_rspec', '~> 1.0'

data/lib/berkeley_library/alma/config.rb

@@ -118,10 +118,12 @@ module BerkeleyLibrary
 
         def default!
           BerkeleyLibrary::Alma.configure do
-            config.alma_sru_host = ENV.fetch('LIT_ALMA_SRU_HOST', 'berkeley.alma.exlibrisgroup.com')
-            config.alma_institution_code = ENV.fetch('LIT_ALMA_INSTITUTION_CODE', '01UCS_BER')
-            config.alma_primo_host = ENV.fetch('LIT_ALMA_PRIMO_HOST', 'search.library.berkeley.edu')
-            config.alma_permalink_key = ENV.fetch('LIT_ALMA_PERMALINK_KEY', 'iqob43')
+            config.tap do |c|
+              c.alma_sru_host = ENV.fetch('LIT_ALMA_SRU_HOST', 'berkeley.alma.exlibrisgroup.com')
+              c.alma_institution_code = ENV.fetch('LIT_ALMA_INSTITUTION_CODE', '01UCS_BER')
+              c.alma_primo_host = ENV.fetch('LIT_ALMA_PRIMO_HOST', 'search.library.berkeley.edu')
+              c.alma_permalink_key = ENV.fetch('LIT_ALMA_PERMALINK_KEY', 'iqob43')
+            end
           end
         end
 

data/lib/berkeley_library/alma/module_info.rb

@@ -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.5'.freeze
+      VERSION = '0.0.7.1'.freeze
       HOMEPAGE = 'https://github.com/BerkeleyLibrary/alma'.freeze
     end
   end

data/lib/berkeley_library/alma/record_id.rb

@@ -48,7 +48,7 @@ module BerkeleyLibrary
       #
       # @return [URI] the MARC URI
       def marc_uri
-        SRU.sru_query_uri(sru_query_value)
+        SRU.sru_query_uri(sru_query_value, max_records: 1)
       end
 
       # Makes an SRU query for this record and returns a MARC record, or nil if the
@@ -60,12 +60,8 @@ module BerkeleyLibrary
       # @return [MARC::Record, nil] the MARC record
       # rubocop:disable Naming/AccessorMethodName
       def get_marc_record
-        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)
+        records = SRU.marc_records_for(sru_query_value, max_records: 1)
+        logger.warn("GET #{marc_uri} did not return a MARC record") unless (marc_record = records.first)
         marc_record
       end
       # rubocop:enable Naming/AccessorMethodName
@@ -76,7 +72,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
-        SRU.make_sru_query(sru_query_value)
+        SRU.make_sru_query(sru_query_value, max_records: 1)
       end
       # rubocop:enable Naming/AccessorMethodName
 

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

@@ -0,0 +1,108 @@
+require 'uri'
+require 'berkeley_library/util/uris'
+require 'berkeley_library/alma/config'
+require 'berkeley_library/alma/constants'
+require 'berkeley_library/alma/record_id'
+require 'berkeley_library/alma/sru/xml_reader'
+
+module BerkeleyLibrary
+  module Alma
+    module SRU
+      include BerkeleyLibrary::Logging
+      include Constants
+
+      DEFAULT_MAX_RECORDS = 10
+
+      class << self
+        include SRU
+      end
+
+      # Given a list of record IDs, returns the MARC records for each ID (if found).
+      # Note that the order of the records is not guaranteed.
+      #
+      # @param record_ids [Array<String, RecordId>] the record IDs to look up
+      # @param freeze [Boolean] whether to freeze the records
+      # @param max_records the number of records per SRU page.
+      # @return [Enumerator::Lazy<MARC::Record>] the records
+      def get_marc_records(*record_ids, max_records: DEFAULT_MAX_RECORDS, freeze: false)
+        # 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, max_records: max_records, freeze: freeze)
+      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
+      # @param max_records the number of records per SRU page
+      def sru_query_uri(sru_query_value, max_records: DEFAULT_MAX_RECORDS)
+        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, '&', "maximumRecords=#{max_records}")
+      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
+      # @param max_records the number of records per SRU page
+      # @return [String, nil] the SRU query response body, or nil in the event of an error.
+      def make_sru_query(query_value, max_records: DEFAULT_MAX_RECORDS)
+        uri = sru_query_uri(query_value, max_records: max_records)
+        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
+      # @param freeze [Boolean] whether to freeze the records
+      # @param max_records the number of records per SRU page
+      # @return [Enumerator::Lazy<MARC::Record>] the records
+      def marc_records_for(query_value, max_records: DEFAULT_MAX_RECORDS, freeze: false)
+        Enumerator.new do |y|
+          uri = sru_query_uri(query_value, max_records: max_records)
+          perform_query(uri, freeze: freeze) { |rec| y << rec }
+        end.lazy
+      end
+
+      private
+
+      def perform_query(query_uri, start_record: nil, freeze: false, &block)
+        full_query_uri = full_query_uri_for(query_uri, start_record)
+        next_start_record = perform_single_query(full_query_uri, freeze, &block)
+        return unless next_start_record
+
+        perform_query(query_uri, start_record: next_start_record, freeze: freeze, &block)
+      end
+
+      def full_query_uri_for(query_uri, start_record)
+        return query_uri unless start_record
+
+        BerkeleyLibrary::Util::URIs.append(query_uri, "&startRecord=#{start_record}")
+      end
+
+      def perform_single_query(query_uri, freeze, &block)
+        return unless (xml = do_get(query_uri))
+
+        xml_reader = XMLReader.read(xml, freeze: freeze)
+        xml_reader.each(&block)
+        xml_reader.next_record_position
+      end
+
+      def do_get(uri)
+        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/lib/berkeley_library/alma/sru/xml_reader.rb

@@ -0,0 +1,148 @@
+require 'nokogiri'
+require 'marc/xml_parsers'
+require 'berkeley_library/util/files'
+
+module BerkeleyLibrary
+  module Alma
+    module SRU
+      # A customized XML reader for reading MARC records from SRU search results.
+      class XMLReader
+        include Enumerable
+        include ::MARC::NokogiriReader
+        include BerkeleyLibrary::Util::Files
+
+        # ############################################################
+        # Constants
+
+        NS_SRW = 'http://www.loc.gov/zing/srw/'.freeze
+        NS_MARC = 'http://www.loc.gov/MARC21/slim'.freeze
+
+        # ############################################################
+        # Attributes
+
+        # @return [Integer, nil] the record identifier of the most recently parsed record, if any
+        attr_reader :last_record_id
+
+        # @return [Integer, nil] the record position of the most recently parsed record, if any
+        attr_reader :last_record_position
+
+        # @return [Integer, nil] the next record position, if present
+        attr_reader :next_record_position
+
+        # Returns the total number of records, based on the `<numberOfRecords/>` tag
+        # returned in the SRU response.
+        #
+        # Note that the total is not guaranteed to be present, and if present,
+        # may not be present unless at least some records have been parsed.
+        #
+        # @return [Integer, nil] the total number of records, or `nil` if the total has not been read yet
+        def num_records
+          @num_records&.to_i
+        end
+
+        # Returns the number of records yielded.
+        #
+        # @return [Integer] the number of records yielded.
+        def records_yielded
+          @records_yielded ||= 0
+        end
+
+        # ############################################################
+        # Initializer
+
+        def initialize(source, freeze: false)
+          @handle = ensure_io(source)
+          @freeze = freeze
+          init
+        end
+
+        class << self
+          # Reads MARC records from an XML datasource given either as an XML string, a file path,
+          # or as an IO object.
+          #
+          # @param source [String, Pathname, IO] an XML string, the path to a file, or an IO to read from directly
+          # @param freeze [Boolean] whether to freeze each record after reading
+          def read(source, freeze: false)
+            new(source, freeze: freeze)
+          end
+        end
+
+        # ############################################################
+        # MARC::GenericPullParser overrides
+
+        def yield_record
+          @record[:record].tap do |record|
+            record.freeze if @freeze
+          end
+
+          super
+        ensure
+          increment_records_yielded!
+        end
+
+        # ############################################################
+        # Nokogiri::XML::SAX::Document overrides
+
+        # @see Nokogiri::XML::Sax::Document#start_element_namespace
+        # rubocop:disable Metrics/ParameterLists
+        def start_element_namespace(name, attrs = [], prefix = nil, uri = nil, ns = [])
+          super
+
+          @current_element_ns = uri
+          @current_element_name = name
+        end
+        # rubocop:enable Metrics/ParameterLists
+
+        # @see Nokogiri::XML::Sax::Document#end_element_namespace
+        def end_element_namespace(name, prefix = nil, uri = nil)
+          # Delay yielding record till we reach the end of the outer SRU <record/>
+          # element (not the inner MARC <record/> element), so we can record the
+          # values of <recordIdentifier> and <recordPosition/>
+          if name.downcase == 'record'
+            yield_record if uri == NS_SRW
+          elsif uri == NS_MARC
+            super
+          end
+
+          @current_element_name = nil
+        end
+
+        # @see Nokogiri::XML::Sax::Document#characters
+        # rubocop:disable Metrics/MethodLength
+        def characters(string)
+          return super unless NS_SRW == @current_element_ns
+          return unless (name = @current_element_name)
+
+          case name
+          when 'numberOfRecords'
+            @num_records = string
+          when 'recordIdentifier'
+            @last_record_id = string
+          when 'recordPosition'
+            @last_record_position = string.to_i
+          when 'nextRecordPosition'
+            @next_record_position = string.to_i
+          end
+        end
+        # rubocop:enable Metrics/MethodLength
+
+        # ############################################################
+        # Private
+
+        private
+
+        def ensure_io(file)
+          return file if reader_like?(file)
+          return File.new(file) if file_exists?(file)
+          return StringIO.new(file) if file =~ /^\s*</x
+
+          raise ArgumentError, "Don't know how to read XML from #{file.inspect}: not an IO, file path, or XML text"
+        end
+
+        def increment_records_yielded!
+          @records_yielded = records_yielded + 1
+        end
+      end
+    end
+  end
+end

data/lib/berkeley_library/alma/sru.rb

@@ -1,79 +1 @@
-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
+Dir.glob(File.expand_path('sru/*.rb', __dir__)).sort.each(&method(:require))