From b11d2813cd83a9320937e7512a4f969100b815d8 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Fri, 11 Mar 2011 13:37:23 -0500
Subject: [PATCH] multiple contacts

---
 lib/avm/contact.rb                         |  4 ++
 lib/avm/creator.rb                         |  6 ++-
 spec/avm/creator_spec.rb                   | 63 ++++++++++++++++------
 spec/sample_files/creator/one_creator.xmp  |  2 -
 spec/sample_files/creator/two_creators.xmp | 26 +++++++++
 5 files changed, 82 insertions(+), 19 deletions(-)
 create mode 100644 spec/sample_files/creator/two_creators.xmp

diff --git a/lib/avm/contact.rb b/lib/avm/contact.rb
index 62ecfa0..52f6867 100644
--- a/lib/avm/contact.rb
+++ b/lib/avm/contact.rb
@@ -24,5 +24,9 @@ module AVM
     def to_creator_list_element
       %{<rdf:li>#{self.name}</rdf:li>}
     end
+
+    def primary?
+      @primary
+    end
   end
 end
diff --git a/lib/avm/creator.rb b/lib/avm/creator.rb
index 05512e8..d84344b 100644
--- a/lib/avm/creator.rb
+++ b/lib/avm/creator.rb
@@ -85,12 +85,14 @@ module AVM
 
         IPTC_CORE_FIELDS_AND_NAMES.each do |key, element_name|
           if node = refs[:iptc].at_xpath("//Iptc4xmpCore:#{element_name}")
-            contacts.first[key] = node.text.strip
+            contacts.each { |contact| contact[key] = node.text.strip }
           end
         end
       end
 
-      @contacts = contacts.collect { |contact| Contact.new(contact) }
+      if !(@contacts = contacts.collect { |contact| Contact.new(contact) }).empty?
+        @contacts.first.primary = true
+      end
     end
 
     def primary_contact
diff --git a/spec/avm/creator_spec.rb b/spec/avm/creator_spec.rb
index 2341200..20e64d3 100644
--- a/spec/avm/creator_spec.rb
+++ b/spec/avm/creator_spec.rb
@@ -108,18 +108,7 @@ describe AVM::Creator do
 
       its('creator.length') { should == 1 }
 
-      context 'creator one' do
-        subject { image.creator[0] }
-
-        let(:name) { 'John Bintz' }
-        let(:email) { 'bintz@stsci.edu' }
-        let(:telephone) { '800-555-1234' }
-        let(:address) { '3700 San Martin Drive' }
-        let(:city) { 'Baltimore' }
-        let(:state) { 'Maryland' }
-        let(:zip) { '21218' }
-        let(:country) { 'USA' }
-
+      def self.field_checks
         its(:name) { should == name }
         its(:address) { should == address }
         its(:city) { should == city }
@@ -129,10 +118,54 @@ describe AVM::Creator do
         its(:email) { should == email }
         its(:telephone) { should == telephone }
       end
-    end
 
-    context 'two creators' do
-      let(:file_path) { 'spec/sample_files/creator/two_creators.xmp' }
+      let(:name) { 'John Bintz' }
+      let(:email) { 'bintz@stsci.edu' }
+      let(:telephone) { '800-555-1234' }
+      let(:address) { '3700 San Martin Drive' }
+      let(:city) { 'Baltimore' }
+      let(:state) { 'Maryland' }
+      let(:zip) { '21218' }
+      let(:country) { 'USA' }
+
+      context 'creator one' do
+        subject { image.creator[0] }
+
+        field_checks
+
+        it { should be_primary }
+      end
+
+      context 'two creators' do
+        let(:file_path) { 'spec/sample_files/creator/two_creators.xmp' }
+
+        its('creator.length') { should == 2 }
+
+        context 'first creator' do
+          subject { image.creator[0] }
+
+          field_checks
+
+          it { should be_primary }
+        end
+
+        context 'second creator' do
+          subject { image.creator[1] }
+
+          field_checks
+
+          it { should_not be_primary }
+
+          let(:name) { 'Aohn Bintz' }
+          let(:email) { 'aohn@stsci.edu' }
+          let(:telephone) { '800-555-2345' }
+          let(:address) { '3700 San Martin Drive' }
+          let(:city) { 'Baltimore' }
+          let(:state) { 'Maryland' }
+          let(:zip) { '21218' }
+          let(:country) { 'USA' }
+        end
+      end
     end
   end
 
diff --git a/spec/sample_files/creator/one_creator.xmp b/spec/sample_files/creator/one_creator.xmp
index 25e4af3..8518979 100644
--- a/spec/sample_files/creator/one_creator.xmp
+++ b/spec/sample_files/creator/one_creator.xmp
@@ -21,5 +21,3 @@
     </rdf:Description>
   </rdf:RDF>
 </x:xmpmeta>
-
-
diff --git a/spec/sample_files/creator/two_creators.xmp b/spec/sample_files/creator/two_creators.xmp
new file mode 100644
index 0000000..2f12a9f
--- /dev/null
+++ b/spec/sample_files/creator/two_creators.xmp
@@ -0,0 +1,26 @@
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.2-c063 53.352624, 2008/07/30-18:05:41        ">
+  <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <rdf:Description rdf:about=""
+      xmlns:dc="http://purl.org/dc/elements/1.1/">
+      <dc:creator>
+        <rdf:Seq>
+          <rdf:li>John Bintz</rdf:li>
+          <rdf:li>Aohn Bintz</rdf:li>
+        </rdf:Seq>
+      </dc:creator>
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/">
+      <Iptc4xmpCore:CreatorContactInfo rdf:parseType="Resource">
+        <Iptc4xmpCore:CiAdrExtadr>3700 San Martin Drive</Iptc4xmpCore:CiAdrExtadr>
+        <Iptc4xmpCore:CiAdrCity>Baltimore</Iptc4xmpCore:CiAdrCity>
+        <Iptc4xmpCore:CiAdrRegion>Maryland</Iptc4xmpCore:CiAdrRegion>
+        <Iptc4xmpCore:CiAdrPcode>21218</Iptc4xmpCore:CiAdrPcode>
+        <Iptc4xmpCore:CiAdrCtry>USA</Iptc4xmpCore:CiAdrCtry>
+        <Iptc4xmpCore:CiTelWork>800-555-1234,800-555-2345</Iptc4xmpCore:CiTelWork>
+        <Iptc4xmpCore:CiEmailWork>bintz@stsci.edu,aohn@stsci.edu</Iptc4xmpCore:CiEmailWork>
+        <Iptc4xmpCore:CiUrlWork>http://hubblesite.org</Iptc4xmpCore:CiUrlWork>
+      </Iptc4xmpCore:CreatorContactInfo>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>