eadcodec 0.1.1 → 0.1.2

data/README

@@ -18,5 +18,5 @@ with it allowing for stream parsing of XML files of arbitrary length with
 constant memory usage while still treating elements as ruby objects.
 
 Author:
-  Pedro C�rte-Real
-  <pedrocr@gmail.com>
+  Pedro Côrte-Real
+  <pedro@pedrocr.net>

data/Rakefile

@@ -1,5 +1,5 @@
 PKG_NAME = 'eadcodec'
-PKG_VERSION = '0.1.1'
+PKG_VERSION = '0.1.2'
 
 require 'rake'
 require 'rake/testtask'
@@ -29,7 +29,7 @@ spec = Gem::Specification.new do |s|
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.author = 'Pedro Côrte-Real'
-  s.email = 'pedrocr@gmail.com'
+  s.email = 'pedro@pedrocr.net'
   s.requirements << 'xmlcodec'
   s.add_dependency('xmlcodec', '>= 0.1.0')
   s.require_path = 'lib'
@@ -39,14 +39,11 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options = RDOC_OPTIONS
   s.extra_rdoc_files = RDOC_EXTRA_FILES
   s.description = <<EOF
-An exporter and importer for the Encoded Archival Description XML format. See
-http://www.loc.gov/ead/ for more information about the format.
+An exporter and importer for the Encoded Archival Description XML format based on xmlcodec. See http://www.loc.gov/ead/ for more information about the format.
 EOF
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
 end
 
 Rake::TestTask.new do |t|

data/lib/elements/ead.rb

@@ -1,8 +1,8 @@
 class Document < EADElement
   elname "ead"
 
-  COUNTRY_CODE = "pt"
-  AGENCY_CODE = "iantt"
+  DTD_LOC = '"+//ISBN 1-931666-00-8//DTD ead.dtd '+
+            '(Encoded Archival Description (EAD) Version 2002)//EN" "ead.dtd"'
 
   xmlsubel :eadheader
   xmlsubel :archdesc
@@ -20,7 +20,7 @@ class Document < EADElement
   def export(filename)
     doc = REXML::Document.new
     doc << REXML::XMLDecl.new("1.0", "UTF-8")
-    doc << REXML::DocType.new("ead SYSTEM", '"file:///home/pedrocr/ead.dtd"')
+    doc << REXML::DocType.new("ead PUBLIC", DTD_LOC)
     create_xml(doc)
     output = File.open(filename, "w")
 
@@ -32,7 +32,7 @@ class Document < EADElement
   def start_partial_export(file)
     if not already_partial_exported?
       file << "<?xml version='1.0' encoding='UTF-8'?>\n"
-      file << "<!DOCTYPE ead SYSTEM \"file:///home/pedrocr/ead.dtd\">\n"
+      file << "<!DOCTYPE ead PUBLIC #{DTD_LOC}>"
       super
     end
   end

data/test/description_test.rb

@@ -59,15 +59,15 @@ class TestEADDescription < Test::Unit::TestCase
 		import
 		did = @ead.archdesc[:did]
 
-		assert_equal(@head, did[:head].value)
-		assert_equal(@origination, did[:origination].value) 
-		assert_equal(@unittitle, did[:unittitle].value) 
-		assert_equal(@unitid, did[:unitid].value)
-		assert_equal(@abstract, did[:abstract].value)
-		assert_equal(@physdesc, did[:physdesc].value)
-		assert_equal(@physloc, did[:physloc].value)
+		assert_equal(@head, did[:head].value.strip)
+		assert_equal(@origination, did[:origination].value.strip) 
+		assert_equal(@unittitle, did[:unittitle].value.strip) 
+		assert_equal(@unitid, did[:unitid].value.strip)
+		assert_equal(@abstract, did[:abstract].value.strip)
+		assert_equal(@physdesc, did[:physdesc].value.strip)
+		assert_equal(@physloc, did[:physloc].value.strip)
 
-		assert_equal(@unitdate, did[:unitdate].value)
+		assert_equal(@unitdate, did[:unitdate].value.strip)
 		assert_equal(@unitdatelabel, did[:unitdate].label) 
 		assert_equal(@unitdatetype, did[:unitdate].type)
 	end

data/test/document_test.rb

@@ -18,9 +18,10 @@ class TestEADDocument < Test::Unit::TestCase
 	end
 
 	def test_base_import
+    export
 		import
-		assert_equal("1", @ead.eadheader.eadid.value)
-		assert_equal("Teste", @ead.eadheader.eadtitle.value)
+		assert_equal("1", @ead.eadheader.eadid.value.strip)
+		assert_equal("Teste", @ead.eadheader.eadtitle.value.strip)
 	end
 
 	#def test_import_export_2

data/test/note_test.rb

@@ -30,7 +30,7 @@ class TestEADNote < Test::Unit::TestCase
 		import
 		note = @ead.archdesc[:dsc][:c][:note]
 		ps = note.find_all_named(:p)
-		assert_equal(@p, ps[0].value)
-		assert_equal(@p, ps[1].value)
+		assert_equal(@p, ps[0].value.strip)
+		assert_equal(@p, ps[1].value.strip)
 	end
 end

data/test/phystech_test.rb

@@ -36,10 +36,10 @@ class TestEADPhysTech < Test::Unit::TestCase
 		import
 		phystech = @ead.archdesc[:phystech]
 
-		assert_equal(@head, phystech[:head].value)
+		assert_equal(@head, phystech[:head].value.strip)
 		ps = phystech.find_all_named(:p)
 		(1..4).each do |i| 
-			assert_equal(@ptext+i.to_s, ps[i-1].value)
+			assert_equal(@ptext+i.to_s, ps[i-1].value.strip)
 		end
 	end
 end

data/test/scopecontent_test.rb

@@ -33,9 +33,9 @@ class TestEADScopeContent < Test::Unit::TestCase
 		import
 		assert_equal(1, @ead.archdesc[:dsc].find_all_named(:c).size)
 		sc = @ead.archdesc[:dsc][:c][:scopecontent]
-		assert_equal(@head, sc[:head].value)
+		assert_equal(@head, sc[:head].value.strip)
 		ps = sc.find_all_named(:p)
-		assert_equal(@p, ps[0].value)
-		assert_equal(@p, ps[1].value)
+		assert_equal(@p, ps[0].value.strip)
+		assert_equal(@p, ps[1].value.strip)
 	end
 end

data/test/subordinates_test.rb

@@ -27,6 +27,6 @@ class TestEADSubordinates < Test::Unit::TestCase
 		dsc = @ead.archdesc[:dsc]
 
 		assert_equal(@type, dsc.type)
-		assert_equal(@head, dsc[:head].value)
+		assert_equal(@head, dsc[:head].value.strip)
 	end
 end

data/test/subtitle_test.rb

@@ -31,9 +31,9 @@ class TestEADSubtitle < Test::Unit::TestCase
 	def test_base_import
 		import
 		st = @ead.eadheader.filedesc.titlestmt.subtitle
-		assert_equal(@text, st.subelements[0].to_s)
-		assert_equal(@abbr, st.subelements[1].to_s)
-		assert_equal(@text, st.subelements[2].to_s)
-		assert_equal(@abbr, st.subelements[3].to_s)
+		assert_equal(@text, st.subelements[0].to_s.strip)
+		assert_equal(@abbr, st.subelements[1].to_s.strip)
+		assert_equal(@text, st.subelements[2].to_s.strip)
+		assert_equal(@abbr, st.subelements[3].to_s.strip)
 	end
 end

data/test/test_helper.rb

@@ -4,6 +4,8 @@ require 'test/unit'
 require 'tmpdir'
 
 class Test::Unit::TestCase
+  DTD_PATH = File.dirname(__FILE__) + '/examples/'
+
   alias_method :old_setup, :setup
   def setup
     @ead = EADCodec::Document.new("1", "Teste")
@@ -22,24 +24,30 @@ class Test::Unit::TestCase
     @ead = EADCodec::Document.from_file filepath
   end
 
-  def validate_well_formed
-    assert(system("rxp", "-xs", filepath))
+  def xmllint_installed
+    assert(system("xmllint --version > /dev/null 2>&1"), 
+           "xmllint utility not installed"+
+           "(on ubuntu/debian install package libxml2-utils)")
   end
 
+  def validate_well_formed
+    xmllint_installed
+		assert(system("xmllint #{filepath} >/dev/null"), 
+           "Validation failed for #{filepath}")
+	end
+
   def validate_dtd
-    assert(system("rxp", "-VVs", filepath))
-    #assert(system("xmlstarlet", "val", "-d", "ead.dtd", @test_file))
+    xmllint_installed
+    assert(system("xmllint --nonet --loaddtd --path #{DTD_PATH}"+
+                  " #{filepath} > /dev/null"),
+           "Validation failed for #{filepath}")
   end
 
   def compare_xpath(value, path)
-    assert_equal(value, select(path))
-  end
+		assert_equal(value.strip, XMLUtils::select_path(path, filepath).strip)
+	end
 
   def element_exists(xpath, *args)
     assert(XMLUtils::element_exists(xpath, filepath), *args)
   end
-
-  def select(xpath)
-    XMLUtils::select_path(xpath, filepath)
-  end
 end

data/test/xmlsoparser_test.rb

@@ -50,9 +50,9 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     
     assert_equal(@ead, parser.top_element)
     
-    assert_equal("1", @ead.eadheader.eadid.value)
+    assert_equal("1", @ead.eadheader.eadid.value.strip)
     assert_equal("1", @ead.eadheader.id)
-    assert_equal("Teste", @ead.eadheader.eadtitle.value)
+    assert_equal("Teste", @ead.eadheader.eadtitle.value.strip)
     
     dsc = @ead.archdesc[:dsc]
     assert(dsc[:c], "Check that the level was imported")

metadata

@@ -1,113 +1,130 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: eadcodec
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-09-14 00:00:00 +01:00
-summary: Importer/Exporter for the EAD XML format
-require_paths: 
-- lib
-email: pedrocr@gmail.com
-homepage: 
-rubyforge_project: 
-description: An exporter and importer for the Encoded Archival Description XML format. See http://www.loc.gov/ead/ for more information about the format.
-autorequire: rake
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - "Pedro C\xC3\xB4rte-Real"
+autorequire: rake
+bindir: bin
+cert_chain: []
+
+date: 2010-09-14 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: xmlcodec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id001
+description: |
+  An exporter and importer for the Encoded Archival Description XML format based on xmlcodec. See http://www.loc.gov/ead/ for more information about the format.
+
+email: pedro@pedrocr.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
 - lib/eadcodec.rb
-- lib/elements/p.rb
-- lib/elements/head.rb
-- lib/elements/accessrestrict.rb
-- lib/elements/accruals.rb
-- lib/elements/acqinfo.rb
-- lib/elements/altformavail.rb
+- lib/elements/physfacet.rb
+- lib/elements/repository.rb
+- lib/elements/event.rb
+- lib/elements/titlestmt.rb
+- lib/elements/scopecontent.rb
+- lib/elements/language.rb
+- lib/elements/profiledesc.rb
 - lib/elements/appraisal.rb
-- lib/elements/arrangement.rb
-- lib/elements/bibliography.rb
-- lib/elements/bioghist.rb
-- lib/elements/chronlist.rb
 - lib/elements/container.rb
+- lib/elements/p.rb
+- lib/elements/phystech.rb
+- lib/elements/dsc.rb
 - lib/elements/controlaccess.rb
-- lib/elements/custodhist.rb
-- lib/elements/date.rb
-- lib/elements/description.rb
-- lib/elements/dimensions.rb
-- lib/elements/defitem.rb
-- lib/elements/event.rb
+- lib/elements/accessrestrict.rb
 - lib/elements/extent.rb
-- lib/elements/fileplan.rb
-- lib/elements/geogname.rb
-- lib/elements/language.rb
-- lib/elements/label.rb
-- lib/elements/langmaterial.rb
-- lib/elements/list.rb
-- lib/elements/dsc.rb
 - lib/elements/item.rb
+- lib/elements/id.rb
+- lib/elements/list.rb
+- lib/elements/unittitle.rb
+- lib/elements/fileplan.rb
+- lib/elements/chronlist.rb
+- lib/elements/chronitem.rb
 - lib/elements/materialspec.rb
-- lib/elements/name.rb
-- lib/elements/note.rb
-- lib/elements/odd.rb
+- lib/elements/altformavail.rb
+- lib/elements/bioghist.rb
 - lib/elements/originalsloc.rb
+- lib/elements/date.rb
+- lib/elements/processinfo.rb
+- lib/elements/ead.rb
+- lib/elements/odd.rb
+- lib/elements/unitdate.rb
+- lib/elements/userestrict.rb
+- lib/elements/creation.rb
+- lib/elements/arrangement.rb
+- lib/elements/eadheader.rb
+- lib/elements/acqinfo.rb
+- lib/elements/label.rb
+- lib/elements/head.rb
+- lib/elements/name.rb
+- lib/elements/archdesc.rb
+- lib/elements/accruals.rb
 - lib/elements/otherfindaid.rb
 - lib/elements/physdesc.rb
-- lib/elements/physfacet.rb
+- lib/elements/c.rb
+- lib/elements/unitid.rb
 - lib/elements/physloc.rb
-- lib/elements/phystech.rb
-- lib/elements/processinfo.rb
-- lib/elements/profiledesc.rb
-- lib/elements/relatedmaterial.rb
-- lib/elements/repository.rb
-- lib/elements/scopecontent.rb
-- lib/elements/descgrp.rb
+- lib/elements/note.rb
+- lib/elements/bibliography.rb
+- lib/elements/langmaterial.rb
+- lib/elements/dimensions.rb
+- lib/elements/filedesc.rb
 - lib/elements/subtitle.rb
-- lib/elements/userestrict.rb
+- lib/elements/description.rb
 - lib/elements/origination.rb
-- lib/elements/unitid.rb
-- lib/elements/dao.rb
-- lib/elements/unittitle.rb
-- lib/elements/chronitem.rb
-- lib/elements/unitdate.rb
-- lib/elements/archdesc.rb
-- lib/elements/ead.rb
-- lib/elements/id.rb
-- lib/elements/titlestmt.rb
-- lib/elements/filedesc.rb
-- lib/elements/eadheader.rb
-- lib/elements/creation.rb
-- lib/elements/c.rb
-- test/xmlsoparser_test.rb
-- test/subtitle_test.rb
-- test/subordinates_test.rb
+- lib/elements/custodhist.rb
+- lib/elements/geogname.rb
+- lib/elements/defitem.rb
+- lib/elements/relatedmaterial.rb
+- test/partial_export_test.rb
+- test/note_test.rb
+- test/description_test.rb
+- test/level_test.rb
 - test/test_helper.rb
+- test/subordinates_test.rb
+- test/xmlsoparser_test.rb
 - test/phystech_test.rb
 - test/document_test.rb
-- test/note_test.rb
-- test/level_test.rb
-- test/description_test.rb
-- test/partial_export_test.rb
 - test/scopecontent_test.rb
+- test/subtitle_test.rb
 - test/examples/example1.xml
 - test/examples/example2.xml
 - README
 - LICENSE
 - Rakefile
-test_files: []
+has_rdoc: true
+homepage: 
+licenses: []
 
+post_install_message: 
 rdoc_options: 
 - -S
 - -w 2
@@ -115,21 +132,32 @@ rdoc_options:
 - -Axmlsubel_mult=XML Subelement Collection
 - -Axmlsubel=XML Subelement
 - -Axmlattr=XML Attribute
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: 
 - xmlcodec
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: xmlcodec
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.0
-    version: 
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Importer/Exporter for the EAD XML format
+test_files: []
+

data/lib/elements/dao.rb

@@ -1,16 +0,0 @@
-class Dao < EADElement
-  elname "dao"
-  
-  xmlattr :actuate
-  xmlattr :altrender
-  xmlattr :arcrole
-  xmlattr :audience
-  xmlattr :entityref
-  xmlattr :href
-  xmlattr :id
-  xmlattr :linktype
-  xmlattr :role
-  xmlattr :show
-  xmlattr :title
-  xmlattr :xpointer
-end

data/lib/elements/descgrp.rb

@@ -1,11 +0,0 @@
-class DescGrp < EADElement
-  elname "descgrp"
-  
-  xmlattr :altrender
-  xmlattr :audience
-  xmlattr :encodinganalog
-  xmlattr :id
-  xmlattr :type
-  
-  xmlsubelements
-end