marc4j4r 1.4.1 → 1.4.2

metadata

@@ -1,127 +1,105 @@
 --- !ruby/object:Gem::Specification
 name: marc4j4r
 version: !ruby/object:Gem::Version
-  version: 1.4.1
-  prerelease: 
+  version: 1.4.2
+  prerelease:
 platform: ruby
 authors:
 - BillDueber
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jlogger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  type: :runtime
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
     none: false
+  name: jlogger
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  prerelease: false
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  name: bacon
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  prerelease: false
+  type: :development
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-description: Syntactic sugar and some extra methods to deal with MARC data using the
-  java .jar marc4j
+        version: !binary |-
+          MA==
+    none: false
+  name: yard
+description: Syntactic sugar and some extra methods to deal with MARC data using the java .jar marc4j
 email: bill@dueber.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
-files:
-- CHANGES
 - LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- benchj.rb
+files:
 - 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
+- LICENSE
+- README.rdoc
 homepage: http://github.com/billdueber/javamarc/tree/master/ruby/marc4j4r/
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Use marc4j java library in JRuby in a more ruby-ish way
 test_files: []

data/CHANGES

@@ -1,27 +0,0 @@
-1.4.0
-  Update to use newest version of marc4j_extra_readers_writers.jar; before I wasn't 
-  correctly turning '^' into ' ' in leaders and control fields.
-  
-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 
-  http://dilettantes.code4lib.org/blog/2010/09/a-proposal-to-serialize-marc-in-json/)
-  
-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
-  Including alephsequential reader (but not writer) and specs
-  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
-0.9.1
-  Updated to latest marc4j; changes involve character conversion
-
-0.9.0
-  First real public release

data/Rakefile

@@ -1,71 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "marc4j4r"
-    gem.summary = %Q{Use marc4j java library in JRuby in a more ruby-ish way}
-    gem.description = %Q{Syntactic sugar and some extra methods to deal with MARC data using the java .jar marc4j}
-    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.4"
-    gem.add_development_dependency "bacon", ">= 0"
-    gem.add_development_dependency "yard", ">= 0"
-    
-    gem.files.include 'jars/*.jar'
-    
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
-# Make sure we've got the right .jar
-LOCALJAR = 'jars/javamarc.jar'
-JAVAJAR  = '../../javamarc.jar'
-
-
-
-file LOCALJAR => JAVAJAR do |t|
-  FileUtils.cp(JAVAJAR, LOCALJAR)
-end
-  
-
-
-require 'rake/testtask'
-Rake::TestTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |spec|
-    spec.libs << 'spec'
-    spec.pattern = 'spec/**/*_spec.rb'
-    spec.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :spec => [:check_dependencies, LOCALJAR]
-
-task :default => :spec
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/VERSION

@@ -1 +0,0 @@
-1.4.1

data/benchj.rb

@@ -1,73 +0,0 @@
-$:.unshift 'lib'
-require 'marc4j4r'
-
-require 'benchmark'
-
-# require 'yajl'
-# require 'json/pure'
-# require 'msgpack'
-
-
-jsonsize = 0.0
-marcsize = 0.0
-mpsize   = 0.0
-
-
-# Use Benchmark.measure
-# sjptime =  Benchmark::Tms.new(0,0,0,0,0, "JSON Pure")
-smtime =  Benchmark::Tms.new(0,0,0,0,0, "MARC")
-smptime =  Benchmark::Tms.new(0,0,0,0,0, "Msgpack")
-sjptime =  Benchmark::Tms.new(0,0,0,0,0, "JSON")
-
-djptime =  Benchmark::Tms.new(0,0,0,0,0, "JSON")
-dmtime =  Benchmark::Tms.new(0,0,0,0,0, "MARC")
-dmptime =  Benchmark::Tms.new(0,0,0,0,0, "Msgpack")
-
-
-
-i = 0
-iterations = 1
-
-iterations.times do
-  reader = MARC4J4R::Reader.new('topics.xml', :marcxml)
-  
-  reader.each_with_index do |r, i|
-   marc = nil
-   json = nil
-   mp   = nil
-   copy = nil
- 
-
-   smtime += Benchmark.measure {marc = r.to_marc}
-   dmtime += Benchmark.measure {copy = MARC4J4R::Record.from_string(marc)}
-   
-
-   sjptime += Benchmark.measure {json = r.to_marc_in_json}
-   djptime += Benchmark.measure {copy = MARC4J4R::Record.new_from_marc_in_json(json)}
-   
-   # break if i > 1000
-
-  end
-end
-
-puts "Total of #{i} records run #{iterations} times"
-
-puts "\nSERIALIZING"
-
-base = smtime.total
-puts '  %-15s %8.2f s (%3.0f%%)' % ['MARC', smtime.total, smtime.total / base * 100]
-puts '  %-15s %8.2f s (%3.0f%%)' % ['Json', sjptime.total, sjptime.total / base * 100]
-# puts '  %-15s %8.2f s (%3.0f%%)' % ['Msgpack', smptime.total, smptime.total / base * 100]
-
-base = dmtime.total
-puts "\nDESERIALIZING"
-puts '  %-15s %8.2f s (%3.0f%%)' % ['MARC', dmtime.total, dmtime.total / base * 100]
-puts '  %-15s %8.2f s (%3.0f%%)' % ['Json', djptime.total, djptime.total / base * 100]
-# puts '  %-15s %8.2f s (%3.0f%%)' % ['Msgpack', dmptime.total, dmptime.total / base * 100]
-
-base = dmtime.total + smtime.total
-puts "\nSERIALIZE + DESERIALIZE"
-puts '  %-15s %8.2f s (%3.0f%%)' % ['MARC', dmtime.total + smtime.total, (dmtime.total + smtime.total) / base * 100]
-puts '  %-15s %8.2f s (%3.0f%%)' % ['Json', djptime.total + sjptime.total, (djptime.total + sjptime.total) / base * 100]
-# puts '  %-15s %8.2f s (%3.0f%%)' % ['Msgpack', dmptime.total + smptime.total, (dmptime.total + smptime.total) / base * 100]
-

data/lib/marc4j4r.rb

@@ -1,70 +0,0 @@
-unless defined? JRUBY_VERSION
-  raise "Only works under JRUBY"
-end
-
-jardir = File.join(File.dirname(__FILE__), '..', 'jars')
-
-# For each jar, check for a representative class in each
-# and include the jar if it's not defined
-
-begin
-  include_class Java::org.marc4j.marc.impl.RecordImpl
-rescue NameError  => e
-  require "#{jardir}/javamarc.jar"
-end
-
-begin
-  include_class Java::org.marc4j.MarcAlephSequentialReader
-rescue
-  require "#{jardir}/marc4j-extra-readers-writers.jar"
-end
-
-begin
-  include_class Java::org.codehaus.jackson.map.ObjectMapper
-rescue
-  require "#{jardir}/jackson-all-1.6.0.jar"
-end
-
-
-# Define a method that will take a string (filename), IO object, or StringIO object,
-# and return an inputstream/outputstream
-
-module IOConvert
-  
-  def byteinstream(fromwhere)
-    stream = nil
-    if fromwhere.is_a? Java::JavaIO::InputStream
-      stream = fromwhere
-    elsif fromwhere.is_a? String
-      stream = java.io.FileInputStream.new(fromwhere.to_java_string)
-    elsif fromwhere.respond_to? :to_inputstream
-      stream = fromwhere.to_inputstream
-    end
-    return stream
-  end
-  
-  def byteoutstream towhere
-    stream = nil
-    if towhere.is_a? Java::JavaIO::OutputStream
-      stream = towhere
-    elsif towhere.is_a? String
-      stream = java.io.FileOutputStream.new(towhere.to_java_string)
-    elsif towhere.respond_to? :to_outputstream
-      stream = towhere.to_outputstream
-    end
-    return stream
-  end
-  
-  
-  module_function :byteinstream, :byteoutstream
-  
-end
-  
-  
-  
-  
-
-require 'marc4j4r/record.rb'
-require 'marc4j4r/controlfield.rb'
-require 'marc4j4r/reader.rb'
-require 'marc4j4r/datafield.rb'

data/lib/marc4j4r/controlfield.rb

@@ -1,32 +0,0 @@
-module MARC4J4R
-  ControlField = Java::org.marc4j.marc.impl::ControlFieldImpl
-  class ControlField
-    def value
-      return self.data
-    end
-
-    def value= str
-      self.data = str
-    end
-
-    def controlField?
-      return true
-    end 
-
-    def self.control_tag? tag
-      return Java::org.marc4j.marc.impl.Verifier.isControlField tag
-    end
-
-    # Pretty-print
-    # @param [String] joiner What string to use to join the subfields
-    # @param [String] The pretty string
-    def to_s
-      return self.tag + "    " + self.value
-    end                 
-
-    def == other
-      self.tag == other.tag && self.value == other.value
-    end
-
-  end
-end