mods_display 0.0.1.beta4 → 0.0.1.beta5

data/lib/mods_display/fields/abstract.rb

@@ -1,32 +1,7 @@
-# encoding: utf-8
 class ModsDisplay::Abstract < ModsDisplay::Field
 
   def label
     super || "Abstract"
   end
 
-  def text
-    return link_value(super) unless super.nil?
-    link_value(@value.text)
-  end
-
-  private
-
-  def link_value(val)
-    val = val.dup
-    # http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-    url = /(?i)\b(?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]+|\([^\s()<>]+\)*\))+(?:\([^\s()<>]+|\([^\s()<>]+\)*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’])/i
-    # http://www.regular-expressions.info/email.html
-    email = /[A-Z0-9_\.%\+\-\']+@(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2,4}|museum|travel)/i
-    matches = [val.scan(url), val.scan(email)].flatten
-    matches.each do |match|
-      if match =~ email
-        val = val.gsub(match, "<a href='mailto:#{match}'>#{match}</a>")
-      else
-        val = val.gsub(match, "<a href='#{match}'>#{match}</a>")
-      end
-    end
-    val
-  end
-
 end

data/lib/mods_display/fields/description.rb

@@ -1,14 +1,35 @@
 class ModsDisplay::Description < ModsDisplay::Field
 
   def fields
-    description_fields.map do |description|
-      ModsDisplay::Values.new({:label => (label || description_label(description) || labels[description.name.to_sym] || "Physical Description"),
-                               :values => [description.text]})
+    return_values = []
+    current_label = nil
+    prev_label = nil
+    buffer = []
+    description_fields.each_with_index do |val, index|
+      current_label = description_label(val)
+      if description_fields.length == 1
+        return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
+      elsif index == (description_fields.length-1)
+        # need to deal w/ when we have a last element but we have separate labels in the buffer.
+        if current_label != prev_label
+          return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
+          return_values << ModsDisplay::Values.new(:label => current_label, :values => [val.text])
+        else
+          buffer << val.text
+          return_values << ModsDisplay::Values.new(:label => current_label, :values => buffer.flatten)
+        end
+      elsif prev_label and (current_label != prev_label)
+        return_values << ModsDisplay::Values.new(:label => prev_label, :values => buffer.flatten)
+        buffer = []
+      end
+      buffer << val.text
+      prev_label = current_label
     end
+    return_values
   end
 
   def description_label(element)
-    element.attributes["displayLabel"].value if element.attributes["displayLabel"].respond_to?(:value)
+    label || displayLabel(element) || labels[element.name.to_sym] || "Physical Description"
   end
 
   private

data/lib/mods_display/fields/field.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class ModsDisplay::Field
   def initialize(value, config, klass)
     @value = value
@@ -57,7 +58,7 @@ class ModsDisplay::Field
         output << "<dt#{label_class} title='#{field.label}'>#{field.label}:</dt>"
         output << "<dd#{value_class}>"
           output << field.values.map do |val|
-            @config.link ? link_to_value(val.to_s) : val.to_s
+            @config.link ? link_to_value(val.to_s) : link_urls_and_email(val.to_s)
           end.join(@config.delimiter)
         output << "</dd>"
       end
@@ -114,4 +115,23 @@ class ModsDisplay::Field
     ["%value%"]
   end
 
+  def link_urls_and_email(val)
+    val = val.dup
+    # http://daringfireball.net/2010/07/improved_regex_for_matching_urls
+    url = /(?i)\b(?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\([^\s()<>]+|\([^\s()<>]+\)*\))+(?:\([^\s()<>]+|\([^\s()<>]+\)*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’])/i
+    # http://www.regular-expressions.info/email.html
+    email = /[A-Z0-9_\.%\+\-\']+@(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2,4}|museum|travel)/i
+    matches = [val.scan(url), val.scan(email)].flatten
+    unless val =~ /<a/ # we'll assume that linking has alraedy occured and we don't want to double link
+      matches.each do |match|
+        if match =~ email
+          val = val.gsub(match, "<a href='mailto:#{match}'>#{match}</a>")
+        else
+          val = val.gsub(match, "<a href='#{match}'>#{match}</a>")
+        end
+      end
+    end
+    val
+  end
+
 end

data/lib/mods_display/fields/name.rb

@@ -67,10 +67,22 @@ class ModsDisplay::Name < ModsDisplay::Field
   private
 
   def name_label(element)
-    if element.attributes.has_key?("type") && name_labels.has_key?(element.attributes["type"].value)
-      return name_labels[element.attributes["type"].value]
+    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
+      "Author/Creator"
+    else
+      "Contributor"
+    end
+  end
+  
+  def name_is_main_author?(element)
+    begin
+      ["author", "aut", "creator", "cre", ""].include?(element.role.roleTerm.text.downcase)
+    rescue
+      false
     end
-    "Creator/Contributor"
   end
 
   def name_labels

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.0.1.beta4"
+  VERSION = "0.0.1.beta5"
 end

data/spec/fields/abstract_spec.rb

@@ -12,10 +12,10 @@ describe ModsDisplay::Abstract do
 
   describe "links" do
     it "should turn URLs into links" do
-      mods_display_abstract(@link).fields.first.values.first.should match(/\(<a href='http:\/\/library.stanford.edu'>http:\/\/library.stanford.edu<\/a>\)/)
+      mods_display_abstract(@link).to_html.should match(/A link to the library \(<a href='http:\/\/library.stanford.edu'>http:\/\/library.stanford.edu<\/a>\) should appear here/)
     end
     it "should turn email addresses into mailto links" do
-      mods_display_abstract(@email).fields.first.values.first.should match(/<a href='mailto:jdoe@example.com'>jdoe@example.com<\/a>/)
+      mods_display_abstract(@email).to_html.should match(/A link to an email address <a href='mailto:jdoe@example.com'>jdoe@example.com<\/a> should appear here/)
     end
   end
 end

data/spec/fields/name_spec.rb

@@ -18,18 +18,22 @@ describe ModsDisplay::Language 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
+    @contributor = Stanford::Mods::Record.new.from_str("<mods><name><namePart>John Doe</namePart><role><roleTerm>lithographer</roleTerm></role></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
     @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
   end
   describe "label" do
-    it "should default Creator/Contributor when none is available" do
-      mods_display_name(@name).fields.first.label.should == "Creator/Contributor"
+    it "should default Author/Creator when none 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"
     end
+    it "should apply contributor labeling to all non blank/author/creator roles" do
+      mods_display_name(@contributor).fields.first.label.should == "Contributor"
+    end
   end
   
   describe "fields" do
@@ -53,7 +57,7 @@ describe ModsDisplay::Language do
     it "should collapse adjacent matching labels" do
       fields = mods_display_name(@collapse_label).fields
       fields.length.should == 1
-      fields.first.label.should == "Creator/Contributor"
+      fields.first.label.should == "Author/Creator"
       fields.first.values.each do |val|
         ["John Doe", "Jane Doe"].should include val.to_s
       end
@@ -62,7 +66,7 @@ describe ModsDisplay::Language do
       fields = mods_display_name(@complex_labels).fields
 
       fields.length.should == 3
-      fields.first.label.should == "Creator/Contributor"
+      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
@@ -72,7 +76,7 @@ describe ModsDisplay::Language do
       fields[1].values.length.should == 1
       fields[1].values.first.to_s.should == "John Dough"
 
-      fields.last.label.should == "Creator/Contributor"
+      fields.last.label.should == "Author/Creator"
       fields.last.values.length.should == 1
       fields.last.values.first.to_s.should == "Jane Dough"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta4
+  version: 0.0.1.beta5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2208754655843204973
+      hash: -354569883239195069
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: