marc 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c9044ee8b0320c4a4145862195ae8d031e33bc5d6bc8e0e306b5db0ff9cc38f
-  data.tar.gz: 854fffb717093c1aca08fbb7d3ca84153f22dc4131bd65d61a844d861a367c55
+  metadata.gz: 53c1e338a00e1dbd7c09ed14edc916edd1211abe0edbabcf757b8b00a5aa209c
+  data.tar.gz: 80b4c48c2fc95887216194d264583302bacae6c606616a087c888668ba2bfb68
 SHA512:
-  metadata.gz: 8036b61f1558aa341b52686923e2532983196b441f2fbcba21068b51b1b092217480c1a5ae892aa090654c5a693bedcf733a6733a506c37e5c902d4e7854bc0d
-  data.tar.gz: 2118c251d7a6683c38130ae5fc7dd2e02b993059e9d41f92bf8afdadf7e1be7ebd4c285e9bec2df9332427a2c07790a45cdfb305b76cb270d923b94f4dbc9439
+  metadata.gz: b6dd17fa76ff33ef0da68946d29ec2079c495423559c47391cabf80b59393f0d481ef6b1467b839465d3225c1a52aec2d4945994986e8e956eccfc2ea73ada5b
+  data.tar.gz: a745e41aa2cbe87c70f9a2cbfe0de0dd12f47c167f867127353d86ff771ada14327dbce1ec461fcb81cacb3cf3f60f821cdb4c0087213f37a0ef42dc7ade78e8

data/Changes

@@ -1,3 +1,6 @@
+v1.1.1 June 2021
+- Fix a regression when normalizing indicator values when serializing marcxml
+
 v1.1.0 June 2021
  - Add support for additional valid subfield codes in marcxml
 

data/lib/marc/version.rb

@@ -1,3 +1,3 @@
 module MARC
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/marc/xmlwriter.rb

@@ -60,7 +60,8 @@ module MARC
     # and returns a REXML::Document for the XML serialization.
 
     def self.encode(record, opts={})
-      singleChar = Regexp.new('[\dA-Za-z!"#$%&\'()*+,-./:;<=>?{}_^`~\[\]\\\]{1}')
+      singleChar = Regexp.new('[\da-z ]{1}')
+      subfieldChar = Regexp.new('[\dA-Za-z!"#$%&\'()*+,-./:;<=>?{}_^`~\[\]\\\]{1}')
       ctrlFieldTag = Regexp.new('00[1-9A-Za-z]{1}')
       
       # Right now, this writer handles input from the strict and
@@ -122,7 +123,7 @@ module MARC
             
             # If marc is leniently parsed, we may have some dirty data; using
             # the blank subfield code should help us locate these later to fix
-            if (subfield.code.match(singleChar) == nil)
+            if (subfield.code.match(subfieldChar) == nil)
               subfield.code = ' '
             end
             

data/test/tc_xml.rb

@@ -140,11 +140,16 @@ class XMLTest < Test::Unit::TestCase
     record1 = MARC::Record.new
     record1.leader =  '00925njm  22002777a 4500'
     record1.append MARC::ControlField.new('007', 'sdubumennmplu')
-    record1.append MARC::DataField.new('245', '0', '4', 
+    record1.append MARC::DataField.new('245', '0', '4',
       ['a', 'The Great Ray Charles'], ['h', '[sound recording].'])
+    record1.append MARC::DataField.new('998', ' ', ' ',
+      ['^', 'Valid local subfield'])
+
+    # MARC::XMLWriter mutates records
+    dup_record = MARC::Record.new_from_hash(record1.to_hash)
 
     writer = MARC::XMLWriter.new('test/test.xml', :stylesheet => 'style.xsl')
-    writer.write(record1)
+    writer.write(dup_record)
     writer.close
 
     xml = File.read('test/test.xml')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marc
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Kevin Clarke
@@ -13,7 +13,7 @@ authors:
 autorequire: marc
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scrub_rb