stanford-mods 2.4.1 → 2.6.2

data/spec/searchworks_pub_dates_spec.rb

@@ -212,6 +212,7 @@ describe "Date methods (searchworks.rb)" do
       expect(smods_rec.send(:pub_date)).to eq('8--')
     end
   end # pub_date
+
   context "pub_dates (protected)" do
     it "puts dateIssued values before dateCreated values" do
       m = "<mods #{ns_decl}><originInfo>

data/spec/searchworks_spec.rb

@@ -97,6 +97,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
       </mods>"
       @smods_rec.from_str(m)
     end
+
     it "main author (for author_1xx_search)" do
       expect(@smods_rec).to receive(:main_author_w_date) # in stanford-mods.rb
       @smods_rec.sw_main_author

data/spec/searchworks_subject_raw_spec.rb

@@ -128,6 +128,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </mods>"
           @smods_rec.from_str m
         end
+
         it "uses a ', ' as the separator by default" do
           expect(@smods_rec.sw_subject_names).to eq ['first, second']
         end
@@ -192,6 +193,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
               </mods>"
           @smods_rec.from_str m
         end
+
         it "uses a ' ' as the separator by default" do
           expect(@smods_rec.sw_subject_titles).to eq ['first second']
         end
@@ -276,6 +278,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           expect(@smods_rec.sw_geographic_search).to eq([])
         end
       end
+
       context "hierarchicalGeographic subelement" do
         it "should have a separate value for each hierarchicalGeographic element" do
           m = "<mods #{@ns_decl}>
@@ -305,6 +308,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
             </subject></mods>"
             @smods_rec.from_str m
           end
+
           it "uses a space as the separator by default" do
             expect(@smods_rec.sw_geographic_search).to eq ['Canada British Columbia Vancouver']
           end
@@ -313,6 +317,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           end
         end
       end # hierarchicalGeographic
+
       context "geographicCode subelement" do
         before(:all) do
           m = "<mods #{@ns_decl}>
@@ -324,6 +329,7 @@ describe "Searchworks mixin for Stanford::Mods::Record" do
           @smods_rec.from_str m
           @geo_search_from_codes = @smods_rec.sw_geographic_search
         end
+
         it "should not add untranslated values" do
           expect(@geo_search_from_codes).not_to include('n-us-md')
           expect(@geo_search_from_codes).not_to include('e-er')

data/spec/searchworks_subject_spec.rb

@@ -44,9 +44,6 @@ describe "Subject fields (searchworks.rb)" do
       it "should contain subject <topic> subelement data" do
         expect(@smods_rec.topic_search).to include(@topic)
       end
-      it "should contain top level <genre> element data" do
-        expect(@smods_rec.topic_search).to include(@genre)
-      end
       it "should not contain other subject element data" do
         expect(@smods_rec.topic_search).not_to include(@cart_coord)
         expect(@smods_rec.topic_search).not_to include(@s_genre)
@@ -64,12 +61,6 @@ describe "Subject fields (searchworks.rb)" do
         @smods_rec.from_str(m)
         expect(@smods_rec.topic_search).to eq([@topic])
       end
-      it "should not be nil if there are only <genre> elements (no subject/topic elements)" do
-        m = "<mods #{@ns_decl}><genre>#{@genre}</genre></mods>"
-        @smods_rec = Stanford::Mods::Record.new
-        @smods_rec.from_str(m)
-        expect(@smods_rec.topic_search).to eq([@genre])
-      end
       context "topic subelement" do
         it "should have a separate value for each topic element" do
           m = "<mods #{@ns_decl}>
@@ -249,6 +240,7 @@ describe "Subject fields (searchworks.rb)" do
           expect(@smods_rec.subject_other_subvy_search).to be_nil
         end
       end
+
       context "genre subelement" do
         it "should have a separate value for each genre element" do
           m = "<mods #{@ns_decl}>
@@ -275,14 +267,12 @@ describe "Subject fields (searchworks.rb)" do
       before :each do
         allow(@smods_rec.sw_logger).to receive(:info).with(/ has subject geographicCode element with untranslated encoding \(iso3166\): <geographicCode authority=.*>us<\/geographicCode>/)
       end
+
       it "should be nil if there are no values in the MODS" do
         @smods_rec = Stanford::Mods::Record.new
         @smods_rec.from_str(@ng_mods_no_subject.to_s)
         expect(@smods_rec.subject_all_search).to be_nil
       end
-      it "should contain top level <genre> element data" do
-        expect(@smods_rec.subject_all_search).to include(@genre)
-      end
       it "should not contain cartographic sub element" do
         expect(@smods_rec.subject_all_search).not_to include(@cart_coord)
       end

data/spec/searchworks_title_spec.rb

@@ -27,6 +27,19 @@ describe 'title fields (searchworks.rb)' do
     end
   end
 
+  context 'when titleInfo contains a subTitle but no title' do
+    let(:record) do
+      m = "<mods #{@ns_decl}><titleInfo><subTitle>An overview from 1942-1950</subTitle></titleInfo></mods>"
+      rec = Stanford::Mods::Record.new
+      rec.from_str m
+      rec
+    end
+
+    it 'returns nil' do
+      expect(record.sw_full_title).to be_nil
+    end
+  end
+
   context 'missing title node' do
     it 'deals with missing titleInfo node' do
       m = "<mods #{@ns_decl}></mods>"
@@ -80,6 +93,7 @@ describe 'title fields (searchworks.rb)' do
           expect(@smods_rec.sw_full_title).to eq 'The Olympics!'
         end
       end # no subtitle
+
       context 'subtitle' do
         it 'end title with a colon' do
           m = "<mods #{@ns_decl}>
@@ -123,6 +137,7 @@ describe 'title fields (searchworks.rb)' do
           expect(@smods_rec.sw_full_title).to eq 'The Olympics : a history?'
         end
       end # subtitle
+
       context 'partName' do
         context 'no partNumber' do
           it 'end partName with period' do
@@ -162,6 +177,7 @@ describe 'title fields (searchworks.rb)' do
             expect(@smods_rec.sw_full_title).to eq 'cfb. Appendix.'
           end
         end # no partNumber
+
         context 'partNumber' do
           it 'end partNumber with comma' do
             m = "<mods #{@ns_decl}>
@@ -205,6 +221,7 @@ describe 'title fields (searchworks.rb)' do
           end
         end
       end # partName
+
       context 'no partName, but partNumber' do
         it 'end partNumber with period' do
           m = "<mods #{@ns_decl}>
@@ -322,6 +339,7 @@ describe 'title fields (searchworks.rb)' do
         expect(@smods_rec.sw_title_display).to eq 'The Jerk'
       end
     end
+
     context 'no subtitle' do
       it 'end title with a period' do
         m = "<mods #{@ns_decl}>
@@ -351,6 +369,7 @@ describe 'title fields (searchworks.rb)' do
         expect(@smods_rec.sw_title_display).to eq 'The Olympics!'
       end
     end # no subtitle
+
     context 'subtitle' do
       it 'end title with a colon' do
         m = "<mods #{@ns_decl}>
@@ -394,6 +413,7 @@ describe 'title fields (searchworks.rb)' do
         expect(@smods_rec.sw_title_display).to eq 'The Olympics : a history?'
       end
     end # subtitle
+
     context 'partName' do
       context 'no partNumber' do
         it 'end partName with period' do
@@ -433,6 +453,7 @@ describe 'title fields (searchworks.rb)' do
           expect(@smods_rec.sw_title_display).to eq 'cfb. Appendix'
         end
       end # no partNumber
+
       context 'partNumber' do
         it 'end partNumber with comma' do
           m = "<mods #{@ns_decl}>
@@ -476,6 +497,7 @@ describe 'title fields (searchworks.rb)' do
         end
       end
     end # partName
+
     context 'no partName, but partNumber' do
       it 'end partNumber with period' do
         m = "<mods #{@ns_decl}>
@@ -544,6 +566,7 @@ describe 'title fields (searchworks.rb)' do
       @smods_rec.from_str(m)
       @addl_titles = @smods_rec.sw_addl_titles
     end
+
     it 'should not include the main title' do
       expect(@addl_titles.size).to eq 2
       expect(@addl_titles).not_to include(@smods_rec.sw_full_title)
@@ -563,6 +586,18 @@ describe 'title fields (searchworks.rb)' do
       @smods_rec.from_str(m)
       expect(@smods_rec.sw_addl_titles).to eq ['Alternative', 'Joke]']
     end
+    it 'excludes weird cases where there is no short title' do
+      m = <<-EOXML
+        <mods #{@ns_decl}>
+        <titleInfo></titleInfo>
+        <titleInfo type="alternative">
+          <title>Sponsored projects report for the year ended</title>
+        </titleInfo>
+        </mods>
+      EOXML
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_addl_titles).to be_empty
+    end
   end
 
   context 'sort title' do
@@ -630,6 +665,7 @@ describe 'title fields (searchworks.rb)' do
         </titleInfo></mods>"
       @all_smods_rec.from_str(all)
     end
+
     it 'short titles' do
       expect(@mccarthy_smods_rec.sw_short_title).to eql 'McCarthy, John'
       expect(@insp_general_smods_rec.sw_short_title).to eql 'Semiannual report to Congress'

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
+SimpleCov.start
 
 require 'stanford-mods'
 

data/stanford-mods.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^spec/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'mods', '~> 2.0', '>= 2.0.2'
+  gem.add_dependency 'mods', '~> 2.2'
   # active_support for .ordinalize, eg. 1 -> 1st, 2 -> 2nd for centuries
   gem.add_dependency 'activesupport'
 
@@ -27,4 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
   # tests
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rubocop', '~> 0.60'
+  gem.add_development_dependency 'rubocop-rspec'
+  gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +95,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.60'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stanford specific wrangling of MODS metadata from DOR, the Stanford Digital
   Object Repository
 email:
@@ -176,8 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Stanford specific wrangling of MODS metadata