stanford-mods 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b7166744ed54bca31cdcbfa1f400d5e05e3e24
-  data.tar.gz: 41439aae07f4ab0d35913284f6c5d3ca3db85f1a
+  metadata.gz: 69a9ca8048029f26ee81d1ecedcfce609472a4fd
+  data.tar.gz: 94bebebe8d0ae3eab18dd309279af83a1e4d700e
 SHA512:
-  metadata.gz: 6640e0395f1a500507ea4be9daccb561c85a6f0f02eff01a0e32260efe424cc4bb97a6ece0968a55d0bfbfdad8b45bac0e6ea6362edc6df6d242f32ee2829db2
-  data.tar.gz: bf70600680517f261d291d5e377838b6d5b2aad36288bdc238e2b87e9bfbc2d2cf1c70b0c7aa3727f9655d0513cdf30d8290ece7f7e546de43955737777bc7f3
+  metadata.gz: 3c30ff296e9e66ebeac2be5d0924536516ae2b1d2939122c5ebf786f1347dd8072ff7a9ddab3a8211bec38d17731d7d032a7f6073c18a3da2f348fceaf6cfba6
+  data.tar.gz: 12c8c7f6af8e26172a041aaeb68c421c0a165477d9a8365088bc0af8453380e3e996e43b4de3647439603afc917769ab831ebd9c33649854bc71b2abf239e306

data/lib/stanford-mods/searchworks.rb

@@ -276,6 +276,8 @@ module Stanford
 
       # select one or more format values from the controlled vocabulary per JVine Summer 2014
       #   http://searchworks-solr-lb.stanford.edu:8983/solr/select?facet.field=format_main_ssim&rows=0&facet.sort=index
+      # https://github.com/sul-dlss/stanford-mods/issues/66 - For geodata, the
+      # resource type should be only Map and not include Software, multimedia.
       # @return <Array[String]> value in the SearchWorks controlled vocabulary
       def format_main
         val = []
@@ -300,6 +302,7 @@ module Stanford
             case type
               when 'cartographic'
                 val << 'Map'
+                val.delete 'Software/Multimedia'
               when 'mixed material'
                 val << 'Archive/Manuscript'
               when 'moving image'
@@ -309,7 +312,7 @@ module Stanford
               when 'software, multimedia'
                 if genres && (genres.include?('dataset') || genres.include?('Dataset'))
                   val << 'Dataset'
-                else
+                elsif (!val.include?('Map'))
                   val << 'Software/Multimedia'
                 end
               when 'sound recording-musical'
@@ -333,30 +336,28 @@ module Stanford
       end
 
       # return values for the genre facet in SearchWorks
+      # https://github.com/sul-dlss/stanford-mods/issues/66
+      # Limit genre values to Government document, Conference proceedings,
+      # Technical report and Thesis/Dissertation
       # @return <Array[String]>
       def sw_genre
         val = []
         genres = self.term_values(:genre)
         types = self.term_values(:typeOfResource)
         if genres
-          val << genres.map(&:capitalize)
-          val.flatten! if !val.empty?
           if genres.include?('thesis') || genres.include?('Thesis')
             val << 'Thesis/Dissertation'
-            val.delete 'Thesis'
           end
           conf_pub = ['conference publication', 'Conference publication', 'Conference Publication']
           if !(genres & conf_pub).empty?
             if types && types.include?('text')
               val << 'Conference proceedings'
-              val.delete 'Conference publication'
             end
           end
           gov_pub = ['government publication', 'Government publication', 'Government Publication']
           if !(genres & gov_pub).empty?
             if types && types.include?('text')
               val << 'Government document'
-              val.delete 'Government publication'
             end
           end
           tech_rpt = ['technical report', 'Technical report', 'Technical Report']
@@ -366,10 +367,6 @@ module Stanford
             end
           end
         end
-        # Archived website is in the MODS genre tag but it is considered a
-        # Resource type for Searchworks, so it needs to be removed from the
-        # applicable genre values
-        val.delete 'Archived website'
         val.uniq
       end
 

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "1.5.3"
+    VERSION = "1.5.4"
   end
 end

data/spec/fixtures/searchworks_pub_date_data.rb

