active-fedora 3.1.0.pre8 → 3.1.0.pre9

data/Gemfile.lock

@@ -0,0 +1,139 @@
+PATH
+  remote: .
+  specs:
+    active-fedora (3.1.0.pre9)
+      activeresource (~> 3.0.0)
+      activesupport (~> 3.0.0)
+      equivalent-xml
+      facets
+      mediashelf-loggable
+      mime-types (>= 1.16)
+      multipart-post (= 1.1.2)
+      nokogiri
+      om (>= 1.4.3)
+      rdf
+      rdf-rdfxml
+      rubydora (~> 0.1.9)
+      solr-ruby (>= 0.0.6)
+      solrizer (> 1.0.0)
+      xml-simple (>= 1.0.12)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.8)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    addressable (2.2.6)
+    akami (1.0.0)
+      gyoku (>= 0.4.0)
+    builder (2.1.2)
+    childprocess (0.2.2)
+      ffi (~> 1.0.6)
+    columnize (0.3.4)
+    daemons (1.1.4)
+    equivalent-xml (0.2.8)
+      nokogiri (>= 1.4.3)
+    facets (2.9.2)
+    fastercsv (1.5.4)
+    ffi (1.0.10)
+    gyoku (0.4.4)
+      builder (>= 2.1.2)
+    httpi (0.9.5)
+      rack
+    i18n (0.5.0)
+    jettywrapper (1.0.1)
+      activesupport (>= 3.0.0)
+      childprocess
+      i18n
+      logger
+      mediashelf-loggable
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    logger (1.2.8)
+    mediashelf-loggable (0.4.7)
+    metaclass (0.0.1)
+    mime-types (1.16)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
+    multipart-post (1.1.2)
+    nokogiri (1.5.0)
+    nori (1.0.2)
+    om (1.4.3)
+      mediashelf-loggable
+      nokogiri (>= 1.4.2)
+    rack (1.3.5)
+    rake (0.9.2)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.11)
+    rdf (0.3.4.1)
+      addressable (>= 2.2.6)
+    rdf-rdfxml (0.3.5)
+      nokogiri (>= 1.4.4)
+      rdf (>= 0.3.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rsolr (1.0.2)
+      builder (>= 2.1.2)
+    rspec (1.3.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    rubydora (0.1.9)
+      activemodel
+      activesupport
+      fastercsv
+      mime-types
+      nokogiri
+      rest-client
+      savon
+    savon (0.9.7)
+      akami (~> 1.0)
+      builder (>= 2.1.2)
+      gyoku (>= 0.4.0)
+      httpi (~> 0.9)
+      nokogiri (>= 1.4.0)
+      nori (~> 1.0)
+      wasabi (~> 2.0)
+    solr-ruby (0.0.8)
+    solrizer (1.1.2)
+      daemons
+      mediashelf-loggable
+      nokogiri
+      om (>= 1.4.0)
+      stomp
+      xml-simple
+    solrizer-fedora (1.1.3)
+      active-fedora (>= 2.3.0)
+      fastercsv
+      rsolr
+      solr-ruby (>= 0.0.6)
+      solrizer (>= 1.0.0)
+    stomp (1.1.9)
+    wasabi (2.0.0)
+      nokogiri (>= 1.4.0)
+    xml-simple (1.1.1)
+    yard (0.7.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  active-fedora!
+  jettywrapper (>= 1.0.1)
+  mocha (>= 0.9.8)
+  rake
+  rcov
+  rspec (< 2.0.0)
+  ruby-debug
+  solrizer-fedora (>= 1.1.3)
+  yard

data/active-fedora.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency('mime-types', '>= 1.16')
   s.add_dependency('multipart-post', "= 1.1.2")
   s.add_dependency('nokogiri')
-  s.add_dependency('om', '>= 1.0')
+  s.add_dependency('om', '>= 1.4.3')
   s.add_dependency('solrizer', '>1.0.0')
   s.add_dependency("activeresource", '~> 3.0.0')
   s.add_dependency("activesupport", '~> 3.0.0')

data/lib/active_fedora/base.rb

@@ -49,8 +49,7 @@ module ActiveFedora
     end
     
     def new_object=(bool)
-      @new_object = bool
-      #inner_object.new_object = bool
+      ActiveSupport::Deprecation.warn("ActiveFedora::Base.new_object= has been deprecated and nolonger has any effect")
     end
 
     ## Required by associations
@@ -84,10 +83,9 @@ module ActiveFedora
         else
           attrs = attrs.merge!({:pid=>RubydoraConnection.instance.nextid})  
         end
-        @new_object=true
+        self.relationships_loaded = true
         @inner_object = DigitalObject.find(self.class, attrs[:pid])
       else
-        @new_object = attrs[:new_object] == false ? false : true
         @inner_object = DigitalObject.find(self.class, attrs[:pid])
         load_datastreams_from_fedora
       end
@@ -135,7 +133,6 @@ module ActiveFedora
       else
         result = update
       end
-      @new_object = false
       self.update_index if @metadata_is_dirty == true && ENABLE_SOLR_UPDATES
       @metadata_is_dirty == false
       return result
@@ -208,7 +205,10 @@ module ActiveFedora
           if ds_spec.last.class == Proc
             ds_spec.last.call(datastreams[dsid])
           end
-          klass.from_xml(datastreams[dsid].content, datastreams[dsid])  ### TODO, this is loading eagerly, we could load it as needed
+          # 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
@@ -508,7 +508,7 @@ module ActiveFedora
     #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
     #
     # Returns
-    #  {"external_images"=>[],"thumbnails"=>{#<ActiveFedora::Datastream:0x7ffd6512daf8 @new_object=true,...}} 
+    #  {"external_images"=>[],"thumbnails"=>{#<ActiveFedora::Datastream:0x7ffd6512daf8 ...}} 
     def named_datastreams
       ds_values = {}
       self.class.named_datastreams_desc.keys.each do |name|
@@ -872,7 +872,6 @@ module ActiveFedora
       create_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)]
       modified_date = solr_doc[ActiveFedora::SolrService.solr_name(:system_create, :date)].nil? ? solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date).to_s] : solr_doc[ActiveFedora::SolrService.solr_name(:system_modified, :date)]
       obj = self.new({:pid=>solr_doc[SOLR_DOCUMENT_ID],:create_date=>create_date,:modified_date=>modified_date})
