active-fedora 6.0.0.pre5 → 6.0.0.pre6

data/active-fedora.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency("mediashelf-loggable")
   s.add_dependency("rubydora", '~>1.2')
   s.add_dependency("rdf")
-  s.add_dependency("rdf-rdfxml", '~>0.3.8')
+  s.add_dependency("rdf-rdfxml", '~>1.0.0')
   s.add_dependency("deprecation")
   s.add_development_dependency("yard")
   s.add_development_dependency("RedCloth") # for RDoc formatting

data/lib/active_fedora/rdf_list.rb

@@ -4,7 +4,11 @@ module ActiveFedora
     def initialize(graph, subject)
       @graph = graph
       @subject = subject
+      first = graph.query([subject, RDF.first, nil]).first
+      graph.insert([subject, RDF.first, RDF.nil]) unless first
+      graph.insert([subject, RDF.rest, RDF.nil])
     end
+
     def first
       self[0] 
     end
@@ -13,8 +17,22 @@ module ActiveFedora
       idx == 0 ?  head.value : tail[idx-1]
     end
 
+    def []=(idx, value)
+      idx == 0 ?  head.value=value : tail_or_create(idx-1).value=value
+    end
+
     def size
-      tail ?  tail.size + 1 : 0
+      if tail
+        tail.size + 1
+      elsif graph.query([subject, RDF.first, RDF.nil]).first
+        0
+      else
+        1
+      end
+    end
+
+    def inspect
+      "[ #{value ? value.inspect : 'nil'}, #{tail.inspect}]"
     end
 
     def value
@@ -27,14 +45,38 @@ module ActiveFedora
       v
     end
 
+    def value=(obj)
+      graph.delete([subject, RDF.first, RDF.nil])
+      if obj.respond_to? :rdf_subject
+        graph.insert([subject, RDF.first, obj.rdf_subject]) # an ActiveFedora::RdfObject
+      else
+        graph.insert([subject, RDF.first, obj])
+      end
+    end
+
     def head
       @head ||= self.class.new(graph, subject)
     end
 
     def tail
       rest = graph.query([subject, RDF.rest, nil]).first
-      return unless rest
+      return if rest.object == RDF.nil
       self.class.new(graph, rest.object)
     end
+
+    def tail_or_create(idx)
+      rest = graph.query([subject, RDF.rest, nil]).first
+      obj = if rest.object != RDF.nil 
+        self.class.new(graph, rest.object)
+      else
+        #add a tail
+        graph.delete([subject, RDF.rest, RDF.nil])
+        tail = RDF::Node.new
+        graph.insert([subject, RDF.rest, tail])
+        self.class.new(graph, tail)
+      end
+
+      idx == 0 ? obj : obj.tail_or_create(idx-1)
+    end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.0.0.pre5"
+  VERSION = "6.0.0.pre6"
 end

data/spec/unit/rdf_list_spec.rb

@@ -38,70 +38,134 @@ describe ActiveFedora::RdfList do
     Object.send(:remove_const, :MADS)
   end
 
-  subject do
-    subject = DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')
-    subject.content =<<END
-<rdf:RDF
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
-    
-      <mads:ComplexSubject rdf:about="info:fedora/foo">
-        <mads:elementList rdf:parseType="Collection">
-          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
-          <mads:TopicElement>
-            <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
-          </mads:TopicElement>
-          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
-          <mads:TemporalElement>
-            <mads:elementValue>20th century</mads:elementValue>
-          </mads:TemporalElement>
-        </mads:elementList>
-      </mads:ComplexSubject>
-    </rdf:RDF>
+  describe "a new list" do
+    let (:ds) { DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')}
+    subject { ds.elementList.build}
+
+    it "should insert at the end" do
+      subject.should be_kind_of DemoList::List
+      subject.size.should == 0
+      subject[1] = DemoList::List::TopicElement.new(subject.graph)
+      subject.size.should == 2
+    end
+
+    it "should insert at the head" do
+      subject.should be_kind_of DemoList::List
+      subject.size.should == 0
+      subject[0] = DemoList::List::TopicElement.new(subject.graph)
+      subject.size.should == 1
+    end
+
+    describe "that has 4 elements" do
+      before do
+        subject[3] = DemoList::List::TopicElement.new(subject.graph)
+        subject.size.should == 4
+      end
+      it "should insert in the middle" do
+        subject[1] = DemoList::List::TopicElement.new(subject.graph)
+        subject.size.should == 4
+      end
+    end
+
+    describe "return updated xml" do
+      it "should be built" do
+        subject[0] = RDF::URI.new "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
+        subject[1] = DemoList::List::TopicElement.new(ds.graph)
+        subject[1].elementValue = "Relations with Mexican Americans"
+        subject[2] = RDF::URI.new "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
+        subject[3] = DemoList::List::TemporalElement.new(ds.graph)
+        subject[3].elementValue = "20th century"
+        expected_xml =<<END
+  <rdf:RDF
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
+      
+        <rdf:Description rdf:about="info:fedora/foo">
+          <mads:elementList rdf:parseType="Collection">
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
+            <mads:TopicElement>
+              <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
+            </mads:TopicElement>
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
+            <mads:TemporalElement>
+              <mads:elementValue>20th century</mads:elementValue>
+            </mads:TemporalElement>
+          </mads:elementList>
+        </rdf:Description>
+      </rdf:RDF>
 END
+        ds.content.should be_equivalent_to expected_xml
+      end
+    end
 
-    subject
-  end
- it "should have a subject" do
-    subject.rdf_subject.to_s.should == "info:fedora/foo"
-  end
-  it "should have fields" do
-    list = subject.elementList.first
-    list.first.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
-    list[1].should be_kind_of DemoList::List::TopicElement
-    list[1].elementValue.should == ["Relations with Mexican Americans"]
-    list[2].should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
-    list[3].should be_kind_of DemoList::List::TemporalElement
-    list[3].elementValue.should == ["20th century"]
-  end
 
-  it "should have size" do
-    list = subject.elementList.first
-    list.size.should == 4
   end
 
-  it "should update fields" do
-    list = subject.elementList.first
-    list[3].elementValue = ["1900s"]
-    expected_xml =<<END
-<rdf:RDF
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
-    
-      <mads:ComplexSubject rdf:about="info:fedora/foo">
-        <mads:elementList rdf:parseType="Collection">
-          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
-          <mads:TopicElement>
-            <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
-          </mads:TopicElement>
-          <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
-          <mads:TemporalElement>
-            <mads:elementValue>1900s</mads:elementValue>
-          </mads:TemporalElement>
-        </mads:elementList>
-      </mads:ComplexSubject>
-    </rdf:RDF>
+  describe "a list with content" do
+    subject do
+      subject = DemoList.new(stub('inner object', :pid=>'foo', :new? =>true), 'descMetadata')
+      subject.content =<<END
+  <rdf:RDF
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
+      
+        <mads:ComplexSubject rdf:about="info:fedora/foo">
+          <mads:elementList rdf:parseType="Collection">
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
+            <mads:TopicElement>
+              <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
+            </mads:TopicElement>
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
+            <mads:TemporalElement>
+              <mads:elementValue>20th century</mads:elementValue>
+            </mads:TemporalElement>
+          </mads:elementList>
+        </mads:ComplexSubject>
+      </rdf:RDF>
+END
+
+      subject
+    end
+   it "should have a subject" do
+      subject.rdf_subject.to_s.should == "info:fedora/foo"
+    end
+    it "should have fields" do
+      list = subject.elementList.first
+      list.first.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
+      list[1].should be_kind_of DemoList::List::TopicElement
+      list[1].elementValue.should == ["Relations with Mexican Americans"]
+      list[2].should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
+      list[3].should be_kind_of DemoList::List::TemporalElement
+      list[3].elementValue.should == ["20th century"]
+    end
+
+    it "should have size" do
+      list = subject.elementList.first
+      list.size.should == 4
+    end
+
+    it "should update fields" do
+      list = subject.elementList.first
+      list[3].elementValue = ["1900s"]
+      expected_xml =<<END
+  <rdf:RDF
+      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
+      
+        <mads:ComplexSubject rdf:about="info:fedora/foo">
+          <mads:elementList rdf:parseType="Collection">
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
+            <mads:TopicElement>
+              <mads:elementValue>Relations with Mexican Americans</mads:elementValue>
+            </mads:TopicElement>
+            <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"/>
+            <mads:TemporalElement>
+              <mads:elementValue>1900s</mads:elementValue>
+            </mads:TemporalElement>
+          </mads:elementList>
+        </mads:ComplexSubject>
+      </rdf:RDF>
 
 END
-    subject.content.should be_equivalent_to expected_xml
+      subject.content.should be_equivalent_to expected_xml
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre5
+  version: 6.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -180,7 +180,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -188,7 +188,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.8
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement