stanford-mods 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a99ffd1547688f19839564988a43e698223bc3ac
-  data.tar.gz: 261a71cbde0d578de0c1b6f43fe329bf531c20ab
+  metadata.gz: 2811e50451509b7e00a879532aa64d9095705dd5
+  data.tar.gz: 59b2860b06e6b3c1911bf2bc7eb182eb42717acb
 SHA512:
-  metadata.gz: 996cc6f68f4fb8f3154a21423668e188826c46305ab2cd1445c871f0bcf7a20c0e362332b42ceebdee9be8a70e2ad0420532516356009ef4b7b1c1327e4cb3b3
-  data.tar.gz: 7ebf7b202fd71b7c546fde56f1064092f116e146f023c44a7d4f993ce39db0f88d402306fcdae44f081cffbd82fffdc5aeecb06c764567fc52c5df413ed87ccd
+  metadata.gz: f44b0b10b632573073ec57ea1eb2743dd339f2e6e2e1299a79d36f299d27600c1b3647d8b3b0ebe730ef0527341f23ba94ed0e574c3c5de29aa4d56167cfeb00
+  data.tar.gz: e57c8c2dff5cf4011ee9d8f5bac257a2afcf779237a5eb95af5f3f1c69d155e1d243fbd7561282372710f3621213bea6f816fff905c610b020cc02792a0a8bbe

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 1.9.3
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
-  - jruby-head
+#  - jruby-head  # failing 2014-07
 notifications:
   email:
     - ndushay@stanford.edu

data/README.rdoc

@@ -59,6 +59,7 @@ Example Using SearchWorks Mixins:
 6. Create new Pull Request
 
 == Releases
+* <b>1.0.2</b> add format_main and sw_genre tests to searchworks.rb
 * <b>1.0.1</b> sw_title_display keeps appropriate trailing punct more or less per spec in solrmarc-sw sw_index.properties
 * <b>1.0.0</b> sw_full_title now includes partName and partNumber; sw_title_display created to be like sw_full_title but without trailing punctuation; sw format for typeOfResource sound recording; genre value is librettos, plural; sw format algorithm accommodates first letter upcase; genre value report does NOT map to a format, genre value 'project report' with ToR text is 'Book'
 * <b>0.0.27</b> add genres 'Issue brief', 'Book chapter' and 'Working paper' to map to searchworks format 'Book'

data/lib/stanford-mods/searchworks.rb

@@ -527,8 +527,8 @@ module Stanford
       
       # select one or more format values from the controlled vocabulary here:
       #   http://searchworks-solr-lb.stanford.edu:8983/solr/select?facet.field=format&rows=0&facet.sort=index
-      # based on the dor_content_type
-      # @return [String] value in the SearchWorks controlled vocabulary
+      # @return <Array[String]> value in the SearchWorks controlled vocabulary
+      # @deprecated - kept for backwards compatibility but not part of SW UI redesign work Summer 2014
       def format
         val = []
         types = self.term_values(:typeOfResource)
@@ -579,6 +579,87 @@ module Stanford
         val.uniq
       end
 