-      #obj.new_object = false
       #set by default to load any dependent relationship objects from solr as well
       #need to call rels_ext once so it exists when iterating over datastreams
       obj.rels_ext

data/lib/active_fedora/digital_object.rb

@@ -0,0 +1,18 @@
+module ActiveFedora
+  # Helps Rubydora create datastreams of the type defined by the ActiveFedora::Base#datastream_class_for_name
+  class DigitalObject < Rubydora::DigitalObject
+    attr_accessor :original_class
+    
+    def self.find(original_class, pid)
+      obj = super(pid, RubydoraConnection.instance.connection)
+      obj.original_class = original_class
+      obj
+    end
+
+    def datastream_object_for dsid
+      klass = original_class.datastream_class_for_name(dsid)
+      klass.new self, dsid
+    end
+    
+  end
+end

data/lib/active_fedora/metadata_datastream.rb

@@ -48,6 +48,7 @@ module ActiveFedora
     # ds.update_attributes({:myfield=>{"0"=>"a","1"=>"b"},:myotherfield=>{"-1"=>"c"}})
     #
     def update_indexed_attributes(params={}, opts={})
+      ensure_xml_loaded
       
       ##FIX this bug, it should delete it from a copy of params in case passed to another datastream for update since this will modify params
       ##for subsequent calls if updating more than one datastream in a single update_indexed_attributes call
@@ -105,6 +106,7 @@ module ActiveFedora
     
     
     def get_values(field_name, default=[])
+      ensure_xml_loaded  
       field_accessor_method = "#{field_name}_values"
       if respond_to? field_accessor_method
         values = self.send(field_accessor_method)
@@ -123,6 +125,7 @@ module ActiveFedora
     end
     
     def set_value(field_name, values)
+      ensure_xml_loaded  
       field_accessor_method = "#{field_name}_values="
       if respond_to? field_accessor_method
         values = self.send(field_accessor_method, values)
@@ -173,13 +176,16 @@ module ActiveFedora
       @fields[name.to_s.to_sym]={:type=>tupe, :values=>[]}.merge(opts)
       eval <<-EOS
         def #{name}_values=(arg)
+          ensure_xml_loaded  
           @fields["#{name.to_s}".to_sym][:values]=[arg].flatten
           self.dirty=true
         end
         def #{name}_values
+          ensure_xml_loaded  
           @fields["#{name}".to_sym][:values]
         end
         def #{name}_append(arg)
+          ensure_xml_loaded  
           @fields["#{name}".to_sym][:values] << arg
           self.dirty =true
         end

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -3,7 +3,7 @@ require 'solrizer/field_name_mapper'
 #this class represents a MetadataDatastream, a special case of ActiveFedora::Datastream
 module ActiveFedora::MetadataDatastreamHelper 
   
-  attr_accessor :fields
+  attr_accessor :fields, :xml_loaded
   
   module ClassMethods
     
@@ -20,6 +20,12 @@ module ActiveFedora::MetadataDatastreamHelper
     klass.extend(ClassMethods)
     klass.send(:include, Solrizer::FieldNameMapper)
   end
+
+  def ensure_xml_loaded
+    return if xml_loaded
+    self.xml_loaded = true
+    self.class.from_xml content, self
+  end
   
   def serialize! # :nodoc:
     self.content = self.to_xml  ##TODO only do this when the xml will have changed to avoid a load of the datastream content. 

data/lib/active_fedora/model.rb

@@ -76,8 +76,6 @@ module ActiveFedora
         end
         results = hits.map do |hit|
           obj = RubydoraConnection.instance.find_model(hit[SOLR_DOCUMENT_ID], self)
-          #obj.inner_object.new_object = false
-          #return obj
         end
         if return_multiple == true
           return results

data/lib/active_fedora/nokogiri_datastream.rb

@@ -23,6 +23,7 @@ module ActiveFedora
       self.class.from_xml(nil, self)
     end
 
+
     
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
@@ -296,6 +297,7 @@ module ActiveFedora
       if self.class.terminology.nil?
         raise "No terminology is set for this NokogiriDatastream class.  Cannot perform update_indexed_attributes"
       end
+      ensure_xml_loaded
       # remove any fields from params that this datastream doesn't recognize    
       # make sure to make a copy of params so not to modify hash that might be passed to other methods
       current_params = params.clone
@@ -317,6 +319,7 @@ module ActiveFedora
     end
     
     def get_values(field_key,default=[])
+      ensure_xml_loaded
       term_values(*field_key)
     end
 
@@ -342,6 +345,7 @@ module ActiveFedora
         #lazy load values from solr on demand
         get_values_from_solr(*term_pointer)
       else
+        ensure_xml_loaded
         om_term_values(*term_pointer)
       end
     end

data/lib/active_fedora/semantic_node.rb

@@ -8,7 +8,7 @@ module ActiveFedora
       self.class_relationships = {}
       self.class_named_relationships_desc = {}
     end
-    attr_accessor :named_relationship_desc, :relationships_are_dirty, :load_from_solr, :subject #:internal_uri
+    attr_accessor :named_relationship_desc, :relationships_are_dirty, :relationships_loaded, :load_from_solr, :subject #:internal_uri
 
     #TODO I think we can remove named_relationship_desc from attr_accessor  - jcoyne
 
@@ -147,9 +147,17 @@ module ActiveFedora
     end
     
     def relationships
-#      @relationships ||= {:self=>{}}
       @subject ||=  RDF::URI.new(internal_uri)
       @relationships ||= RDF::Graph.new
+      load_relationships if !relationships_loaded
+      @relationships
+    end
+
+    def load_relationships
+      self.relationships_loaded = true
+      content = rels_ext.content
+      return unless content.present?
+      RelsExtDatastream.from_xml content, rels_ext
     end
     
     def relationships_from_class

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre8"
+    VERSION = "3.1.0.pre9"
 end

data/spec/integration/base_find_by_fields_spec.rb

@@ -19,7 +19,6 @@ describe ActiveFedora::Base do
   
   before(:each) do
     @test_object = ActiveFedora::Base.new
-    @test_object.new_object = true
   end
 
   after(:each) do
@@ -49,7 +48,6 @@ describe ActiveFedora::Base do
     it 'should return fedora objects of the model of self that match the given solr query, queries the active_fedora solr instance' do
       #get objects into fedora and solr
       @test_object2 = MockAFBaseQuerySolr.new
-      @test_object2.new_object = true
       attributes = {"holding_id"=>{0=>"Holding 1"},
                     "language"=>{0=>"Italian"},
                     "creator"=>{0=>"Linguist, A."},
@@ -59,7 +57,6 @@ describe ActiveFedora::Base do
       @test_object2.save
       
       @test_object3 = MockAFBaseQuerySolr.new
-      @test_object3.new_object = true
       attributes = {"holding_id"=>{0=>"Holding 2"},
                     "language"=>{0=>"Spanish;Latin"},
                     "creator"=>{0=>"Linguist, A."},
@@ -69,7 +66,6 @@ describe ActiveFedora::Base do
       @test_object3.save      
 
       @test_object4 = MockAFBaseQuerySolr.new
-      @test_object4.new_object = true
       attributes = {"holding_id"=>{0=>"Holding 3"},
                     "language"=>{0=>"Spanish;Latin"},
                     "creator"=>{0=>"Linguist, A."},
@@ -212,4 +208,4 @@ describe ActiveFedora::Base do
       found_pids.should == [@test_object2.pid]
     end
   end
-end
+end

data/spec/integration/mods_article_integration_spec.rb

@@ -1,6 +1,6 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
-# require File.join( File.dirname(__FILE__), "..", "samples", "models", "mods_article" )
 require "active_fedora/samples"
+
 describe ActiveFedora::Base do
 
   before(:all) do
@@ -42,4 +42,4 @@ describe ActiveFedora::Base do
       retrieved_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
     end
   end
-end
+end

data/spec/integration/semantic_node_spec.rb

@@ -5,17 +5,17 @@ require 'active_fedora'
 describe ActiveFedora::SemanticNode do
   
   before(:all) do 
-    class SpecNode
-      include ActiveFedora::RelationshipsHelper
-      include ActiveFedora::SemanticNode
-      has_relationship "collection_members", :has_collection_member
-      attr_accessor :rels_ext
-      def initialize
-        self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
-        rels_ext.model = self
-      end
-    end
-    @node = SpecNode.new
+    class SNSpecNode < ActiveFedora::Base
+      # include ActiveFedora::RelationshipsHelper
+      # include ActiveFedora::SemanticNode
+      # has_relationship "collection_members", :has_collection_member
+      # attr_accessor :rels_ext
+      # def initialize
+      #   self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      #   rels_ext.model = self
+      # end
+    end
+    @node = SNSpecNode.new
     class SNSpecModel < ActiveFedora::Base
       has_relationship("parts", :is_part_of, :inbound => true)
       has_relationship("containers", :is_member_of)
@@ -148,7 +148,7 @@ describe ActiveFedora::SemanticNode do
   
   describe '#has_relationship' do
     it "should create useable finders" do
-      spec_node = SpecNode.new
+      spec_node = SNSpecNode.new
       spec_node.collection_members.should == []
       rel = ActiveFedora::Relationship.new(:subject => :self, :predicate => :has_collection_member, :object => @test_object.pid)  
       
@@ -434,17 +434,17 @@ describe ActiveFedora::SemanticNode do
 
   #putting this test here instead of relationships_helper because testing that relationships_by_name hash gets refreshed if the relationships hash is changed
   describe "relationships_by_name" do
-    class MockSemNamedRelationships 
-      include ActiveFedora::RelationshipsHelper
-      include ActiveFedora::SemanticNode
+    class MockSemNamedRelationships  < ActiveFedora::Base
+      # include ActiveFedora::RelationshipsHelper
+      # include ActiveFedora::SemanticNode
       has_relationship "testing", :has_part
       has_relationship "testing2", :has_member
       has_relationship "testing_inbound", :has_part, :inbound=>true
-      attr_accessor :rels_ext
-      def initialize
-        self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
-        rels_ext.model = self
-      end
+      # attr_accessor :rels_ext
+      # def initialize
+      #   self.rels_ext = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      #   rels_ext.model = self
+      # end
     end
 
     it 'should automatically update the relationships_by_name if relationships has changed (no refresh of relationships_by_name hash unless relationships hash has changed' do
@@ -452,13 +452,13 @@ describe ActiveFedora::SemanticNode do
       r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockSemNamedRelationships)}) 
       @test_object2.add_relationship(r.predicate, r.object)
       #should return expected named relationships
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[], "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[]}}
       r3 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>@test_object})
       @test_object2.add_relationship(r3.predicate, r3.object)
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[]}}
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[], "collection_members"=>[], "part_of"=>[],  "parts_outbound"=>[r3.object]}}
       r4 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_member,:object=>"3"})
       @test_object2.add_relationship(r4.predicate, r4.object)
-      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]}}
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object], "collection_members"=>[], "part_of"=>[],  "parts_outbound"=>[r3.object]}}
     end
   end
 end

data/spec/unit/base_spec.rb

@@ -30,6 +30,7 @@ describe ActiveFedora::Base do
     @mock_repo = mock("repository")
     ActiveFedora::DigitalObject.any_instance.expects(:repository).returns(@mock_repo).at_least_once
     @this_pid = increment_pid.to_s
+    @mock_repo.stubs(:datastream_dissemination)
     ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(@this_pid)
 
     @mock_repo.expects(:datastream).with{ |x| x[:dsid] == 'RELS-EXT'}.returns("").at_least_once #raises(RuntimeError, "Fake Not found")
@@ -118,6 +119,7 @@ describe ActiveFedora::Base do
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText'}
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'withText2'}
       @mock_repo.expects(:add_datastream).with {|params| params[:dsid] == 'RELS-EXT'}
+      @mock_repo.expects(:datastream_dissemination).with(:pid => 'monkey:99', :dsid => 'RELS-EXT')
 
       @n = FooHistory.new(:pid=>"monkey:99")
       @n.expects(:update_index)
@@ -198,10 +200,10 @@ 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")#, :add_relationship)
+      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) 
+      @test_object.expects(:rels_ext).returns(mock_rels_ext).at_least_once 
       @test_object.add_relationship("predicate", "object")
     end
 
@@ -392,7 +394,6 @@ describe ActiveFedora::Base do
       @test_object.save
     end
     it "should update solr index if relationships have changed" do
-      @mock_repo = mock('repository')
       @mock_repo.expects(:ingest).with(:pid => @test_object.pid)
       @test_object.inner_object.expects(:repository).returns(@mock_repo).at_least_once
       @test_object.inner_object.expects(:new?).returns(true).twice

data/spec/unit/metadata_datastream_spec.rb

@@ -226,7 +226,8 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should insert custom element attrs into the xml stream" do
-      sds = SpecDatastream.new(nil, nil)
+      sds = SpecDatastream.new(@test_object.inner_object, nil)
+      sds.stubs(:content=>'')
       sds.mycomplicated_field_values='foo'
       sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
       expected_xml = '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
@@ -234,7 +235,8 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should add getters and setters and appenders with field name" do
-      local_test_ds = SpecDatastream.new(nil, nil)
+      local_test_ds = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds.stubs(:content=>'')
       local_test_ds.should respond_to(:publisher_values)
       local_test_ds.should respond_to(:publisher_append)
       local_test_ds.should respond_to(:publisher_values=)
@@ -251,8 +253,10 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should track field values at instance level, not at class level" do
-      local_test_ds1 = SpecDatastream.new(nil, nil)
-      local_test_ds2 = SpecDatastream.new(nil, nil)
+      local_test_ds1 = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds1.stubs(:content=>'')
+      local_test_ds2 = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds2.stubs(:content=>'')
       local_test_ds1.publisher_values = ["publisher1", "publisher2"]
       local_test_ds2.publisher_values = ["publisherA", "publisherB"]
       
@@ -261,19 +265,22 @@ describe ActiveFedora::MetadataDatastream do
     end
     
     it "should allow you to add field values using <<" do
-      local_test_ds1 = SpecDatastream.new(nil, nil)
+      local_test_ds1 = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds1.stubs(:content=>'')
       local_test_ds1.publisher_values << "publisher1"
       local_test_ds1.publisher_values.should == ["publisher1"] 
     end
     
     it "should create setter that always turns non-arrays into arrays" do
-      local_test_ds = SpecDatastream.new(nil, nil)
+      local_test_ds = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds.stubs(:content=>'')
       local_test_ds.publisher_values = "Foo"
       local_test_ds.publisher_values.should == ["Foo"]
     end
     
     it "should create setter that sets datastream.dirty? to true" do
-      local_test_ds = SpecDatastream.new(nil, nil)
+      local_test_ds = SpecDatastream.new(@test_object.inner_object, nil)
+      local_test_ds.stubs(:content=>'')
       local_test_ds.should_not be_dirty
       local_test_ds.publisher_values = "Foo"
       local_test_ds.should be_dirty

data/spec/unit/semantic_node_spec.rb

@@ -44,9 +44,11 @@ describe ActiveFedora::SemanticNode do
     end
     
     @node = SpecNode.new
+    @node.stubs(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>''))
     @node.pid = increment_pid
     @test_object = SpecNode2.new
     @test_object.pid = increment_pid    
+    @test_object.stubs(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>''))
     @stub_relationship = stub("mock_relationship", :subject => @pid, :predicate => "isMemberOf", :object => "demo:8", :class => ActiveFedora::Relationship)  
     @test_relationship = ActiveFedora::Relationship.new(:subject => @pid, :predicate => "isMemberOf", :object => "demo:9")  
     @test_relationship1 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "demo:10")  
@@ -183,7 +185,7 @@ describe ActiveFedora::SemanticNode do
       
       # local_node.add_relationship(ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "info:fedora/container:A") )
       # local_node.add_relationship(ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "info:fedora/container:B") )
-      local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true)).twice
+      local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
       local_node.add_relationship(:is_member_of, "info:fedora/container:A")
       local_node.add_relationship(:is_member_of, "info:fedora/container:B")
 
@@ -231,7 +233,7 @@ describe ActiveFedora::SemanticNode do
       @test_object2 = MockHasRelationship.new
       @test_object2.pid = increment_pid
       @test_object2.stubs(:testing_inbound).returns({})
-      @test_object2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true))
+      @test_object2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content =>'')).at_least_once
       @test_object2.add_relationship(:has_model, ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode2))
       @test_object2.should respond_to(:testing_append)
       @test_object2.should respond_to(:testing_remove)
@@ -366,6 +368,7 @@ describe ActiveFedora::SemanticNode do
         mock_repo = mock("repo")
         mock_repo.expects(:find_model).never
         local_node.stubs(:internal_uri)
+        local_node.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
         ActiveFedora::SolrService.instance.conn.expects(:query).returns(solr_result)
         local_node.constituents(:response_format => :solr).should equal(solr_result)
       end
@@ -380,7 +383,7 @@ describe ActiveFedora::SemanticNode do
       it "(:response_format => :id_array) should return an array of fedora PIDs" do
         SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
         local_node = SpecNode.new
-        local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true))
+        local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
         local_node.add_relationship(@test_relationship1.predicate, @test_relationship1.object)
         result = local_node.containers_ids
         result.should be_instance_of(Array)
@@ -475,9 +478,9 @@ describe ActiveFedora::SemanticNode do
       @local_node2 = SpecNode.new
       @local_node2.pid = "mypid2"
       r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(SpecNode)}) 
-      @local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true)).twice
+      @local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
       @local_node.add_relationship(r.predicate, r.object)
-      @local_node2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true)).twice
+      @local_node2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
       @local_node2.add_relationship(r.predicate, r.object)
       r2 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>@local_node2})
       @local_node.add_relationship(r2.predicate, r2.object)
@@ -494,7 +497,6 @@ describe ActiveFedora::SemanticNode do
   
   describe ".add_relationship" do
     it "should add relationship to the relationships hash" do
-      @node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true))
       @node.add_relationship(@test_relationship.predicate, @test_relationship.object)
       @node.ids_for_outbound("isMemberOf").should == ['demo:9']
     end
@@ -502,8 +504,9 @@ describe ActiveFedora::SemanticNode do
     it "adding relationship to an instance should not affect class-level relationships hash" do 
       local_test_node1 = SpecNode.new
       local_test_node2 = SpecNode.new
-      local_test_node1.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true))
+      local_test_node1.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
       local_test_node1.add_relationship(@test_relationship1.predicate, @test_relationship1.object)
+      local_test_node2.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
       
       local_test_node1.ids_for_outbound(:is_member_of).should == ["demo:10"]
       local_test_node2.ids_for_outbound(:is_member_of).should == []
@@ -557,7 +560,7 @@ describe ActiveFedora::SemanticNode do
     it 'should remove a relationship from the relationships hash' do
       r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>"info:fedora/3"})
       r2 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>"info:fedora/4"})
-      @test_object.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true)).times(5)
+      @test_object.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).times(6)
       @test_object.add_relationship(r.predicate, r.object)
       @test_object.add_relationship(r2.predicate, r2.object)
       #check both are there

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832009
+  hash: 1923832011
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 8
-  version: 3.1.0.pre8
+  - 9
+  version: 3.1.0.pre9
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 -05:00
+date: 2011-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,11 +106,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 1
         segments: 
         - 1
-        - 0
-        version: "1.0"
+        - 4
+        - 3
+        version: 1.4.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -548,6 +549,7 @@ files:
 - COPYING.txt
 - COYING.LESSER.txt
 - Gemfile
+- Gemfile.lock
 - History.txt
 - LICENSE
 - License.txt
@@ -577,6 +579,7 @@ files:
 - lib/active_fedora/datastream.rb
 - lib/active_fedora/datastream_hash.rb
 - lib/active_fedora/delegating.rb
+- lib/active_fedora/digital_object.rb
 - lib/active_fedora/fedora_object.rb
 - lib/active_fedora/fixture_loader.rb
 - lib/active_fedora/metadata_datastream.rb