traject 2.3.4 → 3.0.0.alpha.1

data/test/indexer/macros/macros_marc21_semantics_test.rb

@@ -22,16 +22,16 @@ describe "Traject::Macros::Marc21Semantics" do
   end
 
   it "oclcnum" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "oclcnum", oclcnum
     end
     output = @indexer.map_record(@record)
 
     assert_equal %w{47971712},  output["oclcnum"]
-    
+
     assert_equal({}, @indexer.map_record(empty_record))
   end
-  
+
   it "deals with all prefixed OCLC nunbers" do
     @record.append(MARC::DataField.new('035', ' ', ' ', ['a', '(OCoLC)ocm111111111']))
     @record.append(MARC::DataField.new('035', ' ', ' ', ['a', '(OCoLC)222222222']))
@@ -40,21 +40,21 @@ describe "Traject::Macros::Marc21Semantics" do
     @record.append(MARC::DataField.new('035', ' ', ' ', ['a', '(OCoLC)ocn555555555']))
     @record.append(MARC::DataField.new('035', ' ', ' ', ['a', '(OCoLC)on666666666']))
     @record.append(MARC::DataField.new('035', ' ', ' ', ['a', '777777777'])) # not OCLC number
-    
-    @indexer.instance_eval do
+
+    @indexer.configure do
       to_field "oclcnum", oclcnum
     end
     output = @indexer.map_record(@record)
 
     assert_equal %w{47971712 111111111 222222222 333333333 444444444 555555555 666666666},  output["oclcnum"]
   end
-    
-  
+
+
 
   it "#marc_series_facet" do
     @record = MARC::Reader.new(support_file_path  "louis_armstrong.marc").to_a.first
 
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "series_facet", marc_series_facet
     end
     output = @indexer.map_record(@record)
@@ -62,14 +62,14 @@ describe "Traject::Macros::Marc21Semantics" do
     # trims punctuation too
     assert_equal ["Big bands"], output["series_facet"]
     assert_equal({}, @indexer.map_record(empty_record))
-    
+
   end
 
   describe "marc_sortable_author" do
     # these probably should be taking only certain subfields, but we're copying
     # from SolrMarc that didn't do so either and nobody noticed, so not bothering for now.
     before do
-      @indexer.instance_eval do
+      @indexer.configure do
         to_field "author_sort", marc_sortable_author
       end
     end
@@ -78,7 +78,7 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["Herman, Edward S.   Manufacturing consent the political economy of the mass media Edward S. Herman and Noam Chomsky ; with a new introduction by the authors"], output["author_sort"]
       assert_equal [""], @indexer.map_record(empty_record)['author_sort']
-    
+
     end
     it "respects non-filing" do
       @record = MARC::Reader.new(support_file_path  "the_business_ren.marc").to_a.first
@@ -87,19 +87,19 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["Business renaissance quarterly [electronic resource]."], output["author_sort"]
       assert_equal [""], @indexer.map_record(empty_record)['author_sort']
-    
+
     end
   end
 
   describe "marc_sortable_title" do
     before do
-      @indexer.instance_eval { to_field "title_sort", marc_sortable_title }
+      @indexer.configure { to_field "title_sort", marc_sortable_title }
     end
     it "works" do
       output = @indexer.map_record(@record)
       assert_equal ["Manufacturing consent : the political economy of the mass media"], output["title_sort"]
       assert_equal({}, @indexer.map_record(empty_record))
-    
+
     end
     it "respects non-filing" do
       @record = MARC::Reader.new(support_file_path  "the_business_ren.marc").to_a.first
@@ -116,7 +116,7 @@ describe "Traject::Macros::Marc21Semantics" do
 
   describe "marc_languages" do
     before do
-      @indexer.instance_eval {to_field "languages", marc_languages() }
+      @indexer.configure {to_field "languages", marc_languages() }
     end
 
     it "unpacks packed 041a and translates" do
@@ -125,14 +125,14 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["English", "French", "German", "Italian", "Spanish", "Russian"], output["languages"]
       assert_equal({}, @indexer.map_record(empty_record))
-    
+
     end
   end
 
   describe "marc_instrumentation_humanized" do
     before do
       @record = MARC::Reader.new(support_file_path  "musical_cage.marc").to_a.first
-      @indexer.instance_eval {to_field "instrumentation", marc_instrumentation_humanized }
+      @indexer.configure {to_field "instrumentation", marc_instrumentation_humanized }
     end
 
     it "translates, de-duping" do
@@ -140,14 +140,14 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["Larger ensemble, Unspecified", "Piano", "Soprano voice", "Tenor voice", "Violin", "Larger ensemble, Ethnic", "Guitar", "Voices, Unspecified"], output["instrumentation"]
       assert_equal({}, @indexer.map_record(empty_record))
-    
+
     end
   end
 
   describe "marc_instrument_codes_normalized" do
     before do
       @record = MARC::Reader.new(support_file_path  "musical_cage.marc").to_a.first
-      @indexer.instance_eval {to_field "instrument_codes", marc_instrument_codes_normalized }
+      @indexer.configure {to_field "instrument_codes", marc_instrument_codes_normalized }
     end
     it "normalizes, de-duping" do
       output = @indexer.map_record(@record)
@@ -161,27 +161,27 @@ describe "Traject::Macros::Marc21Semantics" do
 
       assert_equal ["bb01", "bb01.s", "bb", "bb.s", "oe"], output["instrument_codes"]
       assert_equal({}, @indexer.map_record(empty_record))
-   
+
     end
   end
 
   describe "publication_date" do
     # there are way too many edge cases for us to test em all, but we'll test some of em.
-    
+
     it "works when there's no date information" do
       assert_nil Marc21Semantics.publication_date(empty_record)
     end
-    
+
     it "uses macro correctly with no date info" do
-      @indexer.instance_eval {to_field "date", marc_publication_date }
+      @indexer.configure {to_field "date", marc_publication_date }
       assert_equal({}, @indexer.map_record(empty_record))
     end
-    
-    
+
+
     it "pulls out 008 date_type s" do
       @record = MARC::Reader.new(support_file_path  "manufacturing_consent.marc").to_a.first
       assert_equal 2002, Marc21Semantics.publication_date(@record)
-      
+
     end
     it "uses start date for date_type c continuing resource" do
       @record = MARC::Reader.new(support_file_path  "the_business_ren.marc").to_a.first
@@ -221,14 +221,14 @@ describe "Traject::Macros::Marc21Semantics" do
 
   describe "marc_lcc_to_broad_category" do
     before do
-      @indexer.instance_eval {to_field "discipline_facet", marc_lcc_to_broad_category }
+      @indexer.configure { to_field "discipline_facet", marc_lcc_to_broad_category }
     end
     it "maps a simple example" do
       @record = MARC::Reader.new(support_file_path  "manufacturing_consent.marc").to_a.first
       output = @indexer.map_record(@record)
 
       assert_equal ["Language & Literature"], output["discipline_facet"]
-      
+
     end
     it "maps to default" do
       @record = MARC::Reader.new(support_file_path  "musical_cage.marc").to_a.first
@@ -238,14 +238,14 @@ describe "Traject::Macros::Marc21Semantics" do
     end
 
     it "maps to nothing if none and no default" do
-      @indexer.instance_eval {to_field "discipline_no_default", marc_lcc_to_broad_category(:default => nil)}
+      @indexer.configure { to_field "discipline_no_default", marc_lcc_to_broad_category(:default => nil) }
       @record = MARC::Reader.new(support_file_path  "musical_cage.marc").to_a.first
       output = @indexer.map_record(@record)
 
       assert_nil output["discipline_no_default"]
-      
+
       assert_nil @indexer.map_record(empty_record)["discipline_no_default"]
-      
+
     end
 
     describe "LCC_REGEX" do
@@ -258,7 +258,7 @@ describe "Traject::Macros::Marc21Semantics" do
 
   describe "marc_geo_facet" do
     before do
-      @indexer.instance_eval {to_field "geo_facet", marc_geo_facet }
+      @indexer.configure { to_field "geo_facet", marc_geo_facet }
     end
     it "maps a complicated record" do
       @record = MARC::Reader.new(support_file_path  "multi_geo.marc").to_a.first
@@ -272,13 +272,13 @@ describe "Traject::Macros::Marc21Semantics" do
       output = @indexer.map_record(@record)
       assert_nil output["geo_facet"]
       assert_equal({}, @indexer.map_record(empty_record))
-      
+
     end
   end
 
   describe "marc_era_facet" do
     before do
-      @indexer.instance_eval {to_field "era_facet", marc_era_facet}
+      @indexer.configure { to_field "era_facet", marc_era_facet }
     end
     it "maps a complicated record" do
       @record = MARC::Reader.new(support_file_path  "multi_era.marc").to_a.first
@@ -287,12 +287,12 @@ describe "Traject::Macros::Marc21Semantics" do
       assert_equal ["Early modern, 1500-1700", "17th century", "Great Britain: Puritan Revolution, 1642-1660", "Great Britain: Civil War, 1642-1649", "1642-1660"],
         output["era_facet"]
       assert_equal({}, @indexer.map_record(empty_record))
-        
+
     end
   end
 
   describe "marc_lcsh_display" do
-    it "formats typical field" do      
+    it "formats typical field" do
       field = MARC::DataField.new('650', ' ', ' ', ['a', 'Psychoanalysis and literature'], ['z', 'England'], ['x', 'History'], ['y', '19th century.'])
       str = Marc21Semantics.assemble_lcsh(field)
 
@@ -307,7 +307,7 @@ describe "Traject::Macros::Marc21Semantics" do
       assert_equal "Psychoanalysis and literature — History", str
     end
 
-    it "doesn't put subdivision in wrong place" do 
+    it "doesn't put subdivision in wrong place" do
       field = MARC::DataField.new('600', ' ', ' ', ['a', 'Eliot, George,'],['d', '1819-1880.'], ['t', 'Middlemarch'])
       str = Marc21Semantics.assemble_lcsh(field)
 
@@ -329,14 +329,14 @@ describe "Traject::Macros::Marc21Semantics" do
     describe "marc_lcsh_formatted macro" do
       it "smoke test" do
         @record = MARC::Reader.new(support_file_path  "george_eliot.marc").to_a.first
-        @indexer.instance_eval {to_field "lcsh", marc_lcsh_formatted}
+        @indexer.configure { to_field "lcsh", marc_lcsh_formatted }
         output = @indexer.map_record(@record)
 
         assert output["lcsh"].length > 0, "outputs data"
         assert output["lcsh"].include?("Eliot, George, 1819-1880 — Characters"), "includes a string its supposed to"
-        
+
         assert_equal({}, @indexer.map_record(empty_record))
-        
+
       end
     end
   end
@@ -347,17 +347,17 @@ describe "Traject::Macros::Marc21Semantics" do
     end
 
     it "works as expected" do
-      @indexer.instance_eval do
+      @indexer.configure do
         to_field 'title_phrase', extract_marc_filing_version('245ab')
       end
       output = @indexer.map_record(@record)
       assert_equal ['Business renaissance quarterly'], output['title_phrase']
       assert_equal({}, @indexer.map_record(empty_record))
-      
+
     end
 
     it "works with :include_original" do
-      @indexer.instance_eval do
+      @indexer.configure do
         to_field 'title_phrase', extract_marc_filing_version('245ab', :include_original=>true)
       end
       output = @indexer.map_record(@record)
@@ -366,19 +366,19 @@ describe "Traject::Macros::Marc21Semantics" do
     end
 
     it "doesn't do anything if you don't include the first subfield" do
-      @indexer.instance_eval do
+      @indexer.configure do
         to_field 'title_phrase', extract_marc_filing_version('245h')
       end
       output = @indexer.map_record(@record)
       assert_equal ['[electronic resource].'], output['title_phrase']
       assert_equal({}, @indexer.map_record(empty_record))
-   
+
     end
 
 
     it "dies if you pass it something else" do
       assert_raises(RuntimeError) do
-        @indexer.instance_eval do
+        @indexer.configure do
           to_field 'title_phrase', extract_marc_filing_version('245ab', :include_original=>true, :uniq => true)
         end
       end

data/test/indexer/macros/marc21/extract_all_marc_values_test.rb

@@ -31,7 +31,7 @@ describe "The extract_all_marc_values macro" do
   end
 
   it "#extract_all_marc_values" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "text", extract_all_marc_values
     end
     output = @indexer.map_record(@record)

data/test/indexer/macros/marc21/extract_marc_test.rb

@@ -17,7 +17,7 @@ describe "extract_marc" do
 
 
   it "extracts marc" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "title", extract_marc("245ab")
     end
 
@@ -29,7 +29,7 @@ describe "extract_marc" do
   end
 
   it "respects :first=>true option" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "other_id", extract_marc("035a", :first => true)
     end
 
@@ -40,7 +40,7 @@ describe "extract_marc" do
   end
 
   it "trims punctuation with :trim_punctuation => true" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "title", extract_marc("245ab", :trim_punctuation => true)
     end
 
@@ -48,11 +48,21 @@ describe "extract_marc" do
 
     assert_equal ["Manufacturing consent : the political economy of the mass media"], output["title"]
     assert_equal({}, @indexer.map_record(empty_record))
+  end
+
+  it "can use trim_punctuation as transformation macro" do
+    @indexer.configure do
+      to_field "title", extract_marc("245ab"), trim_punctuation
+    end
 
+    output = @indexer.map_record(@record)
+
+    assert_equal ["Manufacturing consent : the political economy of the mass media"], output["title"]
+    assert_equal({}, @indexer.map_record(empty_record))
   end
 
   it "respects :default option" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "only_default", extract_marc("9999", :default => "DEFAULT VALUE")
     end
     output = @indexer.map_record(@record)
@@ -65,7 +75,7 @@ describe "extract_marc" do
     f = @record.fields('008').first
     @record.append(f)
 
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "lang1", extract_marc('008[35-37]')
       to_field "lang2", extract_marc('008[35-37]', :allow_duplicates => true)
     end
@@ -78,7 +88,7 @@ describe "extract_marc" do
 
   it "fails on an extra/misspelled argument to extract_marc" do
     assert_raises(RuntimeError) do
-      @indexer.instance_eval do
+      @indexer.configure do
         to_field "foo", extract_marc("9999", :misspelled => "Who cares")
       end
     end
@@ -86,7 +96,7 @@ describe "extract_marc" do
 
 
   it "throws away nil values unless settings['allow_nil_values]'" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field 'default_nil', extract_marc('9999', :default => nil)
     end
     output = @indexer.map_record(@record)
@@ -98,7 +108,7 @@ describe "extract_marc" do
     @indexer.settings do |s|
       s['allow_nil_values'] = true
     end
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field 'default_nil', extract_marc('9999', :default => nil)
     end
     output = @indexer.map_record(@record)
@@ -109,7 +119,7 @@ describe "extract_marc" do
 
 
   it "uses :translation_map" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "cataloging_agency", extract_marc("040a", :separator => nil, :translation_map => "marc_040a_translate_test")
     end
     output = @indexer.map_record(@record)

data/test/indexer/macros/marc21/serialize_marc_test.rb

@@ -15,7 +15,7 @@ describe "serialized_marc" do
   end
 
   it "serializes xml" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "marc_record", serialized_marc(:format => "xml")
     end
     output = @indexer.map_record(@record)
@@ -27,7 +27,7 @@ describe "serialized_marc" do
   end
 
   it "serializes binary UUEncoded" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "marc_record", serialized_marc(:format => "binary")
     end
     output = @indexer.map_record(@record)
@@ -42,7 +42,7 @@ describe "serialized_marc" do
   end
 
   it "serializes binary raw" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "marc_record", serialized_marc(:format => "binary", :binary_escape => false)
     end
     output = @indexer.map_record(@record)
@@ -55,7 +55,7 @@ describe "serialized_marc" do
   end
 
   it "serializes json" do
-    @indexer.instance_eval do
+    @indexer.configure do
       to_field "marc_record", serialized_marc(:format => "json")
     end
     output = @indexer.map_record(@record)

data/test/indexer/macros/to_field_test.rb

@@ -7,7 +7,7 @@ describe "Indexer Macros#to_field" do
   end
 
   it "works with simple literal" do
-    @indexer.instance_eval do
+    @indexer.configure do
       extend Traject::Macros::Basic
 
       to_field "source", literal("MY LIBRARY")
@@ -21,7 +21,7 @@ describe "Indexer Macros#to_field" do
   it "works with macro AND block" do
     called = false
 
-    @indexer.instance_eval do
+    @indexer.configure do
       extend Traject::Macros::Basic
       to_field "source", literal("MY LIBRARY") do |record, accumulator, context|
         called = true