marcspec 1.0.0 → 1.1.0

data/CHANGES

@@ -1,3 +1,5 @@
+1.1.0
+  * Added support for Proc objects as the value in a MVMap
 1.0.0
   * Added constant specs (:constantValue=>'val' or :constantValue=>['array', 'of', 'values'])
   * Arbitrarily decided this is version 1.0

data/VERSION

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

data/lib/marcspec/map.rb

@@ -60,7 +60,7 @@ module MARCSpec
 
     # Check for map equality
     def == other
-      return ((other.mapname == self.mapname) and (other.map = self.map))
+      return ((other.mapname == @mapname) and (other.map == @map))
     end
     
     # Generic pretty_print; used mostly for translating from solrmarc

data/lib/marcspec/multivaluemap.rb

@@ -13,15 +13,27 @@ module MARCSpec
   #
   # Keys can be either strings or regular expressions (e.g., /^Bil/). 
   #
+  # IF the key is a regexp, the value may then be a Proc object that takes a single argument: the 
+  # MatchData object produced by calling key.match(passed_in_value)
+  #
   # Again, note that if several keys are === to the passed argument, all the values will be returned. 
   
   class MultiValueMap   < Map
     
     attr_accessor :mapname,:map
     
-
+    # Given a passed_in_key (and optional default) return the set of values that match, as described
+    # above.
     def [] key, default=nil
-      rv =  @map.map {|pv| pv[0] === key ? pv[1] : nil}
+      rv = []
+      @map.each do |pv|
+        if pv[1].is_a? Proc
+          match = pv[0].match key
+          rv << pv[1].call(match) if match
+        else
+          rv << pv[1] if pv[0] === key
+        end
+      end
       rv.flatten!
       rv.compact!
       rv.uniq!
@@ -32,6 +44,9 @@ module MARCSpec
       end
     end
     
+    # Try to produce a valid MVMap from a solrmarc file
+    # @param [String] filename The file to read
+    # @return [MARCSpec::MultiValueMap] A new mvmap
     def self.from_solrmarc_file filename
       mapname = File.basename(filename).sub(/\..+?$/, '')
       kvlist = []
@@ -50,12 +65,16 @@ module MARCSpec
       return self.new(mapname, kvlist)
     end
         
+    # Produce a string suitable for pretty-printing. Unfortunately, we need to just plain
+    # delete the procs before doing so
+    
     def asPPString
+      map = @map.reject {|kv| kv[1].is_a? Proc}
       s = StringIO.new
       s.print "{\n :maptype=>:multi,\n :mapname=>"
       PP.singleline_pp(@mapname, s)
       s.print ",\n :map => "
-      PP.pp(@map, s)
+      PP.pp(map, s)
       s.puts "\n}"
       return s.string
     end

data/spec/maps_spec.rb

@@ -3,7 +3,14 @@ require 'spec_helper'
 describe "Maps" do
   before do
     @kvmap = MARCSpec::KVMap.new('kvmap', {'one' => '1', 'two' => ['2', 'zwei']})
-    @mvmap = MARCSpec::MultiValueMap.new('mvmap', [[/bi/, 'Bill'], [/mo/i, 'Molly'], [/ll/, 'Bill'], [/lly/i, ['One', 'Two']]])
+    @mvmap = MARCSpec::MultiValueMap.new('mvmap', [
+                                                  [/bi/, 'Bill'], 
+                                                  [/mo/i, 'Molly'], 
+                                                  [/ll/, 'Bill'], 
+                                                  [/lly/i, ['One', 'Two']], 
+                                                  [/^.*?\s+(.*)$/, Proc.new{|m| m[1]}]
+                                                  ]
+                                          )
   end
   
   it "knows its name" do
@@ -44,12 +51,35 @@ describe "Maps" do
     newkvmap.should.equal @kvmap
   end
   
-  it "should round trip a multivaluemap" do 
+  it "should round trip a multivaluemap without a Proc" do 
+    cleanmap = []
+    @mvmap.map.each do |kv|
+      cleanmap.push kv unless kv[1].is_a? Proc
+    end
+    @mvmap.map = cleanmap
     s = @mvmap.asPPString
     newmvmap = MARCSpec::MultiValueMap.fromPPString s
     newmvmap.should.equal @mvmap
   end
   
+  it "can't round-trip a multivaluemap with a Proc" do
+    s = @mvmap.asPPString
+    puts s
+    newmvmap = MARCSpec::MultiValueMap.fromPPString s
+    newmvmap.should.not.equal @mvmap
+  end
+  
+  
+  it "can use a proc in a multivaluemap" do
+    @mvmap['Molly Dueber'].sort.should.equal ['Molly', 'Bill', 'Dueber', 'One', 'Two'].sort
+  end
+  
+  it "can use a simple passthrough in a multivaluemap" do
+     @mvmap = MARCSpec::MultiValueMap.new('mvmap', [[/.*/, Proc.new {|m| m[0]}]])
+     @mvmap['one'].should.equal ['one']
+     @mvmap['two'].should.equal ['two']
+  end
+  
   it "should read a kv solrmarc file" do
     map = MARCSpec::KVMap.from_solrmarc_file "#{DIR}/data/umich/translation_maps/country_map.properties"
     map.mapname.should.equal 'country_map'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 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-14 00:00:00 -04:00
+date: 2010-09-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency