marc4j4r 1.0.0 → 1.1.0

data/CHANGES

@@ -1,3 +1,5 @@
+1.1
+  Added native java method to turn a record into XML (20% speedup or so)
 1.0
   Arbitrary decision that this is 1.0
   Using javamarc.jar (fork of marc4j) from http://github.com/billdueber/javamarc
@@ -5,10 +7,6 @@
   Added code to Reader#each to deal with #errors object if provided by the
     specific reader (right now, :permissivemarc and :alephsequential) and specs
     to test
-  Added lots of specs
-  Fixed definition of class-level methods in Record. For some reason (I'm sure having to do with the
-  fact that they're aliased java classes), using 'def self.to_xml' doesn't work; need to use
-  'def Record.to_xml' instead
 0.9.1
   Updated to latest marc4j; changes involve character conversion
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/lib/marc4j4r/record.rb

@@ -142,20 +142,13 @@ module MARC4J4R
 
     # Return the record as valid MARC-XML
     # @return String A MARC-XML representation of the record, including the XML header
+     
     def to_xml
-      begin
-        xml = java.io.StringWriter.new
-        res = javax.xml.transform.stream.StreamResult.new(xml)
-        writer =  org.marc4j.MarcXmlWriter.new(res)
-        writer.write(self)
-        writer.writeEndDocument
-        return xml.toString
-      rescue
-        "Woops! to_xml failed for record #{self['001'].data}: #{$!}"
-      end
-  	end
+      return Java::org.marc4j.MarcXmlWriter.record_to_XML(self)
+    end
+      
 
-  	def to_marc
+    def to_marc
       begin
         s = Java::java.io.ByteArrayOutputStream.new
         writer =  org.marc4j.MarcPermissiveStreamWriter.new(s)

data/lib/marc4j4r/writer.rb

@@ -20,7 +20,8 @@ module MARC4J4R
       if type == :strictmarc
         return Java::org.marc4j.MarcStreamWriter.new(@handle)
       elsif type == :marcxml
-        return Java::org.marc4j.MarcStreamWriter.new(@handle)
+        writer =  Java::org.marc4j.MarcXmlWriter.new(@handle)
+        writer.setUnicodeNormalization(true)
       else
         raise ArgumentError.new("#{type} must be :strictmarc or :marcxml")
       end

data/spec/alephsequentialreader_spec.rb

@@ -4,7 +4,7 @@ import 'org.marc4j.ErrorHandler'
 
 describe "MarcAlephSequentialReader constructor" do
   before do
-    @seqfile = 'spec/three.seq'
+    @seqfile = "#{DIR}/three.seq"
   end
   
   it "should open a file" do
@@ -20,7 +20,7 @@ end
 
 describe "MarcAlephSequentialReader record construction" do
   before do
-    seqfile = 'spec/three.seq'
+    seqfile = "#{DIR}/three.seq"
     reader =  MARC4J4R::Reader.new(seqfile, :alephsequential)
     @recs = reader.collect
     
@@ -65,19 +65,19 @@ describe "MarcAlephSequentialReader error handling" do
   
   it "should bail on a bad file" do
     lambda{
-      reader =  MARC4J4R::Reader.new('spec/dne', :alephsequential)
+      reader =  MARC4J4R::Reader.new("#{DIR}/doesntexist.seq", :alephsequential)
     }.should.raise Java::java.io.IOException
   end
     
   
   it "should fail to read a non-aleph-seq file" do
     lambda {
-      reader =  MARC4J4R::Reader.new('spec/batch.xml', :alephsequential)
+      reader =  MARC4J4R::Reader.new("#{DIR}/batch.xml", :alephsequential)
     }.should.raise Java::org.marc4j.MarcException
   end
   
   it "should produce a minor error for bad indicators" do
-    reader =  MARC4J4R::Reader.new('spec/errors.seq', :alephsequential)
+    reader =  MARC4J4R::Reader.new("#{DIR}/errors.seq", :alephsequential)
     r = reader.next
     err = reader.errors.getErrors
     e = err[0]
@@ -89,7 +89,7 @@ describe "MarcAlephSequentialReader error handling" do
   end
     
   it "should produce a major error for poorly-formed variable field" do
-    reader =  MARC4J4R::Reader.new('spec/errors.seq', :alephsequential)
+    reader =  MARC4J4R::Reader.new("#{DIR}/errors.seq", :alephsequential)
     r = reader.next
     r = reader.next # second record
     err = reader.errors.getErrors

data/spec/record_spec.rb

@@ -117,4 +117,9 @@ describe "MARC4J4R::Record #find_by_tag" do
     MARC4J4R::Record.from_string(@one.to_marc).should.equal @one
     MARC4J4R::Record.from_xml_string(@one.to_xml).should.equal @one
   end
+  
+  it "round trips xml with the native_to_xml" do
+    MARC4J4R::Record.from_xml_string(@one.native_to_xml).should.equal @one
+  end
+    
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marc4j4r
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - BillDueber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -04:00
+date: 2010-09-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - Rakefile
 - VERSION
 - jars/javamarc.jar
+- jars/marc4j_serializations.jar
 - lib/marc4j4r.rb
 - lib/marc4j4r/controlfield.rb
 - lib/marc4j4r/datafield.rb