active-fedora 3.2.0.pre5 → 3.2.0.pre6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.2.0.pre5)
+    active-fedora (3.2.0.pre6)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/lib/active_fedora.rb

@@ -23,6 +23,7 @@ module ActiveFedora #:nodoc:
     autoload :FileManagement
     autoload :RelationshipGraph
     autoload :Datastream
+    autoload :Datastreams
     autoload :Delegating
     autoload :DigitalObject
     autoload :UnsavedDigitalObject

data/lib/active_fedora/base.rb

@@ -32,6 +32,7 @@ module ActiveFedora
   class Base
     include SemanticNode
 
+
     def self.method_missing (name, *args)
       if [:has_relationship, :has_bidirectional_relationship, :register_relationship_desc].include? name 
         ActiveSupport::Deprecation.warn("Deprecation: Relationships will not be included by default in the next version.   To use #{name} add 'include ActiveFedora::Relationships' to your model")
@@ -67,15 +68,15 @@ module ActiveFedora
     end
 
 
-    class_attribute  :ds_specs
-    
-    def self.inherited(p)
-      # each subclass should get a copy of the parent's datastream definitions, it should not add to the parent's definition table.
-      p.ds_specs = p.ds_specs.dup
-      super
-    end
-    
-    self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
+    # class_attribute  :ds_specs
+    # 
+    # def self.inherited(p)
+    #   # each subclass should get a copy of the parent's datastream definitions, it should not add to the parent's definition table.
+    #   p.ds_specs = p.ds_specs.dup
+    #   super
+    # end
+    # 
+    # self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
 
     # Has this object been saved?
     def new_object?
@@ -162,207 +163,6 @@ module ActiveFedora
       obj
     end
 
-    ## Given a method name, return the best-guess dsid
-    def corresponding_datastream_name(method_name)
-      dsid = method_name.to_s
-      return dsid if datastreams.has_key? dsid
-      unescaped_name = method_name.to_s.gsub('_', '-')
-      return unescaped_name if datastreams.has_key? unescaped_name
-      nil
-    end
-
-    
-    #
-    # Datastream Management
-    #
-    
-    # Returns all known datastreams for the object.  If the object has been 
-    # saved to fedora, the persisted datastreams will be included.
-    # Datastreams that have been modified in memory are given preference over 
-    # the copy in Fedora.
-    def datastreams
-      @datastreams ||= DatastreamHash.new(self)
-    end
-  
-    def datastreams_in_memory
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base.datastreams_in_memory has been deprecated.  Use #datastreams instead")
-      datastreams
-    end
-
-    def configure_datastream(ds, ds_spec=nil)
-      ds_spec ||= self.class.ds_specs[ds.instance_variable_get(:@dsid)]
-      if ds_spec
-        ds.model = self if ds_spec[:type] == RelsExtDatastream
-        # If you called has_metadata with a block, pass the block into the Datastream class
-        if ds_spec[:block].class == Proc
-          ds_spec[:block].call(ds)
-        end
-      end
-    end
-
-    def datastream_from_spec(ds_spec, name)
-      ds = ds_spec[:type].new(inner_object, name)
-      ds.dsLabel = ds_spec[:label] if ds_spec[:label].present?
-      ds.controlGroup = ds_spec[:control_group]
-      additional_attributes_for_external_and_redirect_control_groups(ds, ds_spec)
-      ds
-    end
-
-    def load_datastreams
-      ds_specs = self.class.ds_specs.dup
-      inner_object.datastreams.each do |dsid, ds|
-        self.add_datastream(ds)
-        configure_datastream(datastreams[dsid])
-        ds_specs.delete(dsid)
-      end
-      ds_specs.each do |name,ds_spec|
-        ds = datastream_from_spec(ds_spec, name)
-        self.add_datastream(ds)
-        configure_datastream(ds, ds_spec)
-      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
-    # @return [String] dsid of the added datastream
-    def add_datastream(datastream, opts={})
-      if datastream.dsid == nil || datastream.dsid.empty?
-        prefix = opts.has_key?(:prefix) ? opts[:prefix] : "DS"
-        datastream.instance_variable_set :@dsid, generate_dsid(prefix)
-      end
-      datastreams[datastream.dsid] = datastream
-      return datastream.dsid
-    end
-
-    def add(datastream) # :nodoc:
-      warn "Warning: ActiveFedora::Base.add has been deprecated.  Use add_datastream"
-      add_datastream(datastream)
-    end
-    
-    #return all datastreams of type ActiveFedora::MetadataDatastream
-    def metadata_streams
-      results = []
-      datastreams.each_value do |ds|
-        if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
-          results << ds
-        end
-      end
-      return results
-    end
-    
-    #return all datastreams not of type ActiveFedora::MetadataDatastream 
-    #(that aren't Dublin Core or RELS-EXT streams either)
-    def file_streams
-      results = []
-      datastreams.each_value do |ds|
-        if !ds.kind_of?(ActiveFedora::MetadataDatastream) 
-          dsid = ds.dsid
-          if dsid != "DC" && dsid != "RELS-EXT"
-            results << ds
-          end
-        end
-      end
-      return results
-    end
-    
-    # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
-    # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
-    def generate_dsid(prefix="DS")
-      matches = datastreams.keys.map {|d| data = /^#{prefix}(\d+)$/.match(d); data && data[1].to_i}.compact
-      val = matches.empty? ? 1 : matches.max + 1
-      format_dsid(prefix, val)
-    end
-    
-    ### Provided so that an application can override how generated pids are formatted (e.g DS01 instead of DS1)
-    def format_dsid(prefix, suffix)
-      sprintf("%s%i", prefix,suffix)
-    end    
-
-    # Return the Dublin Core (DC) Datastream. You can also get at this via 
-    # the +datastreams["DC"]+.
-    def dc
-      #dc = REXML::Document.new(datastreams["DC"].content)
-      return  datastreams["DC"] 
-    end
-
-    # Returns the RELS-EXT Datastream
-    # Tries to grab from in-memory datastreams first
-    # Failing that, attempts to load from Fedora and addst to in-memory datastreams
-    # Failing that, creates a new RelsExtDatastream and adds it to the object
-    def rels_ext
-      if !datastreams.has_key?("RELS-EXT") 
-        ds = ActiveFedora::RelsExtDatastream.new(@inner_object,'RELS-EXT')
-        ds.model = self
-        add_datastream(ds)
-      end
-      return datastreams["RELS-EXT"]
-    end
-
-    #
-    # File Management
-    #
-    
-    # Add the given file as a datastream in the object
-    #
-    # @param [File] file the file to add
-    # @param [Hash] opts options: :dsid, :label, :mimeType, :prefix
-    def add_file_datastream(file, opts={})
-      label = opts.has_key?(:label) ? opts[:label] : ""
-      attrs = {:dsLabel => label, :controlGroup => 'M', :blob => file, :prefix=>opts[:prefix]}
-      if opts.has_key?(:mime_type)
-        attrs.merge!({:mimeType=>opts[:mime_type]})
-      elsif opts.has_key?(:mimeType)
-        attrs.merge!({:mimeType=>opts[:mimeType]})
-      elsif opts.has_key?(:content_type)
-        attrs.merge!({:mimeType=>opts[:content_type]})
-      end
-      ds = create_datastream(ActiveFedora::Datastream, opts[:dsid], attrs)
-      add_datastream(ds)
-    end
-    
-    
-    def create_datastream(type, dsid, opts={})
-      dsid = generate_dsid(opts[:prefix] || "DS") if dsid == nil
-      klass = type.kind_of?(Class) ? type : type.constantize
-      raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String) || dsid.kind_of?(NilClass)
-      ds = klass.new(inner_object, dsid)
-      ds.mimeType = opts[:mimeType] 
-      ds.controlGroup = opts[:controlGroup] 
-      ds.dsLabel = opts[:dsLabel] 
-      ds.dsLocation = opts[:dsLocation] 
-      blob = opts[:blob] 
-      if blob 
-        if !ds.mimeType.present? 
-          ##TODO, this is all done by rubydora -- remove
-          ds.mimeType = blob.respond_to?(:content_type) ? blob.content_type : "application/octet-stream"
-        end
-        if !ds.dsLabel.present? && blob.respond_to?(:path)
-          ds.dsLabel = File.basename(blob.path)
-#          ds.dsLabel = blob.original_filename
-        end
-      end
-
-#      blob = blob.read if blob.respond_to? :read
-      ds.content = blob || "" 
-      ds
-    end
-
-
-    # 
-    # Relationships Management
-    #
-    
-    # @return [Hash] relationships hash, as defined by SemanticNode
-    # Rely on rels_ext datastream to track relationships array
-    # Overrides accessor for relationships array used by SemanticNode.
-    # If outbound_only is false, inbound relationships will be included.
-    # def relationships(outbound_only=true)
-    #   outbound_only ? rels_ext.relationships : rels_ext.relationships.merge(:inbound=>inbound_relationships)
-    # end
-
-    
-
     def inner_object # :nodoc
       @inner_object
     end
@@ -372,7 +172,6 @@ module ActiveFedora
     # TODO make inner_object a proxy that can hold the pid
     def pid
        @inner_object.pid
-#      @inner_object ?  @inner_object.pid : @pid
     end
 
 
@@ -624,48 +423,6 @@ module ActiveFedora
       end
     end
     
-
-    private
-    def configure_defined_datastreams
-      if self.class.ds_specs
-        self.class.ds_specs.each do |name,ds_config|
-          if self.datastreams.has_key?(name)
-            #attributes = self.datastreams[name].attributes
-          else
-            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 ds_config[:block].class == Proc
-              ds_config[:block].call(ds)
-            end
-            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
-
   end
 
   Base.class_eval do
@@ -676,6 +433,7 @@ module ActiveFedora
     include ActiveModel::Conversion
     include Validations
     include Callbacks
+    include Datastreams
     extend ActiveModel::Naming
     include Delegating
     include Associations

data/lib/active_fedora/callbacks.rb

@@ -19,7 +19,6 @@ module ActiveFedora
   # * (-) <tt>create</tt>
   # * (5) <tt>after_create</tt>
   # * (6) <tt>after_save</tt>
-  # * (7) <tt>after_commit</tt>
   #
   # Lastly an <tt>after_find</tt> and <tt>after_initialize</tt> callback is triggered for each object that 
   # is found and instantiated by a finder, with <tt>after_initialize</tt> being triggered after new objects
@@ -233,12 +232,12 @@ module ActiveFedora
       run_callbacks(:destroy) { super }
     end
 
-    def save #:nodoc:
-      run_callbacks(:save) { super }
-    end
 
   private
 
+    def persist #:nodoc:
+      run_callbacks(:save) { super }
+    end
 
     def create #:nodoc:
       run_callbacks(:create) { super }

data/lib/active_fedora/datastream.rb

@@ -5,7 +5,7 @@ module ActiveFedora
     
     attr_writer :digital_object
     attr_accessor :dirty, :last_modified, :fields
-    before_create :add_mime_type
+    before_create :add_mime_type, :add_ds_location
   
     def initialize(digital_object, dsid)
       @fields={}
@@ -21,6 +21,11 @@ module ActiveFedora
       self.mimeType = 'text/xml' unless self.mimeType
     end
 
+    def add_ds_location
+      if self.controlGroup == 'E'
+      end
+    end
+
     #compatibility method for rails' url generators. This method will 
     #urlescape escape dots, which are apparently
     #invalid characters in a dsid.

data/lib/active_fedora/datastreams.rb

@@ -0,0 +1,264 @@
+module ActiveFedora
+  module Datastreams
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :ds_specs
+      self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :label=>"Fedora Object-to-Object Relationship Metadata", :control_group=>'X', :block=>nil}}
+      class << self
+        def inherited_with_datastreams(kls) #:nodoc:
+          ## Do some inheritance logic that doesn't override Base.inherited
+          inherited_without_datastreams kls
+          # each subclass should get a copy of the parent's datastream definitions, it should not add to the parent's definition table.
+          kls.ds_specs = kls.ds_specs.dup
+        end
+        alias_method_chain :inherited, :datastreams
+      end
+
+      before_save :add_disseminator_location_to_datastreams
+      before_save :serialize_datastreams
+    end
+
+    def serialize_datastreams
+      datastreams.each {|k, ds| ds.serialize! }
+      self.metadata_is_dirty = datastreams.any? {|k,ds| ds.changed? && (ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream))}
+      true
+    end
+
+    # Adds the disseminator location to the datastream after the pid has been established
+    def add_disseminator_location_to_datastreams
+      self.class.ds_specs.each do |name,ds_config|
+        ds = datastreams[name]
+        if ds && ds.controlGroup == 'E' && ds_config[:disseminator].present?
+          ds.dsLocation= "#{RubydoraConnection.instance.options[:url]}/objects/#{pid}/methods/#{ds_config[:disseminator]}"
+        end
+      end
+      true
+    end
+
+    ## Given a method name, return the best-guess dsid
+    def corresponding_datastream_name(method_name)
+      dsid = method_name.to_s
+      return dsid if datastreams.has_key? dsid
+      unescaped_name = method_name.to_s.gsub('_', '-')
+      return unescaped_name if datastreams.has_key? unescaped_name
+      nil
+    end
+
+    
+    #
+    # Datastream Management
+    #
+    
+    # Returns all known datastreams for the object.  If the object has been 
+    # saved to fedora, the persisted datastreams will be included.
+    # Datastreams that have been modified in memory are given preference over 
+    # the copy in Fedora.
+    def datastreams
+      @datastreams ||= DatastreamHash.new(self)
+    end
+  
+    def datastreams_in_memory
+      ActiveSupport::Deprecation.warn("ActiveFedora::Base.datastreams_in_memory has been deprecated.  Use #datastreams instead")
+      datastreams
+    end
+
+    def configure_datastream(ds, ds_spec=nil)
+      ds_spec ||= self.class.ds_specs[ds.instance_variable_get(:@dsid)]
+      if ds_spec
+        ds.model = self if ds_spec[:type] == RelsExtDatastream
+        # If you called has_metadata with a block, pass the block into the Datastream class
+        if ds_spec[:block].class == Proc
+          ds_spec[:block].call(ds)
+        end
+      end
+    end
+
+    def datastream_from_spec(ds_spec, name)
+      ds = ds_spec[:type].new(inner_object, name)
+      ds.dsLabel = ds_spec[:label] if ds_spec[:label].present?
+      ds.controlGroup = ds_spec[:control_group]
+      additional_attributes_for_external_and_redirect_control_groups(ds, ds_spec)
+      ds
+    end
+
+    def load_datastreams
+      ds_specs = self.class.ds_specs.dup
+      inner_object.datastreams.each do |dsid, ds|
+        self.add_datastream(ds)
+        configure_datastream(datastreams[dsid])
+        ds_specs.delete(dsid)
+      end
+      ds_specs.each do |name,ds_spec|
+        ds = datastream_from_spec(ds_spec, name)
+        self.add_datastream(ds)
+        configure_datastream(ds, ds_spec)
+      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
+    # @return [String] dsid of the added datastream
+    def add_datastream(datastream, opts={})
+      if datastream.dsid == nil || datastream.dsid.empty?
+        prefix = opts.has_key?(:prefix) ? opts[:prefix] : "DS"
+        datastream.instance_variable_set :@dsid, generate_dsid(prefix)
+      end
+      datastreams[datastream.dsid] = datastream
+      return datastream.dsid
+    end
+
+    def add(datastream) # :nodoc:
+      warn "Warning: ActiveFedora::Base.add has been deprecated.  Use add_datastream"
+      add_datastream(datastream)
+    end
+    
+    #return all datastreams of type ActiveFedora::MetadataDatastream
+    def metadata_streams
+      results = []
+      datastreams.each_value do |ds|
+        if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
+          results << ds
+        end
+      end
+      return results
+    end
+    
+    #return all datastreams not of type ActiveFedora::MetadataDatastream 
+    #(that aren't Dublin Core or RELS-EXT streams either)
+    def file_streams
+      results = []
+      datastreams.each_value do |ds|
+        if !ds.kind_of?(ActiveFedora::MetadataDatastream) 
+          dsid = ds.dsid
+          if dsid != "DC" && dsid != "RELS-EXT"
+            results << ds
+          end
+        end
+      end
+      return results
+    end
+    
+    # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
+    # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
+    def generate_dsid(prefix="DS")
+      matches = datastreams.keys.map {|d| data = /^#{prefix}(\d+)$/.match(d); data && data[1].to_i}.compact
+      val = matches.empty? ? 1 : matches.max + 1
+      format_dsid(prefix, val)
+    end
+    
+    ### Provided so that an application can override how generated pids are formatted (e.g DS01 instead of DS1)
+    def format_dsid(prefix, suffix)
+      sprintf("%s%i", prefix,suffix)
+    end    
+
+    # Return the Dublin Core (DC) Datastream. You can also get at this via 
+    # the +datastreams["DC"]+.
+    def dc
+      #dc = REXML::Document.new(datastreams["DC"].content)
+      return  datastreams["DC"] 
+    end
+
+    # Returns the RELS-EXT Datastream
+    # Tries to grab from in-memory datastreams first
+    # Failing that, attempts to load from Fedora and addst to in-memory datastreams
+    # Failing that, creates a new RelsExtDatastream and adds it to the object
+    def rels_ext
+      if !datastreams.has_key?("RELS-EXT") 
+        ds = ActiveFedora::RelsExtDatastream.new(@inner_object,'RELS-EXT')
+        ds.model = self
+        add_datastream(ds)
+      end
+      return datastreams["RELS-EXT"]
+    end
+
+    #
+    # File Management
+    #
+    
+    # Add the given file as a datastream in the object
+    #
+    # @param [File] file the file to add
+    # @param [Hash] opts options: :dsid, :label, :mimeType, :prefix
+    def add_file_datastream(file, opts={})
+      label = opts.has_key?(:label) ? opts[:label] : ""
+      attrs = {:dsLabel => label, :controlGroup => 'M', :blob => file, :prefix=>opts[:prefix]}
+      if opts.has_key?(:mime_type)
+        attrs.merge!({:mimeType=>opts[:mime_type]})
+      elsif opts.has_key?(:mimeType)
+        attrs.merge!({:mimeType=>opts[:mimeType]})
+      elsif opts.has_key?(:content_type)
+        attrs.merge!({:mimeType=>opts[:content_type]})
+      end
+      ds = create_datastream(ActiveFedora::Datastream, opts[:dsid], attrs)
+      add_datastream(ds)
+    end
+    
+    
+    def create_datastream(type, dsid, opts={})
+      dsid = generate_dsid(opts[:prefix] || "DS") if dsid == nil
+      klass = type.kind_of?(Class) ? type : type.constantize
+      raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String) || dsid.kind_of?(NilClass)
+      ds = klass.new(inner_object, dsid)
+      ds.mimeType = opts[:mimeType] 
+      ds.controlGroup = opts[:controlGroup] 
+      ds.dsLabel = opts[:dsLabel] 
+      ds.dsLocation = opts[:dsLocation] 
+      blob = opts[:blob] 
+      if blob 
+        if !ds.mimeType.present? 
+          ##TODO, this is all done by rubydora -- remove
+          ds.mimeType = blob.respond_to?(:content_type) ? blob.content_type : "application/octet-stream"
+        end
+        if !ds.dsLabel.present? && blob.respond_to?(:path)
+          ds.dsLabel = File.basename(blob.path)
+#          ds.dsLabel = blob.original_filename
+        end
+      end
+
+#      blob = blob.read if blob.respond_to? :read
+      ds.content = blob || "" 
+      ds
+    end
+
+    # def configure_defined_datastreams
+    #   if self.class.ds_specs
+    #     self.class.ds_specs.each do |name,ds_config|
+    #       if self.datastreams.has_key?(name)
+    #         #attributes = self.datastreams[name].attributes
+    #       else
+    #         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 ds_config[:block].class == Proc
+    #           ds_config[:block].call(ds)
+    #         end
+    #         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] && ds_config[:url].present?
+          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
+
+  end
+end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -46,6 +46,7 @@ module ActiveFedora
     
     def ng_xml=(new_xml)
       self.xml_loaded=true
+      self.dirty = true
       case new_xml 
       when Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node
         @ng_xml = new_xml
@@ -58,7 +59,8 @@ module ActiveFedora
     
     def content=(content)
       super
-      self.ng_xml = Nokogiri::XML::Document.parse(content)
+      self.xml_loaded=true
+      @ng_xml = Nokogiri::XML::Document.parse(content)
     end
     
     

data/lib/active_fedora/persistence.rb

@@ -85,21 +85,26 @@ module ActiveFedora
 
     # Deals with preparing new object to be saved to Fedora, then pushes it and its datastreams into Fedora. 
     def create
-      @inner_object = @inner_object.save #replace the unsaved digital object with a saved digital object
+      assign_pid
       assert_content_model
       @metadata_is_dirty = true
       persist
     end
+
+    def assign_pid
+      @inner_object = @inner_object.save #replace the unsaved digital object with a saved digital object
+    end
     
     # Pushes the object and all of its new or dirty datastreams into Fedora
     def update
       persist
     end
 
-    def persist
-      datastreams.each {|k, ds| ds.serialize! }
-      @metadata_is_dirty = datastreams.any? {|k,ds| ds.changed? && (ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream))}
+    def metadata_is_dirty=(bool)
+      @metadata_is_dirty = bool
+    end
 
+    def persist
       result = @inner_object.save
 
       ### Rubydora re-inits the datastreams after a save, so ensure our copy stays in synch

data/lib/active_fedora/unsaved_digital_object.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   # Helps Rubydora create datastreams of the type defined by the ActiveFedora::Base#datastream_class_for_name
   class UnsavedDigitalObject 
-    attr_accessor :original_class, :datastreams, :label, :namespace
+    attr_accessor :original_class, :ownerId, :datastreams, :label, :namespace
     
     def initialize(original_class, namespace, pid=nil)
       @pid = pid
@@ -25,6 +25,7 @@ module ActiveFedora
         v.digital_object = obj
         obj.datastreams[k] = v
       end
+      obj.ownerId = ownerId if ownerId
       obj
     end
 

data/lib/active_fedora/version.rb

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

data/spec/unit/base_spec.rb

@@ -157,6 +157,7 @@ describe ActiveFedora::Base do
       @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 == "urlsub_url/objects/#{@this_pid}/methods/hull-sDef:uketdObject/getUKETDMetadata"
     end
 
     context ":control_group => 'E'" do

data/spec/unit/nokogiri_datastream_spec.rb

@@ -14,12 +14,12 @@ describe ActiveFedora::NokogiriDatastream do
   end
   
   before(:each) do
-    mock_inner = mock('inner object')
+    @mock_inner = mock('inner object')
     @mock_repo = mock('repository')
     @mock_repo.stubs(:datastream_dissemination=>'My Content')
-    mock_inner.stubs(:repository).returns(@mock_repo)
-    mock_inner.stubs(:pid)
-    @test_ds = ActiveFedora::NokogiriDatastream.new(mock_inner, "descMetadata")
+    @mock_inner.stubs(:repository).returns(@mock_repo)
+    @mock_inner.stubs(:pid)
+    @test_ds = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
     @test_ds.content="<test_xml/>"
   end
   
@@ -78,6 +78,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
     it "should do nothing if field key is a string (must be an array or symbol).  Will not accept xpath queries!" do
       xml_before = @mods_ds.to_xml
+      logger.expects(:warn).with "WARNING: descMetadata ignoring {\"fubar\" => \"the role\"} because \"fubar\" is a String (only valid OM Term Pointers will be used).  Make sure your html has the correct field_selector tags in it."
       @mods_ds.update_indexed_attributes( { "fubar"=>"the role" } ).should == {}
       @mods_ds.to_xml.should == xml_before
     end
@@ -192,16 +193,19 @@ describe ActiveFedora::NokogiriDatastream do
   end
   
   describe 'ng_xml=' do
+    before do
+      @test_ds2 = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
+    end
     it "should parse raw xml for you" do
-      @test_ds.ng_xml.to_xml.should_not be_equivalent_to(@sample_raw_xml)
-      @test_ds.ng_xml = @sample_raw_xml
-      @test_ds.ng_xml.class.should == Nokogiri::XML::Document
-      @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
+      @test_ds2.ng_xml = @sample_raw_xml
+      @test_ds2.ng_xml.class.should == Nokogiri::XML::Document
+      @test_ds2.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
     end
     it "should mark the datastream as dirty" do
-      @test_ds.dirty = false  # pretend it isn't dirty to show that content= does it
-      @test_ds.ng_xml = @sample_raw_xml
-      @test_ds.should be_dirty
+      @test_ds2.dirty.should be_false 
+      @test_ds2.ng_xml = @sample_raw_xml
+      @test_ds2.dirty.should be_true  #not the same as be_dirty
+      @test_ds2.should be_dirty
     end
   end
   

data/spec/unit/unsaved_digital_object_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe ActiveFedora::UnsavedDigitalObject do
+  it "should have ownerId property" do
+    @obj = ActiveFedora::UnsavedDigitalObject.new(String, 'bar') 
+    @obj.ownerId = 'fooo'
+    @obj.ownerId.should == 'fooo'
+  end
+
+  describe "#save" do
+    it "should set the ownerId property" do
+      @obj = ActiveFedora::UnsavedDigitalObject.new(String, 'bar') 
+      @obj.ownerId = 'fooo'
+      saved_obj = @obj.save
+      saved_obj.should be_kind_of ActiveFedora::DigitalObject
+      saved_obj.ownerId.should == 'fooo'
+    end
+  end
+
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832035
+  hash: 1923832037
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - pre
-  - 5
-  version: 3.2.0.pre5
+  - 6
+  version: 3.2.0.pre6
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-01 00:00:00 -06:00
+date: 2012-01-02 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -568,6 +568,7 @@ files:
 - lib/active_fedora/datastream.rb
 - lib/active_fedora/datastream_collections.rb
 - lib/active_fedora/datastream_hash.rb
+- lib/active_fedora/datastreams.rb
 - lib/active_fedora/delegating.rb
 - lib/active_fedora/digital_object.rb
 - lib/active_fedora/fedora_object.rb
@@ -721,6 +722,7 @@ files:
 - spec/unit/service_definitions_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
+- spec/unit/unsaved_digital_object_spec.rb
 - spec/unit/validations_spec.rb
 has_rdoc: true
 homepage: http://yourmediashelf.com/activefedora
@@ -866,4 +868,5 @@ test_files:
 - spec/unit/service_definitions_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
+- spec/unit/unsaved_digital_object_spec.rb
 - spec/unit/validations_spec.rb