RubyGems - mods - Versions diffs - 2.0.1 → 2.0.2 - Mend

mods 2.0.1 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +4 -4
data/.rspec +1 -0
data/lib/mods/nom_terminology.rb +248 -249
data/lib/mods/reader.rb +2 -4
data/lib/mods/record.rb +5 -1
data/lib/mods/version.rb +1 -1
data/mods.gemspec +4 -4
data/spec/language_spec.rb +30 -30
data/spec/location_spec.rb +44 -44
data/spec/name_spec.rb +155 -155
data/spec/origin_info_spec.rb +32 -32
data/spec/part_spec.rb +122 -122
data/spec/physical_description_spec.rb +18 -18
data/spec/reader_spec.rb +41 -40
data/spec/record_info_spec.rb +120 -120
data/spec/record_spec.rb +63 -58
data/spec/related_item_spec.rb +76 -76
data/spec/subject_spec.rb +165 -165
data/spec/title_spec.rb +44 -44
data/spec/top_level_elmnts_simple_spec.rb +61 -61
metadata +28 -27

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0dbc17f9dd70f600b35f19e44e917590ab32b0
-  data.tar.gz: 2d423307ffb07736581493c22b40ba584c4b9d06
+  metadata.gz: dbfc453c27c3716eb928f59f53b2657c0fe246ab
+  data.tar.gz: b5c4b5eae1e685f381bd2ace70e6f9fb4b21fb1c
 SHA512:
-  metadata.gz: bafb8e7068e4a8d831104b345106af6e0cb23b8fe0d7ab80aad059c616e4dd615e14dd09719586fd229fcb875b09299399c62fb2019e5fbfae8eb0b0d9d8d94f
-  data.tar.gz: 9ff214bcc0bc1ffa290c3382ccfc62db858a6d94e1774462fad3112b4f157c90394999c4ef24a31608551948f1fdc0175ba08f1adb872de8a4f9085b27844aa4
+  metadata.gz: 391b47928854bcb135a0e44c7a05c38ec71695b7a2a86a147ad1aa86e973225f73179a8d7e7bc8f198b489e8f77fac90c1dbd0ca2b144d5f4440d61a2a63c90e
+  data.tar.gz: ec5f06c7246778c9f923717c8fd22b466d30d0cdc7cba2665c69800c4bf23a139f065902a1c556a24928417cae680859e1f18b6468863e5208b1c477e73c7b05

data/.rspec ADDED Viewed

	@@ -0,0 +1 @@
1	+ --color

data/lib/mods/nom_terminology.rb CHANGED Viewed

@@ -1,13 +1,12 @@
 module Mods
   # from:  http://www.loc.gov/standards/mods/v3/mods-userguide-generalapp.html
-  LANG_ATTRIBS = ['script', 'transliteration']
-  if Nokogiri::VERSION < "1.6.6"
-    # Nokogiri 1.6.6 introduced lang as a built-in attribute
-    LANG_ATTRIBS += ['lang']
-  end
+  # Nokogiri 1.6.6 introduced lang as a built-in attribute
+  LANG_ATTRIBS = (Nokogiri::VERSION < "1.6.6") ?
+      ['script', 'transliteration', 'lang'] :
+      ['script', 'transliteration']
   LINKING_ATTRIBS = ['xlink', 'ID']
   DATE_ATTRIBS = ['encoding', 'point', 'keyDate', 'qualifier']
@@ -15,69 +14,69 @@ module Mods
   POINT_ATTRIB_VALUES = ['start', 'end']
   KEY_DATE_ATTRIB_VALUES = ['yes']
   QUALIFIER_ATTRIB_VALUES = ['approximate', 'inferred', 'questionable']
   AUTHORITY_ATTRIBS = ['authority', 'authorityURI', 'valueURI']
   class Record
     # set the NOM terminology;  WITH namespaces
     # NOTES:
     # 1.  certain words, such as 'type' 'name' 'description' are reserved words in jruby or nokogiri
-    #  when the terminology would use these words, a suffix of '_at' is added if it is an attribute,
+    #  when the terminology would use these words, a suffix of '_at' is added if it is an attribute,
     #  (e.g. 'type_at' for @type) and a suffix of '_el' is added if it is an element.
-    # 2.  the underscore prefix variant terms are a way of making subterms for a node available
+    # 2.  the underscore prefix variant terms are a way of making subterms for a node available
     #   to any instance of said node and are not intended to be used externally
     # @param mods_ng_xml a Nokogiri::Xml::Document object containing MODS (with namespaces)
     def set_terminology_ns(mods_ng_xml)
       mods_ng_xml.set_terminology(:namespaces => { 'm' => Mods::MODS_NS }) do |t|
-# FIXME: may want to deal with camelcase vs. underscore in method_missing
+# FIXME: may want to deal with camelcase vs. underscore in method_missing
         # ABSTRACT -------------------------------------------------------------------------------
-        t.abstract :path => '/m:mods/m:abstract'
+        t.abstract  :path => '/m:mods/m:abstract'
         t._abstract :path => '//m:abstract' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # ACCESS_CONDITION -----------------------------------------------------------------------
-        t.accessCondition :path => '/m:mods/m:accessCondition'
+        t.accessCondition  :path => '/m:mods/m:accessCondition'
         t._accessCondition :path => '//m:accessCondition' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.displayLabel   :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.type_at        :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # CLASSIFICATION -------------------------------------------------------------------------
-        t.classification :path => '/m:mods/m:classification'
+        t.classification  :path => '/m:mods/m:classification'
         t._classification :path => '//m:classification' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.edition :path => '@edition', :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.edition       :path => '@edition',      :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
-        end
+        end
         # EXTENSION ------------------------------------------------------------------------------
-        t.extension :path => '/m:mods/m:extension'
+        t.extension  :path => '/m:mods/m:extension'
         t._extension :path => '//m:extension' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
         end
         # GENRE ----------------------------------------------------------------------------------
-        t.genre :path => '/m:mods/m:genre'
+        t.genre  :path => '/m:mods/m:genre'
         t._genre :path => '//m:genre' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
-          n.usage :path => '@usage', :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
+          n.usage        :path => '@usage',        :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
@@ -87,18 +86,18 @@ module Mods
         end
         # IDENTIIER ------------------------------------------------------------------------------
-        t.identifier :path => '/m:mods/m:identifier'
+        t.identifier  :path => '/m:mods/m:identifier'
         t._identifier :path => '//m:identifier' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.invalid :path => '@invalid', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.invalid      :path => '@invalid',      :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # LANGUAGE -------------------------------------------------------------------------------
-        t.language :path => '/m:mods/m:language'
+        t.language  :path => '/m:mods/m:language'
         t._language :path => '//m:language' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -107,19 +106,19 @@ module Mods
           }
           # child elements
           n.languageTerm :path => 'm:languageTerm'
-          n.code_term :path => 'm:languageTerm[@type="code"]'
-          n.text_term :path => 'm:languageTerm[@type="text"]'
-          n.scriptTerm :path => 'm:scriptTerm'
+          n.code_term    :path => 'm:languageTerm[@type="code"]'
+          n.text_term    :path => 'm:languageTerm[@type="text"]'
+          n.scriptTerm   :path => 'm:scriptTerm'
         end
         t._languageTerm :path => '//m:languageTerm' do |lt|
-          lt.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          lt.type_at    :path => '@type', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             lt.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end # t.language
         # LOCATION -------------------------------------------------------------------------------
-        t.location :path => '/m:mods/m:location'
+        t.location  :path => '/m:mods/m:location'
         t._location :path => '//m:location' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -128,7 +127,7 @@ module Mods
           }
           # child elements
           n.physicalLocation :path => 'm:physicalLocation' do |e|
-            e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+            e.displayLabel   :path => '@displayLabel', :accessor => lambda { |a| a.text }
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               e.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
@@ -136,17 +135,17 @@ module Mods
           n.shelfLocator :path => 'm:shelfLocator'
           n.url :path => 'm:url' do |e|
             e.dateLastAccessed :path => '@dateLastAccessed', :accessor => lambda { |a| a.text }
-            e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-            e.note :path => '@note', :accessor => lambda { |a| a.text }
+            e.displayLabel     :path => '@displayLabel',     :accessor => lambda { |a| a.text }
+            e.note   :path => '@note',   :accessor => lambda { |a| a.text }
             e.access :path => '@access', :accessor => lambda { |a| a.text }
-            e.usage :path => '@usage', :accessor => lambda { |a| a.text }
+            e.usage  :path => '@usage',  :accessor => lambda { |a| a.text }
           end
-          n.holdingSimple :path => 'm:holdingSimple'
+          n.holdingSimple   :path => 'm:holdingSimple'
           n.holdingExternal :path => 'm:holdingExternal'
         end # t.location
         # NAME ------------------------------------------------------------------------------------
-        t.plain_name :path => '/m:mods/m:name'
+        t.plain_name  :path => '/m:mods/m:name'
         t._plain_name :path => '//m:name' do |n|
           Mods::Name::ATTRIBUTES.each { |attr_name|
             if attr_name != 'type'
@@ -159,15 +158,15 @@ module Mods
           n.namePart :path => 'm:namePart' do |np|
             np.type_at :path => '@type', :accessor => lambda { |a| a.text }
           end
-          n.family_name :path => 'm:namePart[@type="family"]'
-          n.given_name :path => 'm:namePart[@type="given"]'
+          n.family_name    :path => 'm:namePart[@type="family"]'
+          n.given_name     :path => 'm:namePart[@type="given"]'
           n.termsOfAddress :path => 'm:namePart[@type="termsOfAddress"]'
-          n.date :path => 'm:namePart[@type="date"]'
+          n.date           :path => 'm:namePart[@type="date"]'
           n.displayForm :path => 'm:displayForm'
           n.affiliation :path => 'm:affiliation'
           n.description_el :path => 'm:description' # description is used by Nokogiri
-          n.role :path => 'm:role' do |r|
+          n.role :path => 'm:role' do |r|
             r.roleTerm :path => 'm:roleTerm' do |rt|
               rt.type_at :path => "@type", :accessor => lambda { |a| a.text }
               Mods::AUTHORITY_ATTRIBS.each { |attr_name|
@@ -175,7 +174,7 @@ module Mods
               }
             end
             # role convenience method
-            r.authority :path => '.', :accessor => lambda { |role_node|
+            r.authority :path => '.', :accessor => lambda { |role_node|
               a = nil
               role_node.roleTerm.each { |role_t|
                 # role_t.authority will be [] if it is missing from an earlier roleTerm
@@ -185,10 +184,10 @@ module Mods
               }
               a
             }
-            # role convenience method
-            r.code :path => '.', :accessor => lambda { |role_node|
+            # role convenience method
+            r.code :path => '.', :accessor => lambda { |role_node|
               c = nil
-              role_node.roleTerm.each { |role_t|
+              role_node.roleTerm.each { |role_t|
                 if role_t.type_at == 'code'
                   c ||= role_t.text
                 end
@@ -196,9 +195,9 @@ module Mods
               c
             }
             # role convenience method
-            r.value :path => '.', :accessor => lambda { |role_node|
+            r.value :path => '.', :accessor => lambda { |role_node|
               val = nil
-              role_node.roleTerm.each { |role_t|
+              role_node.roleTerm.each { |role_t|
                 if role_t.type_at == 'text'
                   val ||= role_t.text
                 end
@@ -210,7 +209,7 @@ module Mods
               val
             }
           end # role node
           # name convenience method
           # uses the displayForm of a name if present
           #   if no displayForm, try to make a string from family, given and terms of address
@@ -229,7 +228,7 @@ module Mods
                 end
                 if !dv.empty?
                   first = true
-                  name_node.namePart.each { |np|
+                  name_node.namePart.each { |np|
                     if np.type_at == 'termsOfAddress' && !np.text.empty?
                       if first
                         dv = dv + " " + np.text
@@ -239,7 +238,7 @@ module Mods
                       end
                     end
                   }
-                else # no family or given name
+                else # no family or given name
                   dv = name_node.namePart.select {|np| np.type_at != 'date' && !np.text.empty?}.join(" ")
                 end
               else # not a personal name
@@ -248,12 +247,12 @@ module Mods
             end
             dv.strip.empty? ? nil : dv.strip
           }
           # name convenience method
           n.display_value_w_date :path => '.', :single => true, :accessor => lambda {|name_node|
-            dv = ''
+            dv = ''
             dv = dv + name_node.display_value if name_node.display_value
-            name_node.namePart.each { |np|
+            name_node.namePart.each { |np|
               if np.type_at == 'date' && !np.text.empty? && !dv.end_with?(np.text)
                 dv = dv + ", #{np.text}"
               end
@@ -265,19 +264,19 @@ module Mods
           }
         end # t._plain_name
-        t.personal_name :path => '/m:mods/m:name[@type="personal"]'
-        t._personal_name :path => '//m:name[@type="personal"]'
-        t.corporate_name :path => '/m:mods/m:name[@type="corporate"]'
-        t._corporate_name :path => '//m:name[@type="corporate"]'
-        t.conference_name :path => '/m:mods/m:name[@type="conference"]'
+        t.personal_name    :path => '/m:mods/m:name[@type="personal"]'
+        t._personal_name   :path => '//m:name[@type="personal"]'
+        t.corporate_name   :path => '/m:mods/m:name[@type="corporate"]'
+        t._corporate_name  :path => '//m:name[@type="corporate"]'
+        t.conference_name  :path => '/m:mods/m:name[@type="conference"]'
         t._conference_name :path => '//m:name[@type="conference"]'
         # NOTE ---------------------------------------------------------------------------------
         t.note :path => '/m:mods/m:note'
         t._note :path => '//m:note' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.id_at        :path => '@ID',           :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
@@ -311,8 +310,8 @@ module Mods
               end
             end
           }
-          n.edition :path => 'm:edition'
-          n.issuance :path => 'm:issuance'
+          n.edition   :path => 'm:edition'
+          n.issuance  :path => 'm:issuance'
           n.frequency :path => 'm:frequency' do |f|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               f.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
@@ -321,12 +320,12 @@ module Mods
         end # t.origin_info
         # PART -----------------------------------------------------------------------------------
-        t.part :path => '/m:mods/m:part'
+        t.part  :path => '/m:mods/m:part'
         t._part :path => '//m:part' do |n|
           # attributes
-          n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
-          n.order :path => '@order', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.id_at        :path => '@ID',    :accessor => lambda { |a| a.text }
+          n.order        :path => '@order', :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',  :accessor => lambda { |a| a.text }
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
@@ -334,35 +333,35 @@ module Mods
           # child elements
           n.detail :path => 'm:detail' do |e|
             # attributes
-            e.level :path => '@level', :accessor => lambda { |a| a.text }
-            e.type_at :path => '@type', :accessor => lambda { |a| a.text }
+            e.level   :path => '@level', :accessor => lambda { |a| a.text }
+            e.type_at :path => '@type',  :accessor => lambda { |a| a.text }
             # elements
-            e.number :path => 'm:number'
+            e.number  :path => 'm:number'
             e.caption :path => 'm:caption'
-            e.title :path => 'm:title'
+            e.title   :path => 'm:title'
           end
-          n.extent :path => 'm:extent' do |e|  # TODO:  extent is ordered in xml schema
+          n.extent  :path => 'm:extent' do |e|  # TODO:  extent is ordered in xml schema
             # attributes
-            e.unit :path => '@unit', :accessor => lambda { |a| a.text }
+            e.unit  :path => '@unit', :accessor => lambda { |a| a.text }
             # elements
             e.start :path => 'm:start'
-            e.end :path => 'm:end'
+            e.end   :path => 'm:end'
             e.total :path => 'm:total'
-            e.list :path => 'm:list'
+            e.list  :path => 'm:list'
           end
-          n.date :path => 'm:date' do |e|
+          n.date :path => 'm:date' do |e|
             Mods::DATE_ATTRIBS.reject { |a| a == 'keyDate' }.each { |attr_name|
               e.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.text_el :path => 'm:text' do |e|
+          n.text_el :path => 'm:text' do |e|
             e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-            e.type_at :path => '@type', :accessor => lambda { |a| a.text }
+            e.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           end
         end # t._part
         # PHYSICAL_DESCRIPTION -------------------------------------------------------------------
-        t.physical_description :path => '/m:mods/m:physicalDescription'
+        t.physical_description  :path => '/m:mods/m:physicalDescription'
         t._physical_description :path => '//m:physicalDescription' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -387,7 +386,7 @@ module Mods
         end
         # RECORD_INFO --------------------------------------------------------------------------
-        t.record_info :path => '/m:mods/m:recordInfo'
+        t.record_info  :path => '/m:mods/m:recordInfo'
         t._record_info :path => '//m:recordInfo' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -432,35 +431,35 @@ module Mods
         t.related_item :path => '/m:mods/m:relatedItem' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.id_at        :path => '@ID',           :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           # elements
-          n.abstract :path => 'abstract'
+          n.abstract        :path => 'abstract'
           n.accessCondition :path => 'm:accessCondition'
-          n.classification :path => 'm:classification'
-          n.extension :path => 'm:extension'
-          n.genre :path => 'm:genre'
-          n.identifier :path => 'm:identifier'
-          n.language :path => 'm:language'
-          n.location :path => 'm:location'
-          n.name_el :path => 'm:name'  # Note:  'name' is used by Nokogiri
-          n.personal_name :path => 'm:name[@type="personal"]'
-          n.corporate_name :path => 'm:name[@type="corporate"]'
+          n.classification  :path => 'm:classification'
+          n.extension       :path => 'm:extension'
+          n.genre           :path => 'm:genre'
+          n.identifier      :path => 'm:identifier'
+          n.language        :path => 'm:language'
+          n.location        :path => 'm:location'
+          n.name_el         :path => 'm:name'  # Note:  'name' is used by Nokogiri
+          n.personal_name   :path => 'm:name[@type="personal"]'
+          n.corporate_name  :path => 'm:name[@type="corporate"]'
           n.conference_name :path => 'm:name[@type="conference"]'
-          n.note :path => 'm:note'
-          n.originInfo :path => 'm:originInfo'
-          n.part :path => 'm:part'
+          n.note            :path => 'm:note'
+          n.originInfo      :path => 'm:originInfo'
+          n.part            :path => 'm:part'
           n.physicalDescription :path => 'm:physicalDescription'
-          n.recordInfo :path => 'm:recordInfo'
-          n.subject :path => 'm:subject'
+          n.recordInfo      :path => 'm:recordInfo'
+          n.subject         :path => 'm:subject'
           n.tableOfContents :path => 'm:tableOfContents'
-          n.targetAudience :path => 'm:targetAudience'
-          n.titleInfo :path => 'm:titleInfo'
-          n.typeOfResource :path => 'm:typeOfResource'
+          n.targetAudience  :path => 'm:targetAudience'
+          n.titleInfo       :path => 'm:titleInfo'
+          n.typeOfResource  :path => 'm:typeOfResource'
         end
         # SUBJECT -----------------------------------------------------------------------------
-        t.subject :path => '/m:mods/m:subject'
+        t.subject  :path => '/m:mods/m:subject'
         t._subject :path => '//m:subject' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -471,9 +470,9 @@ module Mods
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
           # child elements
-          n.cartographics :path => 'm:cartographics' do |n1|
-            n1.scale :path => 'm:scale'
-            n1.projection :path => 'm:projection'
+          n.cartographics  :path => 'm:cartographics' do |n1|
+            n1.scale       :path => 'm:scale'
+            n1.projection  :path => 'm:projection'
             n1.coordinates :path => 'm:coordinates'
             Mods::Subject::CARTOGRAPHICS_CHILD_ELEMENTS.each { |elname|
               n1.send elname, :path => "m:#{elname}"
@@ -494,7 +493,7 @@ module Mods
               gc.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
             # convenience method
-            gc.translated_value :path => '.', :accessor => lambda { |gc_node|
+            gc.translated_value :path => '.', :accessor => lambda { |gc_node|
               code_val ||= gc_node.text
               xval = nil
               if code_val
@@ -522,10 +521,10 @@ module Mods
               t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.personal_name :path => 'm:name[@type="personal"]'
-          n.corporate_name :path => 'm:name[@type="corporate"]'
+          n.personal_name   :path => 'm:name[@type="personal"]'
+          n.corporate_name  :path => 'm:name[@type="corporate"]'
           n.conference_name :path => 'm:name[@type="conference"]'
-          n.occupation :path => 'm:occupation' do |n1|
+          n.occupation      :path => 'm:occupation' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               n1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
@@ -552,20 +551,20 @@ module Mods
         end # t.subject
         # TABLE_OF_CONTENTS ---------------------------------------------------------------------
-        t.tableOfContents :path => '/m:mods/m:tableOfContents'
+        t.tableOfContents  :path => '/m:mods/m:tableOfContents'
         t._tableOfContents :path => '//m:tableOfContents' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.shareable :path => '@shareable', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.displayLabel   :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.shareable      :path => '@shareable',    :accessor => lambda { |a| a.text }
+          n.type_at        :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # TARGET_AUDIENCE -----------------------------------------------------------------------
-        t.targetAudience :path => '/m:mods/m:targetAudience'
+        t.targetAudience  :path => '/m:mods/m:targetAudience'
         t._targetAudience :path => '//m:targetAudience' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
@@ -575,7 +574,7 @@ module Mods
         end
         # TITLE_INFO ----------------------------------------------------------------------------
-        t.title_info :path => '/m:mods/m:titleInfo'
+        t.title_info  :path => '/m:mods/m:titleInfo'
         t._title_info :path => '//m:titleInfo' do |n|
           Mods::TitleInfo::ATTRIBUTES.each { |attr_name|
             if attr_name != 'type'
@@ -583,114 +582,114 @@ module Mods
             else
               n.type_at :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             end
-          }
-          n.title :path => 'm:title'
-          n.subTitle :path => 'm:subTitle'
-          n.nonSort :path => 'm:nonSort'
+          }
+          n.title      :path => 'm:title'
+          n.subTitle   :path => 'm:subTitle'
+          n.nonSort    :path => 'm:nonSort'
           n.partNumber :path => 'm:partNumber'
-          n.partName :path => 'm:partName'
+          n.partName   :path => 'm:partName'
           # convenience method
-          n.sort_title :path => '.', :accessor => lambda { |node|
-            if node.type_at != "alternative" || (node.type_at == "alternative" &&
+          n.sort_title :path => '.', :accessor => lambda { |node|
+            if node.type_at != "alternative" || (node.type_at == "alternative" &&
                   mods_ng_xml.xpath('/m:mods/m:titleInfo', {'m' => Mods::MODS_NS}).size == 1)
-              node.title.text + (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
+              node.title.text + (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
             end
           }
           # convenience method
-          n.full_title :path => '.', :accessor => lambda { |node|
-             (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
-             node.title.text +
-             (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
+          n.full_title :path => '.', :accessor => lambda { |node|
+             (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+             node.title.text +
+             (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
           }
           # convenience method
-          n.short_title :path => '.', :accessor => lambda { |node|
+          n.short_title :path => '.', :accessor => lambda { |node|
             if node.type_at != "alternative"
-              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
               node.title.text
             end
           }
           # convenience method
-          n.alternative_title :path => '.', :accessor => lambda { |node|
+          n.alternative_title :path => '.', :accessor => lambda { |node|
             if node.type_at == "alternative"
-              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
               node.title.text
             end
           }
         end # t._title_info
         # TYPE_OF_RESOURCE --------------------------------------------------------------------
-        t.typeOfResource :path => '/m:mods/m:typeOfResource'
+        t.typeOfResource  :path => '/m:mods/m:typeOfResource'
         t._typeOfResource :path => '//m:typeOfResource' do |n|
-          n.collection :path => '@collection', :accessor => lambda { |a| a.text }
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.manuscript :path => '@manuscript', :accessor => lambda { |a| a.text }
-          n.usage :path => '@usage', :accessor => lambda { |a| a.text }
+          n.collection    :path => '@collection',   :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.manuscript    :path => '@manuscript',   :accessor => lambda { |a| a.text }
+          n.usage         :path => '@usage',        :accessor => lambda { |a| a.text }
         end
       end # terminology
-      mods_ng_xml.nom!
+      mods_ng_xml.nom!
       mods_ng_xml
     end # set_terminology_ns
     # set the NOM terminology;  do NOT use namespaces
     # NOTES:
     # 1.  certain words, such as 'type' 'name' 'description' are reserved words in jruby or nokogiri
-    #  when the terminology would use these words, a suffix of '_at' is added if it is an attribute,
+    #  when the terminology would use these words, a suffix of '_at' is added if it is an attribute,
     #  (e.g. 'type_at' for @type) and a suffix of '_el' is added if it is an element.
-    # 2.  the underscore prefix variant terms are a way of making subterms for a node available
+    # 2.  the underscore prefix variant terms are a way of making subterms for a node available
     #   to any instance of said node and are not intended to be used externally
     # @param mods_ng_xml a Nokogiri::Xml::Document object containing MODS (without namespaces)
     def set_terminology_no_ns(mods_ng_xml)
       mods_ng_xml.set_terminology() do |t|
-# FIXME: may want to deal with camelcase vs. underscore in method_missing
+# FIXME: may want to deal with camelcase vs. underscore in method_missing
         # ABSTRACT -------------------------------------------------------------------------------
-        t.abstract :path => '/mods/abstract'
+        t.abstract  :path => '/mods/abstract'
         t._abstract :path => '//abstract' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # ACCESS_CONDITION -----------------------------------------------------------------------
-        t.accessCondition :path => '/mods/accessCondition'
+        t.accessCondition  :path => '/mods/accessCondition'
         t._accessCondition :path => '//accessCondition' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.type_at      :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # CLASSIFICATION -------------------------------------------------------------------------
-        t.classification :path => '/mods/classification'
+        t.classification  :path => '/mods/classification'
         t._classification :path => '//classification' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.edition :path => '@edition', :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.edition       :path => '@edition',      :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
-        end
+        end
         # EXTENSION ------------------------------------------------------------------------------
-        t.extension :path => '/mods/extension'
+        t.extension  :path => '/mods/extension'
         t._extension :path => '//extension' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
         end
         # GENRE ----------------------------------------------------------------------------------
-        t.genre :path => '/mods/genre'
+        t.genre  :path => '/mods/genre'
         t._genre :path => '//genre' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
-          n.usage :path => '@usage', :accessor => lambda { |a| a.text }
+          n.usage  :path => '@usage', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
@@ -700,7 +699,7 @@ module Mods
         end
         # IDENTIIER ------------------------------------------------------------------------------
-        t.identifier :path => '/mods/identifier'
+        t.identifier  :path => '/mods/identifier'
         t._identifier :path => '//identifier' do |n|
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           n.invalid :path => '@invalid', :accessor => lambda { |a| a.text }
@@ -711,7 +710,7 @@ module Mods
         end
         # LANGUAGE -------------------------------------------------------------------------------
-        t.language :path => '/mods/language'
+        t.language  :path => '/mods/language'
         t._language :path => '//language' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -720,9 +719,9 @@ module Mods
           }
           # child elements
           n.languageTerm :path => 'languageTerm'
-          n.code_term :path => 'languageTerm[@type="code"]'
-          n.text_term :path => 'languageTerm[@type="text"]'
-          n.scriptTerm :path => 'scriptTerm'
+          n.code_term    :path => 'languageTerm[@type="code"]'
+          n.text_term    :path => 'languageTerm[@type="text"]'
+          n.scriptTerm   :path => 'scriptTerm'
         end
         t._languageTerm :path => '//languageTerm' do |lt|
           lt.type_at :path => '@type', :accessor => lambda { |a| a.text }
@@ -749,12 +748,12 @@ module Mods
           n.shelfLocator :path => 'shelfLocator'
           n.url :path => 'url' do |e|
             e.dateLastAccessed :path => '@dateLastAccessed', :accessor => lambda { |a| a.text }
-            e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-            e.note :path => '@note', :accessor => lambda { |a| a.text }
+            e.displayLabel     :path => '@displayLabel',     :accessor => lambda { |a| a.text }
+            e.note   :path => '@note',   :accessor => lambda { |a| a.text }
             e.access :path => '@access', :accessor => lambda { |a| a.text }
-            e.usage :path => '@usage', :accessor => lambda { |a| a.text }
+            e.usage  :path => '@usage',  :accessor => lambda { |a| a.text }
           end
-          n.holdingSimple :path => 'holdingSimple'
+          n.holdingSimple   :path => 'holdingSimple'
           n.holdingExternal :path => 'holdingExternal'
         end # t.location
@@ -772,15 +771,15 @@ module Mods
           n.namePart :path => 'namePart' do |np|
             np.type_at :path => '@type', :accessor => lambda { |a| a.text }
           end
-          n.family_name :path => 'namePart[@type="family"]'
-          n.given_name :path => 'namePart[@type="given"]'
+          n.family_name    :path => 'namePart[@type="family"]'
+          n.given_name     :path => 'namePart[@type="given"]'
           n.termsOfAddress :path => 'namePart[@type="termsOfAddress"]'
-          n.date :path => 'namePart[@type="date"]'
+          n.date           :path => 'namePart[@type="date"]'
-          n.displayForm :path => 'displayForm'
-          n.affiliation :path => 'affiliation'
+          n.displayForm    :path => 'displayForm'
+          n.affiliation    :path => 'affiliation'
           n.description_el :path => 'description' # description is used by Nokogiri
-          n.role :path => 'role' do |r|
+          n.role :path => 'role' do |r|
             r.roleTerm :path => 'roleTerm' do |rt|
               rt.type_at :path => "@type", :accessor => lambda { |a| a.text }
               Mods::AUTHORITY_ATTRIBS.each { |attr_name|
@@ -788,9 +787,9 @@ module Mods
               }
             end
             # convenience method
-            r.authority :path => '.', :accessor => lambda { |role_node|
+            r.authority :path => '.', :accessor => lambda { |role_node|
               a = nil
-              role_node.roleTerm.each { |role_t|
+              role_node.roleTerm.each { |role_t|
                 # role_t.authority will be [] if it is missing from an earlier roleTerm
                 if role_t.authority && (!a || a.size == 0)
                   a = role_t.authority
@@ -798,21 +797,21 @@ module Mods
               }
               a
             }
-            # convenience method
-            r.code :path => '.', :accessor => lambda { |role_node|
+            # convenience method
+            r.code :path => '.', :accessor => lambda { |role_node|
               c = nil
-              role_node.roleTerm.each { |role_t|
-                if role_t.type_at == 'code'
+              role_node.roleTerm.each { |role_t|
+                if role_t.type_at == 'code'
                   c ||= role_t.text
                 end
               }
               c
             }
             # convenience method
-            r.value :path => '.', :accessor => lambda { |role_node|
+            r.value :path => '.', :accessor => lambda { |role_node|
               val = nil
-              role_node.roleTerm.each { |role_t|
-                if role_t.type_at == 'text'
+              role_node.roleTerm.each { |role_t|
+                if role_t.type_at == 'text'
                   val ||= role_t.text
                 end
               }
@@ -842,7 +841,7 @@ module Mods
                 end
                 if !dv.empty?
                   first = true
-                  name_node.namePart.each { |np|
+                  name_node.namePart.each { |np|
                     if np.type_at == 'termsOfAddress' && !np.text.empty?
                       if first
                         dv = dv + " " + np.text
@@ -861,11 +860,11 @@ module Mods
             end
             dv.strip.empty? ? nil : dv.strip
           }
           # name convenience method
           n.display_value_w_date :path => '.', :single => true, :accessor => lambda {|name_node|
             dv = '' + name_node.display_value
-            name_node.namePart.each { |np|
+            name_node.namePart.each { |np|
               if np.type_at == 'date' && !np.text.empty? && !dv.end_with?(np.text)
                 dv = dv + ", #{np.text}"
               end
@@ -877,11 +876,11 @@ module Mods
           }
         end # t._plain_name
-        t.personal_name :path => '/mods/name[@type="personal"]'
-        t._personal_name :path => '//name[@type="personal"]'
-        t.corporate_name :path => '/mods/name[@type="corporate"]'
-        t._corporate_name :path => '//name[@type="corporate"]'
-        t.conference_name :path => '/mods/name[@type="conference"]'
+        t.personal_name    :path => '/mods/name[@type="personal"]'
+        t._personal_name   :path => '//name[@type="personal"]'
+        t.corporate_name   :path => '/mods/name[@type="corporate"]'
+        t._corporate_name  :path => '//name[@type="corporate"]'
+        t.conference_name  :path => '/mods/name[@type="conference"]'
         t._conference_name :path => '//name[@type="conference"]'
         # NOTE ---------------------------------------------------------------------------------
@@ -923,8 +922,8 @@ module Mods
               end
             end
           }
-          n.edition :path => 'edition'
-          n.issuance :path => 'issuance'
+          n.edition   :path => 'edition'
+          n.issuance  :path => 'issuance'
           n.frequency :path => 'frequency' do |f|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
               f.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
@@ -936,9 +935,9 @@ module Mods
         t.part :path => '/mods/part'
         t._part :path => '//part' do |n|
           # attributes
-          n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
-          n.order :path => '@order', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.id_at   :path => '@ID',    :accessor => lambda { |a| a.text }
+          n.order   :path => '@order', :accessor => lambda { |a| a.text }
+          n.type_at :path => '@type',  :accessor => lambda { |a| a.text }
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
@@ -946,35 +945,35 @@ module Mods
           # child elements
           n.detail :path => 'detail' do |e|
             # attributes
-            e.level :path => '@level', :accessor => lambda { |a| a.text }
-            e.type_at :path => '@type', :accessor => lambda { |a| a.text }
+            e.level   :path => '@level', :accessor => lambda { |a| a.text }
+            e.type_at :path => '@type',  :accessor => lambda { |a| a.text }
             # elements
-            e.number :path => 'number'
+            e.number  :path => 'number'
             e.caption :path => 'caption'
-            e.title :path => 'title'
+            e.title   :path => 'title'
           end
           n.extent :path => 'extent' do |e|  # TODO:  extent is ordered in xml schema
             # attributes
             e.unit :path => '@unit', :accessor => lambda { |a| a.text }
             # elements
             e.start :path => 'start'
-            e.end :path => 'end'
+            e.end   :path => 'end'
             e.total :path => 'total'
-            e.list :path => 'list'
+            e.list  :path => 'list'
           end
-          n.date :path => 'date' do |e|
+          n.date :path => 'date' do |e|
             Mods::DATE_ATTRIBS.reject { |a| a == 'keyDate' }.each { |attr_name|
               e.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.text_el :path => 'text' do |e|
+          n.text_el :path => 'text' do |e|
             e.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-            e.type_at :path => '@type', :accessor => lambda { |a| a.text }
+            e.type_at      :path => '@type', :accessor => lambda { |a| a.text }
           end
         end # t._part
         # PHYSICAL_DESCRIPTION -------------------------------------------------------------------
-        t.physical_description :path => '/mods/physicalDescription'
+        t.physical_description  :path => '/mods/physicalDescription'
         t._physical_description :path => '//physicalDescription' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
@@ -1044,31 +1043,31 @@ module Mods
         t.related_item :path => '/mods/relatedItem' do |n|
           # attributes
           n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.id_at :path => '@ID', :accessor => lambda { |a| a.text }
+          n.id_at   :path => '@ID',   :accessor => lambda { |a| a.text }
           n.type_at :path => '@type', :accessor => lambda { |a| a.text }
           # elements
           n.abstract :path => 'abstract'
           n.accessCondition :path => 'accessCondition'
-          n.classification :path => 'classification'
-          n.extension :path => 'extension'
-          n.genre :path => 'genre'
+          n.classification  :path => 'classification'
+          n.extension  :path => 'extension'
+          n.genre      :path => 'genre'
           n.identifier :path => 'identifier'
-          n.language :path => 'language'
-          n.location :path => 'location'
-          n.name_el :path => 'name'  # Note:  'name' is used by Nokogiri
-          n.personal_name :path => 'name[@type="personal"]'
-          n.corporate_name :path => 'name[@type="corporate"]'
+          n.language   :path => 'language'
+          n.location   :path => 'location'
+          n.name_el    :path => 'name'  # Note:  'name' is used by Nokogiri
+          n.personal_name   :path => 'name[@type="personal"]'
+          n.corporate_name  :path => 'name[@type="corporate"]'
           n.conference_name :path => 'name[@type="conference"]'
-          n.note :path => 'note'
+          n.note       :path => 'note'
           n.originInfo :path => 'originInfo'
-          n.part :path => 'part'
+          n.part       :path => 'part'
           n.physicalDescription :path => 'physicalDescription'
-          n.recordInfo :path => 'recordInfo'
-          n.subject :path => 'subject'
+          n.recordInfo      :path => 'recordInfo'
+          n.subject         :path => 'subject'
           n.tableOfContents :path => 'tableOfContents'
-          n.targetAudience :path => 'targetAudience'
-          n.titleInfo :path => 'titleInfo'
-          n.typeOfResource :path => 'typeOfResource'
+          n.targetAudience  :path => 'targetAudience'
+          n.titleInfo       :path => 'titleInfo'
+          n.typeOfResource  :path => 'typeOfResource'
         end
         # SUBJECT -----------------------------------------------------------------------------
@@ -1106,7 +1105,7 @@ module Mods
               gc.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
             # convenience method
-            gc.translated_value :path => '.', :accessor => lambda { |gc_node|
+            gc.translated_value :path => '.', :accessor => lambda { |gc_node|
               code_val ||= gc_node.text
               xval = nil
               if code_val
@@ -1134,8 +1133,8 @@ module Mods
               t1.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             }
           end
-          n.personal_name :path => 'name[@type="personal"]'
-          n.corporate_name :path => 'name[@type="corporate"]'
+          n.personal_name   :path => 'name[@type="personal"]'
+          n.corporate_name  :path => 'name[@type="corporate"]'
           n.conference_name :path => 'name[@type="conference"]'
           n.occupation :path => 'occupation' do |n1|
             Mods::AUTHORITY_ATTRIBS.each { |attr_name|
@@ -1164,20 +1163,20 @@ module Mods
         end # t.subject
         # TABLE_OF_CONTENTS ---------------------------------------------------------------------
-        t.tableOfContents :path => '/mods/tableOfContents'
+        t.tableOfContents  :path => '/mods/tableOfContents'
         t._tableOfContents :path => '//tableOfContents' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.shareable :path => '@shareable', :accessor => lambda { |a| a.text }
-          n.type_at :path => '@type', :accessor => lambda { |a| a.text }
+          n.displayLabel   :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.shareable      :path => '@shareable',    :accessor => lambda { |a| a.text }
+          n.type_at        :path => '@type',         :accessor => lambda { |a| a.text }
           Mods::LANG_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
         end
         # TARGET_AUDIENCE -----------------------------------------------------------------------
-        t.targetAudience :path => '/mods/targetAudience'
+        t.targetAudience  :path => '/mods/targetAudience'
         t._targetAudience :path => '//targetAudience' do |n|
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
           Mods::AUTHORITY_ATTRIBS.each { |attr_name|
             n.send attr_name, :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
           }
@@ -1195,43 +1194,43 @@ module Mods
             else
               n.type_at :path => "@#{attr_name}", :accessor => lambda { |a| a.text }
             end
-          }
-          n.title :path => 'title'
-          n.subTitle :path => 'subTitle'
-          n.nonSort :path => 'nonSort'
+          }
+          n.title      :path => 'title'
+          n.subTitle   :path => 'subTitle'
+          n.nonSort    :path => 'nonSort'
           n.partNumber :path => 'partNumber'
-          n.partName :path => 'partName'
-          n.sort_title :path => '.', :accessor => lambda { |node|
+          n.partName   :path => 'partName'
+          n.sort_title :path => '.', :accessor => lambda { |node|
             if node.type_at != "alternative" || (node.type_at == "alternative" && mods_ng_xml.xpath('/mods/titleInfo').size == 1)
-              node.title.text + (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
+              node.title.text + (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
             end
           }
-          n.full_title :path => '.', :accessor => lambda { |node|
-             (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
-             node.title.text +
-             (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
+          n.full_title :path => '.', :accessor => lambda { |node|
+             (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+             node.title.text +
+             (!node.subTitle.text.empty? ? "#{@title_delimiter}#{node.subTitle.text}" : "" )
           }
-          n.short_title :path => '.', :accessor => lambda { |node|
+          n.short_title :path => '.', :accessor => lambda { |node|
             if node.type_at != "alternative"
-              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
               node.title.text
             end
           }
-          n.alternative_title :path => '.', :accessor => lambda { |node|
+          n.alternative_title :path => '.', :accessor => lambda { |node|
             if node.type_at == "alternative"
-              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
+              (!node.nonSort.text.empty? ? "#{node.nonSort.text} " : "" ) +
               node.title.text
             end
           }
         end # t._title_info
         # TYPE_OF_RESOURCE --------------------------------------------------------------------
-        t.typeOfResource :path => '/mods/typeOfResource'
+        t.typeOfResource  :path => '/mods/typeOfResource'
         t._typeOfResource :path => '//typeOfResource' do |n|
-          n.collection :path => '@collection', :accessor => lambda { |a| a.text }
-          n.displayLabel :path => '@displayLabel', :accessor => lambda { |a| a.text }
-          n.manuscript :path => '@manuscript', :accessor => lambda { |a| a.text }
-          n.usage :path => '@usage', :accessor => lambda { |a| a.text }
+          n.collection    :path => '@collection',   :accessor => lambda { |a| a.text }
+          n.displayLabel  :path => '@displayLabel', :accessor => lambda { |a| a.text }
+          n.manuscript    :path => '@manuscript',   :accessor => lambda { |a| a.text }
+          n.usage         :path => '@usage',        :accessor => lambda { |a| a.text }
         end
       end # terminology