mods_display 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fbeb6e358da70acf9959feba56cea0b735f47b
-  data.tar.gz: b4236dd3026d7d7cb3c5a93217e64491c6fd6528
+  metadata.gz: ab713fa903d406d1b3e5d7b019a33fe02c15f5fd
+  data.tar.gz: d4ec7939d4d45cbf7ae8162554396b9316641940
 SHA512:
-  metadata.gz: b2e555e1dd3269a8ad2fea3aa1426e042b417992cba343369dc4c8ba3a27c66c18d2ab637df006e9a9f69550a31d44237ed7535994093da65bcf3f916460dbb2
-  data.tar.gz: 91caac5689b774665d1e027b20cb4dbdcded4f62950799c46c77a062781968588e36a8313049695cb9b6baaf54494057d65cbf1289de2191d02ec156093cc0b7
+  metadata.gz: abb09cdaf3bbe01eab797de7dd20e5467cc66de304d151b11478f5710b55d41b72c3adcbe8e9e07061089ad628aa7435f01309f6c7db6d4468fd3482738dbb8f
+  data.tar.gz: 2fc0e8df881f28edfba1a85d28f54c3d802b5d1e09b633b48d79a5be58fb6c1d53654693c73b79b530113e3e0a772c86aa0ffe3c8dfb6e100062fc58a562b2c5

data/lib/mods_display/country_codes.rb

@@ -371,7 +371,8 @@ module ModsDisplay::CountryCodes
     "xra" => "South Australia",
     "xs" => "South Georgia and the South Sandwich Islands",
     "xv" => "Slovenia",
-    "xx" => "No place, unknown, or undetermined",
+    # Removing per METADOR-32
+    #"xx" => "No place, unknown, or undetermined",
     "xxc" => "Canada",
     "xxk" => "United Kingdom",
     "xxr" => "Soviet Union",

data/lib/mods_display/fields/name.rb

@@ -2,12 +2,12 @@ class ModsDisplay::Name < ModsDisplay::Field
   include ModsDisplay::RelatorCodes
   def fields
     return_fields = @values.map do |value|
-      role = process_role(value)
+      roles = process_role(value)
       person = nil
       if value.displayForm.length > 0
-        person = ModsDisplay::Name::Person.new(:name => value.displayForm.text, :role => role)
+        person = ModsDisplay::Name::Person.new(:name => value.displayForm.text, :roles => roles)
       elsif !name_parts(value).empty?
-        person = ModsDisplay::Name::Person.new(:name => name_parts(value), :role => role)
+        person = ModsDisplay::Name::Person.new(:name => name_parts(value), :roles => roles)
       end
       ModsDisplay::Values.new(:label => displayLabel(value) || name_label(value), :values => [person]) if person
     end.compact
@@ -23,7 +23,7 @@ class ModsDisplay::Name < ModsDisplay::Field
         output << field.values.map do |val|
           if @config.link
             txt = link_to_value(val.name)
-            txt << " (#{val.role})" if val.role
+            txt << " (#{val.roles.join(', ')})" if val.roles
             txt
           else
             val.to_s
@@ -37,17 +37,23 @@ class ModsDisplay::Name < ModsDisplay::Field
   private
 
   def name_label(element)
-    if name_is_main_author?(element)
-      if element.attributes.has_key?("type") && name_labels.has_key?(element.attributes["type"].value)
-        return name_labels[element.attributes["type"].value]
-      end
+    if !has_role?(element) || is_primary?(element) || has_author_or_creator_roles?(element)
       "Author/Creator"
     else
       "Contributor"
     end
   end
-  
-  def name_is_main_author?(element)
+
+  def has_role?(element)
+    element.respond_to?(:role) and !element.role.empty?
+  end
+
+  def is_primary?(element)
+    element.attributes["usage"].respond_to?(:value) and
+    element.attributes["usage"].value == "primary"
+  end
+
+  def has_author_or_creator_roles?(element)
     begin
       ["author", "aut", "creator", "cre", ""].include?(element.role.roleTerm.text.downcase)
     rescue
@@ -108,22 +114,26 @@ class ModsDisplay::Name < ModsDisplay::Field
              term.attributes["authority"].respond_to?(:value) and
              term.attributes["authority"].value == "marcrelator" and
              relator_codes.include?(term.text.strip)
-               term = term.clone
-               term.content = relator_codes[term.text.strip]
-               term
+               relator_codes[term.text.strip]
           end
-        end.compact.first
+        end.compact
       end
     end
   end
 
   def unencoded_role_term(element)
-    element.role.roleTerm.find do |term|
-      term.attributes["type"].respond_to?(:value) and
-      term.attributes["type"].value == "text"
-    end || element.role.roleTerm.find do |term|
-      !term.attributes["type"].respond_to?(:value)
-    end
+    roles = element.role.map do |role|
+      role.roleTerm.find do |term|
+        term.attributes["type"].respond_to?(:value) and
+        term.attributes["type"].value == "text"
+      end
+    end.compact
+    roles = element.role.map do |role|
+      role.roleTerm.find do |term|
+        !term.attributes["type"].respond_to?(:value)
+      end
+    end.compact if roles.empty?
+    roles.map{|t| t.text.strip }
   end
 
   def unencoded_role_term?(element)
@@ -141,15 +151,15 @@ class ModsDisplay::Name < ModsDisplay::Field
   end
   
   class Person
-    attr_accessor :name, :role
+    attr_accessor :name, :roles
     def initialize(data)
-      @name = data[:name]
-      @role = data[:role] ? data[:role].text : nil
+      @name =  data[:name]
+      @roles = data[:roles] && !data[:roles].empty? ? data[:roles] : nil
     end
     
     def to_s
       text = @name.dup
-      text << " (#{@role})" if @role
+      text << " (#{@roles.join(', ')})" if @roles
       text
     end
   end

data/lib/mods_display/fields/subject.rb

@@ -47,7 +47,7 @@ class ModsDisplay::Subject < ModsDisplay::Field
             if @config.link and @config.hierarchical_link
               if val.is_a?(ModsDisplay::Name::Person)
                 txt = link_to_value(val.name, buffer.join(' '))
-                txt << " (#{val.role})" if val.role
+                txt << " (#{val.roles.join(', ')})" if val.roles
                 sub_parts << txt
               else
                 sub_parts << link_to_value(val, buffer.join(' '))
@@ -55,7 +55,7 @@ class ModsDisplay::Subject < ModsDisplay::Field
             elsif @config.link
               if val.is_a?(ModsDisplay::Name::Person)
                 txt = link_to_value(val.name)
-                txt << " (#{val.role})" if val.role
+                txt << " (#{val.roles.join(', ')})" if val.roles
                 sub_parts << txt
               else
                 sub_parts << link_to_value(val.to_s)

data/lib/mods_display/fields/title.rb

@@ -25,7 +25,7 @@ class ModsDisplay::Title < ModsDisplay::Field
         return_values << ModsDisplay::Values.new(:label => displayLabel(value) || title_label(value), :values => [[preParts, parts].compact.join(". ")])
       end
     end
-    return_values
+    collapse_fields(return_values)
   end
 
   private

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fields/imprint_spec.rb

@@ -29,6 +29,7 @@ describe ModsDisplay::Imprint do
     @questionable_date = Stanford::Mods::Record.new.from_str(questionable_date, false).origin_info
     @inferred_date = Stanford::Mods::Record.new.from_str(inferred_date, false).origin_info
     @three_imprint_dates = Stanford::Mods::Record.new.from_str(three_imprint_dates, false).origin_info
+    @xx_country_code = Stanford::Mods::Record.new.from_str(xx_country_code, false).origin_info
     @qualified_imprint_date = Stanford::Mods::Record.new.from_str(qualified_imprint_date, false).origin_info
     @imprint_date_range = Stanford::Mods::Record.new.from_str(imprint_date_range, false).origin_info
     @encoded_place = Stanford::Mods::Record.new.from_str(encoded_place, false).origin_info
@@ -205,6 +206,11 @@ describe ModsDisplay::Imprint do
       fields.length.should == 1
       fields.first.values.should include "Netherlands"
     end
+    it "should ignore 'xx' country codes" do
+      fields = mods_display_imprint(@xx_country_code).fields
+      fields.length.should == 1
+      fields.first.values.should == ["1994"]
+    end
   end
   describe "to_html" do
     it "should return the display form if one is available" do

data/spec/fields/name_spec.rb

@@ -17,7 +17,7 @@ describe ModsDisplay::Language do
   before(:all) do
     @name = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name></mods>", false).plain_name
     @blank_name = Stanford::Mods::Record.new.from_str("<mods><name><namePart/><role><roleTerm></roleTerm></role></name></mods>", false).plain_name
-    @conf_name = Stanford::Mods::Record.new.from_str("<mods><name type='conference'><namePart>John Doe</namePart></name></mods>", false).plain_name
+    @primary_name = Stanford::Mods::Record.new.from_str("<mods><name usage='primary'><namePart>John Doe</namePart><role><roleTerm>lithographer</roleTerm></role></name></mods>", false).plain_name
     @contributor = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm>lithographer</roleTerm></role></name></mods>", false).plain_name
     @encoded_role = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm type='code' authority='marcrelator'>ltg</roleTerm></role></name></mods>", false).plain_name
     @mixed_role = Stanford::Mods::Record.new.from_str("<mods><name><role><roleTerm>publisher</roleTerm></role><namePart>John Doe</namePart><role><roleTerm type='text' authority='marcrelator'>engraver</roleTerm></role></name></mods>", false).plain_name
@@ -25,15 +25,17 @@ describe ModsDisplay::Language do
     @simple_toa = Stanford::Mods::Record.new.from_str("<mods><name><namePart>Unqualfieid</namePart><namePart type='termsOfAddress'>Ier, empereur</namePart><namePart type='date'>date1-date2</namePart><namePart type='given'>Given Name</namePart><namePart type='family'>Family Name</namePart></name></mods>", false).plain_name
     @display_form = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><displayForm>Mr. John Doe</displayForm></name></mods>", false).plain_name
     @collapse_label = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name><name><namePart>Jane Doe</namePart></name></mods>", false).plain_name
-    @complex_labels = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name><name><namePart>Jane Doe</namePart></name><name type='conference'><namePart>John Dough</namePart></name><name><namePart>Jane Dough</namePart></name></mods>", false).plain_name
+    @complex_labels = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart></name><name><namePart>Jane Doe</namePart><role><roleTerm>lithographer</roleTerm></role></name><name><namePart>John Dough</namePart></name><name><namePart>Jane Dough</namePart></name></mods>", false).plain_name
+    @complex_roles = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm type='text'>Depicted</roleTerm><roleTerm type='code'>dpt</roleTerm></role></name></mods>", false).plain_name
     @name_with_role = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm type='text'>Depicted</roleTerm></role></name></mods>", false).plain_name
+    @multiple_roles = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm type='text'>Depicted</roleTerm></role><role><roleTerm type='text'>Artist</roleTerm></role></name></mods>", false).plain_name
   end
   describe "label" do
-    it "should default Author/Creator when none is available" do
+    it "should default Author/Creator when no role is available" do
       mods_display_name(@name).fields.first.label.should == "Author/Creator"
     end
-    it "should derive the name from the type attribute if one is available" do
-      mods_display_name(@conf_name).fields.first.label.should == "Meeting"
+    it "should label 'Author/Creator' for primary authors" do
+      mods_display_name(@primary_name).fields.first.label.should == "Author/Creator"
     end
     it "should apply contributor labeling to all non blank/author/creator roles" do
       mods_display_name(@contributor).fields.first.label.should == "Contributor"
@@ -48,25 +50,6 @@ describe ModsDisplay::Language do
       fields.first.values.first.should be_a(ModsDisplay::Name::Person)
       fields.first.values.first.name.should == "Mr. John Doe"
     end
-    it "should get the role when present" do
-      fields = mods_display_name(@name_with_role).fields
-      fields.length.should == 1
-      fields.first.values.length.should == 1
-      fields.first.values.first.should be_a(ModsDisplay::Name::Person)
-      fields.first.values.first.role.should == "Depicted"
-    end
-    it "should decode encoded roleTerms when no text (or non-typed) roleTerm is available" do
-      fields = mods_display_name(@encoded_role).fields
-      fields.length.should == 1
-      fields.first.values.length.should == 1
-      fields.first.values.first.to_s.should == "John Doe (Lithographer)"
-    end
-    it "should get the type='text' role before an untyped role" do
-      fields = mods_display_name(@mixed_role).fields
-      fields.length.should == 1
-      fields.first.values.length.should == 1
-      fields.first.values.first.role.should == "engraver"
-    end
     it "should not add blank names" do
       mods_display_name(@blank_name).fields.should == []
     end
@@ -97,18 +80,58 @@ describe ModsDisplay::Language do
 
       fields.length.should == 3
       fields.first.label.should == "Author/Creator"
-      fields.first.values.length.should == 2
-      fields.first.values.each do |val|
-        ["John Doe", "Jane Doe"].should include val.to_s
-      end
-
-      fields[1].label.should == "Meeting"
+      fields.first.values.length.should == 1
+      fields.first.values.first.to_s.should == "John Doe"
+      
+      fields[1].label.should == "Contributor"
       fields[1].values.length.should == 1
-      fields[1].values.first.to_s.should == "John Dough"
+      fields[1].values.first.name.should == "Jane Doe"
+      fields[1].values.first.roles.should == ["lithographer"]
 
       fields.last.label.should == "Author/Creator"
