From eec57433810022532a2acc3a40f52f4ec5ce4c86 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 15 Mar 2011 11:16:10 -0400
Subject: [PATCH] read distances

---
 lib/avm/image.rb                        |  4 +--
 spec/avm/image_spec.rb                  | 24 ++++++++------
 spec/sample_files/image/both.xmp        | 43 +++++++++++++++++++++++++
 spec/sample_files/image/light_years.xmp |  1 +
 spec/sample_files/image/redshift.xmp    | 43 +++++++++++++++++++++++++
 5 files changed, 103 insertions(+), 12 deletions(-)
 create mode 100644 spec/sample_files/image/both.xmp
 create mode 100644 spec/sample_files/image/redshift.xmp

diff --git a/lib/avm/image.rb b/lib/avm/image.rb
index e8effa2..1641ef5 100644
--- a/lib/avm/image.rb
+++ b/lib/avm/image.rb
@@ -94,14 +94,14 @@ module AVM
         end
 
         if node = refs[:avm].at_xpath('./avm:Distance')
-          list_values = node.search('.//ref:li').collect { |li| li.text }
+          list_values = node.search('.//rdf:li').collect { |li| li.text }
 
           case list_values.length
           when 1
             options[:light_years] = list_values.first
           when 2
             options[:light_years] = (list_values.first == '-') ? nil : list_values.first
-            options[:redshift] = list_valueslast
+            options[:redshift] = list_values.last
           end
         end
       end
diff --git a/spec/avm/image_spec.rb b/spec/avm/image_spec.rb
index 892930a..5f914d7 100644
--- a/spec/avm/image_spec.rb
+++ b/spec/avm/image_spec.rb
@@ -90,23 +90,27 @@ describe AVM::Image do
         has_most_options
 
         its(:redshift) { should be_nil }
+        its(:light_years) { should == light_years }
       end
 
       context "distaince in redshift" do
-        
-      let(:file_path) { 'spec/sample_files/image/redshift.xmp' }
-      end
-      context "distance in both" do
-        
-      let(:file_path) { 'spec/sample_files/image/both.xmp' }
+        let(:file_path) { 'spec/sample_files/image/redshift.xmp' }
 
+        has_most_options
+
+        its(:light_years) { should be_nil }
+        its(:redshift) { should == redshift }
       end
-      context "distance in neither" do
-        
-      let(:file_path) { 'spec/sample_files/image/neither.xmp' }
+
+      context "distance in both" do
+        let(:file_path) { 'spec/sample_files/image/both.xmp' }
+
+        has_most_options
+
+        its(:light_years) { should == light_years }
+        its(:redshift) { should == redshift }
       end
     end
-    
   end
 
   describe '#to_xml' do
diff --git a/spec/sample_files/image/both.xmp b/spec/sample_files/image/both.xmp
new file mode 100644
index 0000000..6f62e8e
--- /dev/null
+++ b/spec/sample_files/image/both.xmp
@@ -0,0 +1,43 @@
+<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:title>:
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">My title</rdf:li>
+        </rdf:Alt>
+      </dc:title>
+      <dc:description>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Description</rdf:li>
+        </rdf:Alt>
+      </dc:description>
+
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/">
+      <Iptc4xmpCore:CreatorContactInfo rdf:parseType="Resource">
+      </Iptc4xmpCore:CreatorContactInfo>
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+      <photoshop:Headline>Headline</photoshop:Headline>
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:avm="http://www.communicatingastronomy.org/avm/1.0/">
+      <avm:Distance.Notes>Distance Notes</avm:Distance.Notes>
+      <avm:ReferenceURL>Reference URL</avm:ReferenceURL>
+      <avm:Credit>Credit</avm:Credit>
+      <avm:Date>2010-01-01</avm:Date>
+      <avm:ID>ID</avm:ID>
+      <avm:Type>Observation</avm:Type>
+      <avm:Image.ProductQuality>Good</avm:Image.ProductQuality>
+      <avm:Distance>
+        <rdf:Seq>
+          <rdf:li>Light years</rdf:li>
+          <rdf:li>Redshift</rdf:li>
+        </rdf:Seq>
+      </avm:Distance>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>
diff --git a/spec/sample_files/image/light_years.xmp b/spec/sample_files/image/light_years.xmp
index b32eb55..becc7b8 100644
--- a/spec/sample_files/image/light_years.xmp
+++ b/spec/sample_files/image/light_years.xmp
@@ -32,6 +32,7 @@
       <avm:ID>ID</avm:ID>
       <avm:Type>Observation</avm:Type>
       <avm:Image.ProductQuality>Good</avm:Image.ProductQuality>
+      <avm:Distance><rdf:Seq><rdf:li>Light years</rdf:li></rdf:Seq></avm:Distance>
     </rdf:Description>
   </rdf:RDF>
 </x:xmpmeta>
diff --git a/spec/sample_files/image/redshift.xmp b/spec/sample_files/image/redshift.xmp
new file mode 100644
index 0000000..e86c9b4
--- /dev/null
+++ b/spec/sample_files/image/redshift.xmp
@@ -0,0 +1,43 @@
+<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:title>:
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">My title</rdf:li>
+        </rdf:Alt>
+      </dc:title>
+      <dc:description>
+        <rdf:Alt>
+          <rdf:li xml:lang="x-default">Description</rdf:li>
+        </rdf:Alt>
+      </dc:description>
+
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:Iptc4xmpCore="http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/">
+      <Iptc4xmpCore:CreatorContactInfo rdf:parseType="Resource">
+      </Iptc4xmpCore:CreatorContactInfo>
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+      <photoshop:Headline>Headline</photoshop:Headline>
+    </rdf:Description>
+    <rdf:Description rdf:about=""
+      xmlns:avm="http://www.communicatingastronomy.org/avm/1.0/">
+      <avm:Distance.Notes>Distance Notes</avm:Distance.Notes>
+      <avm:ReferenceURL>Reference URL</avm:ReferenceURL>
+      <avm:Credit>Credit</avm:Credit>
+      <avm:Date>2010-01-01</avm:Date>
+      <avm:ID>ID</avm:ID>
+      <avm:Type>Observation</avm:Type>
+      <avm:Image.ProductQuality>Good</avm:Image.ProductQuality>
+      <avm:Distance>
+        <rdf:Seq>
+          <rdf:li>-</rdf:li>
+          <rdf:li>Redshift</rdf:li>
+        </rdf:Seq>
+      </avm:Distance>
+    </rdf:Description>
+  </rdf:RDF>
+</x:xmpmeta>