marc4j4r 1.2.0 → 1.3.0

data/CHANGES

@@ -1,3 +1,7 @@
+1.3.0
+  Updated to use jlogger; added logging #nextRecord (also used by #each) to 
+  AlephSequentialReader and PermissiveStreamReader
+  
 1.2.0
   Fixed encoding problem with to_marc and from_string roundtrip
   Added to_hash/to_marc_in_json and from_hash/from_marc_in_json (see 

data/Rakefile

@@ -11,6 +11,8 @@ begin
     gem.email = "bill@dueber.com"
     gem.homepage = "http://github.com/billdueber/javamarc/tree/master/ruby/marc4j4r/"
     gem.authors = ["BillDueber"]
+
+    gem.add_dependency "jlogger", ">= 0.0.3"
     gem.add_development_dependency "bacon", ">= 0"
     gem.add_development_dependency "yard", ">= 0"
     

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/marc4j4r.rb

@@ -2,9 +2,6 @@ unless defined? JRUBY_VERSION
   raise "Only works under JRUBY"
 end
 
-require 'logger'
-$LOG ||= Logger.new(STDERR)
-
 jardir = File.join(File.dirname(__FILE__), '..', 'jars')
 
 # For each jar, check for a representative class in each

data/lib/marc4j4r/reader.rb

@@ -1,34 +1,55 @@
 import 'org.marc4j.ErrorHandler'
-require 'logger'
-$LOG ||= Logger.new(STDERR)
+require 'jlogger'
 
-module Java::OrgMarc4j::MarcReader
-  include Enumerable
-  
-  # Return the next record, after calling #hashify on it
-  def each(hashify=true)
-    while self.hasNext
+module MarcReader
+  module LoggingNextRecord
+    def nextRecord(hashify=true)
       begin
         r = self.next
       # rescue  Java::org.marc4j.MarcException => e
       rescue   org.marc4j.MarcException => e
-        unless self.methods.include? 'errors'
-          puts "#{e}"
-          raise e
-        end
-        self.errors.getErrors.each do |err|
-          case err.severity
-          when ErrorHandler::ERROR_TYPO, ErrorHandler::MINOR_ERROR, ErrorHandler::MAJOR_ERROR
-            $LOG.warn err.toString
-          when ErrorHandler::INFO
-            $LOG.info err.toString
-          when ErrorHandler::FATAL
-            $LOG.error err.toString
-            next # skip to the next record
-          end
-        end
+        puts "#{e}"
+        raise e
       end
+      self.logErrors if self.methods.include? 'errors'
       r.hashify if hashify
+      return r
+    end    
+  end
+end
+
+module Java::OrgMarc4j::MarcReader
+  include Enumerable
+  include JLogger::Simple
+  
+  
+  def logErrors
+    return unless self.errors.getErrors
+    self.errors.getErrors.each do |err|
+      case err.severity
+      when ErrorHandler::MAJOR_ERROR
+        log.error err.toString
+      when ErrorHandler::ERROR_TYPO, ErrorHandler::MINOR_ERROR
+        self.log.warn err.toString
+      when ErrorHandler::INFO
+        log.info err.toString
+      when ErrorHandler::FATAL
+        log.error err.toString
+        Process.exit
+      end
+    end
+  end
+  
+  def nextRecord(hashify = true)
+    r = self.next
+    r.hashify if hashify
+    return r
+  end
+  
+  # Return the next record, after calling #hashify on it
+  def each(hashify=true)
+    while self.hasNext
+      r = self.nextRecord(hashify)
       yield r
     end
   end  
@@ -79,17 +100,22 @@ module MARC4J4R
       @handle = IOConvert.byteinstream(input)
       case type
       when :strictmarc then
-        Java::org.marc4j.MarcStreamReader.module_eval("include Enumerable")
+        Java::org.marc4j.MarcStreamReader.send(:include, Enumerable)
         return Java::org.marc4j.MarcStreamReader.new(@handle, encoding)
       when :permissivemarc then
         encoding ||= 'BESTGUESS'
-        Java::org.marc4j.MarcPermissiveStreamReader.module_eval("include Enumerable")
+        Java::org.marc4j.MarcPermissiveStreamReader.send(:include, Enumerable)
+        Java::org.marc4j.MarcPermissiveStreamReader.send(:include, JLogger::Simple)
+        Java::org.marc4j.MarcPermissiveStreamReader.send(:include, MarcReader::LoggingNextRecord)        
         return Java::org.marc4j.MarcPermissiveStreamReader.new(@handle, true, true, encoding)
       when :marcxml then
-        Java::org.marc4j.MarcXmlReader.module_eval("include Enumerable")
+        Java::org.marc4j.MarcXmlReader.send(:include, Enumerable)
+        Java::org.marc4j.MarcXmlReader.send(:include, JLogger::Simple)
         return Java::org.marc4j.MarcXmlReader.new(@handle)
       when :alephsequential then
-        Java::org.marc4j.MarcAlephSequentialReader.module_eval("include Enumerable")        
+        Java::org.marc4j.MarcAlephSequentialReader.send(:include, Enumerable)
+        Java::org.marc4j.MarcAlephSequentialReader.send(:include, JLogger::Simple)
+        Java::org.marc4j.MarcAlephSequentialReader.send(:include, MarcReader::LoggingNextRecord)
         return Java::org.marc4j.MarcAlephSequentialReader.new(@handle)
       else
         raise ArgumentError, "Reader type #{type} illegal:  must be :strictmarc, :permissivemarc, :marcxml, or :alephsequential"

data/spec/alephsequentialreader_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'jlogger'
 
 import 'org.marc4j.ErrorHandler'
 
@@ -20,6 +21,7 @@ end
 
 describe "MarcAlephSequentialReader record construction" do
   before do
+    JLogger::Simple.startConsole
     seqfile = "#{DIR}/three.seq"
     reader =  MARC4J4R::Reader.new(seqfile, :alephsequential)
     @recs = reader.collect
@@ -63,6 +65,7 @@ end
 
 describe "MarcAlephSequentialReader error handling" do
   
+  
   it "should bail on a bad file" do
     lambda{
       reader =  MARC4J4R::Reader.new("#{DIR}/doesntexist.seq", :alephsequential)
@@ -73,12 +76,12 @@ describe "MarcAlephSequentialReader error handling" do
   it "should fail to read a non-aleph-seq file" do
     lambda {
       reader =  MARC4J4R::Reader.new("#{DIR}/batch.xml", :alephsequential)
-    }.should.raise Java::org.marc4j.MarcException
+    }.should.raise Java::java.io.IOException
   end
   
   it "should produce a minor error for bad indicators" do
     reader =  MARC4J4R::Reader.new("#{DIR}/errors.seq", :alephsequential)
-    r = reader.next
+    r = reader.nextRecord
     err = reader.errors.getErrors
     e = err[0]
     e.severity.should.equal ErrorHandler::MINOR_ERROR
@@ -91,13 +94,19 @@ describe "MarcAlephSequentialReader error handling" do
   it "should produce a major error for poorly-formed variable field" do
     reader =  MARC4J4R::Reader.new("#{DIR}/errors.seq", :alephsequential)
     r = reader.next
-    r = reader.next # second record
+    r = reader.nextRecord # second record
     err = reader.errors.getErrors
     e = err[0]
     e.severity.should.equal ErrorHandler::MAJOR_ERROR
     e.to_string.should.match /malformed/i
   end
   
+  it "should log all three" do
+    reader =  MARC4J4R::Reader.new("#{DIR}/errors.seq", :alephsequential)
+    1.should.equal 1
+    reader.each {|r|}
+  end
+  
 end
 
   

data/spec/reader_spec.rb

@@ -61,6 +61,8 @@ describe "Reader encodings, strict reader" do
 end
   
 describe "Reader encodings, permissive reader" do
+  
+  
   it "Works with UTF-8 without explicit encoding" do
     reader = MARC4J4R::Reader.new("#{DIR}/chinese_utf8.dat", :permissivemarc)
     r = reader.first
@@ -79,6 +81,8 @@ describe "Reader encodings, permissive reader" do
     second_title = r.find_by_tag('245')[1]
     second_title['a'].should.equal "湘鄂贛苏区史稿 /" # equal, because it's permissive and tries to do the right thing
   end
+  
+    
 end
   
 

metadata

@@ -1,51 +1,60 @@
 --- !ruby/object:Gem::Specification 
 name: marc4j4r
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
+    - 1
+    - 3
+    - 0
+  version: 1.3.0
 platform: ruby
 authors: 
-- BillDueber
+  - BillDueber
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: bacon
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: jlogger
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 0
+              - 3
+            version: 0.0.3
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bacon
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: yard
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :development
+    version_requirements: *id003
 description: Syntactic sugar and some extra methods to deal with MARC data using the java .jar marc4j
 email: bill@dueber.com
 executables: []
@@ -53,72 +62,68 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
+  - README.rdoc
 files: 
-- CHANGES
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- benchj.rb
-- jars/jackson-all-1.6.0.jar
-- jars/javamarc.jar
-- jars/marc4j-extra-readers-writers.jar
-- lib/marc4j4r.rb
-- lib/marc4j4r/controlfield.rb
-- lib/marc4j4r/datafield.rb
-- lib/marc4j4r/reader.rb
-- lib/marc4j4r/record.rb
-- lib/marc4j4r/writer.rb
-- spec/alephsequentialreader_spec.rb
-- spec/bad.dat
-- spec/badbatch.dat
-- spec/badbatch.xml
-- spec/batch.dat
-- spec/batch.txt
-- spec/batch.xml
-- spec/chinese_utf8.dat
-- spec/controlfield_spec.rb
-- spec/datafield_spec.rb
-- spec/errors.seq
-- spec/one.dat
-- spec/one.txt
-- spec/one.xml
-- spec/reader_spec.rb
-- spec/record_spec.rb
-- spec/spec_helper.rb
-- spec/three.seq
+  - CHANGES
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - benchj.rb
+  - jars/jackson-all-1.6.0.jar
+  - jars/javamarc.jar
+  - jars/marc4j-extra-readers-writers.jar
+  - lib/marc4j4r.rb
+  - lib/marc4j4r/controlfield.rb
+  - lib/marc4j4r/datafield.rb
+  - lib/marc4j4r/reader.rb
+  - lib/marc4j4r/record.rb
+  - lib/marc4j4r/writer.rb
+  - spec/alephsequentialreader_spec.rb
+  - spec/bad.dat
+  - spec/badbatch.dat
+  - spec/badbatch.xml
+  - spec/batch.dat
+  - spec/batch.txt
+  - spec/batch.xml
+  - spec/chinese_utf8.dat
+  - spec/controlfield_spec.rb
+  - spec/datafield_spec.rb
+  - spec/errors.seq
+  - spec/one.dat
+  - spec/one.txt
+  - spec/one.xml
+  - spec/reader_spec.rb
+  - spec/record_spec.rb
+  - spec/spec_helper.rb
+  - spec/three.seq
 has_rdoc: true
 homepage: http://github.com/billdueber/javamarc/tree/master/ruby/marc4j4r/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Use marc4j java library in JRuby in a more ruby-ish way