@@ -739,8 +739,7 @@ SEARCHWORKS_PUB_DATE_DATA = {
   # project_south
   # reaction_kinetics?
   # reliability
-  # renaissance
-  'xxx' =>
+  'renaissance' =>
     { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]
       # coll rec sr605np6062 no originInfo
       # mj187xt5183
@@ -808,18 +807,18 @@ SEARCHWORKS_PUB_DATE_DATA = {
   # rigler
   # rumsey
   'rumsey' =>
-  { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]
-    # coll rec xh235dd9059 no originInfo
-    # fy259fg4220
-    mods_origin_info_start_str +
-      '<dateIssued>1855.</dateIssued>' +
-      mods_origin_info_end_str => [1855, '1855'],
-    # hp058zk7170
-    mods_origin_info_start_str +
-      '<dateCreated encoding="marc">1861</dateCreated>' +
-      '<dateIssued>1861.</dateIssued>' +
-      mods_origin_info_end_str => [1861, '1861'],
-  },
+    { # key is mods_xml;  values = [pub date sortable facet value, pub date single string facet value]
+      # coll rec xh235dd9059 no originInfo
+      # fy259fg4220
+      mods_origin_info_start_str +
+        '<dateIssued>1855.</dateIssued>' +
+        mods_origin_info_end_str => [1855, '1855'],
+      # hp058zk7170
+      mods_origin_info_start_str +
+        '<dateCreated encoding="marc">1861</dateCreated>' +
+        '<dateIssued>1861.</dateIssued>' +
+        mods_origin_info_end_str => [1861, '1861']
+    },
   # rock?
   # scrf
   # shale

data/spec/searchworks_format_spec.rb

@@ -493,6 +493,13 @@ describe "Format fields (searchworks.rb)" do
         @smods_rec.from_str(m)
         expect(@smods_rec.format_main).to eq ['Software/Multimedia']
       end
+      # https://github.com/sul-dlss/stanford-mods/issues/66 - For geodata, the
+      # resource type should be only Map and not include Software, multimedia.
+      it "typeOfResource 'cartographic' and 'software, multimedia'" do
+        m = "<mods #{@ns_decl}><typeOfResource>cartographic</typeOfResource><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Map']
+      end
     end
 
     context "Sound Recording:" do
@@ -575,6 +582,11 @@ describe "Format fields (searchworks.rb)" do
   end #format_main
 
   context "sw_genre" do
+    it "ignores values that are not in the prescribed list" do
+      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Not on the list</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq []
+    end
     it "Conference proceedings: typeOfResource 'text', genre 'conference publication'" do
       m = "<mods #{@ns_decl}><genre authority=\"marcgt\">conference publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
@@ -628,37 +640,36 @@ describe "Format fields (searchworks.rb)" do
       expect(@smods_rec.sw_genre).to_not eq ['Archived website']
     end
     it "capitalizes the first letter of a genre value" do
-      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">student project report</genre></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Student project report']
-      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Student project report</genre></mods>"
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">technical report</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Student project report']
-      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Student Project report</genre></mods>"
+      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">Technical report</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Student project report']
-      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Student Project Report</genre></mods>"
+      expect(@smods_rec.sw_genre).to eq ['Technical report']
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">Technical Report</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Student project report']
+      expect(@smods_rec.sw_genre).to eq ['Technical report']
     end
     # NOTE: may need to remove plurals and/or trailing punctuation in future
     it "returns all genre values" do
       m = "<mods #{@ns_decl}>
-            <genre>game</genre>
-            <genre>foo</genre>
-            <genre>technical report</genre>
+            <typeOfResource>text</typeOfResource>
+            <genre>government publication</genre>
+            <genre>conference publication</genre>
+            <genre>thesis</genre>
           </mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Game', 'Foo', 'Technical report']
+      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation', 'Conference proceedings', 'Government document']
     end
     it "doesn't have duplicates" do
       m = "<mods #{@ns_decl}>
-            <genre>game</genre>
+            <typeOfResource>text</typeOfResource>
+            <genre>conference publication</genre>
             <genre>technical report</genre>
-            <genre>Game</genre>
+            <genre>Conference publication</genre>
           </mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.sw_genre).to eq ['Game', 'Technical report']
+      expect(@smods_rec.sw_genre).to eq ['Conference proceedings', 'Technical report']
     end
     it "empty Array if no genre values" do
       m = "<mods #{@ns_decl}>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata