mods_display 0.0.4 → 0.0.5

data/lib/mods_display/fields/imprint.rb

@@ -19,10 +19,12 @@ class ModsDisplay::Imprint < ModsDisplay::Field
         publisher = val.publisher.map do |p|
           p.text unless p.text.strip.empty?
         end.compact.join(" : ").strip unless val.publisher.text.strip.empty?
-        parts = val.children.select do |child|
-          ["dateIssued", "dateOther"].include?(child.name) and !child.attributes.has_key?("encoding")
-        end.map do |child|
-          child.text.strip unless child.text.strip.empty?
+        parts = ["dateIssued", "dateOther"].map do |date_field_name|
+          if val.respond_to?(date_field_name.to_sym)
+            parse_dates(val.send(date_field_name.to_sym))
+          end
+        end.flatten.map do |date|
+          date.strip unless date.strip.empty?
         end.compact.join(", ")
         edition = nil if edition.strip.empty?
         parts = nil if parts.strip.empty?
@@ -33,6 +35,9 @@ class ModsDisplay::Imprint < ModsDisplay::Field
         unless [editionPlace, parts].compact.join(", ").strip.empty?
           return_values << ModsDisplay::Values.new(:label => displayLabel(val) || "Imprint", :values => [[editionPlace, parts].compact.join(", ")])
         end
+        if dates(val).length > 0
+          return_values.concat(dates(val))
+        end
         if other_pub_info(val).length > 0
           other_pub_info(val).each do |pub_info|
             return_values << ModsDisplay::Values.new(:label => displayLabel(val) || pub_info_labels[pub_info.name.to_sym], :values => [pub_info.text.strip])
@@ -42,7 +47,111 @@ class ModsDisplay::Imprint < ModsDisplay::Field
     end
     return_values
   end
-
+  def dates(element)
+    date_field_keys.map do |date_field|
+      if element.respond_to?(date_field)
+        elements = element.send(date_field)
+        unless elements.empty?
+          ModsDisplay::Values.new(:label => displayLabel(element) || pub_info_labels[elements.first.name.to_sym], :values => parse_dates(elements))
+        end
+      end
+    end.compact
+  end
+  def parse_dates(date_field)
+    apply_date_qualifier_decoration dedup_dates join_date_ranges date_field
+  end
+  def join_date_ranges(date_fields)
+    if dates_are_range?(date_fields)
+      start_date = date_fields.find{|d| d.attributes["point"] && d.attributes["point"].value == "start"}
+      end_date = date_fields.find{|d| d.attributes["point"] && d.attributes["point"].value == "end"}
+      date_fields.map do |date|
+        date = date.clone # clone the date object so we don't append the same one
+        if normalize_date(date.text) == start_date.text
+          date.content = [start_date.text, end_date.text].join("-")
+          date
+        elsif normalize_date(date.text) != end_date.text
+          date
+        end
+      end.compact
+    elsif dates_are_open_range?(date_fields)
+      start_date = date_fields.find{|d| d.attributes["point"] && d.attributes["point"].value == "start"}
+      date_fields.map do |date|
+        date = date.clone # clone the date object so we don't append the same one
+        if date.text == start_date.text
+          date.content = "#{start_date.text}-"
+        end
+        date
+      end
+    else
+      date_fields
+    end
+  end
+  def apply_date_qualifier_decoration(date_fields)
+    return_fields = date_fields.map do |date|
+      date = date.clone
+      if date_is_approximate?(date)
+        date.content = "c#{date.text}"
+      elsif date_is_questionable?(date)
+        date.content = "[#{date.text}?]"
+      elsif date_is_inferred?(date)
+        date.content = "[#{date.text}]"
+      end
+      date
+    end
+    return_fields.map{|d| d.text }
+  end
+  def date_is_approximate?(date_field)
+    date_field.attributes["qualifier"] and
+    date_field.attributes["qualifier"].respond_to?(:value) and
+    date_field.attributes["qualifier"].value == "approximate"
+  end
+  def date_is_questionable?(date_field)
+    date_field.attributes["qualifier"] and
+    date_field.attributes["qualifier"].respond_to?(:value) and
+    date_field.attributes["qualifier"].value == "questionable"
+  end
+  def date_is_inferred?(date_field)
+    date_field.attributes["qualifier"] and
+    date_field.attributes["qualifier"].respond_to?(:value) and
+    date_field.attributes["qualifier"].value == "inferred"
+  end
+  def dates_are_open_range?(date_fields)
+    date_fields.any? do |field|
+      field.attributes["point"] and
+      field.attributes["point"].respond_to?(:value) and
+      field.attributes["point"].value == "start"
+    end and !date_fields.any? do |field|
+      field.attributes["point"] and
+      field.attributes["point"].respond_to?(:value) and
+      field.attributes["point"].value == "end"
+    end
+  end
+  def dates_are_range?(date_fields)
+    attributes = date_fields.map do |date|
+      if date.attributes["point"].respond_to?(:value)
+        date.attributes["point"].value
+      end
+    end
+    attributes.include?("start") and
+    attributes.include?("end")
+  end
+  def dedup_dates(date_fields)
+    date_text = date_fields.map{|d| normalize_date(d.text) }
+    if date_text != date_text.uniq
+      if date_fields.find{ |d| d.attributes["qualifier"].respond_to?(:value) }
+        [date_fields.find{ |d| d.attributes["qualifier"].respond_to?(:value) }]
+      elsif date_fields.find{ |d| !d.attributes["encoding"] }
+        [date_fields.find{ |d| !d.attributes["encoding"] }]
+      else
+        [date_fields.first]
+      end
+    else
+      date_fields
+    end
+  end
+  def normalize_date(date)
+    date.strip.gsub(/^\s*c\s*|\[|\]|\?/, "")
+  end
   def other_pub_info(element)
     element.children.select do |child|
       pub_info_parts.include?(child.name.to_sym)
@@ -59,7 +168,11 @@ class ModsDisplay::Imprint < ModsDisplay::Field
   private
 
   def pub_info_parts
-    pub_info_labels.keys
+    [:issuance, :frequency]
+  end
+
+  def date_field_keys
+    [:dateCreated, :dateCaptured, :dateValid, :dateModified, :copyrightDate]
   end
 
   def pub_info_labels

data/lib/mods_display/version.rb

@@ -1,3 +1,3 @@
 module ModsDisplay
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/fields/imprint_spec.rb

@@ -12,12 +12,21 @@ describe ModsDisplay::Imprint do
     @imprint = Stanford::Mods::Record.new.from_str(imprint_mods, false).origin_info
     @no_edition = Stanford::Mods::Record.new.from_str(no_edition_mods, false).origin_info
     @edition_and_date = Stanford::Mods::Record.new.from_str(origin_info_mods, false).origin_info
-    @encoded_date = Stanford::Mods::Record.new.from_str(encoded_date, false).origin_info
-    @encoded_only = Stanford::Mods::Record.new.from_str(only_encoded_data, false).origin_info
     @mixed = Stanford::Mods::Record.new.from_str(mixed_mods, false).origin_info
     @display_form = Stanford::Mods::Record.new.from_str(display_form, false).origin_info
     @display_form_with_label = Stanford::Mods::Record.new.from_str(display_form, false).origin_info
     @display_label = Stanford::Mods::Record.new.from_str(display_label, false).origin_info
+    @date_range = Stanford::Mods::Record.new.from_str(date_range, false).origin_info
+    @open_date_range = Stanford::Mods::Record.new.from_str(open_date_range, false).origin_info
+    @dup_qualified_date = Stanford::Mods::Record.new.from_str(dup_qualified_date, false).origin_info
+    @dup_unencoded_date = Stanford::Mods::Record.new.from_str(dup_unencoded_date, false).origin_info
+    @dup_date = Stanford::Mods::Record.new.from_str(dup_date, false).origin_info
+    @approximate_date = Stanford::Mods::Record.new.from_str(approximate_date, false).origin_info
+    @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
+    @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
   end
 
   describe "labels" do
@@ -30,7 +39,7 @@ describe ModsDisplay::Imprint do
       fields.last.label.should == "Issuance"
     end
     it "should get multiple labels when we have mixed content" do
-      mods_display_imprint(@mixed).fields.map{|val| val.label }.should == ["Imprint", "Issuance", "Date captured"]
+      mods_display_imprint(@mixed).fields.map{|val| val.label }.should == ["Imprint", "Date captured", "Issuance"]
     end
     it "should use the displayLabel when available" do
        mods_display_imprint(@display_label).fields.map{|val| val.label }.should == ["TheLabel", "IssuanceLabel", "IssuanceLabel"]
@@ -51,12 +60,6 @@ describe ModsDisplay::Imprint do
       fields.first.values.should == ["A Valid Date"]
       fields.last.values.should == ["The Issuance"]
     end
-    it "should omit dates with an encoding attribute" do
-      mods_display_imprint(@encoded_date).fields.map{|val| val.values }.join.should_not include("An Encoded Date")
-    end
-    it "should not try to return data w/ only encoded data" do
-      mods_display_imprint(@encoded_only).fields.should be_empty
-    end
     it "should handle mixed mods properly" do
       values = mods_display_imprint(@mixed).fields
       values.length.should == 3
@@ -65,6 +68,69 @@ describe ModsDisplay::Imprint do
       values.map{|val| val.values}.should include(["The Capture Date"])
     end
   end
+  describe "date processing" do
+    describe "ranges" do
+      it "should join start and end point ranges with a '-'" do
+        fields = mods_display_imprint(@date_range).fields
+        fields.length.should == 1
+        fields.first.values.should == ["1820-1825"]
+      end
+      it "should handle open ranges properly" do
+        fields = mods_display_imprint(@open_date_range).fields
+        fields.length.should == 1
+        fields.first.values.should == ["1820-"]
+      end
+      it "should handle when there are more than 3 of the same date w/i a range" do
+        fields = mods_display_imprint(@three_imprint_dates).fields
+        fields.length.should == 1
+        fields.first.values.should == ["[1820-1825?]"]
+      end
+      it "should apply the qualifier decoration in the imprints" do
+        fields = mods_display_imprint(@qualified_imprint_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["[1820?]"]
+      end
+      it "should handle date ranges in imprints" do
+        fields = mods_display_imprint(@imprint_date_range).fields
+        fields.length.should == 1
+        fields.first.values.should == ["1820-1825"]
+      end
+    end
+    describe "duplication" do
+      it "should only return the qualified date when present" do
+        fields = mods_display_imprint(@dup_qualified_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["[1820?]"]
+      end
+      it "should use the non-encoded date when prsent" do
+        fields = mods_display_imprint(@dup_unencoded_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["c1820"]
+      end
+      it "should only return one when no attributes are present" do
+        fields = mods_display_imprint(@dup_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["1820"]
+      end
+    end
+    describe "qualifier decoration" do
+      it "should prepend a 'c' to approximate dates" do
+        fields = mods_display_imprint(@approximate_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["c1820"]
+      end
+      it "should append a '?' to a questionable dates and wrap them in square-brackets" do
+        fields = mods_display_imprint(@questionable_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["[1820?]"]
+      end
+      it "should wrap inferred dates in square-brackets" do
+        fields = mods_display_imprint(@inferred_date).fields
+        fields.length.should == 1
+        fields.first.values.should == ["[1820]"]
+      end
+    end
+  end
   describe "to_html" do
     it "should return the display form if one is available" do
       html = mods_display_imprint(@display_form).to_html

data/spec/fixtures/imprint_fixtures.rb

@@ -38,25 +38,6 @@ module ImprintFixtures
       </mods>
     MODS
   end
-  def encoded_date
-    <<-MODS
-      <mods>
-        <originInfo>
-          <place>A Place</place>
-          <dateIssued encoding="an-encoding">An Encoded Date</dateIssued>
-        </originInfo>
-      </mods>
-    MODS
-  end
-  def only_encoded_data
-    <<-MODS
-      <mods>
-        <originInfo>
-          <dateIssued encoding="an-encoding">An Encoded Date</dateIssued>
-        </originInfo>
-      </mods>
-    MODS
-  end
   def mixed_mods
     <<-MODS
       <mods>
@@ -101,4 +82,111 @@ module ImprintFixtures
       </mods>
     MODS
   end
+  def date_range
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated point="end">1825</dateCreated>
+          <dateCreated point="start">1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def open_date_range
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated point="start">1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def dup_qualified_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated qualifier="questionable">1820</dateCreated>
+          <dateCreated>1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def dup_unencoded_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated encoding="marc">1820</dateCreated>
+          <dateCreated>c1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def dup_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateCreated>1820</dateCreated>
+          <dateCreated>1820</dateCreated>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def approximate_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateValid qualifier="approximate">1820</dateValid>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def questionable_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateValid qualifier="questionable">1820</dateValid>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def inferred_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateValid qualifier="inferred">1820</dateValid>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def three_imprint_dates
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateIssued>[1820-1825]</dateIssued>
+          <dateIssued point="start" qualifier="questionable">1820</dateIssued>
+          <dateIssued point="end" qualifier="questionable">1825</dateIssued>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def qualified_imprint_date
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateIssued qualifier="questionable">1820</dateIssued>
+        </originInfo>
+      </mods>
+    MODS
+  end
+  def imprint_date_range
+    <<-MODS
+      <mods>
+        <originInfo>
+          <dateIssued>[1820]</dateIssued>
+          <dateIssued point="start">1820</dateIssued>
+          <dateIssued point="end">1825</dateIssued>
+        </originInfo>
+      </mods>
+    MODS
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mods_display
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-24 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1792709584890457737
+      hash: -3367910035276828963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1792709584890457737
+      hash: -3367910035276828963
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25