stanford-mods 2.6.4 → 3.1.0

data/lib/stanford-mods.rb

@@ -1,20 +1,21 @@
 require 'active_support'
+require 'active_support/core_ext/integer/inflections'
 require 'mods'
 require 'stanford-mods/date_parsing'
 require 'stanford-mods/coordinate'
-require 'stanford-mods/geo_spatial'
-require 'stanford-mods/geo_utils'
 require 'stanford-mods/imprint'
-require 'stanford-mods/name'
-require 'stanford-mods/origin_info'
-require 'stanford-mods/physical_location'
-require 'stanford-mods/searchworks'
+require 'stanford-mods/vocabularies/searchworks_languages'
+require 'stanford-mods/concerns/geo_spatial'
+require 'stanford-mods/concerns/name'
+require 'stanford-mods/concerns/origin_info'
+require 'stanford-mods/concerns/physical_location'
+require 'stanford-mods/concerns/searchworks'
+require 'stanford-mods/concerns/searchworks_subjects'
+require 'stanford-mods/concerns/title'
+require 'stanford-mods/record'
 require 'stanford-mods/version'
 
-# Stanford specific wranglings of MODS metadata as an extension of the Mods::Record object
 module Stanford
   module Mods
-    class Record < ::Mods::Record
-    end # Record class
-  end # Mods module
-end # Stanford module
+  end
+end

data/spec/fixtures/searchworks_imprint_data.rb

@@ -64,7 +64,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start" qualifier="questionable">1670</dateIssued>
         <dateIssued encoding="marc" point="end" qualifier="questionable">1680</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Amstelodami : [s.n. 1670s?] [1670 - 1680?]',
+        mods_origin_info_end_str => 'Amstelodami : [s.n. 167-?]',
       # ct011mf9794
       mods_origin_info_start_str +
         '<place>
@@ -77,7 +77,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>17--]</dateIssued>
         <dateIssued encoding="marc">17uu</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[Paris : s.n. 18th century]',
+        mods_origin_info_end_str => '[Paris : s.n. 17--]',
       # mm076bz8960
       mods_origin_info_start_str +
         '<place>
@@ -90,7 +90,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>[ca. 1850?]</dateIssued>
         <dateIssued encoding="marc">185u</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'London : Orr and Compy, [ca. 1850?] 1850s',
+        mods_origin_info_end_str => 'London : Orr and Compy, [ca. 1850?]',
       # vs807zh4960
       mods_origin_info_start_str +
         '<place>
@@ -116,7 +116,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start">1740</dateIssued>
         <dateIssued encoding="marc" point="end">1800</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[S.l : s.n. ca. 1740-1800] 1740 - 1800',
+        mods_origin_info_end_str => '[S.l : s.n. ca. 1740-1800]',
       # gy889yj2171
       mods_origin_info_start_str +
         '<place>
@@ -130,7 +130,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start" qualifier="questionable">1758</dateIssued>
         <dateIssued encoding="marc" point="end" qualifier="questionable">uuuu</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[S.l : s.n. 1758] [1758-?]'
+        mods_origin_info_end_str => '[S.l : s.n. 1758]'
     },
   # afro_am_music
   # ai
@@ -166,7 +166,7 @@ SEARCHWORKS_IMPRINT_DATA = {
       # ps072wf8793
       mods_origin_info_start_str +
         '<dateIssued encoding="w3cdtf">1851-07-01</dateIssued>' +
-        mods_origin_info_end_str => 'July 1, 1851',
+        mods_origin_info_end_str => 'July  1, 1851',
       # bh059ts1689
       mods_origin_info_start_str +
         '<dateIssued>early 1890s</dateIssued>' +
@@ -293,19 +293,19 @@ SEARCHWORKS_IMPRINT_DATA = {
   'gis' =>
     { # key is mods_xml;  value is expected value for imprint_display
       # coll rec sv325bx4406
-      mods_origin_info_start_str +
-        '<place>
-          <placeTerm type="code" authority="marccountry">cau</placeTerm>
-        </place>
-        <place>
-          <placeTerm type="text">San Diego, CA</placeTerm>
-        </place>
-        <publisher>Hart Energy Publishing</publisher>
-        <dateIssued>2011</dateIssued>
-        <dateIssued encoding="marc" point="start">2012</dateIssued>
-        <dateIssued encoding="marc" point="end">9999</dateIssued>
-        <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'San Diego, CA : Hart Energy Publishing, 2011 2012-',
+      # mods_origin_info_start_str +
+      #   '<place>
+      #     <placeTerm type="code" authority="marccountry">cau</placeTerm>
+      #   </place>
+      #   <place>
+      #     <placeTerm type="text">San Diego, CA</placeTerm>
+      #   </place>
+      #   <publisher>Hart Energy Publishing</publisher>
+      #   <dateIssued>2011</dateIssued>
+      #   <dateIssued encoding="marc" point="start">2012</dateIssued>
+      #   <dateIssued encoding="marc" point="end">9999</dateIssued>
+      #   <issuance>monographic</issuance>' +
+      #   mods_origin_info_end_str => 'San Diego, CA : Hart Energy Publishing, 2011 2012-',
       # rt625ws6022
       mods_origin_info_start_str +
         '<publisher>Hart Energy Publishing</publisher>
@@ -344,7 +344,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" keyDate="yes" point="start">1599</dateIssued>
         <dateIssued encoding="marc" point="end">1601</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Francofurti : impressa typis Ioannis Saurii, impensis Petri Kopffi, 1599-1601 1599 - 1601',
+        mods_origin_info_end_str => 'Francofurti : impressa typis Ioannis Saurii, impensis Petri Kopffi, 1599-1601',
       # mt060jf5269
       mods_origin_info_start_str +
         '<place>
@@ -359,7 +359,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <edition>Opera noua,</edition>
         <edition>&amp; piena di dotta curiosità.</edition>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => "Opera noua, & piena di dotta curiosità. - In Padoua : per Pietro Paolo Tozzi. 1616: Con licenza de'svperiori 1616",
+        mods_origin_info_end_str => "Opera noua, & piena di dotta curiosità. - In Padoua : per Pietro Paolo Tozzi. 1616: Con licenza de'svperiori",
       # nh718gy4718
       mods_origin_info_start_str +
         '<place>
@@ -372,7 +372,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         '<dateIssued>1743-53</dateIssued>' +
         '<dateIssued encoding="marc" keyDate="yes" point="start">1743</dateIssued>' +
         '<dateIssued encoding="marc" point="end">1753</dateIssued>' +
-        mods_origin_info_end_str => 'La Haye : Chez Jean Neaulme, 1743-53 1743 - 1753',
+        mods_origin_info_end_str => 'La Haye : Chez Jean Neaulme, 1743-53',
       # nh857kn6175
       mods_origin_info_start_str +
         '<place>
@@ -384,7 +384,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <publisher>s.n.</publisher>
         <dateIssued>18--]</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[Bonn : s.n. 19th century]',
+        mods_origin_info_end_str => '[Bonn : s.n. 18--]',
       # zp382js2355
       mods_origin_info_start_str +
         '<place>
@@ -397,7 +397,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>[184-]</dateIssued>
         <dateIssued encoding="marc" keyDate="yes">184u</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'London : [s.n.], [1840s]',
+        mods_origin_info_end_str => 'London : [s.n.], [184-]',
       # qg377px6180
       mods_origin_info_start_str +
         '<place>
@@ -427,7 +427,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <edition>3d ed.,</edition>
         <edition>with the author\'s latest corrections ...</edition>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => "3d ed., with the author's latest corrections ... - London : M.A. Nattali, [etc",
+        mods_origin_info_end_str => "3d ed., with the author's latest corrections ... - London : M.A. Nattali, [etc 1840]",
       # yp117pm9679
       mods_origin_info_start_str +
         '<place>
@@ -544,7 +544,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start">1948</dateIssued>
         <dateIssued encoding="marc" point="end">9999</dateIssued>
         <issuance>serial</issuance>' +
-        mods_origin_info_end_str => 'United States, 1948-',
+        mods_origin_info_end_str => 'United States, 1948 -',
       # vh590xb4582
       mods_origin_info_start_str +
         '<place>
@@ -605,7 +605,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start" qualifier="questionable">1640</dateIssued>
         <dateIssued encoding="marc" point="end" qualifier="questionable">1665</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[Amsterdam : Hugo Allard, 1640-1665?] [1640 - 1665?]',
+        mods_origin_info_end_str => '[Amsterdam : Hugo Allard, 1640-1665?]',
       # mk758ps0914
       mods_origin_info_start_str +
         '<place>
@@ -631,7 +631,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>168-?]</dateIssued>
         <dateIssued encoding="marc">168u</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[Italy? : s.n. 1680s?]',
+        mods_origin_info_end_str => '[Italy? : s.n. 168-?]',
       # cm303hd3051
       mods_origin_info_start_str +
         '<place>
@@ -644,7 +644,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>17--?]</dateIssued>
         <dateIssued encoding="marc">17uu</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => '[Germany : s.n. 18th century?]',
+        mods_origin_info_end_str => '[Germany : s.n. 17--?]',
       # dv052xw4248
       mods_origin_info_start_str +
         '<place>
@@ -670,7 +670,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued encoding="marc" point="start" qualifier="questionable">1764</dateIssued>
         <dateIssued encoding="marc" point="end" qualifier="questionable">1782</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'London : Printed & sold by R. Marshall, No. 4 Aldermay Church Yard, [1764-1782] [1764 - 1782?]',
+        mods_origin_info_end_str => 'London : Printed & sold by R. Marshall, No. 4 Aldermay Church Yard, [1764-1782]',
       # px053ft5911
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" keyDate="yes">1732</dateCreated>
@@ -686,7 +686,7 @@ SEARCHWORKS_IMPRINT_DATA = {
           <placeTerm>[Seoul]</placeTerm>
         </place>
         <dateCreated keyDate="yes" point="" qualifier="approximate">1930</dateCreated>' +
-        mods_origin_info_end_str => '[Seoul], [ca. 1939] [ca. 1930]'
+        mods_origin_info_end_str => '[Seoul], - [ca. 1939] [ca. 1930]'
     },
   # mclaughlin_malta
   # medieval / mss
@@ -897,7 +897,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>A1566</dateIssued>
         <dateIssued encoding="marc">1566</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Venice : [s.n.], A1566 1566',
+        mods_origin_info_end_str => 'Venice : [s.n.], A1566',
       # ym307qw6924
       mods_origin_info_start_str +
         ' <place>
@@ -1002,7 +1002,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         <dateIssued>MDLXXXIIII [1584]</dateIssued>
         <dateIssued encoding="marc">1584</dateIssued>
         <issuance>monographic</issuance>' +
-        mods_origin_info_end_str => 'Romae [Rome] : [haeredes Claudii Duchetti], MDLXXXIIII [1584] 1584',
+        mods_origin_info_end_str => 'Romae [Rome] : [haeredes Claudii Duchetti], MDLXXXIIII [1584]',
       # kj619sr3867
       mods_origin_info_start_str +
         '<place>
@@ -1162,7 +1162,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         </place>
         <publisher>Stanford University Archives</publisher>
         <dateCreated encoding="w3cdtf" keyDate="yes" qualifier=" ">1869-00-00</dateCreated>' +
-        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1869-00-00',
+        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1869',
       # fp085hf5015
       mods_origin_info_start_str +
         '<dateOther encoding="w3cdtf" keyDate="no" qualifier="">1963-10-11</dateOther>
@@ -1171,7 +1171,7 @@ SEARCHWORKS_IMPRINT_DATA = {
         </place>
         <publisher>Stanford University Archives</publisher>
         <dateCreated encoding="w3cdtf" keyDate="yes" qualifier=" ">1903-00-00</dateCreated>' +
-        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1903-00-00',
+        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1903',
       # ns466nn0465
       mods_origin_info_start_str +
         '<dateCreated encoding="w3cdtf" keyDate="no" qualifier="">1918-00-00</dateCreated>
@@ -1180,7 +1180,7 @@ SEARCHWORKS_IMPRINT_DATA = {
           <placeTerm type="text">Stanford, CA</placeTerm>
         </place>
         <publisher>Stanford University Archives</publisher>' +
-        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1918-00-00'
+        mods_origin_info_end_str => 'Stanford, CA : Stanford University Archives, 1918'
     },
   # social_research_tech_reports ?
   # sounds?
@@ -1233,10 +1233,9 @@ SEARCHWORKS_IMPRINT_DATA = {
       # coll rec ww121ss5000
       mods_origin_info_start_str +
         '<dateIssued encoding="marc" point="start">800</dateIssued>
-        <dateIssued encoding="marc" point="start">1899</dateIssued>
+        <dateIssued encoding="marc" point="end">1899</dateIssued>
         <issuance>monographic</issuance>' +
-        # space missing between first date and hyphen because the data has two start dates
-        mods_origin_info_end_str => '800 A.D.- 1899',
+        mods_origin_info_end_str => '800 A.D. - 1899',
       # dc882bs3541
       mods_origin_info_start_str +
         '<place>

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -80,7 +80,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
       mods_origin_info_start_str +
         '<dateIssued>1860?]</dateIssued>' +
         '<dateIssued encoding="marc">186?</dateIssued>' +
-        mods_origin_info_end_str => [1860, '1860s'],
+        mods_origin_info_end_str => [1860, '1860'],
       # cw097mp1488
       mods_origin_info_start_str +
         '<dateIssued>1877?</dateIssued>' +
@@ -720,14 +720,14 @@ SEARCHWORKS_PUB_DATE_DATA = {
       # coll rec jr022nf7673 has no dates
       # jx555jt0710
       mods_origin_info_start_str +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">199 B.C.</dateCreated>' +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="end" qualifier="approximate">100 B.C.</dateCreated>' +
-        mods_origin_info_end_str => [-199, '199 B.C. - 100 B.C.'],
+        '<dateCreated keyDate="yes" point="start" qualifier="approximate">199 B.C.</dateCreated>' +
+        '<dateCreated keyDate="yes" point="end" qualifier="approximate">100 B.C.</dateCreated>' +
+        mods_origin_info_end_str => [-198, '199 B.C. - 100 B.C.'],
       # ww728rz0477
       mods_origin_info_start_str +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
-        mods_origin_info_end_str => [-211, '211 B.C. - 150 B.C.']
+        '<dateCreated keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
+        '<dateCreated keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
+        mods_origin_info_end_str => [-210, '211 B.C. - 150 B.C.']
     },
   # pcc
   # peace

data/spec/fixtures/spotlight_pub_date_data.rb

@@ -51,7 +51,7 @@ SPOTLIGHT_PUB_DATE_DATA = {
         mods_origin_info_end_str => ['2001', '2001'],
       # yt809jk3834, qb375hy6817
       mods_origin_info_start_str +
-        '<dateCreated encoding="w3cdtf" keyDate="yes">3/25/1998</dateCreated>' +
+        '<dateCreated encoding="w3cdtf" keyDate="yes">1998-03-25</dateCreated>' +
         mods_origin_info_end_str => ['1998', '1998'],
       # mg505sz9327, mx006md9511, sy619vt7106
       mods_origin_info_start_str +
@@ -234,14 +234,14 @@ SPOTLIGHT_PUB_DATE_DATA = {
     { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]
       # hd778hw9236
       mods_origin_info_start_str +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">200 B.C.</dateCreated>' +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="end" qualifier="approximate">180 B.C.</dateCreated>' +
-        mods_origin_info_end_str => ['-800', '200 B.C.'],
+        '<dateCreated keyDate="yes" point="start" qualifier="approximate">200 B.C.</dateCreated>' +
+        '<dateCreated keyDate="yes" point="end" qualifier="approximate">180 B.C.</dateCreated>' +
+        mods_origin_info_end_str => ['-801', '200 B.C.'],
       # ww728rz0477
       mods_origin_info_start_str +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
-        '<dateCreated encoding="w3cdtf" keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
-        mods_origin_info_end_str => ['-789', '211 B.C.']
+        '<dateCreated keyDate="yes" point="start" qualifier="approximate">211 B.C.</dateCreated>' +
+        '<dateCreated keyDate="yes" point="end" qualifier="approximate">150 B.C.</dateCreated>' +
+        mods_origin_info_end_str => ['-790', '211 B.C.']
     },
   'renaissance' =>
     { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]

data/spec/geo_spatial_spec.rb

@@ -38,10 +38,6 @@ describe "Cartographic coordinates" do
     EOF
   end
 
-  it 'has access to logger' do
-    expect(smods_rec.logger).to be_a Logger
-  end
-
   context "coordinates" do
     it "returns empty array if no coordinates in the mods" do
       smods_rec.from_str(no_coord)
@@ -118,9 +114,8 @@ describe '#geo_extension_as_envelope' do
       EOF
     end
 
-    it 'logs error and returns emtpy array' do
+    it 'returns an empty array' do
       allow(mods.mods_ng_xml).to receive(:extension).and_raise(RuntimeError)
-      expect(mods.logger).to receive(:warn).with(/failure parsing.*RuntimeError/)
       expect(mods.geo_extensions_as_envelope).to eq []
     end