enhanced_marc 0.1.7 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.2.0

data/enhanced_marc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{enhanced_marc}
-  s.version = "0.1.7"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ross Singer"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-09-24}
   s.description = %q{A set of enhancements to ruby-marc to make parsing MARC data easier}
   s.email = %q{rossfsinger@gmail.com}
   s.extra_rdoc_files = [

data/lib/enhanced_marc.rb

@@ -1,23 +1,23 @@
 require 'marc'
 require 'locale/info'
-require 'enhanced_marc/reader'
-require 'enhanced_marc/record'
-require 'enhanced_marc/xmlreader'
-require 'enhanced_marc/leader'
-require 'enhanced_marc/book_record'
-require 'enhanced_marc/serial_record'
-require 'enhanced_marc/visual_record'
-require 'enhanced_marc/mixed_record'
-require 'enhanced_marc/map_record'
-require 'enhanced_marc/score_record'
-require 'enhanced_marc/sound_record'
-require 'enhanced_marc/computer_record'
-require 'enhanced_marc/record_type'
-require 'enhanced_marc/book_type'
-require 'enhanced_marc/computer_type'
-require 'enhanced_marc/map_type'
-require 'enhanced_marc/mixed_type'
-require 'enhanced_marc/score_type'
-require 'enhanced_marc/serial_type'
-require 'enhanced_marc/sound_type'
-require 'enhanced_marc/visual_type'
+require File.dirname(__FILE__) + '/enhanced_marc/reader'
+require File.dirname(__FILE__) + '/enhanced_marc/record'
+require File.dirname(__FILE__) + '/enhanced_marc/xmlreader'
+require File.dirname(__FILE__) + '/enhanced_marc/leader'
+require File.dirname(__FILE__) + '/enhanced_marc/book_record'
+require File.dirname(__FILE__) + '/enhanced_marc/serial_record'
+require File.dirname(__FILE__) + '/enhanced_marc/visual_record'
+require File.dirname(__FILE__) + '/enhanced_marc/mixed_record'
+require File.dirname(__FILE__) + '/enhanced_marc/map_record'
+require File.dirname(__FILE__) + '/enhanced_marc/score_record'
+require File.dirname(__FILE__) + '/enhanced_marc/sound_record'
+require File.dirname(__FILE__) + '/enhanced_marc/computer_record'
+require File.dirname(__FILE__) + '/enhanced_marc/record_type'
+require File.dirname(__FILE__) + '/enhanced_marc/book_type'
+require File.dirname(__FILE__) + '/enhanced_marc/computer_type'
+require File.dirname(__FILE__) + '/enhanced_marc/map_type'
+require File.dirname(__FILE__) + '/enhanced_marc/mixed_type'
+require File.dirname(__FILE__) + '/enhanced_marc/score_type'
+require File.dirname(__FILE__) + '/enhanced_marc/serial_type'
+require File.dirname(__FILE__) + '/enhanced_marc/sound_type'
+require File.dirname(__FILE__) + '/enhanced_marc/visual_type'

data/lib/enhanced_marc/reader.rb

@@ -97,7 +97,7 @@ module MARC
           record.append(field)
         end
       end
-
+      record.fields.reindex
       return record
     end
 

data/lib/enhanced_marc/record.rb

@@ -6,14 +6,15 @@ module MARC
     # Creates a new MARC::Record using MARC::Leader
     # to work with the leader, rather than a string
     def initialize
-      super
+      @fields = FieldMap.new
+      # leader is 24 bytes
       @leader = Leader.new(' ' * 24) 
     end
             
     def contains_type?(record_type)
       type_map = {"BKS"=>/[at]{1}/, "COM"=>"m", "MAP"=>/[ef]{1}/,"MIX"=>"p", "SCO"=>/[cd]{1}/, "REC"=>/[ij]{1}/, "SER"=>"s", "VIS"=>/[gkor]{1}/}
       matching_fields = []
-      @fields.find_all {|f| ('006') === f.tag}.each { | fxd_fld |
+      @fields.each_by_tag('006').each { | fxd_fld |
         matching_fields << fxd_fld if fxd_fld.value[0,1].match(type_map[record_type])
       
       }
@@ -23,16 +24,18 @@ module MARC
     
     def self.new_from_record(record)
       leader = Leader.new(record.leader)
-      case leader.get_type
-        when 'BKS' then return MARC::BookRecord.new_from_record(record)
-        when 'SER' then return MARC::SerialRecord.new_from_record(record)
-        when 'VIS' then return MARC::VisualRecord.new_from_record(record)
-        when 'MIX' then return MARC::MixedRecord.new_from_record(record)                
-        when 'MAP' then return MARC::MapRecord.new_from_record(record)                
-        when 'SCO' then return MARC::ScoreRecord.new_from_record(record)                
-        when 'REC' then return MARC::SoundRecord.new_from_record(record)                
-        when 'COM' then return MARC::ComputerRecord.new_from_record(record)                
+      typed_record = case leader.get_type
+        when 'BKS' then MARC::BookRecord.new_from_record(record)
+        when 'SER' then MARC::SerialRecord.new_from_record(record)
+        when 'VIS' then MARC::VisualRecord.new_from_record(record)
+        when 'MIX' then MARC::MixedRecord.new_from_record(record)                
+        when 'MAP' then MARC::MapRecord.new_from_record(record)                
+        when 'SCO' then MARC::ScoreRecord.new_from_record(record)                
+        when 'REC' then MARC::SoundRecord.new_from_record(record)                
+        when 'COM' then MARC::ComputerRecord.new_from_record(record)                
       end      
+      typed_record.fields.reindex
+      typed_record
     end    
     
     def to_typed_record
@@ -69,7 +72,7 @@ module MARC
       type_map = {/[at]{1}/=>BookType,'m'=>ComputerType,/[ef]{1}/=>MapType,
         'p'=>MixedType,/[cd]{1}/=>ScoreType,/[ij]{1}/=>SoundType,'s'=>SerialType,
         /[gkor]{1}/=>VisualType}
-      @fields.find_all {|f| ('006') === f.tag}.each { | fxd_fld |    
+      @fields.each_by_tag('006').each { | fxd_fld |    
         type_map.each_key { | key |
           if fxd_fld.value[0,1].match(key)
             self.extend type_map[key]
@@ -83,8 +86,7 @@ module MARC
       unless self['008'].value[35,3].empty?
         languages << Locale::Info.get_language(self['008'].value[35,3])
       end
-      oh_four_ones = @fields.find_all {|fld| fld.tag == "041"}
-      oh_four_ones.each do | oh_four_one |
+      @fields.each_by_tag("041").each do | oh_four_one |
         langs = oh_four_one.find_all { |sub| sub.code == 'a'}
         langs.each do | lang |
           languages << Locale::Info.get_language(lang.value)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enhanced_marc
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 7
-  version: 0.1.7
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ross Singer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -04:00
+date: 2010-09-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency