marcspec 0.7.2 → 0.7.3

data/CHANGES

@@ -1,3 +1,6 @@
+0.7.3
+  * Squashed a bug where I forgot to deal with escaping in java .properties files. Now I'm just using 
+    a real Java Properties object so I don't have to worry about it.
 0.7.2
   * Also change methodArgs to functionArgs
 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/lib/marcspec/kvmap.rb

@@ -64,6 +64,10 @@ module MARCSpec
     
     
     # Translate from a solrmarc map file that has *already been determined* to be a KV map
+    #
+    # Uses the underlying java Properties class to avoid having to rewrite all the esacping 
+    # logic.
+    #
     # @param [String] filename The path to the solrmarc kv map file
     # @return [MARCSpec::KVMap] a KVMap
     
@@ -71,20 +75,15 @@ module MARCSpec
       mapname = File.basename(filename).sub(/\..+?$/, '')
       map = {}
       File.open(filename) do |smf|
-        smf.each_line do |l|
-          l.chomp!
-          next unless l =~ /\S/
-          l.strip!
-          next if l =~ /^#/
-          unless l =~ /^(.+?)\s*=\s*(.+)$/
-            $LOG.warn "KVMap import skipping weird line in #{filename}\n  #{l}"
-            next
-          end
-          map[$1] = $2
+        prop = Java::java.util.Properties.new
+        prop.load(smf.to_inputstream)
+        prop.each do |k,v|
+          map[k] = v
         end
       end
       return self.new(mapname, map)
     end
+            
     
     
   end

data/lib/marcspec/multivaluemap.rb

@@ -36,15 +36,17 @@ module MARCSpec
       mapname = File.basename(filename).sub(/\..+?$/, '')
       kvlist = []
       File.open(filename) do |f|
-        f.each_line do |line|
-          match = /^pattern.*?=\s*(.*?)\s*=>\s*(.*?)\s*$/.match(line)
-          unless match
+        prop = Java::java.util.Properties.new
+        prop.load(f.to_inputstream)
+        prop.each do |patstring,kv|
+          unless patstring =~ /^pattern/ and kv =~ /.+=>.+/
             $LOG.warn "MultiValueMap import skipping weird line in #{filename}\n  #{l}"
             next
           end
+          match = /^\s*(.+?)\s*=>\s*(.+?)\s*$/.match(kv)
           kvlist << [Regexp.new(match[1]), match[2]]
         end
-      end
+      end        
       return self.new(mapname, kvlist)
     end
         

data/lib/marcspec.rb

@@ -17,15 +17,9 @@ require "marcspec/marcfieldspec"
 # It's just a hash.
 
 module CacheSpot
-  def cacheadd k, v
+  def cachespot
     @_cachespot ||= {}
-    @_cachespot[k] = v
-    return v
-  end
-  
-  def cacheget k
-    @_cachespot ||= {}
-    return @_cachespot[k]
+    return @_cachespot
   end
 end
 

data/spec/maps_spec.rb

@@ -56,6 +56,13 @@ describe "Maps" do
     map["nl"].should.equal "New Caledonia"
   end
   
+  it "should correctly deal with solrmarc files with escaped chars (via \\)" do
+    map = MARCSpec::KVMap.from_solrmarc_file "#{DIR}/data/umich/translation_maps/location_map.properties"
+    map['AAEL'].should.equal 'AAEL'
+    map['AAEL MICE'].should.equal 'AAEL MICE'
+    map['BUHR AAEL'].should.equal 'BUHR'
+  end
+  
   it "should read a pattern solrmarc file" do
     map = MARCSpec::MultiValueMap.from_solrmarc_file "#{DIR}/data/umich/translation_maps/library_map.properties"
     map.mapname.should.equal 'library_map'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - BillDueber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -04:00
+date: 2010-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency