pennmarc 1.0.25 → 1.0.26

data/spec/lib/pennmarc/marc_util_spec.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 describe 'PennMARC::Util' do
-  include MarcSpecHelpers
-
   subject(:util) do
     Class.new { extend PennMARC::Util }
   end

data/spec/lib/pennmarc/parser_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 describe PennMARC::Parser do
-  include MarcSpecHelpers
+  include FixtureHelpers
 
   subject(:parser) { described_class.new }
 

data/spec/spec_helper.rb

@@ -2,8 +2,12 @@
 
 $LOAD_PATH.unshift(__dir__) unless $LOAD_PATH.include?(__dir__)
 
+# Require spec-specific helpers dir
 Dir[File.join(__dir__, 'support', '**', '*.rb')].each { |f| require f }
 
+# Require test helpers from gem lib
+Dir[File.join(__dir__, '../lib/pennmarc/test', '*.rb')].each { |f| require f }
+
 require 'pennmarc'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
@@ -22,6 +26,9 @@ require 'pennmarc'
 #
 # See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # Include MarcHelpers by default
+  config.include(PennMARC::Test::MarcHelpers)
+
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
   # assertions if you prefer.

data/spec/support/fixture_helpers.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module FixtureHelpers
+  # Get the path for a test MARC XML file
+  # @param [String] filename of MARCXML fixture
+  # @return [String] full path of MARCXML fixture
+  def marc_xml_path(filename)
+    File.join File.dirname(__FILE__), '..', 'fixtures', 'marcxml', filename
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennmarc
 version: !ruby/object:Gem::Version
-  version: 1.0.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Mike Kanning
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +123,7 @@ files:
 - lib/pennmarc/mappings/locations.yml
 - lib/pennmarc/mappings/relator.yml
 - lib/pennmarc/parser.rb
+- lib/pennmarc/test/marc_helpers.rb
 - lib/pennmarc/util.rb
 - lib/pennmarc/version.rb
 - pennmarc.gemspec
@@ -150,7 +151,7 @@ files:
 - spec/lib/pennmarc/marc_util_spec.rb
 - spec/lib/pennmarc/parser_spec.rb
 - spec/spec_helper.rb
-- spec/support/marc_spec_helpers.rb
+- spec/support/fixture_helpers.rb
 homepage: https://gitlab.library.upenn.edu/dld/catalog/pennmarc
 licenses:
 - MIT

data/spec/support/marc_spec_helpers.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-require 'nokogiri'
-require 'marc'
-
-module MarcSpecHelpers
-  # Return a MARC::XMLReader that will parse a given file and return MARC::Record objects
-  # @param [String] filename of MARCXML fixture
-  # @return [MARC::Record, NilClass]
-  def record_from(filename)
-    MARC::XMLReader.new(marc_xml_path(filename)).first
-  end
-
-  # Get the path for a test MARC XML file
-  # @param [String] filename of MARCXML fixture
-  # @return [String] full path of MARCXML fixture
-  def marc_xml_path(filename)
-    File.join File.dirname(__FILE__), '..', 'fixtures', 'marcxml', filename
-  end
-
-  # Create an isolated MARC::Subfield object for use in specs or as part of a MARC::Field
-  # @param [String] code
-  # @param [String] value
-  # @return [MARC::Subfield]
-  def marc_subfield(code, value)
-    MARC::Subfield.new code.to_s, value
-  end
-
-  # Return a new ControlField (000-009)
-  # @param [String] tag
-  # @param [String] value
-  # @return [MARC::ControlField]
-  def marc_control_field(tag:, value:)
-    MARC::ControlField.new tag, value
-  end
-
-  # Create an isolated MARC::DataField object for use in specs
-  # Can pass in tag, indicators and subfields (using simple hash structure). E.g.,
-  # marc_field(tag: '650', indicator2: '7'),
-  #            subfields: { a: 'Tax planning',
-  #                         m: ['Multiple', 'Subfields']
-  #                         z: 'United States.',
-  #                         '0': http://id.loc.gov/authorities/subjects/sh2008112546 }
-  #            )
-  # @param [String (frozen)] tag MARC tag, e.g., 001, 665
-  # @param [String (frozen)] indicator1 MARC indicator, e.g., 0
-  # @param [String (frozen)] indicator2
-  # @param [Hash] subfields hash of subfield values as code => value or code => [value, value]
-  # @return [MARC::DataField]
-  def marc_field(tag: 'TST', indicator1: ' ', indicator2: ' ', subfields: {})
-    subfield_objects = subfields.each_with_object([]) do |(code, value), array|
-      Array.wrap(value).map { |v| array << marc_subfield(code, v) }
-    end
-    MARC::DataField.new tag, indicator1, indicator2, *subfield_objects
-  end
-
-  # Return a MARC::Record containing passed in DataFields
-  # @param [Array<MARC::DataField>] fields
-  # @param [String, nil] leader
-  # @return [MARC::Record]
-  def marc_record(fields: [], leader: nil)
-    record = MARC::Record.new
-    fields.each { |field| record << field }
-    record.leader = leader if leader
-    record
-  end
-
-  # Mock map for location lookup using Location helper
-  # The location codes :dent and :stor are the two outermost keys
-  # :specific_location, :library, :display are the inner keys that store location values
-  # @example
-  #   location_map[:stor][:library] #=> 'LIBRA'
-  # @return [Hash]
-  def location_map
-    { dent: {  specific_location: 'Levy Dental Medicine Library - Stacks',
-               library: ['Health Sciences Libraries', 'Levy Dental Medicine Library'],
-               display: 'Levy Dental Medicine Library - Stacks' },
-      stor: { specific_location: 'LIBRA',
-              library: 'LIBRA',
-              display: 'LIBRA' },
-      vanp: { specific_location: 'Van Pelt - Stacks',
-              library: 'Van Pelt-Dietrich Library Center',
-              display: 'Van Pelt Library' } }
-  end
-end