stanford-mods 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 402d16e29fddb76f3a3b21418aa000dcf8300a80
-  data.tar.gz: 46ba723a412d940fcc82f667c7c7043f1e25c13b
+  metadata.gz: 9617b16653a05aef7a4369146c3da872e27ae1fc
+  data.tar.gz: e8b07e17af94b4cfc5e3210cd875c6a217efe86a
 SHA512:
-  metadata.gz: 9357e2d632c6bec40aa4b96f9a07905da48ca69431a37444753b35749a99000105a3b75ee24f6b5c3d3aa55601b001e682167147dddace1bf93c098b736a4c8a
-  data.tar.gz: ad7b01a32d9f6bc640aa8e872c3366f42769085c06dea39c072e71843f7f0eee32d5829a5a0689ea80f1fd607d5aded96fd69e800e048dfa8f91c9753a5b9927
+  metadata.gz: ec62fd240d006e705d3767bb829c0ef15c18d9135b9acbab5838b4366d536c0e43de293bc53e4722b92cfb42b193c2b106ffdfbc103e3bbcd0802efd99bdfe1c
+  data.tar.gz: 7588c07a0bf04c4cbceb8a291b833c54619529b8d94de5bcc1e6b3245a6daf288a1c5d4c1676684b39b6519e52ed08f1139713efeefa1df69f5869d93a36243b

data/README.rdoc

@@ -59,6 +59,7 @@ Example Using SearchWorks Mixins:
 6. Create new Pull Request
 
 == Releases
+* <b>0.0.27</b> add genres 'Issue brief', 'Book chapter' and 'Working paper' to map to searchworks format 'Book'
 * <b>0.0.26</b> map typeOfResource 'sound recording-musical' to searchworks format 'Music - Recording' with spaces
 * <b>0.0.25</b> map typeOfResource 'text' and genre 'report' to searchworks format 'Book'
 * <b>0.0.24</b> Largely cosmetic refactoring for easier maintenance.

data/lib/stanford-mods/searchworks.rb

@@ -482,49 +482,48 @@ module Stanford
       # based on the dor_content_type
       # @return [String] value in the SearchWorks controlled vocabulary
       def format
-        val=[]
-        formats = self.term_values(:typeOfResource)
-        genres = self.term_values(:genre)
-        issuance = self.term_values([:origin_info,:issuance])
-        if formats
-          formats.each do |form|
-            case form
-            when 'text'
-              val << 'Thesis' if genres and genres.include? 'thesis'
-              val << 'Book' if issuance and issuance.include? 'monographic'
-              val << 'Journal/Periodical' if issuance and issuance.include? 'continuing'
-              val << 'Journal/Periodical' if genres and genres.include? 'article'
-              val << 'Conference Proceedings' if genres and genres.include? 'conference publication'
-              val << 'Other' if genres and genres.include? 'student project report'
-              val << 'Book' if genres and genres.include? 'technical report'
-              val << 'Book' if genres and genres.include? 'report'
-            when 'still image'
-              val << 'Image'
-            when 'mixed material'
-              val << 'Manuscript/Archive'
-            when 'moving image'
-              val << 'Video'
-            when 'notated music'
-              val << 'Music - Score'
-            when 'three dimensional object'
-              val <<'Other'
-            when 'cartographic'
-              val << 'Map/Globe'
-            when 'sound recording-musical'
-              val << 'Music - Recording'
-            when 'sound recording-nonmusical'
-              val << 'Sound Recording'
-            when 'software, multimedia'
-              val << 'Computer File'      
+        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/Globe'
+              when 'mixed material'
+                val << 'Manuscript/Archive'
+              when 'moving image'
+                val << 'Video'
+              when 'notated music'
+                val << 'Music - Score'
+              when 'software, multimedia'
+                val << 'Computer File'
+              when 'sound recording-musical'
+                val << 'Music - Recording'
+              when 'sound recording-nonmusical'
+                val << 'Sound Recording'
+              when 'still image'
+                val << 'Image'
+              when 'text'
+                val << 'Book' if issuance and issuance.include? 'monographic'
+                val << 'Book' if genres and genres.include? 'book chapter'
+                val << 'Book' if genres and genres.include? 'issue brief'
+                val << 'Book' if genres and genres.include? 'libretto'
+                val << 'Book' if genres and genres.include? 'report'
+                val << 'Book' if genres and genres.include? 'technical report'
+                val << 'Book' if genres and genres.include? 'working paper'
+                val << 'Conference Proceedings' if genres and genres.include? 'conference publication'
+                val << 'Journal/Periodical' if issuance and issuance.include? 'continuing'
+                val << 'Journal/Periodical' if genres and genres.include? 'article'
+                val << 'Other' if genres and genres.include? 'student project report'
+                val << 'Thesis' if genres and genres.include? 'thesis'
+              when 'three dimensional object'
+                val << 'Other'
             end
           end
         end
-        if val.length>0
-          return val.uniq
-        end
-        if not self.typeOfResource or self.typeOfResource.length == 0
-          []
-        end
+        val.uniq
       end
 
       # @return [String] value with the numeric catkey in it, or nil if none exists

data/lib/stanford-mods/version.rb

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

data/spec/searchworks_format_spec.rb

@@ -8,88 +8,117 @@ describe "Format field from Searchworks mixin for Stanford::Mods::Record" do
     @ns_decl = "xmlns='#{Mods::MODS_NS}'"
   end
 
-  it "should check genre as part of deciding format" do
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>thesis</genre></mods>"
-    @smods_rec.from_str(m)
-    @smods_rec.format.should == ['Thesis']
-  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)
+        @smods_rec.format.should == ['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)
+          @smods_rec.format.should == ['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)
+          @smods_rec.format.should == ['Book']
+        end
+        it "'libretto'", :email => 'mods-squad 2014-05-22, Laura Wilsey' do
+          m = "<mods #{@ns_decl}><genre>libretto</genre><typeOfResource>text</typeOfResource></mods>"
+          @smods_rec.from_str(m)
+          @smods_rec.format.should == ['Book']
+        end
+        it "'report'", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
+          m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
+          @smods_rec.from_str(m)
+          @smods_rec.format.should == ['Book']
+        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)
+          @smods_rec.format.should == ['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)
+          @smods_rec.format.should == ['Book']
+        end
+      end
+    end
+  end # 'Book'
   
-  it 'should work for datasets' do
-    m = "<mods #{@ns_decl}><typeOfResource>software, multimedia</typeOfResource></mods>"
-    @smods_rec.from_str(m)
-    @smods_rec.format.should == ['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)
+      @smods_rec.format.should == ['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)
+      @smods_rec.format.should == ['Computer File']
+    end
   end
 
-  it 'should work for books' do
-    m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><originInfo><issuance>monographic</issuance></originInfo></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)
-    @smods_rec.format.should == ['Book']
+    @smods_rec.format.should == ['Conference Proceedings']
   end
-
-  it "should work for a hydrus journal article" do
+  
+  it "Journal/Periodical: typeOfResource 'text', genre 'article'" do
     m = "<mods #{@ns_decl}><typeOfResource>text</typeOfResource><genre>article</genre></mods>"
     @smods_rec.from_str(m)
     @smods_rec.format.should == ['Journal/Periodical']
   end
 
-  it "should work for image" do
+  it "Image: typeOfResource 'still image'" do
     m = "<mods #{@ns_decl}><typeOfResource>still image</typeOfResource></mods>"
     @smods_rec.from_str(m)
     @smods_rec.format.should == ['Image']
   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)
+    @smods_rec.format.should == ['Music - Recording']
+  end
 
-  context "Hydrus mappings per GRYPHONDOR-207" do
-    it "should give a format of Computer File for <genre>game</genre> and <typeOfResource>software, multimedia</typeOfResource>" do
-      m = "<mods #{@ns_decl}><genre>game</genre><typeOfResource>software, multimedia</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Computer File']
-    end
-    it "should give a format of Video for <genre>motion picture</genre> and <typeOfResource>moving image</typeOfResource>" do
-      m = "<mods #{@ns_decl}><genre>motion picture</genre><typeOfResource>moving image</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Video']
-    end
-    it "should give a format of Sound Recording for <genre>sound</genre> and <typeOfResource>sound recording-nonmusical</typeOfResource>" do
-      m = "<mods #{@ns_decl}><genre>sound</genre><typeOfResource>sound recording-nonmusical</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Sound Recording']
-    end
-    it "should give a format of Music - Recording for <typeOfResource>sound recording-musical</typeOfResource>" do
-      m = "<mods #{@ns_decl}><typeOfResource>sound recording-musical</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Music - Recording']
-    end
-    it "should give a format of Conference Proceedings for <genre>conference publication</genre> and <typeOfResource>text</typeOfResource>" do
-      m = "<mods #{@ns_decl}><genre>conference publication</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Conference Proceedings']
-    end
-    it "should give a format of Book for <genre>technical report</genre> and <typeOfResource>text</typeOfResource>" do
-      m = "<mods #{@ns_decl}><genre>technical report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Book']
-    end    
-    it "should give a format of Book for <genre>report</genre> and <typeOfResource>text</typeOfResource>", :jira => 'GRYP-170', :github => 'gdor-indexer/#7' do
-      m = "<mods #{@ns_decl}><genre>report</genre><typeOfResource>text</typeOfResource></mods>"
-      @smods_rec.from_str(m)
-      @smods_rec.format.should == ['Book']
-    end    
+  it "Music - Score: typeOfResource 'notated music'" do
+    m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
+    @smods_rec.from_str(m)
+    @smods_rec.format.should == ['Music - Score']
   end
 
-  # Student Project Reports: spec via email from Vitus, August 16, 2013
-  it "should give a format of Other for <genre>student project report</genre> and <typeOfResource>text</typeOfResource>" do
+  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)
     @smods_rec.format.should == ['Other']
   end
   
-  it "should give a format of Music - Score for <typeOfResource>notated music</typeOfResource>" do
-    m = "<mods #{@ns_decl}><typeOfResource>notated music</typeOfResource></mods>"
+  it "Sound Recording: 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)
-    @smods_rec.format.should == ['Music - Score']
+    @smods_rec.format.should == ['Sound Recording']
   end
-  
-  it "should return nothing if there is no format info" do
+
+  context "Video: typeOfResource 'moving image'" do
+    it "no genre" do
+      m = "<mods #{@ns_decl}><typeOfResource>moving image</typeOfResource></mods>"
+      @smods_rec.from_str(m)
+      @smods_rec.format.should == ['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)
+      @smods_rec.format.should == ['Video']
+    end
+  end
+
+  it "empty Array if no typeOfResource field" do
     m = "<mods #{@ns_decl}><originInfo>
     <dateCreated>1904</dateCreated>
     </originInfo></mods>"
@@ -97,4 +126,11 @@ describe "Format field from Searchworks mixin for Stanford::Mods::Record" do
     @smods_rec.format.should == []
   end
 
+  it "empty Array if weird typeOfResource value" do
+    m = "<mods #{@ns_decl}><originInfo>
+    <typeOfResource>foo</typeOfResource>
+    </originInfo></mods>"
+    @smods_rec.from_str(m)
+    @smods_rec.format.should == []
+  end
 end

data/stanford-mods.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "yard"
   # tests
 	gem.add_development_dependency 'rspec'
-	# using coveralls now
+	# using coveralls with travis now
 	# gem.add_development_dependency 'simplecov'
 	# gem.add_development_dependency 'simplecov-rcov'
 	# gem.add_development_dependency 'ruby-debug19'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stanford-mods
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Naomi Dushay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mods