stanford-mods 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1349b54281f4c2383a7f1fb60faecf8567a3c0cd
-  data.tar.gz: 31df104c5dd8d57eea168f802a04e8a3b4263157
+  metadata.gz: d876e2b5f5ab556e1140c7846fe5a6b23bdc3163
+  data.tar.gz: 4c150486603f2ae953ed0ee7546502cbc2ab1ea2
 SHA512:
-  metadata.gz: 56063abe20c48c0c7bf6ea615a8091cb2abc0eb4dc81a25ef1c3ae1611cee8c9fcf4b15854404a920f0ef21e5982817d9447af626a6b35eb4c0030c42b3db631
-  data.tar.gz: b3f29a4557713e94e4cd0d0db9dab6354927d065255c945b9434efa14e5f226cc281db974cd1fe61b4bb44aa39f72f59987973b5071adcd2a6753bda121ffdbe
+  metadata.gz: 9416188a4effed446e89fc9474996d02e2c0d9ab167ac80dd7ec960a83e3973edadb67ec9698d2db8bcf52b1ec594e3267542fdd057e0df51759d3ceb21c97b8
+  data.tar.gz: 1ee250dcef68b1ac7239d241977cb18e41b76dcd03df8e7e6df756a412f81670d2ca0d2d9d2b1a478e21ba5f0862993a43c48019de24dd46bf69a25531007284

data/lib/stanford-mods/searchworks.rb

@@ -27,19 +27,18 @@ module Stanford
           # get languageTerm codes and add their translations to the result
           n.code_term.each { |ct|
             if ct.authority =~ /^iso639/
-              begin
-                vals = ct.text.split(/[,|\ ]/).reject { |x| x.strip.empty? }
-                vals.each do |v|
+              vals = ct.text.split(/[,|\ ]/).reject { |x| x.strip.empty? }
+              vals.each do |v|
+                if ISO_639.find(v.strip)
                   iso639_val = ISO_639.find(v.strip).english_name
                   if SEARCHWORKS_LANGUAGES.has_value?(iso639_val)
                     result << iso639_val
                   else
                     result << SEARCHWORKS_LANGUAGES[v.strip]
                   end
+                else
+                  logger.warn "Couldn't find english name for #{ct.text}"
                 end
-              rescue
-                # TODO:  this should be written to a logger
-                p "Couldn't find english name for #{ct.text}"
               end
             else
               vals = ct.text.split(/[,|\ ]/).reject { |x| x.strip.empty? }
@@ -127,25 +126,42 @@ module Stanford
 
       # @return [String] value for title_245a_search field
       def sw_short_title
-        short_titles ? short_titles.first : nil
+        short_titles ? short_titles.compact.reject(&:empty?).first : nil
+      end
+
+      # @return [Nokogiri::XML::NodeSet] title_info nodes, rejecting ones that just have blank text values
+      def present_title_info_nodes
+        mods_ng_xml.title_info.reject {|node| node.text.strip.empty?}
+      end
+
+      # @return [Nokogiri::XML::Node] the first titleInfo node if present, else nil
+      def first_title_info_node
+        present_title_info_nodes ? present_title_info_nodes.first : nil
       end
 
+      # @return [String] the nonSort text portion of the titleInfo node as a string (if non-empty, else nil)      
+      def nonSort_title
+        first_title_info_node.nonSort.text.strip.empty? ? nil : first_title_info_node.nonSort.text.strip
+      end
+      
+      # @return [String] the text of the titleInfo node as a string (if non-empty, else nil)
+      def title
+        first_title_info_node.title.text.strip.empty?   ? nil : first_title_info_node.title.text.strip
+      end
+      
       # @return [String] value for title_245_search, title_full_display
       def sw_full_title
-        outer_nodes = mods_ng_xml.title_info
-        outer_node = outer_nodes ? outer_nodes.first : nil
-        return nil unless outer_node
-        nonSort = outer_node.nonSort.text.strip.empty? ? nil : outer_node.nonSort.text.strip
-        title   = outer_node.title.text.strip.empty?   ? nil : outer_node.title.text.strip
-        preSubTitle = nonSort ? [nonSort, title].compact.join(" ") : title
+        
+        return nil unless first_title_info_node        
+        preSubTitle = nonSort_title ? [nonSort_title, title].compact.join(" ") : title
         preSubTitle.sub!(/:$/, '') if preSubTitle # remove trailing colon
 
-        subTitle = outer_node.subTitle.text.strip
+        subTitle = first_title_info_node.subTitle.text.strip
         preParts = subTitle.empty? ? preSubTitle : preSubTitle + " : " + subTitle
         preParts.sub!(/\.$/, '') if preParts # remove trailing period
 
-        partName   = outer_node.partName.text.strip   unless outer_node.partName.text.strip.empty?
-        partNumber = outer_node.partNumber.text.strip unless outer_node.partNumber.text.strip.empty?
+        partName   = first_title_info_node.partName.text.strip   unless first_title_info_node.partName.text.strip.empty?
+        partNumber = first_title_info_node.partNumber.text.strip unless first_title_info_node.partNumber.text.strip.empty?
         partNumber.sub!(/,$/, '') if partNumber # remove trailing comma
         if partNumber && partName
           parts = partNumber + ", " + partName
@@ -157,6 +173,7 @@ module Stanford
         parts.sub!(/\.$/, '') if parts
 
         result = parts ? preParts + ". " + parts : preParts
+        return nil unless result
         result += "." unless result =~ /[[:punct:]]$/
         result.strip!
         result = nil if result.empty?
@@ -182,15 +199,8 @@ module Stanford
       # Returns a sortable version of the main title
       # @return [String] value for title_sort field
       def sw_sort_title
-        # get nonSort piece
-        outer_nodes = mods_ng_xml.title_info
-        outer_node = outer_nodes ? outer_nodes.first : nil
-        if outer_node
-          nonSort = outer_node.nonSort.text.strip.empty? ? nil : outer_node.nonSort.text.strip
-        end
-
         val = '' + (sw_full_title ? sw_full_title : '')
-        val.sub!(Regexp.new("^" + Regexp.escape(nonSort)), '') if nonSort
+        val.sub!(Regexp.new("^" + Regexp.escape(nonSort_title)), '') if nonSort_title
         val.gsub!(/[[:punct:]]*/, '').strip
         val.squeeze(" ").strip
       end

data/lib/stanford-mods/version.rb

@@ -1,6 +1,6 @@
 module Stanford
   module Mods
     # this is the Ruby Gem version
-    VERSION = "2.2.1".freeze
+    VERSION = "2.2.2".freeze
   end
 end

data/spec/searchworks_spec.rb

@@ -13,7 +13,50 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       expect(langs.size).to eq(3)
       expect(langs).to include("Persian", "Arabic", "Dutch")
       expect(langs).not_to include("Dutch; Flemish")
+    end 
+    it "should return a language string from lookup for a valid language code that has a type=code specified but no authority" do
+      m = "<mods #{@ns_decl}> <language><languageTerm type='code'>eng</languageTerm></language></mods>"
+      @smods_rec.from_str m
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to eq(1)
+      expect(langs).to eq ["English"]
+      expect(langs).not_to include("eng")
+    end    
+    it "should return nil for a language code that has a type=code specified but no authority" do
+      m = "<mods #{@ns_decl}> <language><languageTerm type='code'>bogus</languageTerm></language></mods>"
+      @smods_rec.from_str m
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to be 1
+      expect(langs).to eq [nil]
     end
+    it "should return nothing when the authority and type=code are specified but the language code cannot be found" do
+      m = "<mods #{@ns_decl}><language><languageTerm authority='iso639-2b' type='code'>bogus</languageTerm></language></mods>"
+      @smods_rec.from_str m
+      expect(@smods_rec.logger).to receive(:warn).with(/Couldn't find english name for bogus/)
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to eq(0)
+    end       
+    it "should return nothing for a language code that has no authority or type specified" do
+      m = "<mods #{@ns_decl}> <language><languageTerm>bogus</languageTerm></language></mods>"
+      @smods_rec.from_str m
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to be 0
+      expect(langs).to eq []
+    end  
+    it "should return nothing for a language code that has an unknown authority and doesn't have a type specified" do
+      m = "<mods #{@ns_decl}> <language><languageTerm authority='bogus-authority'>bogus</languageTerm></language></mods>"
+      @smods_rec.from_str m
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to be 0
+      expect(langs).to eq []
+    end       
+    it "should return nothing for a blank languageTerm node (even when the authority is valid)" do
+      m = "<mods #{@ns_decl}> <language><languageTerm authority='iso639-2b' type='code'></languageTerm></language></mods>"
+      @smods_rec.from_str m
+      langs = @smods_rec.sw_language_facet
+      expect(langs.size).to be 0
+      expect(langs).to eq []
+    end        
     it "should not have duplicates" do
       m = "<mods #{@ns_decl}><language><languageTerm type='code' authority='iso639-2b'>eng</languageTerm><languageTerm type='text'>English</languageTerm></language></mods>"
       @smods_rec.from_str m

data/spec/searchworks_title_spec.rb

@@ -7,7 +7,7 @@ describe 'title fields (searchworks.rb)' do
     @smods_rec.from_str m
   end
 
-  context 'short title (for title_245a_search, title_245a_display) ' do
+  context 'short title (for title_245a_search, title_245a_display)' do
     it 'should call :short_titles' do
       expect(@smods_rec).to receive(:short_titles) # in Mods gem
       @smods_rec.sw_short_title
@@ -17,6 +17,16 @@ describe 'title fields (searchworks.rb)' do
     end
   end
 
+  context 'blank title node' do
+    it 'should deal with a second blank titleInfo node' do
+      m = "<mods #{@ns_decl}><titleInfo> </titleInfo><otherStuff>goes here</otherStuff><titleInfo><title>Jerk</title><subTitle>A Tale of Tourettes</subTitle><nonSort>The</nonSort></titleInfo></mods>"
+      smods_rec_blank_node = Stanford::Mods::Record.new
+      smods_rec_blank_node.from_str m
+      expect(smods_rec_blank_node.sw_short_title).to eq 'The Jerk'
+      expect(smods_rec_blank_node.sw_full_title).to eq 'The Jerk : A Tale of Tourettes.'
+    end
+  end
+  
   context 'full title (for title_245_search, title_full_display)' do
     it 'should be a String' do
       expect(@smods_rec.sw_full_title).to eq 'The Jerk : A Tale of Tourettes.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata
@@ -195,3 +195,4 @@ test_files:
 - spec/searchworks_title_spec.rb
 - spec/spec_helper.rb
 - spec/sw_publication_spec.rb
+has_rdoc: