marcspec 1.6.4 → 1.6.5

data/CHANGES

@@ -1,3 +1,6 @@
+1.6.5
+  * Change to use jlogger
+  
 1.6.4  
   * Update gem requirements
   

data/Rakefile

@@ -15,8 +15,8 @@ begin
     gem.add_development_dependency "rspec"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_development_dependency 'ci_reporter'
-    gem.add_dependency 'marc4j4r', '>=1.2.0'
-    gem.add_dependency 'logback-simple', '>=0.0.2'
+    gem.add_dependency 'marc4j4r', '>=1.3.0'
+    gem.add_dependency 'jlogger', '>=0.0.3'
     gem.add_dependency 'jruby_streaming_update_solr_server', '>=0.5.3'
     
     

data/VERSION

@@ -1 +1 @@
-1.6.4
+1.6.5

data/lib/marcspec/controlfieldspec.rb

@@ -1,6 +1,8 @@
 require 'marc4j4r'
 require 'set'
 require 'pp'
+require 'jlogger'
+
 module MARCSpec
   # A ControlFieldSpec takes a control tag (generally 001..009) and an optional zero-based range
   # When called with marc_values(record), it returns either the complete value of all
@@ -17,7 +19,7 @@ module MARCSpec
   # substrings are specified.
   
   class ControlFieldSpec
-    include Logback::Simple
+    include JLogger::Simple
     
     attr_accessor :tag, :range, :rangehistory
     

data/lib/marcspec/map.rb

@@ -1,3 +1,5 @@
+require 'jlogger'
+
 module MARCSpec
   
   # A Map is just a named lookup table. The access
@@ -10,7 +12,7 @@ module MARCSpec
   # NOTE: THIS IS AN ABSTRACT SUPERCLASS. DO NOT INSTANTIATE IT DIRECTLY
   
   class Map
-    include Logback::Simple
+    include JLogger::Simple
     
     attr_accessor :mapname, :map
     
@@ -35,14 +37,14 @@ module MARCSpec
       begin
         str = File.open(filename).read
       rescue Exception => e
-        Logback::Simple::Logger.fatal "Problem opening #{filename}: #{e.message}"
+         "Problem opening #{filename}: #{e}"
         raise e
       end
       
       begin 
         rawmap = eval(str)
       rescue Exception => e
-        Logback::Simple::Logger.fatal "Problem evaluating (with 'eval') file #{filename}: #{e.message}"
+        log.error "Problem evaluating (with 'eval') file #{filename}: #{e}"
         raise e
       end
       
@@ -59,7 +61,7 @@ module MARCSpec
       when :multi
         return MultiValueMap.new(rawmap[:mapname], rawmap[:map])
       else
-        Logback::Simple::Logger.fatal "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
+        log.fatal "Map file #{filename} doesn't seem to be either a KV map or a MuliValueMap according to :maptype (#{rawmap[:maptype]})"
         raise ArgumentError, "File #{filename} doesn't evaluate to a valid map"
       end
       

data/lib/marcspec/multivaluemap.rb

@@ -54,6 +54,7 @@ module MARCSpec
     def [] key, default=nil
       rv = []
       
+      self.optimize unless @super_regexp
       if @super_regexp.match key # do *any* of them match?
         @map.each do |pv|
           if pv[1].is_a? Proc

data/lib/marcspec/solrfieldspec.rb

@@ -1,5 +1,6 @@
 require 'stringio'
 require 'marc4j4r/controlfield'
+require 'jlogger'
 
 module MARCSpec
   
@@ -8,7 +9,7 @@ module MARCSpec
   # from a MARC record.
   
   class SolrFieldSpec
-    include Logback::Simple
+    include JLogger::Simple
     
     attr_accessor :solrField, :first, :map, :noMapKeyDefault, :marcfieldspecs, :defaultValue,  :_mapname
     attr_reader :arity

data/lib/marcspec/specset.rb

@@ -1,6 +1,7 @@
 require 'jruby_streaming_update_solr_server'
 require 'marc4j4r'
 require 'benchmark'
+require 'jlogger'
     
 
 module MARCSpec
@@ -30,7 +31,7 @@ module MARCSpec
   # into a set of key=>value pairs suitable for sending to Solr
   
   class SpecSet
-    include Logback::Simple
+    include JLogger::Simple
     
     attr_accessor :tmaps, :solrfieldspecs, :benchmarks
     

data/lib/marcspec/variablefieldspec.rb

@@ -1,5 +1,6 @@
-require 'set'
 require 'pp'
+require 'jlogger'
+
 module MARCSpec
   # A VariableFieldSpec has a tag (three chars) and a set of codes. Its #marc_values(r) method will return
   # all the values for the subfields for the given codes joined by the optional joiner (space by default)
@@ -14,7 +15,7 @@ module MARCSpec
   # vfs =  MARCSpec::VariableFieldSpec.new('245', 'a'..'b')
   
   class VariableFieldSpec
-    include Logback::Simple
+    include JLogger::Simple
     
     attr_accessor :tag, :codes, :joiner, :ind1, :ind2, :codehistory
 

data/lib/marcspec.rb

@@ -1,6 +1,4 @@
 require 'marc4j4r'
-require "logback-simple"
-
 
 
 require "marcspec/customspec"

data/spec/data/umich/translation_maps/library_map.properties

@@ -45,4 +45,4 @@ pattern_43 = ^HATCH MOVRD=>Hatcher Graduate Map Library
 pattern_44 = ^HATCH MRAR=>Hatcher Graduate Map Library
 pattern_45 = ^HATCH MREF=>Hatcher Graduate Map Library
 pattern_46 = ^HATCH MSHLV=>Hatcher Graduate Map Library
-pattern_47 = ^HATCH MSOFT=>Hatcher Graduate Map Library
+pattern_47 = ^HATCH MSOFT=>Hatcher Graduate Map Library

data/spec/maps_spec.rb

@@ -160,6 +160,7 @@ describe "MVMaps" do
 
   it "can dump/load a multivalue map via generic map interface" do
     map = MARCSpec::MultiValueMap.from_solrmarc_file "#{DIR}/data/umich/translation_maps/library_map.properties"
+    map.optimize
     f = Tempfile.new('mvmap')
     f.puts map.asPPString
     path = f.path

data/spec/spec_helper.rb

@@ -9,5 +9,5 @@ require 'marcspec'
 
 DIR = File.dirname(__FILE__)
 
-Logback::Simple.loglevel = :warn
-Logback::Simple.startConsoleLogger
+rootlogger = JLogger::RootLogger.new
+rootlogger.loglevel = :warn

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 6
-    - 4
-  version: 1.6.4
+    - 5
+  version: 1.6.5
 platform: ruby
 authors: 
   - BillDueber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -62,13 +62,13 @@ dependencies:
           - !ruby/object:Gem::Version 
             segments: 
               - 1
-              - 2
+              - 3
               - 0
-            version: 1.2.0
+            version: 1.3.0
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: logback-simple
+    name: jlogger
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
       requirements: 
@@ -77,8 +77,8 @@ dependencies:
             segments: 
               - 0
               - 0
-              - 2
-            version: 0.0.2
+              - 3
+            version: 0.0.3
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency