spotlight-dor-resources 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51c2413bf267fceeaae2eb498ad5c81b44c40877
-  data.tar.gz: f4f60e931737ebc840ad61f7b7fb1d272dd106b5
+  metadata.gz: 802c000f217f5bffac45eeb8cd3622426f952c2b
+  data.tar.gz: b14c29105325cb00da514397812df7a5c333e14e
 SHA512:
-  metadata.gz: b7d71a1624eaad421bd9784b35db016cfa972df641aabe2be42c780b611a5dc35b90d5777e42337a935bd9c397d79a9cf5ed46aa6e1fd4545cbd3d3e1f3fbb9b
-  data.tar.gz: b68375cd5b0793f4f035ce79007175468e9368c373001a968940a366982f5dcb71888f14f27720ba65b1467d894d889e290c93e822c394d0ceaf29df1359b85f
+  metadata.gz: 1f3834e96cdbb9edf59100b3bb782af5731d51151eaa7e55363ae617267fc1a937744eb84e9299e58c2192ef2fed1403c875b8740e25dc1ad8c9dbc5eb01f06d
+  data.tar.gz: 0f24b3fccaa36d56e215f1f8bd4582971e371f7194976691f545d449ae55b77fb457fc6b23851ce47a19e14777acfaa7a05e5024e83beaeb592c5eddd3905123

data/lib/spotlight/dor/indexer.rb

@@ -9,29 +9,45 @@ require 'faraday'
 module Spotlight::Dor
   # Base class to harvest from DOR via harvestdor gem
   class Indexer < GDor::Indexer
-    # tweak author_sort field from stanford-mods
-    before_index do |_sdb, solr_doc|
-      solr_doc[:author_sort] &&= solr_doc[:author_sort].tr("\uFFFF", "\uFFFD")
+    def resource(druid)
+      Harvestdor::Indexer::Resource.new harvestdor, druid
     end
 
-    # add fields from raw mods
-    before_index :add_genre
-
     def solr_document(resource)
       doc_hash = super
       run_hook :before_index, resource, doc_hash
       doc_hash
     end
 
-    def resource(druid)
-      Harvestdor::Indexer::Resource.new harvestdor, druid
+    # tweak author_sort field from stanford-mods
+    before_index do |_sdb, solr_doc|
+      solr_doc[:author_sort] &&= solr_doc[:author_sort].tr("\uFFFF", "\uFFFD")
     end
 
     private
 
-    # add plain MODS <genre> element data, not the SearchWorks genre values
-    def add_genre(sdb, solr_doc)
-      insert_field solr_doc, 'genre', sdb.smods_rec.genre.content, :symbol # this is a _ssim field
+    concerning :StanfordMods do
+      included do
+        before_index :add_author_no_collector
+        before_index :add_collector
+        before_index :add_genre
+      end
+
+      # add author_no_collector_ssim solr field containing the person authors, excluding collectors
+      #   (via stanford-mods gem)
+      def add_author_no_collector(sdb, solr_doc)
+        insert_field solr_doc, 'author_no_collector', sdb.smods_rec.non_collector_person_authors, :symbol # _ssim field
+      end
+
+      # add collector_ssim solr field containing the collector per MODS names (via stanford-mods gem)
+      def add_collector(sdb, solr_doc)
+        insert_field solr_doc, 'collector', sdb.smods_rec.collectors_w_dates, :symbol # _ssim field
+      end
+
+      # add plain MODS <genre> element data, not the SearchWorks genre values
+      def add_genre(sdb, solr_doc)
+        insert_field solr_doc, 'genre', sdb.smods_rec.genre.content, :symbol # this is a _ssim field
+      end
     end
 
     concerning :PhysicalLocation do

data/lib/spotlight/dor/resources/version.rb

@@ -2,7 +2,7 @@ module Spotlight
   module Dor
     # :nodoc:
     module Resources
-      VERSION = '0.2.3'
+      VERSION = '0.3.0'
     end
   end
 end

data/spec/lib/spotlight/dor/indexer_spec.rb

@@ -151,37 +151,99 @@ describe Spotlight::Dor::Indexer do
     end
   end
 
-  describe '#add_genre' do
-    before do
-      allow(r).to receive(:mods).and_return(mods)
-      subject.send(:add_genre, sdb, solr_doc)
-    end
-
-    context 'with a record without a genre' do
+  context 'StanfordMods concern' do
+    describe '#add_author_no_collector' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_author_no_collector, sdb, solr_doc)
+      end
+      let(:name) { 'Macro Hamster' }
       let(:mods) do
         Nokogiri::XML <<-EOF
           <mods xmlns="#{Mods::MODS_NS}">
+            <name type="personal">
+              <namePart>#{name}</namePart>
+              <role>
+                <roleTerm type="code" authority="marcrelator">cre</roleTerm>
+              </role>
+            </name>
+            <name type="personal">
+              <namePart>Ignored</namePart>
+              <role>
+                <roleTerm type="code" authority="marcrelator">col</roleTerm>
+              </role>
+            </name>
           </mods>
           EOF
       end
-
-      it 'is blank' do
-        expect(solr_doc['genre_ssim']).to be_blank
+      it 'populates author_no_collector_ssim field in solr doc' do
+        expect(solr_doc['author_no_collector_ssim']).to eq [name]
+      end
+      it 'calls non_collector_person_authors on Stanford::Mods::Record object' do
+        expect(sdb.smods_rec).to receive(:non_collector_person_authors)
+        subject.send(:add_author_no_collector, sdb, solr_doc)
       end
     end
 
-    context 'with a record with a genre' do
+    describe '#add_collector' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_collector, sdb, solr_doc)
+      end
+      let(:name) { 'Macro Hamster' }
       let(:mods) do
-        # e.g. from https://purl.stanford.edu/vw282gv1740
         Nokogiri::XML <<-EOF
           <mods xmlns="#{Mods::MODS_NS}">
-            <genre authority="aat" valueURI="http://vocab.getty.edu/aat/300028579">manuscripts for publication</genre>
+            <name type="personal">
+              <namePart>#{name}</namePart>
+              <role>
+                <roleTerm type="code" authority="marcrelator">col</roleTerm>
+              </role>
+            </name>
           </mods>
           EOF
       end
+      it 'populates collector_ssim field in solr doc' do
+        expect(solr_doc['collector_ssim']).to eq [name]
+      end
+      it 'calls collectors_w_dates on Stanford::Mods::Record object' do
+        expect(sdb.smods_rec).to receive(:collectors_w_dates)
+        subject.send(:add_collector, sdb, solr_doc)
+      end
+    end
+
+    describe '#add_genre' do
+      before do
+        allow(r).to receive(:mods).and_return(mods)
+        subject.send(:add_genre, sdb, solr_doc)
+      end
 
-      it 'extracts the genre' do
-        expect(solr_doc['genre_ssim']).to contain_exactly 'manuscripts for publication'
+      context 'with a record without a genre' do
+        let(:mods) do
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+            </mods>
+            EOF
+        end
+
+        it 'is blank' do
+          expect(solr_doc['genre_ssim']).to be_blank
+        end
+      end
+
+      context 'with a record with a genre' do
+        let(:mods) do
+          # e.g. from https://purl.stanford.edu/vw282gv1740
+          Nokogiri::XML <<-EOF
+            <mods xmlns="#{Mods::MODS_NS}">
+              <genre authority="aat" valueURI="http://vocab.getty.edu/aat/300028579">manuscripts for publication</genre>
+            </mods>
+            EOF
+        end
+
+        it 'extracts the genre' do
+          expect(solr_doc['genre_ssim']).to contain_exactly 'manuscripts for publication'
+        end
       end
     end
   end

data/spotlight-dor-resources.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'faraday'
   spec.add_dependency 'solrizer'
+  spec.add_dependency 'stanford-mods', '>= 1.2.0' # includes new person facets
   spec.add_dependency 'gdor-indexer'
   # newer versions of harvestdor-indexer have performance improvements for collections
   spec.add_dependency 'harvestdor-indexer', '~> 2.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotlight-dor-resources
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stanford-mods
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: gdor-indexer
   requirement: !ruby/object:Gem::Requirement