-      fields.last.values.length.should == 1
-      fields.last.values.first.to_s.should == "Jane Dough"
+      fields.last.values.length.should == 2
+      fields.last.values.each do |val|
+        ["Jane Dough", "John Dough"].should include val.to_s
+      end
+    end
+    describe "roles" do
+      it "should get the role when present" do
+        fields = mods_display_name(@name_with_role).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.should be_a(ModsDisplay::Name::Person)
+        fields.first.values.first.roles.should == ["Depicted"]
+      end
+      it "should decode encoded roleTerms when no text (or non-typed) roleTerm is available" do
+        fields = mods_display_name(@encoded_role).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.to_s.should == "John Doe (Lithographer)"
+      end
+      it "should get the type='text' role before an untyped role" do
+        fields = mods_display_name(@mixed_role).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.roles.should == ["engraver"]
+      end
+      it "should be handled correctly when there are more than one" do
+        fields = mods_display_name(@multiple_roles).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.roles.should == ["Depicted", "Artist"]
+      end
+      it "should handle code and text roleTerms together correctly" do
+        fields = mods_display_name(@complex_roles).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.roles.should == ["Depicted"]
+      end
+      it "should comma seperate multiple roles" do
+        fields = mods_display_name(@multiple_roles).fields
+        fields.length.should == 1
+        fields.first.values.length.should == 1
+        fields.first.values.first.to_s.should == "John Doe (Depicted, Artist)"
+      end
     end
   end
   

data/spec/fields/subject_spec.rb

@@ -64,7 +64,7 @@ describe ModsDisplay::Subject do
       fields.length.should == 1
       fields.first.values.first.first.should be_a(ModsDisplay::Name::Person)
       fields.first.values.first.first.name.should == "John Doe"
-      fields.first.values.first.first.role.should == "Depicted"
+      fields.first.values.first.first.roles.should == ["Depicted"]
     end
     it "should link the name (and not the role) correctly" do
       html = mods_display_subject(@name_subject).to_html

data/spec/fields/title_spec.rb

@@ -11,6 +11,7 @@ describe ModsDisplay::Title do
     @reverse_title_parts = Stanford::Mods::Record.new.from_str("<mods><titleInfo><nonSort>The</nonSort><title>Title</title><subTitle>For</subTitle><partNumber>Part 62</partNumber><partName>Something</partName></titleInfo></mods>", false).title_info
     @display_label = Stanford::Mods::Record.new.from_str("<mods><titleInfo displayLabel='MyTitle'><title>Title</title></titleInfo></mods>", false).title_info
     @display_form = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Title</title><displayForm>The Title of This Item</displayForm></titleInfo></mods>", false).title_info
+    @multi_label = Stanford::Mods::Record.new.from_str("<mods><titleInfo><title>Main Title</title></titleInfo><titleInfo type='alternative'><title>Alt Title</title></titleInfo><titleInfo type='uniform'><title>Uniform Title</title></titleInfo><titleInfo type='alternative'><title>Another Alt Title</title></titleInfo><titleInfo type='alternative'><title>Yet Another Alt Title</title></titleInfo></mods>", false).title_info
     @alt_title = Stanford::Mods::Record.new.from_str("<mods><titleInfo type='alternative'><title>Title</title></titleInfo></mods>", false).title_info
   end
   describe "labels" do
@@ -23,6 +24,15 @@ describe ModsDisplay::Title do
     it "should return the label held in the displayLabel attribute of the titleInfo element when available" do
       mods_display_title(@display_label).fields.first.label.should == "MyTitle"
     end
+    it "should collapse adjacent identical labels" do
+      fields = mods_display_title(@multi_label).fields
+      fields.length.should == 4
+      fields[0].label.should == "Title"
+      fields[1].label.should == "Alternative title"
+      fields[2].label.should == "Uniform title"
+      fields[3].label.should == "Alternative title"
+      fields[3].values.should == ["Another Alt Title", "Yet Another Alt Title"]
+    end
   end
   describe "fields" do
     it "should return an array of label/value objects" do

data/spec/fixtures/imprint_fixtures.rb

@@ -224,6 +224,18 @@ module ImprintFixtures
       </mods>
     MODS
   end
+  def xx_country_code
+    <<-MODS
+      <mods>
+        <originInfo>
+          <place>
+            <placeTerm type="code" authority="marccountry">xx</placeTerm>
+          </place>
+          <dateIssued>1994</dateIssued>
+        </originInfo>
+      </mods>
+    MODS
+  end
   def encoded_dates
     <<-MODS
       <mods>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jessie Keck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods