marc 0.3.3 → 0.4.0

data/README

@@ -44,7 +44,9 @@ and install the versioned gem:
 AUTHORS
 
 Kevin Clarke <ksclarke@gmail.com>
+Bill Dueber <bill@dueber.com>
 William Groppe <will.groppe@gmail.com>
+Ross Singer <rossfsinger@gmail.com>
 Ed Summers <ehs@pobox.com>
 
-Please send bugs, requests and comments to the authors. 
+Please send bugs, requests and comments to Code4Lib Mailing list (https://listserv.nd.edu/cgi-bin/wa?A0=CODE4LIB). 

data/Rakefile

@@ -1,4 +1,4 @@
-RUBY_MARC_VERSION = '0.3.3'
+RUBY_MARC_VERSION = '0.4.0'
 
 require 'rubygems'
 require 'rake'
@@ -30,7 +30,7 @@ spec = Gem::Specification.new do |s|
   s.autorequire = 'marc'
   s.has_rdoc = true
   s.required_ruby_version = '>= 1.8.6'
-  s.authors = ["Kevin Clarke", "William Groppe", "Ross Singer", "Ed Summers"]
+  s.authors = ["Kevin Clarke", "Bill Dueber", "William Groppe", "Ross Singer", "Ed Summers"]
   s.test_file = 'test/ts_marc.rb'
   s.bindir = 'bin'
 end

data/lib/marc/controlfield.rb

@@ -58,7 +58,11 @@ module MARC
       return [@tag, @value]
     end
     
-
+    # Turn the control field into a hash for MARC-in-JSON
+    def to_hash
+      return {@tag=>@value}
+    end
+    
     def to_s
       return "#{tag} #{value}" 
     end

data/lib/marc/datafield.rb

@@ -3,6 +3,44 @@ require 'marc/record'
 require 'marc/controlfield'
 
 module MARC
+  
+  class SubfieldMap < Array
+    attr_reader :codes
+    def initialize
+      @codes = HashWithChecksumAttribute.new    
+    end
+    
+    def in_sync?
+      @codes.checksum == self.hash
+    end
+    
+    def reindex
+      @codes.clear
+      self.each do |subfield|
+        @codes[subfield.code] ||= []
+        @codes[subfield.code] << self.index(subfield)
+      end
+      @codes.checksum = self.hash
+    end
+    def code_list
+      reindex unless in_sync?
+      @codes.keys
+    end
+    
+    def each_by_code(codes)
+      reindex unless in_sync?
+      matched_codes = []
+      [*codes].each do |code|
+        next unless code && @codes[code]
+        @codes[code].each do |idx|
+          matched_codes << self[idx]
+          yield self[idx]
+        end
+      end
+      matched_codes
+    end
+ 
+  end  
 
   # MARC records contain data fields, each of which has a tag, 
   # indicators and subfields. Tags for data fields must are all
@@ -34,7 +72,7 @@ module MARC
     attr_accessor :indicator2
 
     # A list of MARC::Subfield objects
-    attr_accessor :subfields
+    #attr_accessor :subfields
 
 
     # Create a new field with tag, indicators and subfields.
@@ -64,7 +102,7 @@ module MARC
       # screw us up later when we try to encode
       @indicator1 = i1 == nil ? ' ' : i1
       @indicator2 = i2 == nil ? ' ' : i2
-      @subfields = []
+      @subfields = SubfieldMap.new
 
       # must use MARC::ControlField for tags < 010 or
       # those in MARC::ControlField#extra_control_fields
@@ -110,6 +148,15 @@ module MARC
       return [@tag, @indicator1, @indicator2, @subfields.map {|sf| [sf.code, sf.value]} ]
     end
     
+    # Turn the variable field and subfields into a hash for MARC-in-JSON
+    
+    def to_hash
+      field_hash = {@tag=>{'ind1'=>@indicator1,'ind2'=>@indicator2,'subfields'=>[]}}
+      self.each do |subfield|
+        field_hash[@tag]['subfields'] << {subfield.code=>subfield.value}
+      end
+      field_hash
+    end    
 
     # Add a subfield (MARC::Subfield) to the field
     #    field.append(MARC::Subfield.new('a','Dave Thomas'))
@@ -118,6 +165,7 @@ module MARC
       @subfields.push(subfield)
     end
 
+    
 
     # You can iterate through the subfields in a Field:
     #   field.each {|s| print s}
@@ -128,6 +176,9 @@ module MARC
       end
     end
 
+    def each_by_code(filter)
+      @subfields.each_by_code(filter)
+    end
 
     # You can lookup subfields with this shorthand. Note it 
     # will return a string and not a MARC::Subfield object.
@@ -138,7 +189,29 @@ module MARC
       return subfield.value if subfield
       return
     end
+    
+    def subfields(filter=nil)
+      return @subfields unless filter
+      @subfields.reindex unless subfields.in_sync?
+      subflds = []
+      if filter.is_a?(String) && @subfields.codes[filter]
+        @subfields.codes[filter].each do |idx|
+          subflds << @subfields[idx]
+        end
+      elsif filter.is_a?(Array) || filter.is_a?(Range)
+        filter.each do |code|
+          next unless @subfields.codes[code]
+          @subfields.codes[code].each do |idx|
+            subflds << @subfields[idx]
+          end
+        end
+      end
+      subflds
+    end    
 
+    def codes
+      @subfields.code_list
+    end
 
     # Two fields are equal if their tag, indicators and 
     # subfields are all equal.

data/lib/marc/record.rb

@@ -1,7 +1,65 @@
 require 'marc/controlfield'
 require 'marc/datafield'
 
-module MARC
+module MARC  
+  
+  # Simply what the class name says.
+  # The checksum is used to see if the FieldMap's array has changed.
+  class HashWithChecksumAttribute < Hash
+    attr_accessor :checksum
+  end
+  
+  # The FieldMap is an Array of DataFields and Controlfields.
+  # It also contains a HashWithChecksumAttribute with a Hash-based
+  # representation of the fields for faster lookups
+  class FieldMap < Array
+    attr_reader :tags
+    def initialize
+      @tags = HashWithChecksumAttribute.new
+    end
+    
+    # Checks to see if the HashWithChecksumAttribute is in sync
+    # with the Array of fields
+    def in_sync?
+      @tags.checksum == self.hash
+    end
+    
+    # Rebuild the HashWithChecksumAttribute with the current
+    # values of the fields Array
+    def reindex
+      @tags.clear
+      self.each do |field|
+        @tags[field.tag] ||= []
+        @tags[field.tag] << self.index(field)
+      end
+      @tags.checksum = self.hash
+    end
+    
+    # Returns an array of all of the tags that appear in the record (not in the order they appear, however).
+    def tag_list
+      reindex unless in_sync?
+      @tags.keys
+    end
+    
+    # Returns an array of fields, in the order they appear, according to their tag.
+    # The tags argument can be a string (e.g. '245'), an array (['100','700','800'])
+    # or a range (('600'..'699')).
+    def each_by_tag(tags)
+      reindex unless in_sync?
+      matched_tags = []
+      [*tags].each do |tag|
+        next unless tag && @tags[tag]
+        @tags[tag].each do |idx|
+          matched_tags[idx] = self[idx]                  
+        end
+      end
+      matched_tags.compact!
+      matched_tags.each do |tag|
+        yield tag
+      end
+      matched_tags
+    end
+  end
 
   # A class that represents an individual MARC record. Every record
   # is made up of a collection of MARC::DataField objects. 
@@ -22,13 +80,13 @@ module MARC
     include Enumerable
 
     # the record fields
-    attr_accessor :fields
+    #attr_reader :fields
 
     # the record leader
     attr_accessor :leader
 
     def initialize
-      @fields = []
+      @fields = FieldMap.new
       # leader is 24 bytes
       @leader = ' ' * 24
       # leader defaults:
@@ -51,7 +109,7 @@ module MARC
     end
 
     # each() is here to support iterating and searching since MARC::Record
-    # mixes in Enumberable
+    # mixes in Enumerable
     #
     # iterating through the fields in a record:
     #   record.each { |f| print f }
@@ -67,6 +125,12 @@ module MARC
         yield field
       end
     end
+    
+    # A more convenient way to iterate over each field with a given tag.  
+    # The filter argument can be a string, array or range.
+    def each_by_tag(filter)
+      @fields.each_by_tag(filter) {|tag| yield tag }
+    end
 
     # You can lookup fields using this shorthand:
     #   title = record['245']
@@ -74,6 +138,31 @@ module MARC
     def [](tag)
       return self.find {|f| f.tag == tag}
     end
+    
+    # Provides a backwards compatible means to access the FieldMap.
+    # No argument returns the FieldMap array in entirety.  Providing
+    # a string, array or range of tags will return an array of fields
+    # in the order they appear in the record.
+    def fields(filter=nil)
+      return @fields.to_a unless filter
+      @fields.reindex unless @fields.in_sync?
+      flds = []
+      if filter.is_a?(String) && @fields.tags[filter]
+        @fields.tags[filter].each do |idx|
+          flds << @fields[idx]
+        end
+      elsif filter.is_a?(Array) || filter.is_a?(Range)
+        @fields.each_by_tag(filter) do |tag|
+          flds << tag
+        end
+      end
+      flds
+    end
+    
+    # Returns an array of all of the tags that appear in the record (not necessarily in the order they appear).
+    def tags
+      return @fields.tag_list
+    end
 
     # Factory method for creating a MARC::Record from MARC21 in 
     # transmission format.
@@ -130,7 +219,7 @@ module MARC
         'fields' => self.map {|f| f.to_marchash}
       }
     end #to_hash
-    
+
     # Factory method for creating a new MARC::Record from
     # a marchash object
     #
@@ -150,6 +239,38 @@ module MARC
     end
     
 
+    
+    # Returns a (roundtrippable) hash representation for MARC-in-JSON
+    def to_hash
+      record_hash = {'leader'=>@leader, 'fields'=>[]}
+      @fields.each do |field|
+        record_hash['fields'] << field.to_hash
+      end
+      record_hash
+    end    
+
+    def self.new_from_hash(h)
+      r = self.new
+      r.leader = h['leader']
+      if h['fields']
+        h['fields'].each do |position|
+          position.each_pair do |tag, field|
+            if field.is_a?(Hash)
+              f = MARC::DataField.new(tag, field['ind1'], field['ind2'])
+              field['subfields'].each do | pos |
+                pos.each_pair do |code, value|
+                  f.append MARC::Subfield.new(code, value)
+                end
+              end
+              r << f
+            else
+              r << MARC::ControlField.new(tag, field)
+            end
+          end
+        end
+      end  
+      return r            
+    end
     # Returns a string version of the record, suitable for printing
 
     def to_s

data/test/random_tag_order.dat

@@ -0,0 +1 @@
+01199njm a22002657a 4500001000800000005001700008007001400025008004100039035002100080906004500101010001700146028002100163040001300184050002000197245004100217260004300258300005700301511008200358505037800440500001800818650002100836700002800857953000900885991003900894567743719930615144807.4sdubmmennmplu930430s1966    nyuuun              eng    9(DLC)   93710188  a7bcbccorignewd5encipf19gy-genmusic  a   93710188 00aC2L 41bColumbia  aDLCcDLC00aColumbia C2L 4100aBlonde on blondeh[sound recording].  a[New York, N.Y.] :bColumbia,c[1966?]  a2 sound discs :banalog, 33 1/3 rpm, mono. ;c12 in.0 aWritten and performed by Bob Dylan, vocals, harmonica ; with other musicians.0 aRainy day women #12 & 35 -- Pledging my time -- Visions of Johanna -- One of us must know (Sooner or later) -- I want you -- Memphis blues again -- Leopard-skin pill-box hat -- Just like a woman -- Most likely you go your way and I'll go mine -- Temporary like Achilles -- Absolutely sweet Marie -- 4th time around -- Obviously 5 believers -- Sad eyed lady of the lowlands.  aBrief record. 0aFolk-rock music.1 aDylan, Bob,d1941-4prf  aTA28  bc-RecSoundhColumbia C2L 41wMUSIC

data/test/random_tag_order.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?><record xmlns="http://www.loc.gov/MARC21/slim" xmlns:cinclude="http://apache.org/cocoon/include/1.0" xmlns:zs="http://www.loc.gov/zing/srw/">
+  <leader>01199njm a22002657a 4500</leader>
+  <controlfield tag="001">5677437</controlfield>
+  <controlfield tag="005">19930615144807.4</controlfield>
+  <controlfield tag="007">sdubmmennmplu</controlfield>
+  <controlfield tag="008">930430s1966    nyuuun              eng  </controlfield>
+  <datafield tag="035" ind1=" " ind2=" ">
+    <subfield code="9">(DLC)   93710188</subfield>
+  </datafield>
+  <datafield tag="906" ind1=" " ind2=" ">
+    <subfield code="a">7</subfield>
+    <subfield code="b">cbc</subfield>
+    <subfield code="c">orignew</subfield>
+    <subfield code="d">5</subfield>
+    <subfield code="e">ncip</subfield>
+    <subfield code="f">19</subfield>
+    <subfield code="g">y-genmusic</subfield>
+  </datafield>
+  <datafield tag="010" ind1=" " ind2=" ">
+    <subfield code="a">   93710188 </subfield>
+  </datafield>
+  <datafield tag="028" ind1="0" ind2="0">
+    <subfield code="a">C2L 41</subfield>
+    <subfield code="b">Columbia</subfield>
+  </datafield>
+  <datafield tag="040" ind1=" " ind2=" ">
+    <subfield code="a">DLC</subfield>
+    <subfield code="c">DLC</subfield>
+  </datafield>
+  <datafield tag="050" ind1="0" ind2="0">
+    <subfield code="a">Columbia C2L 41</subfield>
+  </datafield>
+  <datafield tag="245" ind1="0" ind2="0">
+    <subfield code="a">Blonde on blonde</subfield>
+    <subfield code="h">[sound recording].</subfield>
+  </datafield>
+  <datafield tag="260" ind1=" " ind2=" ">
+    <subfield code="a">[New York, N.Y.] :</subfield>
+    <subfield code="b">Columbia,</subfield>
+    <subfield code="c">[1966?]</subfield>
+  </datafield>
+  <datafield tag="300" ind1=" " ind2=" ">
+    <subfield code="a">2 sound discs :</subfield>
+    <subfield code="b">analog, 33 1/3 rpm, mono. ;</subfield>
+    <subfield code="c">12 in.</subfield>
+  </datafield>
+  <datafield tag="511" ind1="0" ind2=" ">
+    <subfield code="a">Written and performed by Bob Dylan, vocals, harmonica ; with other musicians.</subfield>
+  </datafield>
+  <datafield tag="505" ind1="0" ind2=" ">
+    <subfield code="a">Rainy day women #12 &amp; 35 -- Pledging my time -- Visions of Johanna -- One of us must know (Sooner or later) -- I want you -- Memphis blues again -- Leopard-skin pill-box hat -- Just like a woman -- Most likely you go your way and I'll go mine -- Temporary like Achilles -- Absolutely sweet Marie -- 4th time around -- Obviously 5 believers -- Sad eyed lady of the lowlands.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Brief record.</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Folk-rock music.</subfield>
+  </datafield>
+  <datafield tag="700" ind1="1" ind2=" ">
+    <subfield code="a">Dylan, Bob,</subfield>
+    <subfield code="d">1941-</subfield>
+    <subfield code="4">prf</subfield>
+  </datafield>
+  <datafield tag="953" ind1=" " ind2=" ">
+    <subfield code="a">TA28</subfield>
+  </datafield>
+  <datafield tag="991" ind1=" " ind2=" ">
+    <subfield code="b">c-RecSound</subfield>
+    <subfield code="h">Columbia C2L 41</subfield>
+    <subfield code="w">MUSIC</subfield>
+  </datafield>
+</record>

data/test/random_tag_order2.dat

@@ -0,0 +1 @@
+02500cjm a22004571a 45000010009000000050017000090070015000260080041000410350023000820400018001050280021001230410013001440350023001570240017001800280027001970100017002240420013002410500014002541000023002682450086002912460027003772600037004043000060004413060011005014400017005125000093005295000055006225110024006775180055007015000231007565000213009875000018012005000045012185050572012636500018018359060045018539250038018989520012019369550066019489850028020141337876820070513203356.0sd fsngnnmmned031021p20032002ohubln   ez         eng d  a(DLC)   2003577486  aNTGcNTGdDLC02aCD-83567bTelarc0 denggeng  a(OCoLC)ocm526272551 a08940835672802aCD-83567bTelarc Blues  a  2003577486  alcderive00aSDA 807181 aDylan, Bob,d1941-10aBlues on Blonde on blondeh[sound recording] /c[all songs written by Bob Dylan].3 aBlonde on blonde blues  aCleveland, OH :bTelarc,cp2003.  a1 sound disc (67 min.) :bdigital, stereo. ;c4 3/4 in.  a010717 0aTelarc blues  a"Contemporary blues" interpretations of previously released songs; written by Bob Dylan.  aStatement of responsibility from container insert.0 aVarious performers.  aRecorded July 2002 at the Studio, Portland, Maine.  a"Nearly thirty years after the debut of Bob Dylan's 'Blonde on blonde', Telarc assembles some of the finest artists on the contemporary blues scene to salute the monumental blues/folk/rock recording"--Container exterior sheet.  a"Fully 27 years after the debut of 'Blonde on blonde', Telarc gathered an assembly of contemporary blues artists to pay tribute to Dylan's masterpiece from his controversial electric period"--All Music Guide.  aCompact disc.  aComposer and program notes in container.00tRainy day women # 12 & 35r(Brian Stoltz) --tMost likely you go your way and I'll go miner(Sue Foley) --tLeopard-skin pill-box hatr(Walter Trout) --tVisions of Johannar(Anders Osborne) --tPledging my timer(Duke Robillard) --tJust like a womanr(Eric Bibb) --tStuck inside of Mobile with the Memphis blues againr(Joe Louis Walker) --tObviously 5 believersr(Sean Costello) --tOne of us must know (sooner or later)r(Clarence Bucaro) --tTemporary like Achillesr(Deborah Coleman) --tI want your(Cyril Neville) --tAbsolutely sweet Marier(C.J. Chenier). 0aBlues (Music)  a7bcbcccopycatd3encipf20gy-genmusic0 aacquireb2 copiesxpolicy default  amuzerec  avn22 2003-10-28 to MBRS/RSevn17 2004-02-25 copy 2 to MBRS/RS  cOCLCesrreplace 2004-01

data/test/random_tag_order2.xml

@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?><record xmlns="http://www.loc.gov/MARC21/slim" xmlns:cinclude="http://apache.org/cocoon/include/1.0" xmlns:zs="http://www.loc.gov/zing/srw/">
+  <leader>02500cjm a22004571a 4500</leader>
+  <controlfield tag="001">13378768</controlfield>
+  <controlfield tag="005">20070513203356.0</controlfield>
+  <controlfield tag="007">sd fsngnnmmned</controlfield>
+  <controlfield tag="008">031021p20032002ohubln   ez         eng d</controlfield>
+  <datafield tag="035" ind1=" " ind2=" ">
+    <subfield code="a">(DLC)   2003577486</subfield>
+  </datafield>
+  <datafield tag="040" ind1=" " ind2=" ">
+    <subfield code="a">NTG</subfield>
+    <subfield code="c">NTG</subfield>
+    <subfield code="d">DLC</subfield>
+  </datafield>
+  <datafield tag="028" ind1="0" ind2="2">
+    <subfield code="a">CD-83567</subfield>
+    <subfield code="b">Telarc</subfield>
+  </datafield>
+  <datafield tag="041" ind1="0" ind2=" ">
+    <subfield code="d">eng</subfield>
+    <subfield code="g">eng</subfield>
+  </datafield>
+  <datafield tag="035" ind1=" " ind2=" ">
+    <subfield code="a">(OCoLC)ocm52627255</subfield>
+  </datafield>
+  <datafield tag="024" ind1="1" ind2=" ">
+    <subfield code="a">089408356728</subfield>
+  </datafield>
+  <datafield tag="028" ind1="0" ind2="2">
+    <subfield code="a">CD-83567</subfield>
+    <subfield code="b">Telarc Blues</subfield>
+  </datafield>
+  <datafield tag="010" ind1=" " ind2=" ">
+    <subfield code="a">  2003577486</subfield>
+  </datafield>
+  <datafield tag="042" ind1=" " ind2=" ">
+    <subfield code="a">lcderive</subfield>
+  </datafield>
+  <datafield tag="050" ind1="0" ind2="0">
+    <subfield code="a">SDA 80718</subfield>
+  </datafield>
+  <datafield tag="100" ind1="1" ind2=" ">
+    <subfield code="a">Dylan, Bob,</subfield>
+    <subfield code="d">1941-</subfield>
+  </datafield>
+  <datafield tag="245" ind1="1" ind2="0">
+    <subfield code="a">Blues on Blonde on blonde</subfield>
+    <subfield code="h">[sound recording] /</subfield>
+    <subfield code="c">[all songs written by Bob Dylan].</subfield>
+  </datafield>
+  <datafield tag="246" ind1="3" ind2=" ">
+    <subfield code="a">Blonde on blonde blues</subfield>
+  </datafield>
+  <datafield tag="260" ind1=" " ind2=" ">
+    <subfield code="a">Cleveland, OH :</subfield>
+    <subfield code="b">Telarc,</subfield>
+    <subfield code="c">p2003.</subfield>
+  </datafield>
+  <datafield tag="300" ind1=" " ind2=" ">
+    <subfield code="a">1 sound disc (67 min.) :</subfield>
+    <subfield code="b">digital, stereo. ;</subfield>
+    <subfield code="c">4 3/4 in.</subfield>
+  </datafield>
+  <datafield tag="306" ind1=" " ind2=" ">
+    <subfield code="a">010717</subfield>
+  </datafield>
+  <datafield tag="440" ind1=" " ind2="0">
+    <subfield code="a">Telarc blues</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">"Contemporary blues" interpretations of previously released songs; written by Bob Dylan.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Statement of responsibility from container insert.</subfield>
+  </datafield>
+  <datafield tag="511" ind1="0" ind2=" ">
+    <subfield code="a">Various performers.</subfield>
+  </datafield>
+  <datafield tag="518" ind1=" " ind2=" ">
+    <subfield code="a">Recorded July 2002 at the Studio, Portland, Maine.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">"Nearly thirty years after the debut of Bob Dylan's 'Blonde on blonde', Telarc assembles some of the finest artists on the contemporary blues scene to salute the monumental blues/folk/rock recording"--Container exterior sheet.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">"Fully 27 years after the debut of 'Blonde on blonde', Telarc gathered an assembly of contemporary blues artists to pay tribute to Dylan's masterpiece from his controversial electric period"--All Music Guide.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Compact disc.</subfield>
+  </datafield>
+  <datafield tag="500" ind1=" " ind2=" ">
+    <subfield code="a">Composer and program notes in container.</subfield>
+  </datafield>
+  <datafield tag="505" ind1="0" ind2="0">
+    <subfield code="t">Rainy day women # 12 &amp; 35</subfield>
+    <subfield code="r">(Brian Stoltz) --</subfield>
+    <subfield code="t">Most likely you go your way and I'll go mine</subfield>
+    <subfield code="r">(Sue Foley) --</subfield>
+    <subfield code="t">Leopard-skin pill-box hat</subfield>
+    <subfield code="r">(Walter Trout) --</subfield>
+    <subfield code="t">Visions of Johanna</subfield>
+    <subfield code="r">(Anders Osborne) --</subfield>
+    <subfield code="t">Pledging my time</subfield>
+    <subfield code="r">(Duke Robillard) --</subfield>
+    <subfield code="t">Just like a woman</subfield>
+    <subfield code="r">(Eric Bibb) --</subfield>
+    <subfield code="t">Stuck inside of Mobile with the Memphis blues again</subfield>
+    <subfield code="r">(Joe Louis Walker) --</subfield>
+    <subfield code="t">Obviously 5 believers</subfield>
+    <subfield code="r">(Sean Costello) --</subfield>
+    <subfield code="t">One of us must know (sooner or later)</subfield>
+    <subfield code="r">(Clarence Bucaro) --</subfield>
+    <subfield code="t">Temporary like Achilles</subfield>
+    <subfield code="r">(Deborah Coleman) --</subfield>
+    <subfield code="t">I want you</subfield>
+    <subfield code="r">(Cyril Neville) --</subfield>
+    <subfield code="t">Absolutely sweet Marie</subfield>
+    <subfield code="r">(C.J. Chenier).</subfield>
+  </datafield>
+  <datafield tag="650" ind1=" " ind2="0">
+    <subfield code="a">Blues (Music)</subfield>
+  </datafield>
+  <datafield tag="906" ind1=" " ind2=" ">
+    <subfield code="a">7</subfield>
+    <subfield code="b">cbc</subfield>
+    <subfield code="c">copycat</subfield>
+    <subfield code="d">3</subfield>
+    <subfield code="e">ncip</subfield>
+    <subfield code="f">20</subfield>
+    <subfield code="g">y-genmusic</subfield>
+  </datafield>
+  <datafield tag="925" ind1="0" ind2=" ">
+    <subfield code="a">acquire</subfield>
+    <subfield code="b">2 copies</subfield>
+    <subfield code="x">policy default</subfield>
+  </datafield>
+  <datafield tag="952" ind1=" " ind2=" ">
+    <subfield code="a">muzerec</subfield>
+  </datafield>
+  <datafield tag="955" ind1=" " ind2=" ">
+    <subfield code="a">vn22 2003-10-28 to MBRS/RS</subfield>
+    <subfield code="e">vn17 2004-02-25 copy 2 to MBRS/RS</subfield>
+  </datafield>
+  <datafield tag="985" ind1=" " ind2=" ">
+    <subfield code="c">OCLC</subfield>
+    <subfield code="e">srreplace 2004-01</subfield>
+  </datafield>
+</record>

data/test/tc_hash.rb

@@ -0,0 +1,26 @@
+require 'test/unit'
+require 'marc'
+require 'rubygems'
+
+class TestHash < Test::Unit::TestCase
+
+  def test_to_hash
+    raw = IO.read('test/one.dat')
+    r = MARC::Record.new_from_marc(raw)
+    h = r.to_hash
+    assert_kind_of(Hash, h)
+    assert_equal(r.leader, h['leader'])
+    assert_equal(r.fields.length, h['fields'].length)
+    assert_equal(r.fields.first.tag, h['fields'].first.keys.first)
+  end
+
+  def test_roundtrip
+    reader = MARC::Reader.new('test/batch.dat')
+    reader.each do |r|
+      x = MARC::Record.new_from_hash(r.to_hash)
+      assert_equal(r,x)
+    end
+  end
+  
+  
+end

data/test/tc_record.rb

@@ -72,6 +72,43 @@ class TestRecord < Test::Unit::TestCase
         r.append(MARC::DataField.new('245', '0', '4', ['The Pragmatic Programmer']))
         return r
     end
-
+    
+    def test_field_index
+      raw = IO.read('test/random_tag_order.dat')
+      r = MARC::Record.new_from_marc(raw)
+      assert_kind_of(Array, r.fields)
+      assert_kind_of(Array, r.tags)
+      assert_equal(['001','005','007','008','010','028','035','040','050','245','260','300','500','505','511','650','700','906','953','991'], r.tags.sort)
+      assert_kind_of(Array, r.fields('035'))
+      raw2 = IO.read('test/random_tag_order2.dat')
+      r2 = MARC::Record.new_from_marc(raw2)
+      assert_equal(6, r2.fields('500').length)     
+      # Test passing an array to Record#fields
+      assert_equal(3, r.fields(['500','505', '510', '511']).length) 
+      # Test passing a Range to Record#fields
+      assert_equal(9, r.fields(('001'..'099')).length)
+    end
+    
+    def test_field_index_order
+      raw = IO.read('test/random_tag_order.dat')
+      r = MARC::Record.new_from_marc(raw)      
+      notes = ['500','505','511']
+      r.fields(('500'..'599')).each do |f|
+        assert_equal(notes.pop, f.tag)
+      end
+      
+      
+      raw2 = IO.read('test/random_tag_order2.dat')
+      r2 = MARC::Record.new_from_marc(raw2)      
+      
+      fields = ['050','042','010','028','024','035','041','028','040','035','008','007','005','001']
+      r2.each_by_tag(('001'..'099')) do |f|
+        assert_equal(fields.pop, f.tag)
+      end      
+      
+      five_hundreds = r2.fields('500')
+      assert_equal(five_hundreds.first['a'], '"Contemporary blues" interpretations of previously released songs; written by Bob Dylan.')
+      assert_equal(five_hundreds.last['a'], 'Composer and program notes in container.')
+    end
 
 end

metadata

@@ -1,10 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: marc
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  hash: 15
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Kevin Clarke
+- Bill Dueber
 - William Groppe
 - Ross Singer
 - Ed Summers
@@ -12,7 +19,7 @@ autorequire: marc
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -05:00
+date: 2010-09-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -45,9 +52,14 @@ files:
 - test/non-numeric.xml
 - test/one.dat
 - test/one.xml
+- test/random_tag_order.dat
+- test/random_tag_order.xml
+- test/random_tag_order2.dat
+- test/random_tag_order2.xml
 - test/tc_controlfield.rb
 - test/tc_datafield.rb
 - test/tc_dublincore.rb
+- test/tc_hash.rb
 - test/tc_marchash.rb
 - test/tc_parsers.rb
 - test/tc_reader.rb
@@ -70,21 +82,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A ruby library for working with Machine Readable Cataloging