marcspec 1.5.0 → 1.6.1

data/spec/dsl_spec.rb

@@ -60,8 +60,8 @@ describe "DSL" do
           value "Bill"
         end
       end
-      ss.solrfieldspecs.size.should.equal 1
-      ss.hash_from_marc(@one)['id'].should.equal ['Bill']
+      ss.solrfieldspecs.size.should ==  1
+      ss.hash_from_marc(@one)['id'].should ==  ['Bill']
     end
   end
 
@@ -80,7 +80,7 @@ describe "DSL" do
         end
       end
     
-      ss.hash_from_marc(@one)['hello'].should.equal ['Hello']
+      ss.hash_from_marc(@one)['hello'].should ==  ['Hello']
     end
   
     it "builds a custom that can take a single argument" do
@@ -93,7 +93,7 @@ describe "DSL" do
         end
       end
 
-      ss.hash_from_marc(@one)['hello'].should.equal ['Hello Bill']
+      ss.hash_from_marc(@one)['hello'].should ==  ['Hello Bill']
     end
   
     it "builds a custom that can take two arguments" do
@@ -106,7 +106,7 @@ describe "DSL" do
         end
       end
 
-      ss.hash_from_marc(@one)['hello'].should.equal ['Hello Bill Dueber']
+      ss.hash_from_marc(@one)['hello'].should ==  ['Hello Bill Dueber']
     end
  
     it "builds a custom that can take two arguments" do
@@ -119,7 +119,7 @@ describe "DSL" do
         end
       end
 
-      ss.hash_from_marc(@one)['hello'].should.equal ['Hello 1 2 3 4 5']
+      ss.hash_from_marc(@one)['hello'].should ==  ['Hello 1 2 3 4 5']
     end
     
     it "works with multihead" do
@@ -131,8 +131,8 @@ describe "DSL" do
         end
       end
 
-      ss.hash_from_marc(@one)['a'].should.equal ['one']
-      ss.hash_from_marc(@one)['b'].should.equal ['two']
+      ss.hash_from_marc(@one)['a'].should ==  ['one']
+      ss.hash_from_marc(@one)['b'].should ==  ['two']
     end
   end
 
@@ -148,7 +148,7 @@ describe "DSL" do
           spec('001') 
         end
       end
-      ss.hash_from_marc(@one)['id'].should.equal ['afc99990058366']
+      ss.hash_from_marc(@one)['id'].should ==  ['afc99990058366']
     end
 
     it "should allow integer tags" do
@@ -157,7 +157,7 @@ describe "DSL" do
           spec(001) 
         end
       end
-      ss.hash_from_marc(@one)['id'].should.equal ['afc99990058366']
+      ss.hash_from_marc(@one)['id'].should ==  ['afc99990058366']
     end
 
     it "can get a single char" do
@@ -168,7 +168,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['c']
+      ss.hash_from_marc(@one)['tst'].should ==  ['c']
     end
 
     it "can get a range" do
@@ -179,7 +179,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['c9999']
+      ss.hash_from_marc(@one)['tst'].should ==  ['c9999']
     end
     
     it "allows multiple char/chars per control field" do
@@ -191,7 +191,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['c', 'c9999']
+      ss.hash_from_marc(@one)['tst'].should ==  ['c', 'c9999']
     end
       
 
@@ -199,17 +199,17 @@ describe "DSL" do
 
 
   describe "variable fields DSL" do
-    # before do 
-    #   @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
-    # end
-  
+    before do 
+       @one = MARC4J4R::Reader.new("#{DIR}/data/one.dat").first
+     end
+   
     it "can get a whole variable field" do
       ss = MARCSpec.build do
         field("tst") do
           spec(260) 
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['Medina, Texas, 1939.']
+      ss.hash_from_marc(@one)['tst'].should ==  ['Medina, Texas, 1939.']
     end
   
     it "can get a single subfield" do
@@ -220,7 +220,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['Medina, Texas,']
+      ss.hash_from_marc(@one)['tst'].should ==  ['Medina, Texas,']
     end
 
 
@@ -232,7 +232,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['The Texas ranger Sung by Beale D. Taylor.']
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger Sung by Beale D. Taylor.']
     end
 
     it "can get multiple subfields as array" do
@@ -243,7 +243,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['The Texas ranger Sung by Beale D. Taylor.']
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger Sung by Beale D. Taylor.']
     end 
   
     it "can get multiple different subfields from the same field" do
@@ -255,7 +255,7 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['The Texas ranger', 'Sung by Beale D. Taylor.']
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger', 'Sung by Beale D. Taylor.']
     end  
   
     it "can handle multiple specs" do
@@ -269,8 +269,30 @@ describe "DSL" do
           }
         end
       end
-      ss.hash_from_marc(@one)['tst'].should.equal ['The Texas ranger', 'Sung by Beale D. Taylor.']
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger', 'Sung by Beale D. Taylor.']
+    end
+    
+    it "can get tag/subs in the spec string" do
+      ss = MARCSpec.build do
+        field("tst") do
+          spec('245ac')
+        end
+      end
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger Sung by Beale D. Taylor.']
+    end
+
+    it "can get tag/subs in the spec string AND with a 'sub'" do
+      ss = MARCSpec.build do
+        field("tst") do
+          spec('245a') {
+            sub 'c'
+          }
+        end
+      end
+      ss.hash_from_marc(@one)['tst'].should ==  ['The Texas ranger', 'Sung by Beale D. Taylor.']
     end
+
+    
   end
 
   describe "SolrFieldSpec modifiers DSL" do
@@ -285,7 +307,7 @@ describe "DSL" do
         end
       end
       
-      ss.hash_from_marc(@one)['tst'].should.equal ['Lomax, John Avery, 1867-1948']
+      ss.hash_from_marc(@one)['tst'].should ==  ['Lomax, John Avery, 1867-1948']
     end
     
     it "works with default" do
@@ -299,7 +321,7 @@ describe "DSL" do
         end
       end
 
-      ss.hash_from_marc(@one)['tst'].should.equal ['Default value']
+      ss.hash_from_marc(@one)['tst'].should ==  ['Default value']
     end
   end
   
@@ -320,8 +342,8 @@ describe "DSL" do
 
       ss = MARCSpec::SpecSet.new
       ss.instance_eval(string)
-      ss.hash_from_marc(@one)['tst'].should.equal ['Default']
-      ss.hash_from_marc(@one)['id'].should.equal ['c9999']      
+      ss.hash_from_marc(@one)['tst'].should ==  ['Default']
+      ss.hash_from_marc(@one)['id'].should ==  ['c9999']      
     end
     
     it "works in compact form" do
@@ -338,8 +360,8 @@ describe "DSL" do
 
       ss = MARCSpec::SpecSet.new
       ss.instance_eval(string)
-      ss.hash_from_marc(@one)['tst'].should.equal ['Default']
-      ss.hash_from_marc(@one)['id'].should.equal ['c9999']      
+      ss.hash_from_marc(@one)['tst'].should ==  ['Default']
+      ss.hash_from_marc(@one)['id'].should ==  ['c9999']      
     end
     
     it "bails on a missing map" do
@@ -359,7 +381,7 @@ describe "DSL" do
       path = f.path
       f.close
       ss = MARCSpec::SpecSet.new
-      lambda{ss.buildSpecsFromDSLFile(path)}.should.raise SystemExit
+      lambda{ss.buildSpecsFromDSLFile(path)}.should raise_error(SystemExit)
       f.unlink
       
     end

data/spec/leaderspec_spec.rb

@@ -25,11 +25,11 @@ describe "LeaderSpec" do
   
   it "Works with full leader" do
     cfs = MARCSpec::LeaderSpec.new('LDR')
-    cfs.marc_values(@one).should.equal @one.leader
+    cfs.marc_values(@one).should ==  @one.leader
   end
   
   it "Works with substring of leader" do
     cfs = MARCSpec::LeaderSpec.new('LDR', 3..5)
-    cfs.marc_values(@one).should.equal @one.leader[3..5]
+    cfs.marc_values(@one).should ==  @one.leader[3..5]
   end
 end

data/spec/maps_spec.rb

@@ -6,53 +6,53 @@ describe "KV Maps" do
   end
   
   it "knows its name" do
-    @kvmap.mapname.should.equal 'kvmap'
+    @kvmap.mapname.should ==  'kvmap'
   end
   
   it "gets simple value from a kv map" do
-    @kvmap['one'].should.equal '1'
+    @kvmap['one'].should ==  '1'
   end
   
   it "gets a list value from a kv map" do
-    @kvmap['two'].should.equal ['2', 'zwei']
+    @kvmap['two'].should ==  ['2', 'zwei']
   end
   
   it "gets nothing on nonmatches for kvmap" do
-    @kvmap['ddd'].should.equal nil
+    @kvmap['ddd'].should ==  nil
   end
 
   it "gets default if set for nonmatches with KVMap" do
-    @kvmap['ddd', 'default'].should.equal 'default'
+    @kvmap['ddd', 'default'].should ==  'default'
   end
 
   it "gets key if default is :passthrough for nonmatches with KVMap" do
-    @kvmap['ddd', :passthrough].should.equal 'ddd'
+    @kvmap['ddd', :passthrough].should ==  'ddd'
   end
 
   
   it "correctly uses default value" do
-    @kvmap['ddd', 'default'].should.equal 'default'
-    @kvmap['one', 'default'].should.equal '1'
+    @kvmap['ddd', 'default'].should ==  'default'
+    @kvmap['one', 'default'].should ==  '1'
   end
   
   it "should round-trip a kvmap" do
     s = @kvmap.asPPString
     newkvmap = MARCSpec::KVMap.fromPPString s
-    newkvmap.should.equal @kvmap
+    newkvmap.should ==  @kvmap
   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'
-    map["nl"].should.equal "New Caledonia"
+    map.mapname.should ==  'country_map'
+    map["nl"].should ==  "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'
+    map['AAEL'].should ==  'AAEL'
+    map['AAEL MICE'].should ==  'AAEL MICE'
+    map['BUHR AAEL'].should ==  'BUHR'
   end
   
   
@@ -64,13 +64,13 @@ describe "KV Maps" do
     f.close
     map2 = MARCSpec::Map.fromFile(path)
     f.unlink
-    map.class.should.equal MARCSpec::KVMap    
-    map.should.equal map2
+    map.class.should ==  MARCSpec::KVMap    
+    map.should ==  map2
   end
   
   it "can name a map based on the filename when using fromFile(path)" do
     map = MARCSpec::Map.fromFile("#{DIR}/data/simplemap.rb")
-    map.mapname.should.equal 'simplemap'
+    map.mapname.should ==  'simplemap'
   end
 
 end
@@ -94,33 +94,33 @@ describe "MVMaps" do
   end
   
   it "knows its name" do
-    @mvmap.mapname.should.equal 'mvmap'
+    @mvmap.mapname.should ==  'mvmap'
   end
   
   it "gets nothing on nonmatches for mvmap" do
-    @mvmap['ddd'].should.equal nil
+    @mvmap['ddd'].should ==  nil
   end
   
   it "gets default if set for nonmatches with MVMap" do
-    @mvmap['ddd', 'default'].should.equal 'default'
+    @mvmap['ddd', 'default'].should ==  'default'
   end
   
 
   it "gets key if default is :passthrough for nonmatches with KVMap" do
-    @mvmap['ddd', :passthrough].should.equal 'ddd'
+    @mvmap['ddd', :passthrough].should ==  'ddd'
   end
 
   
   it "gets correct values from multivaluemap" do
-    @mvmap['bi'].should.equal ['Bill']
-    @mvmap['bill'].should.equal ['Bill']
-    @mvmap['mobi'].sort.should.equal ['Bill', 'Molly'].sort
-    @mvmap['Molly'].sort.should.equal ['Molly', 'Bill', 'One', 'Two'].sort
+    @mvmap['bi'].should ==  ['Bill']
+    @mvmap['bill'].should ==  ['Bill']
+    @mvmap['mobi'].sort.should ==  ['Bill', 'Molly'].sort
+    @mvmap['Molly'].sort.should ==  ['Molly', 'Bill', 'One', 'Two'].sort
   end
 
   it "correctly uses default value" do
-    @mvmap['bi', 'default'].should.equal ['Bill']
-    @mvmap['ddd', 'default'].should.equal 'default'
+    @mvmap['bi', 'default'].should ==  ['Bill']
+    @mvmap['ddd', 'default'].should ==  'default'
   end
   
   it "should round trip a multivaluemap without a Proc" do 
@@ -131,31 +131,31 @@ describe "MVMaps" do
     @mvmap.map = cleanmap
     s = @mvmap.asPPString
     newmvmap = MARCSpec::MultiValueMap.fromPPString s
-    newmvmap.should.equal @mvmap
+    newmvmap.should ==  @mvmap
   end
   
   it "can't round-trip a multivaluemap with a Proc" do
     s = @mvmap.asPPString
     newmvmap = MARCSpec::MultiValueMap.fromPPString s
-    newmvmap.should.not.equal @mvmap
+    newmvmap.should_not ==  @mvmap
   end
   
   
   it "can use a proc in a multivaluemap" do
-    @mvmap['Molly Dueber'].sort.should.equal ['Molly', 'Bill', 'Dueber', 'One', 'Two'].sort
+    @mvmap['Molly Dueber'].sort.should ==  ['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']
+     @mvmap['one'].should ==  ['one']
+     @mvmap['two'].should ==  ['two']
   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'
-    map['UMTRI Stuff'].should.equal ['Transportation Research Institute Library (UMTRI)']
-    map['HATCH DOCS'].should.equal ['Hatcher Graduate', 'Hatcher Graduate Documents Center']
+    map.mapname.should ==  'library_map'
+    map['UMTRI Stuff'].should ==  ['Transportation Research Institute Library (UMTRI)']
+    map['HATCH DOCS'].should ==  ['Hatcher Graduate', 'Hatcher Graduate Documents Center']
   end
 
   it "can dump/load a multivalue map via generic map interface" do
@@ -166,16 +166,16 @@ describe "MVMaps" do
     f.close
     map2 = MARCSpec::Map.fromFile(path)
     f.unlink
-    map.class.should.equal MARCSpec::MultiValueMap
-    map.should.equal map2
+    map.class.should ==  MARCSpec::MultiValueMap
+    map.should ==  map2
   end
 
   it "collapses ok" do
-    @mvmapCollapse['bill'].should.equal ['William']
-    @mvmapCollapse['william'].should.equal ['William']
-    @mvmapCollapse['bill dueber'].sort.should.equal ['William', 'Dueber'].sort
-    @mvmapCollapse['Will "duebes" Dueber'].sort.should.equal ['William', 'Dueber'].sort
-    @mvmapCollapse['notinthere'].should.equal nil
+    @mvmapCollapse['bill'].should ==  ['William']
+    @mvmapCollapse['william'].should ==  ['William']
+    @mvmapCollapse['bill dueber'].sort.should ==  ['William', 'Dueber'].sort
+    @mvmapCollapse['Will "duebes" Dueber'].sort.should ==  ['William', 'Dueber'].sort
+    @mvmapCollapse['notinthere'].should ==  nil
   end
     
   

data/spec/marcfieldspecs_spec.rb

@@ -29,29 +29,29 @@ describe "ControlFieldSpec" do
   # 01234567890123 # index
   it "gets a single full value" do
     cfs = MARCSpec::ControlFieldSpec.new('001')
-    cfs.marc_values(@one).should.equal ["afc99990058366"]    
+    cfs.marc_values(@one).should ==  ["afc99990058366"]    
   end
   
   it "gets a single character" do
     cfs = MARCSpec::ControlFieldSpec.new('001', 10 )
-    cfs.marc_values(@one).should.equal ['8']
+    cfs.marc_values(@one).should ==  ['8']
   end
   
   it "gets a range of characters" do
     cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
-    cfs.marc_values(@one).should.equal ['90058']
+    cfs.marc_values(@one).should ==  ['90058']
   end
   
   it "should round trip" do
     cfs = MARCSpec::ControlFieldSpec.new('001', 6..10 )
     cfs2 = MARCSpec::ControlFieldSpec.fromPPString(cfs.asPPString)
-    cfs.should.equal cfs2
+    cfs.should ==  cfs2
   end    
   
   it "throws an error if you try to use a datafield tag" do
     lambda{
       cfs = MARCSpec::ControlFieldSpec.new('010', 6..10 )
-    }.should.raise ArgumentError
+    }.should raise_error(ArgumentError)
   end
   
   it "accepts various forms for the range" do
@@ -62,22 +62,22 @@ describe "ControlFieldSpec" do
     # Range 4-7 is 9999
     cfs1.range = 4
     cfs2.range = 4..4
-    cfs1.marc_values(@one).should.equal ['9']
-    cfs2.marc_values(@one).should.equal ['9']
+    cfs1.marc_values(@one).should ==  ['9']
+    cfs2.marc_values(@one).should ==  ['9']
   end
   
   it "rejects bad ranges" do
     lambda{
       cfs = MARCSpec::ControlFieldSpec.new('010', -1)
-    }.should.raise ArgumentError
+    }.should raise_error(ArgumentError)
 
     lambda{
       cfs = MARCSpec::ControlFieldSpec.new('010', -1..3)
-    }.should.raise ArgumentError
+    }.should raise_error(ArgumentError)
     
     lambda{
       cfs = MARCSpec::ControlFieldSpec.new('010', [1,2,3])
-    }.should.raise ArgumentError
+    }.should raise_error(ArgumentError)
   end
 end
 
@@ -90,17 +90,17 @@ describe "LeaderSpec" do
   it "must use LDR as the tag" do
     lambda{
       cfs = MARCSpec::LeaderSpec.new('008')
-    }.should.raise ArgumentError
+    }.should raise_error(ArgumentError)
   end
   
   it "Works with full leader" do
     cfs = MARCSpec::LeaderSpec.new('LDR')
-    cfs.marc_values(@one).should.equal @one.leader
+    cfs.marc_values(@one).should ==  @one.leader
   end
   
   it "Works with substring of leader" do
     cfs = MARCSpec::LeaderSpec.new('LDR', 3..5)
-    cfs.marc_values(@one).should.equal @one.leader[3..5]
+    cfs.marc_values(@one).should ==  @one.leader[3..5]
   end
 end
     
@@ -114,39 +114,39 @@ describe "VariableFieldSpec" do
 
   it "Should get a whole field separated by spaces" do
     dfs = MARCSpec::VariableFieldSpec.new('260')
-    dfs.marc_values(@one).should.equal ["Medina, Texas, 1939."]
+    dfs.marc_values(@one).should ==  ["Medina, Texas, 1939."]
   end
 
   it "Should get just the $a" do
     dfs = MARCSpec::VariableFieldSpec.new('260', 'a')
-    dfs.marc_values(@one).should.equal ["Medina, Texas,"]
+    dfs.marc_values(@one).should ==  ["Medina, Texas,"]
   end
   
   it "should return separate values for repeated subfields if only one code is specified" do
     dfs = MARCSpec::VariableFieldSpec.new('651', 'z')
-    dfs.marc_values(@one).sort.should.equal ['Texas', 'United States of America.']
+    dfs.marc_values(@one).sort.should ==  ['Texas', 'United States of America.']
   end
   
-  it "Should get all fields via several equal routes" do
+  it "Should get all fields via several == routes" do
     a = MARCSpec::VariableFieldSpec.new('260').marc_values(@one)
     ac =  MARCSpec::VariableFieldSpec.new('260', ['a', 'c']).marc_values(@one)
     ca =  MARCSpec::VariableFieldSpec.new('260', ['c', 'a']).marc_values(@one)
     ca2 = MARCSpec::VariableFieldSpec.new('260', 'ca').marc_values(@one)
     allrange = MARCSpec::VariableFieldSpec.new('260', 'a'..'z').marc_values(@one)
-    a.should.equal ac
-    ac.should.equal ca
-    ca.should.equal allrange
+    a.should ==  ac
+    ac.should ==  ca
+    ca.should ==  allrange
   end
   
   it "should get all three 700a's" do
     a = MARCSpec::VariableFieldSpec.new('700', 'a').marc_values(@one)
-    a.should.equal ["Lomax, John Avery, 1867-1948", "Lomax, Ruby T. (Ruby Terrill)", "Taylor, Beale D."]
+    a.should ==  ["Lomax, John Avery, 1867-1948", "Lomax, Ruby T. (Ruby Terrill)", "Taylor, Beale D."]
   end
   
   it "should round trip" do 
     ac =  MARCSpec::VariableFieldSpec.new('260', ['a', 'c'])
     ac2 = MARCSpec::VariableFieldSpec.fromPPString(ac.asPPString)
-    ac.should.equal ac2
+    ac.should ==  ac2
   end
   
 end