marc 0.1.0 → 0.1.2

data/lib/marc/record.rb

@@ -82,13 +82,13 @@ module MARC
     end
 
     # Handy method for returning the MARCXML serialization for a
-    # MARC::Record object.  Really this is just a wrapper around
-    # MARC::MARCXML::encode
+    # MARC::Record object. You'll get back a REXML::Document object.
+    # Really this is just a wrapper around MARC::XMLWriter::encode
     #
-    #   xml = record.to_xml()
+    #   xml_doc = record.to_xml()
 
     def to_xml
-      return MARC::MARCXML.new().encode(self)
+      return MARC::XMLWriter.encode(self)
     end
 
     # Returns a string version of the record, suitable for printing

data/lib/marc/xmlreader.rb

@@ -6,9 +6,28 @@ module MARC
   class XMLReader
     include Enumerable
 
-    def initialize(filename)
-      source = File.new(filename)
-      @parser = REXML::Parsers::PullParser.new(source)
+    # the constructor which you can pass either a filename:
+    #
+    #   reader = MARC::XMLReader.new('/Users/edsu/marc.dat')
+    #
+    # or a File object, 
+    #
+    #   reader = Marc::XMLReader.new(File.new('/Users/edsu/marc.dat'))
+    #
+    # or really any object that responds to read(n)
+    # 
+    #   reader = MARC::XMLReader.new(StringIO.new(xml))
+ 
+    def initialize(file)
+      if file.class == String:
+        handle = File.new(file)
+      elsif file.respond_to?("read", 5)
+        handle = file
+      else
+        throw "must pass in path or File"
+      end
+
+      @parser = REXML::Parsers::PullParser.new(handle)
     end
 
     def each

data/test/tc_record.rb

@@ -8,6 +8,13 @@ class TestRecord < Test::Unit::TestCase
         assert_equal(r.class, MARC::Record)
     end
 
+    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
+    end
+
     def test_append_field
         r = get_record()
         assert_equal(r.fields.length(), 2)

data/test/tc_xml.rb

@@ -1,9 +1,10 @@
 require 'test/unit'
 require 'marc'
+require 'stringio'
 
 class XMLTest < Test::Unit::TestCase
 
-  def otest_batch
+  def test_batch
     reader = MARC::XMLReader.new('test/batch.xml')
     count = 0
     for record in reader
@@ -13,6 +14,12 @@ class XMLTest < Test::Unit::TestCase
     assert_equal(count, 2)
   end
 
+  def test_read_string
+    xml = File.new('test/batch.xml').read
+    reader = MARC::XMLReader.new(StringIO.new(xml))
+    assert_equal reader.entries.length, 2 
+  end
+
   def test_read_write
     record1 = MARC::Record.new
     record1.leader =  '00925njm  22002777a 4500'
@@ -33,5 +40,6 @@ class XMLTest < Test::Unit::TestCase
 
     File.unlink('test/test.xml')
   end
+
 end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: marc
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-12-06 00:00:00 -05:00
+  version: 0.1.2
+date: 2006-12-21 00:00:00 -05:00
 summary: A ruby library for working with Machine Readable Cataloging
 require_paths: 
 - lib