active-fedora 3.2.2 → 3.3.0

data/spec/unit/datastream_spec.rb

@@ -17,12 +17,16 @@ describe ActiveFedora::Datastream do
     @test_datastream.to_param.should == 'foo%2ebar'
   end
   
+  it "should be inspectable" do
+    @test_datastream.inspect.should match /#<ActiveFedora::Datastream:-?\d+ @pid=\"__DO_NOT_USE__\" @dsid=\"abcd\" @controlGroup=\"M\" @dirty=\"false\" @mimeType=\"\" >/
+  end
+
   describe '#save' do
     it "should set dirty? to false" do
-      @mock_repo = mock('repository')
-      @mock_repo.stubs(:add_datastream).with(:mimeType=>'text/xml', :versionable => true, :pid => @test_object.pid, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there', :checksumType => 'DISABLED')
-      @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid)
-      @test_object.inner_object.stubs(:repository).returns(@mock_repo)
+      mock_repo = mock('repository', :config=>{})
+      mock_repo.stubs(:add_datastream).with(:mimeType=>'text/xml', :versionable => true, :pid => @test_object.pid, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there')
+      mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid)
+      @test_object.inner_object.stubs(:repository).returns(mock_repo)
       @test_datastream.dirty?.should be_true
       @test_datastream.save
       @test_datastream.dirty?.should be_false
@@ -85,8 +89,10 @@ describe ActiveFedora::Datastream do
          <dsChecksum>none</dsChecksum>
          </datastreamProfile>"
       EOS
-      @test_datastream.expects(:repository).returns(@mock_repo)
-      @mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns(ds_profile)
+
+      mock_repo = mock('repository', :config=>{})
+      @test_datastream.stubs(:repository).returns(mock_repo)
+      mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns(ds_profile)
       @test_datastream.size.should == 9999
     end
 
@@ -94,5 +100,29 @@ describe ActiveFedora::Datastream do
       @test_datastream.size.should be_nil
     end
   end
+  
+  describe ".from_xml" do
+    it "should load a FOXML datastream node" do
+      ds_xml = <<-EOS
+        <foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true" xmlns:foxml="info:fedora/fedora-system:def/foxml#">
+          <foxml:xmlContent>
+            <datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+              <datastreamVersion ID="DC.1" LABEL="Dublin Core Record for this object" CREATED="2011-09-28T22:50:18.626Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="526">
+                <xmlContent>
+                  <oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+                    <dc:title>Title</dc:title>
+                    <dc:identifier>0123456789</dc:identifier>
+                  </oai_dc:dc>
+                </xmlContent>
+              </datastreamVersion>
+            </datastream>
+          </foxml:xmlContent>
+        </foxml:datastream>
+      EOS
+      ds_node = Nokogiri::XML(ds_xml).root
+      ds = ActiveFedora::Datastream.from_xml(@test_datastream, ds_node)
+      ds.should be_a(ActiveFedora::Datastream)
+    end
+  end
 
 end

data/spec/unit/datastreams_spec.rb

@@ -0,0 +1,251 @@
+require 'spec_helper'
+
+describe ActiveFedora::Datastreams do
+  before do
+    @test_object = ActiveFedora::Base.new
+  end
+
+  it "should respond_to has_metadata" do
+    ActiveFedora::Base.respond_to?(:has_metadata).should be_true
+  end
+
+  describe "has_metadata" do
+    @@last_pid = 0
+    def increment_pid
+      @@last_pid += 1    
+    end
+
+    before(:each) do
+      @this_pid = increment_pid.to_s
+      stub_get(@this_pid)
+      Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
+      ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(@this_pid)
+    end
+
+    describe "creates datastreams" do
+      before do
+        class FooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"someData" do |m|
+            m.field "fubar", :string
+            m.field "swank", :text
+          end
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
+            m.field "fubar", :text
+          end
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+            m.field "fubar", :text
+          end 
+          delegate :fubar, :to=>'withText'
+          delegate :swank, :to=>'someData'
+        end
+        stub_ingest(@this_pid)
+        stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2'])
+
+        @n = FooHistory.new()
+        @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
+        @n.expects(:update_index)
+        @n.save
+      end
+
+      after do
+        Object.send(:remove_const, :FooHistory)
+      end
+
+      it "should create specified datastreams with specified fields" do
+        @n.datastreams["someData"].should_not be_nil
+        @n.datastreams["someData"].fubar_values='bar'
+        @n.datastreams["someData"].fubar_values.should == ['bar']
+        @n.datastreams["withText2"].dsLabel.should == "withLabel"
+      end
+    end
+
+
+    it "should create specified datastreams with appropriate control group" do
+      ActiveFedora.fedora_config.stubs(:[]).returns({:url=>'sub_url'})
+      stub_ingest(@this_pid)
+      stub_add_ds(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
+      stub_get(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
+      class UketdObject < ActiveFedora::Base
+        has_metadata :name => "rightsMetadata", :label=>"Rights metadata", :type => ActiveFedora::NokogiriDatastream 
+        
+        # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
+        # TODO: define terminology for ETD
+        has_metadata :name => "descMetadata", :label=>"MODS metadata", :control_group=>"M", :type => ActiveFedora::NokogiriDatastream
+
+        has_metadata :name => "UKETD_DC", :label=>"UKETD_DC metadata", :control_group => "E", :disseminator=>"hull-sDef:uketdObject/getUKETDMetadata", :type => ActiveFedora::NokogiriDatastream
+
+        has_metadata :name => "DC", :type => ActiveFedora::NokogiriDatastream, :label=>"DC admin metadata"
+
+        # A place to put extra metadata values
+        has_metadata :name => "properties", :label=>"Workflow properties", :type => ActiveFedora::MetadataDatastream do |m|
+          m.field 'collection', :string
+          m.field 'depositor', :string
+        end
+
+      end
+      @n = UketdObject.new()
+      @n.save
+      @n.datastreams["DC"].controlGroup.should eql("X")
+      @n.datastreams["rightsMetadata"].controlGroup.should eql("X")
+      @n.datastreams["properties"].controlGroup.should eql("X")
+      @n.datastreams["descMetadata"].controlGroup.should eql("M")
+      @n.datastreams["UKETD_DC"].controlGroup.should eql("E")
+      @n.datastreams["UKETD_DC"].dsLocation.should == "sub_url/objects/#{@this_pid}/methods/hull-sDef:uketdObject/getUKETDMetadata"
+    end
+
+    context ":control_group => 'E'" do
+      before do
+        stub_get(@this_pid)
+        stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
+      end
+      before :all do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "E"
+        end
+      end
+
+      after(:all) do
+        # clean up test class
+        Object.send(:remove_const, :MoreFooHistory)
+      end
+      it "should raise an error without :disseminator or :url option" do
+        lambda { @n = MoreFooHistory.new }.should raise_exception
+      end
+      
+      it "should allow :control_group => 'E' with a :url option" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E", :url => "http://exampl.com/mypic.jpg"
+        end
+        stub_ingest(@this_pid)
+        @n = MoreFooHistory.new
+        @n.save
+      end
+      it "should raise an error if :url is malformed" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "E"
+        end
+        client = mock_client.stubs(:[]).with do |params|
+          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
+        end
+        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
+        @n = MoreFooHistory.new
+        lambda {@n.save }.should raise_exception
+      end
+    end
+
+    context ":control_group => 'R'" do
+      before do
+        stub_get(@this_pid)
+        stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator' ])
+      end
+      it "should raise an error without :url option" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R"
+        end
+        lambda { @n = MoreFooHistory.new }.should raise_exception
+      end
+      
+      it "should work with a valid  :url option" do
+        stub_ingest(@this_pid)
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R", :url => "http://exampl.com/mypic.jpg"
+        end
+        @n = MoreFooHistory.new
+        @n.save
+      end
+      it "should not take a :disseminator option without a :url option" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "R", :disseminator => "foo:s-def/hull-cModel:Foo"
+        end
+        lambda { @n = MoreFooHistory.new }.should raise_exception
+      end
+      it "should raise an error if :url is malformed" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type => ActiveFedora::NokogiriDatastream, :name=>"externalUrl", :url=>"my_rul", :control_group => "R"
+        end
+        client = mock_client.stubs(:[]).with do |params|
+          /objects\/#{@this_pid}\/datastreams\/externalUrl/.match(params)
+        end
+        client.raises(RuntimeError, "Error adding datastream externalUrl for object changeme:4020. See logger for details")
+        lambda {MoreFooHistory.new }.should raise_exception
+      end
+    end
+  end
+
+  describe "#create_datastream" do
+    it 'should create a datastream object using the type of object supplied in the string (does reflection)' do
+      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
+      f.stubs(:content_type).returns("image/jpeg")
+      f.stubs(:original_filename).returns("minivan.jpg")
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>f})
+      ds.class.should == ActiveFedora::Datastream
+      ds.dsLabel.should == "minivan.jpg"
+      ds.mimeType.should == "image/jpeg"
+    end
+    it 'should create a datastream object from a string' do
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:blob=>"My file data"})
+      ds.class.should == ActiveFedora::Datastream
+      ds.dsLabel.should == nil
+      ds.mimeType.should == "application/octet-stream"
+    end
+
+    it 'should not set dsLocation if dsLocation is nil' do
+      ActiveFedora::Datastream.any_instance.expects(:dsLocation=).never
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:dsLocation=>nil})
+    end
+
+    it 'should set attributes passed in onto the datastream' do
+      ds = @test_object.create_datastream("ActiveFedora::Datastream", 'NAME', {:dsLocation=>"a1", :mimeType=>'image/png', :controlGroup=>'X', :dsLabel=>'My Label', :checksumType=>'SHA-1'})
+      ds.location.should == 'a1'
+      ds.mimeType.should == 'image/png'
+      ds.controlGroup.should == 'X'
+      ds.label.should == 'My Label'
+      ds.checksumType.should == 'SHA-1'
+    end
+  end
+
+  describe ".has_file_datastream" do
+    before do
+      class FileDS < ActiveFedora::Datastream; end
+      class FooHistory < ActiveFedora::Base
+        has_file_datastream :type=>FileDS
+      end
+    end
+    after do
+      Object.send(:remove_const, :FooHistory)
+      Object.send(:remove_const, :FileDS)
+    end
+    it "Should add a line in ds_spec" do
+      FooHistory.ds_specs['content'][:type].should == FileDS
+      FooHistory.ds_specs['content'][:label].should == "File Datastream"
+      FooHistory.ds_specs['content'][:control_group].should == "M"
+    end
+  end
+
+  describe "#add_file_datastream" do
+    before do
+      @mock_file = mock('file')
+    end
+    it "should pass prefix" do
+      stub_add_ds(@test_object.pid, ['content1'])
+      @test_object.add_file_datastream(@mock_file, :prefix=>'content' )
+      @test_object.datastreams.keys.should include 'content1'
+    end
+    it "should pass dsid" do
+      stub_add_ds(@test_object.pid, ['MY_DSID'])
+      @test_object.add_file_datastream(@mock_file, :dsid=>'MY_DSID')
+      @test_object.datastreams.keys.should include 'MY_DSID'
+    end
+    it "without dsid or prefix" do
+      stub_add_ds(@test_object.pid, ['DS1'])
+      @test_object.add_file_datastream(@mock_file, {} )
+      @test_object.datastreams.keys.should include 'DS1'
+    end
+    it "Should pass checksum Type" do
+      stub_add_ds(@test_object.pid, ['DS1'])
+      @test_object.add_file_datastream(@mock_file, {:checksumType=>'MD5'} )
+      @test_object.datastreams['DS1'].checksumType.should == 'MD5'
+    end
+  end
+
+end

data/spec/unit/dc_rdf_datastream_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe ActiveFedora::DCRDFDatastream do
+
+  describe "an instance with content" do
+    before do
+      @subject = ActiveFedora::DCRDFDatastream.new(@inner_object, 'dc_rdf')
+      @subject.content = File.new('spec/fixtures/dublin_core_rdf_descMetadata.nt').read
+      @subject.stubs(:pid => 'test:1')
+      @subject.stubs(:new? => false)
+    end
+    it "should have controlGroup" do
+      @subject.controlGroup.should == 'M'
+    end
+    it "should have mimeType" do
+      @subject.mimeType.should == 'text/plain'
+    end
+    it "should have dsid" do
+      @subject.dsid.should == 'dc_rdf'
+    end
+    it "should have fields" do
+      @subject.publisher.should == ["Penn State"]
+    end
+    it "should have method missing" do
+      lambda{@subject.frank}.should raise_exception NoMethodError
+    end
+
+    it "should set fields" do
+      @subject.publisher= "St. Martin's Press"
+      @subject.publisher.should == ["St. Martin's Press"]
+    end
+    it "should append fields" do
+      @subject.append(RDF::DC.publisher, "St. Martin's Press")
+      @subject.publisher.should == ["Penn State", "St. Martin's Press"]
+    end
+
+  end
+
+  describe "a new instance" do
+    before do
+      @subject = ActiveFedora::DCRDFDatastream.new(@inner_object, 'dc_rdf')
+      @subject.stubs(:pid => 'test:1')
+    end
+    it "should save and reload" do
+      @subject.publisher= ["St. Martin's Press"]
+      @subject.save
+    end
+  end
+
+end

data/spec/unit/metadata_datastream_spec.rb

@@ -22,7 +22,7 @@ describe ActiveFedora::MetadataDatastream do
     @test_object = ActiveFedora::Base.new
     @mock_repo = mock('repository')
     @mock_repo.stubs(:datastream)
-    @mock_repo.stubs(:datastream_dissemination=>'My Content')
+    @mock_repo.stubs(:datastream_dissemination=>'My Content', :config=>{})
     mock_inner.stubs(:repository).returns(@mock_repo)
     mock_inner.stubs(:pid)
     @test_ds = ActiveFedora::MetadataDatastream.new(mock_inner, 'mdDs')

data/spec/unit/nokogiri_datastream_spec.rb

@@ -16,7 +16,7 @@ describe ActiveFedora::NokogiriDatastream do
   before(:each) do
     @mock_inner = mock('inner object')
     @mock_repo = mock('repository')
-    @mock_repo.stubs(:datastream_dissemination=>'My Content')
+    @mock_repo.stubs(:datastream_dissemination=>'My Content', :config=>{})
     @mock_inner.stubs(:repository).returns(@mock_repo)
     @mock_inner.stubs(:pid)
     @test_ds = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
@@ -172,7 +172,7 @@ describe ActiveFedora::NokogiriDatastream do
     it "should persist the product of .to_xml in fedora" do
       @test_ds.expects(:new?).returns(true).twice
       @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'descMetadata')
-      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
+      @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
       @test_ds.expects(:to_xml).returns("fake xml")
       @test_ds.serialize!
       @test_ds.save

data/spec/unit/{rdf_xml_writer.rb → rdf_xml_writer_spec.rb}

@@ -28,24 +28,24 @@ describe ActiveFedora::RDFXMLWriter do
   it "should serialize graphs using the rdf:Description element despite the presence of rdf:type statements" do
     graph = RDF::Graph.new
     subject = RDF::URI.new "info:fedora/test:sample_pid"
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
     graph.insert RDF::Statement.new(subject, RDF::URI('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),  RDF::URI.new('http://purl.org/dc/dcmitype/Collection'))
-    content = RDF::RDFXML::Writer.buffer do |writer|
+    content = ActiveFedora::RDFXMLWriter.buffer do |writer|
       graph.each_statement do |statement|
         writer << statement
       end
     end
-    EquivalentXml.equivalent?(content, @rdf_xml_with_type).should be_true
+    content.should be_equivalent_to @rdf_xml_with_type
   end
   
   it 'should serialize graphs without rdf:type equivalently to RDF::RDFXML::Writer' do
     graph = RDF::Graph.new
     subject = RDF::URI.new "info:fedora/test:sample_pid"
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
-    graph.insert RDF::Statement.new(subject, ActiveFedora::Base.new.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('info:fedora/demo:10'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_part_of),  RDF::URI.new('info:fedora/demo:11'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_part),  RDF::URI.new('info:fedora/demo:12'))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:OtherModel"))
+    graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:has_model),  RDF::URI.new("info:fedora/afmodel:SampleModel"))
 
     local_content = ActiveFedora::RDFXMLWriter.buffer do |writer|
       graph.each_statement do |statement|

data/spec/unit/relationship_graph_spec.rb

@@ -40,6 +40,13 @@ describe ActiveFedora::RelationshipGraph do
     @graph[:has_part].should == [@n1]
   end
 
+  describe "has_predicate?" do
+    it "should return true when it has it" do
+      @graph.has_predicate?(:has_part).should be_false
+      @graph.add(:has_part, @n1)
+      @graph.has_predicate?(:has_part).should be_true
+    end
+  end
 
   describe "delete" do
     it "should delete an object when an object is passed" do
@@ -69,6 +76,13 @@ describe ActiveFedora::RelationshipGraph do
       @graph.delete(:has_part, 'info:fedora/foo:777')
       @graph[:has_part].should == []
     end
+
+    it "should delete all the predicates if only one arg is passed" do
+      @graph.add(:has_part, @n1)
+      @graph[:has_part].should == [@n1]
+      @graph.delete(:has_part)
+      @graph.has_predicate?(:has_part).should_not be_true
+    end
   end
   describe "build_statement" do
     it "should raise an error when the target is a pid, not a uri" do