marcspec 1.1.0 → 1.1.1

data/CHANGES

@@ -1,3 +1,5 @@
+1.1.1
+  * Fixed bug with :noMapKeyDefault => :passthrough for MVMap
 1.1.0
   * Added support for Proc objects as the value in a MVMap
 1.0.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/marcspec/multivaluemap.rb

@@ -40,7 +40,11 @@ module MARCSpec
       if rv.size > 0
         return rv
       else
-        return [default]
+        if default == :passthrough
+          return key
+        else
+          return default
+        end
       end
     end
     

data/spec/maps_spec.rb

@@ -26,10 +26,30 @@ describe "Maps" do
     @kvmap['two'].should.equal ['2', 'zwei']
   end
   
-  it "gets nothing on nonmatches" do
+  it "gets nothing on nonmatches for kvmap" do
     @kvmap['ddd'].should.equal nil
-    @mvmap['ddd'].should.equal [nil]
   end
+
+  it "gets nothing on nonmatches for mvmap" do
+    @mvmap['ddd'].should.equal nil
+  end
+  
+  it "gets default if set for nonmatches with KVMap" do
+    @kvmap['ddd', 'default'].should.equal 'default'
+  end
+
+  it "gets default if set for nonmatches with MVMap" do
+    @mvmap['ddd', 'default'].should.equal 'default'
+  end
+  
+  it "gets key if default is :passthrough for nonmatches with KVMap" do
+    @kvmap['ddd', :passthrough].should.equal 'ddd'
+  end
+
+  it "gets key if default is :passthrough for nonmatches with KVMap" do
+    @mvmap['ddd', :passthrough].should.equal 'ddd'
+  end
+
   
   it "gets correct values from multivaluemap" do
     @mvmap['bi'].should.equal ['Bill']
@@ -40,7 +60,7 @@ describe "Maps" do
   
   it "correctly uses default value" do
     @mvmap['bi', 'default'].should.equal ['Bill']
-    @mvmap['ddd', 'default'].should.equal ['default']
+    @mvmap['ddd', 'default'].should.equal 'default'
     @kvmap['ddd', 'default'].should.equal 'default'
     @kvmap['one', 'default'].should.equal '1'
   end
@@ -64,7 +84,6 @@ describe "Maps" do
   
   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

data/spec/solrfieldspec_spec.rb

@@ -65,6 +65,31 @@ describe "SolrFieldSpec" do
     sfs << @nonmatchingSpec
     sfs.marc_values(@one).should.equal [@default]
   end
+end
+
+describe "Solr Field Specs and maps" do
+  
+  before do 
+    @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
+    # @batch = MARC4J4R::Reader.new("#{DIR}/batch.dat").collect
+    @opts = {:solrField=>'solrfield'}
+    @titleAC =  MARCSpec::VariableFieldSpec.new('245', ['a', 'c'])
+    @titleACValue = "The Texas ranger Sung by Beale D. Taylor."
+    @twosixtyC = MARCSpec::VariableFieldSpec.new('260', 'c')
+    @twosixtyCValue = "1939."
+    
+    @nonmatchingSpec =  MARCSpec::VariableFieldSpec.new('999', ['a', 'c'])
+    
+    @default = 'DEFAULT'
+    
+    
+    @mapValue = "twosixtyCMapValue"
+    @mapValueForDefault = 'mapValueForDefaultValue'
+    @noMapKeyDefault = 'noMapKeyDefault'
+    
+    @map = MARCSpec::KVMap.new('nameOfTheMap', {@twosixtyCValue => @mapValue, @default=>@mapValueForDefault})
+    
+  end
   
   it "works with a KV Map and no defaults" do
     @opts[:map] = @map
@@ -91,7 +116,7 @@ describe "SolrFieldSpec" do
     sfs << @nonmatchingSpec
     sfs.marc_values(@one).should.equal [@default]
   end
-  
+    
   it "returns multiple values from a kv map when appropriate" do
     @map[@twosixtyCValue] = ['one', 'two']
     @opts[:map] = @map
@@ -109,7 +134,7 @@ describe "SolrFieldSpec" do
     sfs << @titleAC
     sfs.marc_values(@one).sort.should.equal ['one', 'two', 'three', 'four'].sort
   end
-    
+
   
   it "round trips if you add the map by hand" do
     @opts[:map] = @map

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marcspec
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - BillDueber