active-fedora 3.1.0 → 3.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.0)
+    active-fedora (3.1.1)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml

data/lib/active_fedora/base.rb

@@ -34,7 +34,9 @@ module ActiveFedora
     include SemanticNode
     class_inheritable_accessor  :ds_specs, :class_named_datastreams_desc
     self.class_named_datastreams_desc = {}
-    self.ds_specs = {'RELS-EXT'=> [ActiveFedora::RelsExtDatastream, "", nil]}#, 'DC'=> [ActiveFedora::Datastream, "", nil]}
+    
+    self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :block=>nil}}
+
     attr_accessor :named_datastreams_desc
     
 
@@ -97,7 +99,7 @@ module ActiveFedora
     end
 
     def self.datastream_class_for_name(dsid)
-      ds_specs[dsid] ? ds_specs[dsid].first : ActiveFedora::Datastream
+      ds_specs[dsid] ? ds_specs[dsid][:type] : ActiveFedora::Datastream
     end
 
     #This method is used to specify the details of a datastream. 
@@ -105,8 +107,7 @@ module ActiveFedora
     #execute the block, but stores it at the class level, to be executed
     #by any future instantiations.
     def self.has_metadata(args, &block)
-      #@ds_specs ||= Hash.new
-      ds_specs[args[:name]]= [args[:type], args.fetch(:label,""), block]
+      ds_specs[args[:name]]= {:type => args[:type], :label =>  args.fetch(:label,""), :control_group => args.fetch(:control_group,"X"), :disseminator => args.fetch(:disseminator,""), :url => args.fetch(:url,""),:block => block}
     end
 
     def method_missing(name, *args)
@@ -127,6 +128,7 @@ module ActiveFedora
     #Saves a Base object, and any dirty datastreams, then updates 
     #the Solr index for this object.
     def save
+
       # If it's a new object, set the conformsTo relationship for Fedora CMA
       if new_object? 
         result = create
@@ -199,20 +201,17 @@ module ActiveFedora
         ds_spec = self.class.ds_specs[dsid]
         datastreams[dsid] = datastream
         if (ds_spec)
-          klass = ds_spec.first
+          klass = ds_spec[:type]
           datastreams[dsid].model = self if klass == RelsExtDatastream
 
-          if ds_spec.last.class == Proc
-            ds_spec.last.call(datastreams[dsid])
+          if ds_spec[:block].class == Proc
+            ds_spec[:block].call(datastreams[dsid])
           end
-          # if klass.respond_to? :from_xml
-          #   ### TODO, this is loading eagerly, we could load it as needed
-          #   klass.from_xml(datastreams[dsid].content, datastreams[dsid])
-          # end
         end
       end
     end
 
+
     # Adds datastream to the object.  Saves the datastream to fedora upon adding.
     # If datastream does not have a DSID, a unique DSID is generated
     # :prefix option will set the prefix on auto-generated DSID
@@ -994,23 +993,46 @@ module ActiveFedora
     private
     def configure_defined_datastreams
       if self.class.ds_specs
-        self.class.ds_specs.each do |name,ar|
+        self.class.ds_specs.each do |name,ds_config|
           if self.datastreams.has_key?(name)
             #attributes = self.datastreams[name].attributes
           else
-            ds = ar.first.new(inner_object, name)
-            ds.model = self if ar.first == RelsExtDatastream
-            ds.dsLabel = ar[1] if ar[1].present?
+            ds = ds_config[:type].new(inner_object, name)
+            ds.model = self if ds_config[:type] == RelsExtDatastream
+            ds.dsLabel = ds_config[:label] if ds_config[:label].present?
+            ds.controlGroup = ds_config[:control_group]
             # If you called has_metadata with a block, pass the block into the Datastream class
-            if ar.last.class == Proc
-              ar.last.call(ds)
+            if ds_config[:block].class == Proc
+              ds_config[:block].call(ds)
             end
-            #ds.attributes = attributes.merge(ds.attributes)
+            additional_attributes_for_external_and_redirect_control_groups(ds, ds_config)
             self.add_datastream(ds)
           end
         end
       end
     end
+
+
+    # This method provides validation of proper options for control_group 'E' and 'R' and builds an attribute hash to be merged back into ds.attributes prior to saving
+    #
+    # @param [Object] ds The datastream
+    # @param [Object] ds_config hash of options which may contain :disseminator and :url
+    def additional_attributes_for_external_and_redirect_control_groups(ds,ds_config)
+      if ds.controlGroup=='E'
+        raise "Must supply either :disseminator or :url if you specify :control_group => 'E'" if (ds_config[:disseminator].empty? && ds_config[:url].empty?)
+        if !ds_config[:disseminator].empty?
+          ds.dsLocation= "#{RubydoraConnection.instance.options[:url]}/objects/#{pid}/methods/#{ds_config[:disseminator]}"
+        elsif !ds_config[:url].empty?
+          ds.dsLocation= ds_config[:url]
+        end
+      elsif ds.controlGroup=='R'
+        raise "Must supply a :url if you specify :control_group => 'R'" if (ds_config[:url].empty?)
+        ds.dsLocation= ds_config[:url]
+      end
+    end
+
+
+
     
     # Deals with preparing new object to be saved to Fedora, then pushes it and its datastreams into Fedora. 
     def create

data/lib/active_fedora/content_model.rb

@@ -13,7 +13,7 @@ module ActiveFedora
     end
     
     def self.pid_from_ruby_class(klass,attrs={})
-      sanitized_class_name = klass.name.gsub(/(::)/, '_')
+
       unless klass.respond_to? :pid_suffix
         pid_suffix = attrs.has_key?(:pid_suffix) ? attrs[:pid_suffix] : CMODEL_PID_SUFFIX
       else
@@ -24,7 +24,12 @@ module ActiveFedora
       else
         namespace = klass.pid_namespace
       end
-      return "info:fedora/#{namespace}:#{sanitized_class_name}#{pid_suffix}" 
+      return "info:fedora/#{namespace}:#{sanitized_class_name(klass)}#{pid_suffix}" 
+    end
+    
+    ###Override this, if you prefer your class names serialized some other way
+    def self.sanitized_class_name(klass)
+      klass.name.gsub(/(::)/, '_')
     end
     
     def self.models_asserted_by(obj)
@@ -41,11 +46,17 @@ module ActiveFedora
       end
       
       if models_array.empty?
-        models_array = [ActiveFedora::Base]
+        models_array = [default_model(obj)]
       end
       
       return models_array
     end
+
+    ### Returns a ruby class to use if no other class could be find to instantiate
+    ### Override this method if you need something other than the default strategy
+    def self.default_model(obj)
+      ActiveFedora::Base
+    end
     
     # Returns a ruby class corresponding to the given uri if one can be found.
     # Returns false if no corresponding class can be found.

data/lib/active_fedora/digital_object.rb

@@ -9,25 +9,6 @@ module ActiveFedora
       obj
     end
 
-    # def datastreams
-    #   @datastreams ||= begin
-    #     h = Hash.new { |h,k| h[k] = datastream_object_for(k) }                
-
-    #     begin
-    #       datastreams_xml = repository.datastreams(:pid => pid)
-    #       datastreams_xml.gsub! '<objectDatastreams', '<objectDatastreams xmlns="http://www.fedora.info/definitions/1/0/access/"' unless datastreams_xml =~ /xmlns=/
-    #       doc = Nokogiri::XML(datastreams_xml)
-    #       doc.xpath('//access:datastream', {'access' => "http://www.fedora.info/definitions/1/0/access/"}).each do |ds| 
-    #         h[ds['dsid']] = datastream_object_for ds['dsid'] 
-    #       end
-    #     rescue RestClient::ResourceNotFound
-    #     end
-
-    #     h
-    #   end
-    # end
-
-
     def datastream_object_for dsid
       klass = original_class.datastream_class_for_name(dsid)
       klass.new self, dsid

data/lib/active_fedora/rels_ext_datastream.rb

@@ -33,7 +33,7 @@ module ActiveFedora
             literal = statement.object.kind_of?(RDF::Literal)
             predicate = self.short_predicate(statement.predicate)
             object = literal ? statement.object.value : statement.object.to_str
-            tmpl.model.add_relationship(predicate, object)
+            tmpl.model.add_relationship(predicate, object, literal)
           end
         end
         tmpl.model.relationships_are_dirty = false

data/lib/active_fedora/semantic_node.rb

@@ -19,40 +19,29 @@ module ActiveFedora
     # Add a relationship to the Object.
     # @param predicate
     # @param object Either a string URI or an object that is a kind of ActiveFedora::Base 
-    def add_relationship(predicate, obj, literal=false)
-      unless relationship_exists?(internal_uri, predicate, obj)
-        register_triple(internal_uri, predicate, obj)
-        #need to call here to indicate update of named_relationships
+    def add_relationship(predicate, target, literal=false)
+      stmt = build_statement(internal_uri, predicate, target, literal)
+      unless relationships.has_statement? stmt
+        relationships.insert stmt
         @relationships_are_dirty = true
         rels_ext.dirty = true
       end
     end
 
-    # Add a RDF triple to the relationship graph
-    # @param pid a string represending the pid of the subject
-    # @param predicate a predicate symbol
-    # @param target an object to store
-    def register_triple(pid, predicate, target)
-      self.relationships_are_dirty = true
-      relationships.insert build_statement(pid, predicate, target)
-
-      # register_subject(subject)
-      # register_predicate(subject, predicate)
-      # relationships[subject][predicate] << object
-    end
-
     # Create an RDF statement
     # @param uri a string represending the subject
     # @param predicate a predicate symbol
     # @param target an object to store
-    def build_statement(uri, predicate, target)
+    def build_statement(uri, predicate, target, literal=nil)
       raise "Not allowed anymore" if uri == :self
       target = target.internal_uri if target.respond_to? :internal_uri
       subject =  RDF::URI.new(uri)  #TODO cache
-      begin
-        literal = URI.parse(target).scheme.nil?
-      rescue URI::InvalidURIError
-        literal = false
+      if literal.nil?
+        begin
+          literal = URI.parse(target).scheme.nil?
+        rescue URI::InvalidURIError
+          literal = false
+        end
       end
       raise ArgumentError, "Invalid target \"#{target}\". Must have namespace." unless literal || /^info/.match(target)
       object = literal ? RDF::Literal.new(target) : RDF::URI.new(target)
@@ -88,18 +77,6 @@ module ActiveFedora
         self.class.vocabularies[xmlns][rel_predicate] 
     end
     
-    # def register_subject(subject)
-    #   if !relationships.has_key?(subject) 
-    #       relationships[subject] = {} 
-    #   end
-    # end
-  
-    # def register_predicate(subject, predicate)
-    #   register_subject(subject)
-    #   if !relationships[subject].has_key?(predicate) 
-    #     relationships[subject][predicate] = []
-    #   end
-    # end
 
     # ** EXPERIMENTAL **
     #
@@ -112,15 +89,6 @@ module ActiveFedora
       rels_ext.dirty = true
     end
 
-
-    
-    # ** EXPERIMENTAL **
-    # 
-    # Returns true if a relationship exists for the given subject, predicate, and object triple
-    def relationship_exists?(subject, predicate, object)
-      relationships.has_statement? build_statement(subject, predicate, object)
-    end
-
     def inbound_relationships(response_format=:uri)
       rel_values = {}
       inbound_relationship_predicates.each_pair do |name,predicate|
@@ -147,14 +115,22 @@ module ActiveFedora
       relationships.statements
     end
     
-    def relationships
+    # If no arguments are supplied, return the whole RDF::Graph.
+    # if a predicate is supplied as a parameter, then it returns the result of quering the graph with that predicate
+    def relationships(*args)
       unless @subject 
         raise "Must have internal_uri" unless internal_uri
         @subject =  RDF::URI.new(internal_uri)
       end
       @relationships ||= RDF::Graph.new
       load_relationships if !relationships_loaded
-      @relationships
+
+      return @relationships if args.empty?
+      rels = @relationships.query(:predicate => find_graph_predicate(args.first))
+      results = []
+      rels.each_object {|o| results << o.to_s }
+      results
+      
     end
 
     def load_relationships
@@ -201,8 +177,8 @@ module ActiveFedora
     def ids_for_outbound(predicate)
       id_array = []
       res = relationships.query(:predicate => find_graph_predicate(predicate))
-      res.each_object do |o|
-        id_array << o.to_s.gsub("info:fedora/", "")
+      relationships(predicate).each do |o|
+        id_array << o.gsub("info:fedora/", "")
       end
       id_array
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0"
+    VERSION = "3.1.1"
 end

data/spec/support/mock_fedora.rb

@@ -6,20 +6,23 @@ def mock_client
   @mock_client 
 end
   
-def stub_get(pid, record_exists=false)
+def stub_get(pid, datastreams=nil, record_exists=false)
   pid.gsub!(/:/, '%3A')
   mock_client.stubs(:[]).with("objects/#{pid}?format=xml").returns(stub('get getter', :get=>'foobar')) if record_exists
  # @mock_client.expects(:[]).with("objects/#{pid}?format=xml").raises(RestClient::ResourceNotFound) unless record_exists
   mock_client.stubs(:[]).with("objects/#{pid}/datastreams?format=xml").returns(@getter)
-  ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
+  datastreams ||= ['someData', 'withText', 'withText2', 'RELS-EXT']
+  datastreams.each do |dsid|
     mock_client.stubs(:[]).with("objects/#{pid}/datastreams/#{dsid}?format=xml").returns(@getter)
   end
 end
 def stub_ingest(pid)
-  mock_client.stubs(:[]).with("objects/#{pid || 'new'}").returns(stub("ingester", :post=>pid))
+  n = pid.gsub(/:/, '%3A')
+  mock_client.stubs(:[]).with("objects/#{n || 'new'}").returns(stub("ingester", :post=>pid))
 end
 
 def stub_add_ds(pid, dsids)
+  pid.gsub!(/:/, '%3A')
   dsids.each do |dsid|
     client = mock_client.stubs(:[]).with do |params|
       /objects\/#{pid}\/datastreams\/#{dsid}/.match(params)

data/spec/unit/base_spec.rb

@@ -106,30 +106,132 @@ describe ActiveFedora::Base do
   end
 
   describe "has_metadata" do
-    before :each do
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams?format=xml").returns(@getter)
-      @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/RELS-EXT/content").returns(@getter)
+    describe "creates datastreams" do
+      before :each do
+        @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams?format=xml").returns(@getter)
+        @mock_client.stubs(:[]).with("objects/monkey%3A99/datastreams/RELS-EXT/content").returns(@getter)
+
+        #Update record
+        @mock_client.stubs(:[]).with("objects/monkey%3A99").returns(stub('post', :post=>'monkey:99'))
+        #Update datastream
+        ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
+          @mock_client.stubs(:[]).with {|params| /objects\/monkey%3A99\/datastreams\/#{dsid}/.match(params)}.returns(stub('post', :post=>'monkey:99', :get=>''))
+        end
+
+        @n = FooHistory.new(:pid=>"monkey:99")
+        @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
+        @n.expects(:update_index)
+        @n.save
+      end
 
-      #Update record
-      @mock_client.stubs(:[]).with("objects/monkey%3A99").returns(stub('post', :post=>'monkey:99'))
-      #Update datastream
-      ['someData', 'withText', 'withText2', 'RELS-EXT'].each do |dsid|
-        @mock_client.stubs(:[]).with {|params| /objects\/monkey%3A99\/datastreams\/#{dsid}/.match(params)}.returns(stub('post', :post=>'monkey:99', :get=>''))
+      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
+      stub_ingest('monkey:99')
+      stub_add_ds('monkey:99', ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
+      stub_get('monkey:99', ['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
 
-      @n = FooHistory.new(:pid=>"monkey:99")
-      @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
-      @n.expects(:update_index)
+        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(:pid=>"monkey:99")
       @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")
     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"
+    context ":control_group => 'E'" do
+      before do
+        stub_ingest(@this_pid)
+        stub_add_ds(@this_pid, ['RELS-EXT', 'externalDisseminator', 'externalUrl'])
+      end
+      it "should raise an error without :disseminator or :url option" do
+        class MoreFooHistory < ActiveFedora::Base
+          has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>"externalDisseminator", :control_group => "E"
+        end
+        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
+        @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_ingest(@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
+        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
 
 
@@ -195,11 +297,9 @@ describe ActiveFedora::Base do
 
   describe '#add_relationship' do
     it 'should call #add_relationship on the rels_ext datastream' do
-      mock_rels_ext = mock("rels-ext")
-      mock_rels_ext.expects(:dirty=).with(true)
-      @test_object.expects(:relationship_exists?).returns(false).once()
-      @test_object.expects(:rels_ext).returns(mock_rels_ext).at_least_once 
-      @test_object.add_relationship("predicate", "object")
+      @test_object.add_relationship("predicate", "info:fedora/object")
+      pred = @test_object.class.vocabularies["info:fedora/fedora-system:def/relations-external#"]["predicate"] 
+      @test_object.relationships.should have_statement(RDF::Statement.new(RDF::URI.new(@test_object.internal_uri), pred, RDF::URI.new("info:fedora/object")))
     end
 
     it "should update the RELS-EXT datastream and set the datastream as dirty when relationships are added" do
@@ -279,7 +379,7 @@ describe ActiveFedora::Base do
       stub_add_ds(@this_pid, ['RELS-EXT'])
       @test_object.persisted?.should be false
       @test_object.expects(:update_index)
-      stub_get(@this_pid, true)
+      stub_get(@this_pid, nil, true)
       @test_object.save.should == true
       @test_object.persisted?.should be true
     end
@@ -418,12 +518,6 @@ describe ActiveFedora::Base do
   end
   
   describe ".to_solr" do
-    
-    # before(:all) do
-    #   # Revert to default mappings after running tests
-    #   ActiveFedora::SolrService.load_mappings
-    # end
-    
     after(:all) do
       # Revert to default mappings after running tests
       ActiveFedora::SolrService.load_mappings
@@ -443,8 +537,7 @@ describe ActiveFedora::Base do
     end
 
     it "should omit base metadata and RELS-EXT if :model_only==true" do
-      @test_object.add_relationship(:has_part, "foo")
-      # @test_object.expects(:modified_date).returns("mDate")
+      @test_object.add_relationship(:has_part, "foo", true)
       solr_doc = @test_object.to_solr(Hash.new, :model_only => true)
       solr_doc["system_create_dt"].should be_nil
       solr_doc["system_modified_dt"].should be_nil

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -14,7 +14,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
   
   before(:each) do
-    stub_get("_nextid_")
+    stub_get("_nextid_", ['RELS-EXT', 'sensitive_passages', 'significant_passages', 'dublin_core', 'properties'])
     Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
     ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("_nextid_")
     @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
@@ -23,7 +23,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
   it "from_xml should parse everything correctly" do
     #originally just tested that lcsh encoding and stuff worked, but the other stuff is worth testing
-    stub_get("meh:leh")
+    stub_get("meh:leh", ['RELS-EXT', 'sensitive_passages', 'significant_passages', 'dublin_core', 'properties'])
     stub_get_content("meh:leh", ['dublin_core'])
     ActiveFedora::RubydoraConnection.instance.expects(:nextid).returns("meh:leh")
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']

data/spec/unit/rels_ext_datastream_spec.rb

@@ -91,32 +91,22 @@ describe ActiveFedora::RelsExtDatastream do
       @test_obj.ids_for_outbound("foo").should == ["foo:bar"]
     end
     it "should handle un-mapped literals" do
-      pending
       xml = "
-              <foxml:datastream ID=\"RELS-EXT\" STATE=\"A\" CONTROL_GROUP=\"X\" VERSIONABLE=\"true\" xmlns:foxml=\"info:fedora/fedora-system:def/foxml#\">
-              <foxml:datastreamVersion ID=\"RELS-EXT.0\" LABEL=\"\" CREATED=\"2011-09-20T19:48:43.714Z\" MIMETYPE=\"text/xml\" SIZE=\"622\">
-                <foxml:xmlContent>
-                <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">
+                <rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"  xmlns:oai=\"http://www.openarchives.org/OAI/2.0/\">
                   <rdf:Description rdf:about=\"info:fedora/changeme:3489\">
                     <hasModel xmlns=\"info:fedora/fedora-system:def/model#\" rdf:resource=\"info:fedora/afmodel:ActiveFedora_Base\"/>
                     <isPartOf xmlns=\"info:fedora/fedora-system:def/relations-external#\" rdf:resource=\"info:fedora/demo:11\"/>
                     <isMemberOf xmlns=\"info:fedora/fedora-system:def/relations-external#\" rdf:resource=\"info:fedora/demo:10\"/>
-                    <hasMetadata xmlns=\"info:fedora/fedora-system:def/relations-external#\">oai:hull.ac.uk:hull:2708</hasMetadata>
+                    <oai:itemID>oai:hull.ac.uk:hull:2708</oai:itemID>
                   </rdf:Description>
-                </rdf:RDF>
-              </foxml:xmlContent>
-            </foxml:datastreamVersion>\n</foxml:datastream>\n"
-      doc = Nokogiri::XML::Document.parse(xml)
-      new_ds = ActiveFedora::RelsExtDatastream.new
-      ActiveFedora::RelsExtDatastream.from_xml(new_ds,doc.root)
-      new_ext = new_ds.to_rels_ext('changeme:3489')
-      new_ext.should match "<hasMetadata xmlns=\"info:fedora/fedora-system:def/relations-external#\">oai:hull.ac.uk:hull:2708</hasMetadata>"
+                </rdf:RDF>"
+      model = ActiveFedora::Base.new
+      new_ds = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      new_ds.model = model
+      ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds)
+      new_ext = new_ds.to_rels_ext()
+      new_ext.should match "<ns0:itemID>oai:hull.ac.uk:hull:2708</ns0:itemID>"
       
     end
   end
-  
-  
-  
-  it "should treat :self and self.pid as equivalent subjects"
-  
 end

data/spec/unit/semantic_node_spec.rb

@@ -316,8 +316,6 @@ describe ActiveFedora::SemanticNode do
         local_node.expects(:relationship_query).with("parts")
         local_node.parts_query
       end
-      
-      it "resulting finder should provide option of filtering results by :type"
     end
     
     describe '#create_outbound_relationship_finders' do
@@ -383,7 +381,6 @@ describe ActiveFedora::SemanticNode do
           result.should include("demo:10")
         end
         
-        it "should provide option of filtering results by :type"
       end
       
       describe " resulting _ids finder" do
@@ -489,10 +486,15 @@ describe ActiveFedora::SemanticNode do
     end
     
     describe ".add_relationship" do
-      it "should add relationship to the relationships hash" do
+      it "should add relationship to the relationships graph" do
         @node.add_relationship(@test_relationship.predicate, @test_relationship.object)
         @node.ids_for_outbound("isMemberOf").should == ['demo:9']
       end
+
+      it "should add a literal relationship to the relationships graph" do
+        @node.add_relationship(@test_relationship.predicate, @test_relationship.object, true)
+        @node.ids_for_outbound("isMemberOf").should == ['demo:9']
+      end
       
       it "adding relationship to an instance should not affect class-level relationships hash" do 
         local_test_node1 = SpecNode.new
@@ -516,20 +518,6 @@ describe ActiveFedora::SemanticNode do
     end
 
       
-    it "should provide a relationship setter"
-    it "should provide a relationship getter"
-    it "should provide a relationship deleter"
-        
-    describe '.register_triple' do
-      it 'should add triples to the relationships hash' do
-        @node.register_triple(@node.internal_uri, :is_part_of, "info:fedora/demo:10")
-        @node.register_triple(@node.internal_uri, :is_member_of, "info:fedora/demo:11")
-        @node.ids_for_outbound(:is_part_of).should == ['demo:10'] 
-        @node.ids_for_outbound(:is_member_of).should == ['demo:11'] 
-      end
-      
-      it "should not be a class level method"
-    end
     
     it 'should provide #predicate_lookup that maps symbols to common RELS-EXT predicates' do
       SpecNode.should respond_to(:predicate_lookup)
@@ -570,18 +558,6 @@ describe ActiveFedora::SemanticNode do
         
       end
     end
-    
-    describe '#relationship_exists?' do
-      it 'should return true if a relationship does exist' do
-        @test_object3 = SpecNode2.new
-        @test_object3.pid = increment_pid
-        r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_member,:object=>@test_object3})
-        @test_object.relationship_exists?(@test_object.internal_uri,r.predicate,r.object).should == false
-        @test_object.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true))
-        @test_object.add_relationship(r.predicate, r.object)
-        @test_object.relationship_exists?(@test_object.internal_uri,r.predicate,r.object).should == true
-      end
-    end
 
     describe '#assert_kind_of' do
       it 'should raise an exception if object supplied is not the correct type' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 -06:00
+date: 2011-11-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency