marc 0.1.3 → 0.1.4

data/lib/marc/record.rb

@@ -88,7 +88,7 @@ module MARC
     #   xml_doc = record.to_xml()
 
     def to_xml
-      return MARC::XMLWriter.encode(self)
+      return MARC::XMLWriter.encode(self, :include_namespace => true)
     end
 
     # Handy method for returning a hash mapping this records values

data/lib/marc/xmlwriter.rb

@@ -70,9 +70,9 @@ module MARC
     # a static method that accepts a MARC::Record object
     # and returns a REXML::Document for the XML serialization.
 
-    def self.encode(record)
-      singleChar = Regexp.new(/[\da-z ]{1}/)
-      ctrlFieldTag = Regexp.new(/00[1-9A-Za-z]{1}s/)
+    def self.encode(record, opts={})
+      singleChar = Regexp.new('[\da-z ]{1}')
+      ctrlFieldTag = Regexp.new('00[1-9A-Za-z]{1}')
       
       # Right now, this writer handles input from the strict and
       # lenient MARC readers. Because it can get 'loose' MARC in, it
@@ -86,8 +86,8 @@ module MARC
       # TODO: At the very least there should be some logging
       # to record our attempts to account for less than perfect MARC.
       
-      root = "<record/>"
-      doc = REXML::Document.new(root)
+      e = REXML::Element.new('record')
+      e.add_namespace(MARC_NS) if opts[:include_namespace]
 
       # MARCXML only allows alphanumerics or spaces in the leader
       record.leader.gsub!(/[^\w|^\s]/, 'Z')
@@ -104,7 +104,7 @@ module MARC
       
       leader = REXML::Element.new("leader")
       leader.add_text(record.leader)
-      doc.root.add_element(leader)
+      e.add_element(leader)
       
       for field in record.fields
         if field.class == MARC::DataField 
@@ -143,24 +143,24 @@ module MARC
             datafield_elem.add_element(subfield_element)
           end
           
-          doc.root.add_element datafield_elem
+          e.add_element datafield_elem
         elsif field.class == MARC::ControlField
           control_element = REXML::Element.new("controlfield")
           
           # We need a marker for invalid tag values (we use 000)
-          if (field.tag.match(ctrlFieldTag) == nil)
+          unless field.tag.match(ctrlFieldTag)
             field.tag = "00z"
           end
           
           control_element.add_attribute("tag", field.tag)
           text = MARC::XMLWriter.convert_to_utf8(field.value)
           control_element.add_text(text)
-          doc.root.add_element(control_element)
+          e.add_element(control_element)
         end
       end
       
       # return xml
-      return doc
+      return e 
     end
   end
 end

data/test/tc_controlfield.rb

@@ -3,23 +3,23 @@ require 'marc'
 
 class TestField < Test::Unit::TestCase
 
-    def test_control
-        control = MARC::ControlField.new('005', 'foobarbaz')
-        assert_equal(control.to_s, '005 foobarbaz')
-    end
+  def test_control
+    control = MARC::ControlField.new('005', 'foobarbaz')
+    assert_equal(control.to_s, '005 foobarbaz')
+  end
 
-    def test_field_as_control
-        assert_raise(MARC::Exception) do
-            # can't have a field with a tag < 010
-            field = MARC::DataField.new('007') 
-        end
+  def test_field_as_control
+    assert_raise(MARC::Exception) do
+      # can't have a field with a tag < 010
+      field = MARC::DataField.new('007') 
     end
+  end
 
-    def test_control_as_field
-        assert_raise(MARC::Exception) do
-            # can't have a control with a tag > 009
-            f = MARC::ControlField.new('245')
-        end
+  def test_control_as_field
+    assert_raise(MARC::Exception) do
+      # can't have a control with a tag > 009
+      f = MARC::ControlField.new('245')
     end
+  end
 end
 

data/test/tc_record.rb

@@ -11,8 +11,8 @@ class TestRecord < Test::Unit::TestCase
     def test_xml
       r = get_record()
       doc = r.to_xml
-      assert_kind_of REXML::Document, doc
-      assert_equal "<record><leader>      Z   22        4500</leader><datafield tag='100' ind1='2' ind2='0'><subfield code='a'>Thomas, Dave</subfield></datafield><datafield tag='245' ind1='0' ind2='4'><subfield code='The Pragmatic Programmer'></subfield></datafield></record>", doc.to_s
+      assert_kind_of REXML::Element, doc
+      assert_equal "<record xmlns='http://www.loc.gov/MARC21/slim'><leader>      Z   22        4500</leader><datafield tag='100' ind1='2' ind2='0'><subfield code='a'>Thomas, Dave</subfield></datafield><datafield tag='245' ind1='0' ind2='4'><subfield code='The Pragmatic Programmer'></subfield></datafield></record>", doc.to_s
     end
 
     def test_append_field

data/test/tc_xml.rb

@@ -32,6 +32,7 @@ class XMLTest < Test::Unit::TestCase
     writer.close
 
     xml = File.read('test/test.xml')
+    assert_match /<controlfield tag='007'>sdubumennmplu<\/controlfield>/, xml
     assert_match /<\?xml-stylesheet type="text\/xsl" href="style.xsl"\?>/, xml
 
     reader = MARC::XMLReader.new('test/test.xml')

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: marc
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 date: 2007-01-02 00:00:00 -05:00
 summary: A ruby library for working with Machine Readable Cataloging
 require_paths: