traject 1.0.0.beta.5 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a51fd70b21e067b49728f2c0fd90006d22586c2
-  data.tar.gz: 8a451bfcb4d9509ae2795f671f6474d4f5fc645a
+  metadata.gz: ccc1ca6c023f01b9e21148a3ca37d86858df8065
+  data.tar.gz: 4360b687f3ba8d957d4a14d39bc6cefbd443bcdd
 SHA512:
-  metadata.gz: b676d97ef3392006e199632fc8df2a5313e913af6b6071dda6217bf259ac61969fb392fb9b04a979f99713da0d14436abbee44b33fd5326b3bc54d3920481271
-  data.tar.gz: f1de9d2a249a81777d1e7882eb5b3a47ac66d8dacdd8474bd65fafe3f59dcff8dc80f37e22ecb15bc7ede894e82cbe20b9abfec7c01926d88d79bb253970ca31
+  metadata.gz: dba976f724960b4048c2db65827780a46a2c64c442b2f48aa077375775f9f3a8901f446f226fd26f8e69cddbb696b3c114403c592b20cdc362bc43161a25f608
+  data.tar.gz: 7216d83c97aa75698d2c03dec2bcc263decf4cc3d39a62187e9b0b09856fa1cac45e4fcb524d633f8a77acbf474343a69fec9b0324b66f056eb888915396e95b

data/lib/traject/macros/marc21.rb

@@ -47,10 +47,6 @@ module Traject::Macros
         raise RuntimeError.new("Illegal/Unknown argument '#{(options.keys - EXTRACT_MARC_VALID_OPTIONS).join(', ')}' in extract_marc at #{Traject::Util.extract_caller_location(caller.first)}")
       end
 
-      only_first              = options.delete(:first)
-      trim_punctuation        = options.delete(:trim_punctuation)
-      default_value           = options.delete(:default)
-      allow_duplicates        = options.delete(:allow_duplicates)
 
       # We create the TranslationMap and the MarcExtractor here
       # on load, so the lambda can just refer to already created
@@ -61,6 +57,8 @@ module Traject::Macros
 
       if translation_map_arg  = options.delete(:translation_map)
         translation_map = Traject::TranslationMap.new(translation_map_arg)
+      else
+        translation_map = nil
       end
 
 
@@ -68,29 +66,39 @@ module Traject::Macros
 
       lambda do |record, accumulator, context|
         accumulator.concat extractor.extract(record)
+        Marc21.apply_extraction_options(accumulator, options, translation_map)
+      end
+    end
+    
+    # Side-effect the accumulator with the options
+    def self.apply_extraction_options(accumulator, options, translation_map=nil)
+      only_first              = options[:first]
+      trim_punctuation        = options[:trim_punctuation]
+      default_value           = options[:default]
+      allow_duplicates        = options[:allow_duplicates]
+
+      if only_first
+        accumulator.replace Array(accumulator[0])
+      end
 
-        if only_first
-          Marc21.first! accumulator
-        end
-
-        if translation_map
-          translation_map.translate_array! accumulator
-        end
-
-        if trim_punctuation
-          accumulator.collect! {|s| Marc21.trim_punctuation(s)}
-        end
+      if translation_map
+        translation_map.translate_array! accumulator
+      end
 
-        unless allow_duplicates
-          accumulator.uniq!
-        end
+      if trim_punctuation
+        accumulator.collect! {|s| Marc21.trim_punctuation(s)}
+      end
 
-        if default_value && accumulator.empty?
-          accumulator << default_value
-        end
+      unless allow_duplicates
+        accumulator.uniq!
+      end
 
+      if default_value && accumulator.empty?
+        accumulator << default_value
       end
     end
+      
+    
     #  A list of symbols that are valid keys in the options hash
     EXTRACT_MARC_VALID_OPTIONS = [:first, :trim_punctuation, :default,
                                   :allow_duplicates, :separator, :translation_map,

data/lib/traject/macros/marc21_semantics.rb

@@ -514,7 +514,7 @@ module Traject::Macros
     # customization you probably just want to write your own method in
     # terms of the Marc21Semantics.assemble_lcsh method. 
     def marc_lcsh_formatted(options = {})
-      spec            = options[:spec] || "600:610:611:630:648:650:651:654:6662"
+      spec            = options[:spec] || "600:610:611:630:648:650:651:654:662"
       subd_separator  = options[:subdivison_separator] || " — "
       other_separator = options[:other_separator] || " "
 

data/lib/traject/version.rb

@@ -1,3 +1,3 @@
 module Traject
-  VERSION = "1.0.0.beta.5"
+  VERSION = "1.0.0.beta.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: traject
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.5
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: marc