+      # 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
+      # @return <Array[String]> value in the SearchWorks controlled vocabulary
+      def format_main
+        val = []
+        types = self.term_values(:typeOfResource)
+        if types
+          genres = self.term_values(:genre)
+          issuance = self.term_values([:origin_info,:issuance])
+          types.each do |type|
+            case type
+              when 'cartographic'
+                val << 'Map'
+              when 'mixed material'
+                val << 'Archive/Manuscript'
+              when 'moving image'
+                val << 'Video'
+              when 'notated music'
+                val << 'Music score'
+              when 'software, multimedia'
+                if genres and (genres.include?('dataset') || genres.include?('Dataset'))
+                  val << 'Dataset'
+                else
+                  val << 'Software/Multimedia'
+                end
+              when 'sound recording-musical'
+                val << 'Music recording'
+              when 'sound recording-nonmusical', 'sound recording'
+                val << 'Sound recording'
+              when 'still image'
+                val << 'Image'
+              when 'text'
+                article_genres = ['article', 'Article',
+                  'book chapter', 'Book chapter', 'Book Chapter',
+                  'issue brief', 'Issue brief', 'Issue Brief',
+                  'project report', 'Project report', 'Project Report',
+                  'student project report', 'Student project report', 'Student Project report', 'Student Project Report',
+                  'technical report', 'Technical report', 'Technical Report',
+                  'working paper', 'Working paper', 'Working Paper'
+                  ]
+                val << 'Article' if genres and !(genres & article_genres).empty?
+                val << 'Book' if issuance and issuance.include? 'monographic'
+                book_genres = ['conference publication', 'Conference publication', 'Conference Publication',
+                  'instruction', 'Instruction',
+                  'librettos', 'Librettos',
+                  'thesis', 'Thesis'
+                  ]
+                val << 'Book' if genres and !(genres & book_genres).empty?
+                val << 'Journal/Periodical' if issuance and issuance.include? 'continuing'
+              when 'three dimensional object'
+                val << 'Object'
+            end
+          end
+        end
+        val.uniq
+      end
+
+      # return values for the genre facet in SearchWorks
+      # @return <Array[String]>
+      def sw_genre
+        val = []
+        genres = self.term_values(:genre)
+        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?
+            types = self.term_values(:typeOfResource)
+            if types && types.include?('text')
+              val << 'Conference proceedings'
+              val.delete 'Conference publication'
+            end
+          end
+        end
+        val.uniq
+      end
+
       # @return [String] value with the numeric catkey in it, or nil if none exists
       def catkey
         catkey=self.term_values([:record_info,:recordIdentifier])

data/lib/stanford-mods/version.rb

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

data/spec/searchworks_format_spec.rb

@@ -1,251 +1,631 @@
 # encoding: UTF-8
 require 'spec_helper'
 
-describe "Format field from Searchworks mixin for Stanford::Mods::Record" do
+describe "Format fields (searchworks.rb)" do
 
   before(:all) do
     @smods_rec = Stanford::Mods::Record.new
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
   end
 
-  context "Book:" do
-    context "typeOfResource text," do
-      it 'originInfo/issuance monographic' do
-        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>monographic</issuance></originInfo></mods>"
-        @smods_rec.from_str(m)
-        expect(@smods_rec.format).to eq ['Book']
-      end
-      context "genre" do
-        it "'book chapter'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
-          m = "<mods #{@ns_decl}><genre>book chapter</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Book chapter</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Book Chapter</genre><typeOfResource>text</typeOfResource></mods>"
+  context "format" do
+    context "Book:" do
+      context "typeOfResource text," do
+        it 'originInfo/issuance monographic' do
+          m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>monographic</issuance></originInfo></mods>"
           @smods_rec.from_str(m)
           expect(@smods_rec.format).to eq ['Book']
         end
-        it "'issue brief'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
-          m = "<mods #{@ns_decl}><genre>issue brief</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Issue brief</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Issue Brief</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-        end
-        it "'librettos'", :jira => 'INDEX-98' do
-          m = "<mods #{@ns_decl}><genre>librettos</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Librettos</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-        end
-        it "'libretto' isn't valid", :jira => 'INDEX-98' do
-          m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq []
-        end
-        it "'project report'", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
-          m = "<mods #{@ns_decl}><genre>project report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Project report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Project Report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-        end
-        it "'report' isn't valid", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
-          m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq []
-        end
-        it "'technical report'", :jira => 'GRYPHONDOR-207' do
-          m = "<mods #{@ns_decl}><genre>technical report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Technical report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Technical Report</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-        end
-        it "'working paper'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
-          m = "<mods #{@ns_decl}><genre>working paper</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Working paper</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
-          m = "<mods #{@ns_decl}><genre>Working Paper</genre><typeOfResource>text</typeOfResource></mods>"
-          @smods_rec.from_str(m)
-          expect(@smods_rec.format).to eq ['Book']
+        context "genre" do
+          it "'book chapter'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+            m = "<mods #{@ns_decl}><genre>book chapter</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Book chapter</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Book Chapter</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
+          it "'issue brief'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+            m = "<mods #{@ns_decl}><genre>issue brief</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Issue brief</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Issue Brief</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
+          it "'librettos'", :jira => 'INDEX-98' do
+            m = "<mods #{@ns_decl}><genre>librettos</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Librettos</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
+          it "'libretto' isn't valid", :jira => 'INDEX-98' do
+            m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq []
+          end
+          it "'project report'", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
+            m = "<mods #{@ns_decl}><genre>project report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Project report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Project Report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
+          it "'report' isn't valid", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
+            m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq []
+          end
+          it "'technical report'", :jira => 'GRYPHONDOR-207' do
+            m = "<mods #{@ns_decl}><genre>technical report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Technical report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Technical Report</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
+          it "'working paper'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+            m = "<mods #{@ns_decl}><genre>working paper</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Working paper</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Working Paper</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format).to eq ['Book']
+          end
         end
       end
-    end
-  end # 'Book'
+    end # 'Book'
   
-  context "Computer File: typeOfResource 'software, multimedia'" do
-    it "no genre (e.g. Dataset)" do
-      m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Computer File']
+    context "Computer File: typeOfResource 'software, multimedia'" do
+      it "no genre (e.g. Dataset)" do
+        m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Computer File']
+      end
+      it "genre 'game'", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre>game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Computer File']
+        m = "<mods #{@ns_decl}><genre>Game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Computer File']
+      end
     end
-    it "genre 'game'", :jira => 'GRYPHONDOR-207' do
-      m = "<mods #{@ns_decl}><genre>game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+
+    it "Conference Proceedings: typeOfResource 'text', genre 'conference publication'", :jira => 'GRYPHONDOR-207' do
+      m = "<mods #{@ns_decl}><genre>conference publication</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Conference Proceedings']
+      m = "<mods #{@ns_decl}><genre>Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Computer File']
-      m = "<mods #{@ns_decl}><genre>Game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+      expect(@smods_rec.format).to eq ['Conference Proceedings']
+      m = "<mods #{@ns_decl}><genre>Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Computer File']
+      expect(@smods_rec.format).to eq ['Conference Proceedings']
     end
-  end
-
-  it "Conference Proceedings: typeOfResource 'text', genre 'conference publication'", :jira => 'GRYPHONDOR-207' do
-    m = "<mods #{@ns_decl}><genre>conference publication</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Conference Proceedings']
-    m = "<mods #{@ns_decl}><genre>Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Conference Proceedings']
-    m = "<mods #{@ns_decl}><genre>Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Conference Proceedings']
-  end
   
-  it "Journal/Periodical: typeOfResource 'text', genre 'article'" do
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>article</genre></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Journal/Periodical']
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Article</genre></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Journal/Periodical']
-  end
+    context "Journal/Periodical: typeOfResource 'text'," do
+      it "genre 'article" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Journal/Periodical']
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Journal/Periodical']
+      end
+      it "originInfo/issuance 'continuing'" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>continuing</issuance></originInfo></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Journal/Periodical']
+      end
+    end
 
-  it "Image: typeOfResource 'still image'" do
-    m = "<mods #{@ns_decl}><typeOfResource>still image</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Image']
-  end
+    it "Image: typeOfResource 'still image'" do
+      m = "<mods #{@ns_decl}><typeOfResource>still image</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Image']
+    end
+    
+    it "Manuscript/Archive: typeOfResource 'mixed material'" do
+      m = "<mods #{@ns_decl}><typeOfResource>mixed material</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Manuscript/Archive']
+    end
+
+    it "Map/Globe: typeOfResource 'cartographic'" do
+      m = "<mods #{@ns_decl}><typeOfResource>cartographic</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Map/Globe']
+    end
   
-  it "Music - Recording: typeOfResource 'sound recording-musical'", :jira => 'GRYPHONDOR-207' do
-    m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Music - Recording']
-  end
+    it "Music - Recording: typeOfResource 'sound recording-musical'", :jira => 'GRYPHONDOR-207' do
+      m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Music - Recording']
+    end
 
-  it "Music - Score: typeOfResource 'notated music'" do
-    m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Music - Score']
-  end
+    it "Music - Score: typeOfResource 'notated music'" do
+      m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Music - Score']
+    end
 
-  it "Other: typeOfResource 'text', genre 'student project report'", :email => 'from Vitus, August 16, 2013' do
-    m = "<mods #{@ns_decl}><genre>student project report</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Other']
-    m = "<mods #{@ns_decl}><genre>Student project report</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Other']
-    m = "<mods #{@ns_decl}><genre>Student Project report</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Other']
-    m = "<mods #{@ns_decl}><genre>Student Project Report</genre><typeOfResource>text</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Other']
-  end
-  
-  context "Sound Recording:" do
-    it "typeOfResource 'sound recording-nonmusical', genre 'sound", :jira => 'GRYPHONDOR-207' do
-      m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+    it "Other: typeOfResource 'text', genre 'student project report'", :email => 'from Vitus, August 16, 2013' do
+      m = "<mods #{@ns_decl}><genre>student project report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Sound Recording']
-      m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+      expect(@smods_rec.format).to eq ['Other']
+      m = "<mods #{@ns_decl}><genre>Student project report</genre><typeOfResource>text</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Sound Recording']
+      expect(@smods_rec.format).to eq ['Other']
+      m = "<mods #{@ns_decl}><genre>Student Project report</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Other']
+      m = "<mods #{@ns_decl}><genre>Student Project Report</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format).to eq ['Other']
+    end
+  
+    context "Sound Recording:" do
+      it "typeOfResource 'sound recording-nonmusical', genre 'sound", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Sound Recording']
+        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Sound Recording']
+      end
+      it "typeOfResource 'sound recording', genre 'sound", :jira => 'INDEX-94' do
+        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Sound Recording']
+        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Sound Recording']
+      end
     end
-    it "typeOfResource 'sound recording', genre 'sound", :jira => 'INDEX-94' do
-      m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+
+    it "Thesis: typeOfResource 'text', genre 'thesis'" do
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>thesis</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Sound Recording']
-      m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+      expect(@smods_rec.format).to eq ['Thesis']
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Thesis</genre></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Sound Recording']
+      expect(@smods_rec.format).to eq ['Thesis']
     end
-  end
 
-  it "Thesis: typeOfResource 'text', genre 'thesis'" do
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>thesis</genre></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Thesis']
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>Thesis</genre></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq ['Thesis']
-  end
+    context "Video: typeOfResource 'moving image'" do
+      it "no genre" do
+        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Video']
+      end
+      it "genre 'motion picture'", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre>motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Video']
+        m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Video']
+        m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Video']
+      end
+    end
+
+    context "multiple format values", :jira => 'INDEX-32' do
+      it "multiple typeOfResource elements" do
+        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Video', 'Sound Recording']
+      end
+      it "multiple genre elements, single typeOfResource" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical']
+      end
+      it "mish mash" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><typeOfResource>still image</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical', 'Image']
+      end
+      it "doesn't give duplicate values" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>issue brief</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format).to eq ['Book']
+      end
+    end
 
-  context "Video: typeOfResource 'moving image'" do
-    it "no genre" do
-      m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource></mods>"
+    it "empty Array if no typeOfResource field" do
+      m = "<mods #{@ns_decl}><originInfo>
+      <dateCreated>1904</dateCreated>
+      </originInfo></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Video']
+      expect(@smods_rec.format).to eq []
     end
-    it "genre 'motion picture'", :jira => 'GRYPHONDOR-207' do
-      m = "<mods #{@ns_decl}><genre>motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+
+    it "empty Array if weird typeOfResource value" do
+      m = "<mods #{@ns_decl}>
+      <typeOfResource>foo</typeOfResource>
+      </mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Video']
-      m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+      expect(@smods_rec.format).to eq []
+    end
+  end # format
+   
+  context "format_main" do
+    it "3D object: typeOfResource 'three dimensional object'" do
+      m = "<mods #{@ns_decl}><typeOfResource>three dimensional object</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Video']
-      m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+      expect(@smods_rec.format_main).to eq ['Object']
+    end
+
+    it "Archive/Manuscript: typeOfResource 'mixed material'" do
+      m = "<mods #{@ns_decl}><typeOfResource>mixed material</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Video']
+      expect(@smods_rec.format_main).to eq ['Archive/Manuscript']
+    end
+
+    context "Article: typeOfResource text, genre" do
+      it "'article'" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre authority=\"marcgt\">Article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'book chapter'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+        m = "<mods #{@ns_decl}><genre authority=\"local\">book chapter</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Book chapter</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Book Chapter</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'issue brief'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+        m = "<mods #{@ns_decl}><genre authority=\"local\">issue brief</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Issue brief</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Issue Brief</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'project report'", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
+        m = "<mods #{@ns_decl}><genre>project report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre>Project report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre>Project Report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'report' isn't valid", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
+        m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq []
+      end
+      it "'student project report'", :consul => '/NGDE/Format 2014-05-28' do
+        m = "<mods #{@ns_decl}><genre authority=\"local\">student project report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Student project report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Student Project report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Student Project Report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'technical report'", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre authority=\"marcgt\">technical report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Technical report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Technical Report</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+      it "'working paper'", :email => 'mods-squad 2014-05-22, Joanna Dyla' do
+        m = "<mods #{@ns_decl}><genre authority=\"local\">working paper</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Working paper</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Working Paper</genre><typeOfResource>text</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article']
+      end
+    end # Article
+
+    context "Book" do
+      context "typeOfResource text," do
+        it 'originInfo/issuance monographic' do
+          m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>monographic</issuance></originInfo></mods>"
+          @smods_rec.from_str(m)
+          expect(@smods_rec.format_main).to eq ['Book']
+        end
+        context "genre" do
+          it "'conference publication'", :jira => 'GRYPHONDOR-207' do
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">conference publication</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+          end
+          it "'instruction'", :consul => '/NGDE/Format 2014-05-28' do
+            # Hydrus 'textbook'
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">instruction</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Instruction</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+          end
+          it "'libretto' isn't valid", :jira => 'INDEX-98' do
+            m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq []
+          end
+          it "'librettos'", :jira => 'INDEX-98' do
+            m = "<mods #{@ns_decl}><genre>librettos</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre>Librettos</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+          end
+          it "'thesis'" do
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">thesis</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+            m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Thesis</genre><typeOfResource>text</typeOfResource></mods>"
+            @smods_rec.from_str(m)
+            expect(@smods_rec.format_main).to eq ['Book']
+          end
+        end
+      end
+    end # Book
+
+    context "Dataset: typeOfResource 'software, multimedia'" do
+      it "genre 'dataset'" do
+        m = "<mods #{@ns_decl}><genre authority=\"local\">dataset</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Dataset']
+        m = "<mods #{@ns_decl}><genre authority=\"local\">Dataset</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Dataset']
+      end
     end
-  end
 
-  context "multiple format values", :jira => 'INDEX-32' do
-    it "multiple typeOfResource elements" do
-      m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource><typeOfResource>sound recording</typeOfResource></mods>"
+    it "Image: typeOfResource 'still image'" do
+      m = "<mods #{@ns_decl}><typeOfResource>still image</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Video', 'Sound Recording']
+      expect(@smods_rec.format_main).to eq ['Image']
     end
-    it "multiple genre elements, single typeOfResource" do
-      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+
+    it "Journal/Periodical: typeOfResource 'text', originInfo/issuance 'continuing'" do
+      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>continuing</issuance></originInfo></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical']
+      expect(@smods_rec.format_main).to eq ['Journal/Periodical']
     end
-    it "mish mash" do
-      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><typeOfResource>still image</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+
+    it "Map: typeOfResource 'cartographic'" do
+      m = "<mods #{@ns_decl}><typeOfResource>cartographic</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Book', 'Journal/Periodical', 'Image']
+      expect(@smods_rec.format_main).to eq ['Map']
+    end
+
+    context "Music - Recording: typeOfResource 'sound recording-musical'", :jira => 'GRYPHONDOR-207' do
+      it "no genre" do
+        m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Music recording']
+      end
+      it "genre 'sound'" do
+        m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource><genre authority=\"marcgt\">sound</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Music recording']
+        m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource><genre authority=\"marcgt\">Sound</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Music recording']
+      end
     end
-    it "doesn't give duplicate values" do
-      m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>issue brief</genre></mods>"
+
+    it "Music - Score: typeOfResource 'notated music'" do
+      m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
       @smods_rec.from_str(m)
-      expect(@smods_rec.format).to eq ['Book']
+      expect(@smods_rec.format_main).to eq ['Music score']
     end
-  end
 
-  it "empty Array if no typeOfResource field" do
-    m = "<mods #{@ns_decl}><originInfo>
-    <dateCreated>1904</dateCreated>
-    </originInfo></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq []
-  end
+    context "Software/Multimedia: typeOfResource 'software, multimedia'" do
+      it "no genre" do
+        m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Software/Multimedia']
+      end
+      it "genre 'game'", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre authority=\"marcgt\">game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Software/Multimedia']
+        m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Software/Multimedia']
+      end
+    end
 
-  it "empty Array if weird typeOfResource value" do
-    m = "<mods #{@ns_decl}><originInfo>
-    <typeOfResource>foo</typeOfResource>
-    </originInfo></mods>"
-    @smods_rec.from_str(m)
-    expect(@smods_rec.format).to eq []
-  end
+    context "Sound Recording:" do
+      it "typeOfResource 'sound recording-nonmusical', genre 'sound", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Sound recording']
+        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Sound recording']
+      end
+      it "typeOfResource 'sound recording', genre 'sound", :jira => 'INDEX-94' do
+        m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Sound recording']
+        m = "<mods #{@ns_decl}><genre>Sound</genre><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Sound recording']
+      end
+    end
+
+
+    context "Video: typeOfResource 'moving image'" do
+      it "no genre" do
+        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Video']
+      end
+      it "genre 'motion picture'", :jira => 'GRYPHONDOR-207' do
+        m = "<mods #{@ns_decl}><genre>motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Video']
+        m = "<mods #{@ns_decl}><genre>Motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Video']
+        m = "<mods #{@ns_decl}><genre>Motion Picture</genre><typeOfResource>moving image</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Video']
+      end
+    end
+
+    context "multiple values", :jira => 'INDEX-32' do
+      it "multiple typeOfResource elements" do
+        m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource><typeOfResource>sound recording</typeOfResource></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Video', 'Sound recording']
+      end
+      it "multiple genre elements, single typeOfResource" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article', 'Book']
+      end
+      it "mish mash" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><typeOfResource>still image</typeOfResource><genre>librettos</genre><genre>article</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Article', 'Book', 'Image']
+      end
+      it "doesn't give duplicate values" do
+        m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>librettos</genre><genre>thesis</genre></mods>"
+        @smods_rec.from_str(m)
+        expect(@smods_rec.format_main).to eq ['Book']
+      end
+    end
+
+    it "empty Array if no typeOfResource field" do
+      m = "<mods #{@ns_decl}><originInfo>
+            <dateCreated>1904</dateCreated>
+          </originInfo></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format_main).to eq []
+    end
+
+    it "empty Array if weird typeOfResource value" do
+      m = "<mods #{@ns_decl}>
+            <typeOfResource>foo</typeOfResource>
+          </mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.format_main).to eq []
+    end
+  end #format_main
+
+  context "sw_genre" do
+    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)
+      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference publication</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Conference Publication</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Conference proceedings']
+    end
+    it "Thesis/Dissertation: typeOfResource 'text', genre 'thesis'" do
+      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">thesis</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation']
+      m = "<mods #{@ns_decl}><genre authority=\"marcgt\">Thesis</genre><typeOfResource>text</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Thesis/Dissertation']
+    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>"
+      @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>"
+      @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>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Student project 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>
+          </mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Game', 'Foo', 'Technical report']
+    end
+    it "doesn't have duplicates" do
+      m = "<mods #{@ns_decl}>
+            <genre>game</genre>
+            <genre>technical report</genre>
+            <genre>Game</genre>
+          </mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq ['Game', 'Technical report']
+    end
+    it "empty Array if no genre values" do
+      m = "<mods #{@ns_decl}>
+            <typeOfResource>text</typeOfResource>
+          </mods>"
+      @smods_rec.from_str(m)
+      expect(@smods_rec.sw_genre).to eq []
+    end
+  end # sw_genre
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,76 +9,76 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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: rdoc
   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: yard
   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: 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'
 description: Stanford specific wrangling of MODS metadata from DOR, the Stanford Digital
@@ -92,10 +92,10 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -123,12 +123,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []