active-fedora 3.1.5 → 3.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (3.1.5)
+    active-fedora (3.1.6)
       activeresource (~> 3.0.0)
       activesupport (~> 3.0.0)
       equivalent-xml
@@ -10,7 +10,7 @@ PATH
       mime-types (>= 1.16)
       multipart-post (= 1.1.2)
       nokogiri
-      om (>= 1.4.3)
+      om (>= 1.4.4)
       rdf
       rdf-rdfxml
       rubydora (~> 0.2.6)
@@ -69,7 +69,7 @@ GEM
     multipart-post (1.1.2)
     nokogiri (1.5.0)
     nori (1.0.2)
-    om (1.4.3)
+    om (1.4.4)
       mediashelf-loggable
       nokogiri (>= 1.4.2)
     rack (1.3.5)

data/History.txt

@@ -1,3 +1,7 @@
+3.1.6
+
+HYDRA-733 When serializing, MetadataDatastream does not load the existing content, so it can overwrite with blank
+
 3.1.5
 HYDRA-722 updating AF::Base#label= and then saving doesn't persist the change
 JettyWrapper to 1.2.0

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.4.3')
+  s.add_dependency('om', '>= 1.4.4')
   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.rb

@@ -32,6 +32,7 @@ module ActiveFedora #:nodoc:
     autoload :SemanticNode
     autoload :NestedAttributes
     autoload :FixtureLoader
+    autoload :DatastreamCollections
 
   end
   

data/lib/active_fedora/associations.rb

@@ -40,6 +40,39 @@ module ActiveFedora
       end
 
   
+      # Specifies a one-to-one association with another class. This method should only be used
+      # if this class contains the foreign key.
+      #
+      # Methods will be added for retrieval and query for a single associated object, for which
+      # this object holds an id:
+      #
+      # [association()]
+      #   Returns the associated object. +nil+ is returned if none is found.
+      # [association=(associate)]
+      #   Assigns the associate object, extracts the primary key, and sets it as the foreign key.
+      #
+      # (+association+ is replaced with the symbol passed as the first argument, so
+      # <tt>belongs_to :author</tt> would add among others <tt>author.nil?</tt>.)
+      #
+      # === Example
+      #
+      # A Post class declares <tt>belongs_to :author</tt>, which will add:
+      # * <tt>Post#author</tt> (similar to <tt>Author.find(author_id)</tt>)
+      # * <tt>Post#author=(author)</tt> 
+      # The declaration can also include an options hash to specialize the behavior of the association.
+      #
+      # === Options
+      #
+      # [:property]
+      #   the association predicate to use when storing the association +REQUIRED+
+      # [:class_name]
+      #   Specify the class name of the association. Use it only if that name can't be inferred
+      #   from the association name. So <tt>has_one :author</tt> will by default be linked to the Author class, but
+      #   if the real class name is Person, you'll have to specify it with this option.
+      #
+      # Option examples:
+      #   belongs_to :firm, :property => :client_of
+      #   belongs_to :author, :class_name => "Person", :property => :author_of
       def belongs_to(association_id, options = {})
         raise "You must specify a property name for #{name}" if !options[:property]
         has_relationship association_id.to_s, options[:property]

data/lib/active_fedora/base.rb

@@ -32,12 +32,10 @@ module ActiveFedora
   class Base
     include RelationshipsHelper
     include SemanticNode
-    class_inheritable_accessor  :ds_specs, :class_named_datastreams_desc
-    self.class_named_datastreams_desc = {}
+    class_inheritable_accessor  :ds_specs
     
     self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"", :block=>nil}}
 
-    attr_accessor :named_datastreams_desc
     
 
     has_relationship "collection_members", :has_collection_member
@@ -110,21 +108,29 @@ module ActiveFedora
       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)
-      if datastreams.has_key? name.to_s
+      dsid = corresponding_datastream_name(name)
+      if dsid
         ### Create and invoke a proxy method 
-        self.class.class_eval <<-end_eval, __FILE__, __LINE__
-          def #{name.to_s}()
-            datastreams["#{name.to_s}"]
-          end
-        end_eval
-
+        self.class.send :define_method, name do
+            datastreams[dsid]
+        end
         self.send(name)
       else 
         super
       end
     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
+
     #Saves a Base object, and any dirty datastreams, then updates 
     #the Solr index for this object.
     def save
@@ -224,8 +230,9 @@ module ActiveFedora
       datastreams[datastream.dsid] = datastream
       return datastream.dsid
     end
+
     def add(datastream) # :nodoc:
-      warn "Warning: ActiveFedora::Base.add has been deprected.  Use add_datastream"
+      warn "Warning: ActiveFedora::Base.add has been deprecated.  Use add_datastream"
       add_datastream(datastream)
     end
     
@@ -258,21 +265,16 @@ module ActiveFedora
     # 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")
-      keys = datastreams.keys
-      next_index = keys.select {|v| v =~ /(#{prefix}\d*$)/}.length + 1
-      new_dsid = prefix.to_s + next_index.to_s
-      while keys.include?(new_dsid)
-        next_index += 1
-        new_dsid = prefix.to_s + next_index.to_s
-      end
-      new_dsid
-
-      # while keys.include?(new_dsid)
-      #         next_index += 1
-      #         new_dsid = prefix.to_s + rand(range).to_s
-      #       end
+      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
@@ -375,192 +377,6 @@ module ActiveFedora
       # will rely on SemanticNode.remove_relationship once it is implemented
     end
     
-    # ** EXPERIMENTAL **
-    #
-    # Returns array of datastream names defined for this object 
-    def datastream_names
-      named_datastreams_desc.keys
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Calls add_named_datastream while assuming it will be managed content and sets :blob and :controlGroup values accordingly
-    # ====Parameters
-    #  name: Datastream name
-    #  file: The file to add for this datastream
-    #  opts: Options hash.  See +add_named_datastream+ for expected keys and values
-    def add_named_file_datastream(name, file, opts={})
-      opts.merge!({:blob=>file,:controlGroup=>'M'})
-      add_named_datastream(name,opts)
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # This object is used by [datastream_name]_append helper to add a named datastream
-    # but can also be called directly.
-    # ====Parameters
-    #  name: name of datastream to add
-    #  opts: hash defining datastream attributes
-    # The following are expected keys in opts hash:
-    #   :label => Defaults to the file name
-    #   :blob or :file  => Required to point to the datastream file being added if managed content
-    #   :controlGroup => defaults to 'M' for managed, can also be 'E' external and 'R' for redirected
-    #   :content_type => required if the file does not respond to 'content_type' and should match :mimeType in has_datastream definition if defined
-    #   :dsLocation => holds uri location of datastream.  Required only if :controlGroup is type 'E' or 'R'.
-    #   :dsid or :dsId => Optional, and used to update an existing datastream with dsid supplied.  Will throw an error if dsid does not exist and does not match prefix pattern for datastream name
-    def add_named_datastream(name,opts={})
-      unless named_datastreams_desc.has_key?(name) && named_datastreams_desc[name].has_key?(:type) 
-        raise "Failed to add datastream. Named datastream #{name} not defined for object #{pid}." 
-      end
-
-      if opts.has_key?(:mime_type)
-        opts.merge!({:content_type=>opts[:mime_type]})
-      elsif opts.has_key?(:mimeType)
-        opts.merge!({:content_type=>opts[:mimeType]})
-      end
-      opts.merge!(named_datastreams_desc[name])
-        
-      label = opts.has_key?(:label) ? opts[:label] : ""
-
-      #only do these steps for managed datastreams
-      unless (opts.has_key?(:controlGroup)&&opts[:controlGroup]!="M")
-        if opts.has_key?(:file)
-          opts.merge!({:blob => opts[:file]}) 
-          opts.delete(:file)
-        end
-        
-        raise "You must define parameter blob for this managed datastream to load for #{pid}" unless opts.has_key?(:blob)
-        
-        #if no explicit label and is a file use original file name for label
-        if !opts.has_key?(:label)&&opts[:blob].respond_to?(:original_filename)
-          label = opts[:blob].original_filename
-        end
-        
-        if opts[:blob].respond_to?(:content_type)&&!opts[:blob].content_type.nil? && !opts.has_key?(:content_type)
-          opts.merge!({:content_type=>opts[:blob].content_type})
-        end
-
-        raise "The blob must respond to content_type or the hash must have :content_type or :mime_type property set" unless opts.has_key?(:content_type)
-        
-        #throw error for mimeType mismatch
-        if named_datastreams_desc[name].has_key?(:mimeType) && !named_datastreams_desc[name][:mimeType].eql?(opts[:content_type])
-          raise "Content type mismatch for add datastream #{name} to #{pid}.  Expected: #{named_datastreams_desc[name][:mimeType]}, Actual: #{opts[:content_type]}"
-        end
-      else 
-        label = opts[:dsLocation] if (opts.has_key?(:dsLocation)) 
-      end
-      
-      opts.merge!(:dsLabel => label)
-      
-      ds = create_datastream(named_datastreams_desc[name][:type], opts[:dsid], opts)
-      #Must be of type datastream
-      assert_kind_of 'datastream',  ds, ActiveFedora::Datastream
-      #make sure dsid is nil so that it uses the prefix for mapping purposes
-      #check dsid works for the prefix if it is set
-      if !ds.dsid.nil? && opts.has_key?(:prefix)
-        raise "dsid supplied does not conform to pattern #{opts[:prefix]}[number]" unless ds.dsid =~ /#{opts[:prefix]}[0-9]/
-      end
-      
-      add_datastream(ds,opts)
-    end
-
-    # ** EXPERIMENTAL **
-    #
-    # Update an existing named datastream.  It has same parameters as add_named_datastream
-    # except the :dsid key is now required.
-    #
-    # ====TODO
-    # Currently requires you to update file if a managed datastream 
-    # but could change to allow metadata only updates as well
-    def update_named_datastream(name, opts={})
-      #check that dsid provided matches existing datastream with that name
-      raise "You must define parameter dsid for datastream to update for #{pid}" unless opts.include?(:dsid)
-      raise "Datastream with name #{name} and dsid #{opts[:dsid]} does not exist for #{pid}" unless self.send("#{name}_ids").include?(opts[:dsid])
-      add_named_datastream(name,opts)
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Throws an assertion failure unless the object 'o' is kind_of? class 't'
-    # ====Parameters
-    #  n: Name of object
-    #  o: The object to test
-    #  t: The class type to check is kind_of?
-    def assert_kind_of(n, o,t)
-      raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Returns true if the name is a defined named datastream
-    def is_named_datastream?(name)
-      named_datastreams_desc.has_key?(name)
-    end
-
-    # ** EXPERIMENTAL **
-    #
-    # Returns hash of datastream names defined by has_datastream calls mapped to 
-    # array of datastream objects that have been added
-    # ====Example
-    # For the following has_datastream entries and a datastream defined for minivan only would be
-    #  has_datastream :name=>"minivan", :prefix => "VAN", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'M'
-    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
-    #
-    # Returns
-    #  {"external_images"=>[],"thumbnails"=>{#<ActiveFedora::Datastream:0x7ffd6512daf8 ...}} 
-    def named_datastreams
-      ds_values = {}
-      self.class.named_datastreams_desc.keys.each do |name|
-        ds_values.merge!({name=>self.send("#{name}")})
-      end
-      return ds_values
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Returns hash of datastream names mapped to an array
-    # of dsid's for named datastream objects
-    # === Example
-    # For the following has_datastream call, assume we have added two datastreams.
-    # 
-    #  has_datastream :name=>"thumbnails",:prefix => "THUMB",:type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'                     
-    #
-    # It would then return
-    #  {"thumbnails=>["THUMB1", "THUMB2"]}
-    def named_datastreams_ids
-      dsids = {}
-      self.class.named_datastreams_desc.keys.each do |name|
-        dsid_array = self.send("#{name}_ids")
-        dsids[name] = dsid_array
-      end
-      return dsids
-    end 
-    
-    # ** EXPERIMENTAL **
-    #
-    # Returns the hash that stores arguments passed to has_datastream calls within an
-    # ActiveFedora::Base child class.    
-    #  
-    #  has_datastream :name=>"audio_file", :prefix=>"AUDIO", :type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav" 
-    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
-    #
-    # The above examples result in the following hash
-    #  {"audio_file"=>{:prefix=>"AUDIO",:type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav", :controlGroup=>'M'},
-    #   "external_images=>{:prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'}}
-    #
-    # This hash is later used when adding a named datastream such as an "audio_file" as defined above.
-    def named_datastreams_desc
-      @named_datastreams_desc ||= named_datastreams_desc_from_class
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Get class variable hash that stores has_datastream arguments.
-    # It is used to initialize the value returned by public named_datastreams_desc method
-    def named_datastreams_desc_from_class
-      self.class.named_datastreams_desc
-    end
-    
     def create_datastream(type, dsid, opts={})
       dsid = generate_dsid(opts[:prefix] || "DS") if dsid == nil
       klass = type.kind_of?(Class) ? type : type.constantize
@@ -587,128 +403,6 @@ module ActiveFedora
       ds
     end
 
-    # ** EXPERIMENTAL **
-    #
-    # Allows for a datastream to be treated like any other attribute of a model class 
-    # while enforcing mimeType and/or datastream type (ie. external, managed, etc.) if defined. 
-    # ====Examples 
-    #                 
-    #  has_datastream :name=>"thumbnails",:prefix => "THUMB",:type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'                     
-    #  has_datastream :name=>"EADs", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
-    #  has_datastream :name=>"external_images", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
-    #
-    # Required Keys in args
-    #  :name  -  name to give this datastream (must be unique)
-    #
-    # Optional Keys in args
-    #  :prefix - used to create the DSID plus an index ie. THUMB1, THUMB2.  If :prefix is not specified, defaults to :name value in all uppercase 
-    #  :type - defaults to ActiveFedora::Datastream if you would like content specific class to be used supply it here
-    #  :mimeType - if supplied it will ensure any datastreams added are of this type, if not supplied any mimeType is acceptabl e
-    #  :controlGroup -  possible values "X", "M", "R", or "E" (InlineXML, Managed Content, Redirect, or External Referenced) If controlGroup is 'E' or 'R' it expects a dsLocation be defined when adding the datastream.
-    #
-    # You use the datastream attribute using helper methods created for each datastream name:
-    #
-    # ====Helper Method Examples
-    #  thumbnails_append -  Append a thumbnail datastream
-    #  thumbnails        -  Get array of thumbnail datastreams
-    #  thumbnails_ids    -  Get array of dsid's for thumbnail datastreams
-    #
-    # When loading the list of datastreams for a name from Fedora it uses the DSID prefix to find them in Fedora
-    def self.has_datastream(args)
-      unless args.has_key?(:name)
-        return false
-      end
-      unless args.has_key?(:prefix)
-        args.merge!({:prefix=>args[:name].to_s.upcase})
-      end
-      unless named_datastreams_desc.has_key?(args[:name]) 
-        named_datastreams_desc[args[:name]] = {} 
-      end
-          
-      args.merge!({:mimeType=>args[:mime_type]}) if args.has_key?(:mime_type)
-      
-      unless named_datastreams_desc[args[:name]].has_key?(:type) 
-        #default to type ActiveFedora::Datastream
-        args.merge!({:type => "ActiveFedora::Datastream"})
-      end
-      named_datastreams_desc[args[:name]]= args   
-      create_named_datastream_finders(args[:name],args[:prefix])
-      create_named_datastream_update_methods(args[:name])
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Creates the following helper methods for a datastream name
-    #   [datastream_name]_append  - Add a named datastream
-    #
-    # ==== Examples for "thumbnails" datastream
-    #  thumbnails_append -  Append a thumbnail datastream
-    # TODO: Add [datastream_name]_remove
-    def self.create_named_datastream_update_methods(name)
-      append_file_method_name = "#{name.to_s.downcase}_file_append"
-      append_method_name = "#{name.to_s.downcase}_append"
-      #remove_method_name = "#{name.to_s.downcase}_remove"
-      self.send(:define_method,:"#{append_file_method_name}") do |*args| 
-        file,opts = *args
-        opts ||= {}
-        add_named_file_datastream(name,file,opts)
-      end
-      
-      self.send(:define_method,:"#{append_method_name}") do |*args| 
-        #call add_named_datastream instead of add_file_named_datastream in case not managed datastream
-        add_named_datastream(name,*args)
-      end
-    end 
-    
-    # ** EXPERIMENTAL **
-    #
-    # Creates the following helper methods for a datastream name
-    #   [datastream_name]  - Returns array of named datastreams
-    #   [datastream_name]_ids - Returns array of named datastream dsids
-    #
-    # ==== Examples for "thumbnails" datastream
-    #  thumbnails        -  Get array of thumbnail datastreams
-    #  thumbnails_ids    -  Get array of dsid's for thumbnail datastreams
-    def self.create_named_datastream_finders(name, prefix)
-      class_eval <<-END,  __FILE__, __LINE__
-      def #{name}(opts={})
-        id_array = []
-        keys = datastreams.keys
-        id_array = keys.select {|v| v =~ /#{prefix}\d*/}
-        if opts[:response_format] == :id_array
-          return id_array
-        else
-          named_ds = []
-          id_array.each do |name|
-            if datastreams.has_key?(name)
-              named_ds.push(datastreams[name])
-            end
-          end
-          return named_ds
-        end
-      end
-      def #{name}_ids
-        #{name}(:response_format => :id_array)
-      end
-      END
-    end
-    
-    # ** EXPERIMENTAL **
-    #
-    # Accessor for class variable for hash that stores arguments passed to has_datastream calls within an
-    # ActiveFedora::Base child class.    
-    #  
-    #  has_datastream :name=>"audio_file", :prefix=>"AUDIO", :type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav" 
-    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
-    #
-    # The above examples result in the following hash
-    #  {"audio_file"=>{:prefix=>"AUDIO",:type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav", :controlGroup=>'M'},
-    #   "external_images=>{:prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'}}
-    #
-    # This hash is later used when adding a named datastream such as an "audio_file" as defined above.
-    def self.named_datastreams_desc
-      self.class_named_datastreams_desc ||= {}
-    end
 
     # 
     # Relationships Management
@@ -1073,6 +767,7 @@ module ActiveFedora
     include Associations
     include NestedAttributes
     include Reflection
+    include DatastreamCollections
   end
 
 end

data/lib/active_fedora/datastream.rb

@@ -28,7 +28,6 @@ module ActiveFedora
     end
     
     # Test whether this datastream been modified since it was last saved?
-    # TODO deprecate this, just use changed?
     def dirty?
       @dirty || changed?
     end

data/lib/active_fedora/datastream_collections.rb

@@ -0,0 +1,326 @@
+module DatastreamCollections
+  extend ActiveSupport::Concern
+
+  included do
+    class_inheritable_accessor :class_named_datastreams_desc
+    self.class_named_datastreams_desc = {}
+  end
+
+  module ClassMethods
+
+    # ** EXPERIMENTAL **
+    #
+    # Allows for a datastream to be treated like any other attribute of a model class 
+    # while enforcing mimeType and/or datastream type (ie. external, managed, etc.) if defined. 
+    # ====Examples 
+    #                 
+    #  has_datastream :name=>"thumbnails",:prefix => "THUMB",:type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'                     
+    #  has_datastream :name=>"EADs", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
+    #  has_datastream :name=>"external_images", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
+    #
+    # Required Keys in args
+    #  :name  -  name to give this datastream (must be unique)
+    #
+    # Optional Keys in args
+    #  :prefix - used to create the DSID plus an index ie. THUMB1, THUMB2.  If :prefix is not specified, defaults to :name value in all uppercase 
+    #  :type - defaults to ActiveFedora::Datastream if you would like content specific class to be used supply it here
+    #  :mimeType - if supplied it will ensure any datastreams added are of this type, if not supplied any mimeType is acceptabl e
+    #  :controlGroup -  possible values "X", "M", "R", or "E" (InlineXML, Managed Content, Redirect, or External Referenced) If controlGroup is 'E' or 'R' it expects a dsLocation be defined when adding the datastream.
+    #
+    # You use the datastream attribute using helper methods created for each datastream name:
+    #
+    # ====Helper Method Examples
+    #  thumbnails_append -  Append a thumbnail datastream
+    #  thumbnails        -  Get array of thumbnail datastreams
+    #  thumbnails_ids    -  Get array of dsid's for thumbnail datastreams
+    #
+    # When loading the list of datastreams for a name from Fedora it uses the DSID prefix to find them in Fedora
+    def has_datastream(args)
+      unless args.has_key?(:name)
+        return false
+      end
+      unless args.has_key?(:prefix)
+        args.merge!({:prefix=>args[:name].to_s.upcase})
+      end
+      unless class_named_datastreams_desc.has_key?(args[:name]) 
+        class_named_datastreams_desc[args[:name]] = {} 
+      end
+          
+      args.merge!({:mimeType=>args[:mime_type]}) if args.has_key?(:mime_type)
+      
+      unless class_named_datastreams_desc[args[:name]].has_key?(:type) 
+        #default to type ActiveFedora::Datastream
+        args.merge!({:type => "ActiveFedora::Datastream"})
+      end
+      class_named_datastreams_desc[args[:name]]= args   
+      create_named_datastream_finders(args[:name],args[:prefix])
+      create_named_datastream_update_methods(args[:name])
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Creates the following helper methods for a datastream name
+    #   [datastream_name]_append  - Add a named datastream
+    #
+    # ==== Examples for "thumbnails" datastream
+    #  thumbnails_append -  Append a thumbnail datastream
+    # TODO: Add [datastream_name]_remove
+    def create_named_datastream_update_methods(name)
+      append_file_method_name = "#{name.to_s.downcase}_file_append"
+      append_method_name = "#{name.to_s.downcase}_append"
+      #remove_method_name = "#{name.to_s.downcase}_remove"
+      self.send(:define_method,:"#{append_file_method_name}") do |*args| 
+        file,opts = *args
+        opts ||= {}
+        add_named_file_datastream(name,file,opts)
+      end
+      
+      self.send(:define_method,:"#{append_method_name}") do |*args| 
+        #call add_named_datastream instead of add_file_named_datastream in case not managed datastream
+        add_named_datastream(name,*args)
+      end
+    end 
+    
+    # ** EXPERIMENTAL **
+    #
+    # Creates the following helper methods for a datastream name
+    #   [datastream_name]  - Returns array of named datastreams
+    #   [datastream_name]_ids - Returns array of named datastream dsids
+    #
+    # ==== Examples for "thumbnails" datastream
+    #  thumbnails        -  Get array of thumbnail datastreams
+    #  thumbnails_ids    -  Get array of dsid's for thumbnail datastreams
+    def create_named_datastream_finders(name, prefix)
+      class_eval <<-END,  __FILE__, __LINE__
+      def #{name}(opts={})
+        id_array = []
+        keys = datastreams.keys
+        id_array = keys.select {|v| v =~ /#{prefix}\d*/}
+        if opts[:response_format] == :id_array
+          return id_array
+        else
+          named_ds = []
+          id_array.each do |name|
+            if datastreams.has_key?(name)
+              named_ds.push(datastreams[name])
+            end
+          end
+          return named_ds
+        end
+      end
+      def #{name}_ids
+        #{name}(:response_format => :id_array)
+      end
+      END
+    end
+    
+
+
+  end
+
+    # ** EXPERIMENTAL **
+    #
+    # Accessor for class variable for hash that stores arguments passed to has_datastream calls within an
+    # ActiveFedora::Base child class.    
+    #  
+    #  has_datastream :name=>"audio_file", :prefix=>"AUDIO", :type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav" 
+    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
+    #
+    # The above examples result in the following hash
+    #  {"audio_file"=>{:prefix=>"AUDIO",:type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav", :controlGroup=>'M'},
+    #   "external_images=>{:prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'}}
+    #
+    # This hash is later used when adding a named datastream such as an "audio_file" as defined above.
+    def named_datastreams_desc
+      self.class_named_datastreams_desc ||= {}
+    end
+
+    # ** EXPERIMENTAL **
+    #
+    # Returns array of datastream names defined for this object 
+    def datastream_names
+      named_datastreams_desc.keys
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Calls add_named_datastream while assuming it will be managed content and sets :blob and :controlGroup values accordingly
+    # ====Parameters
+    #  name: Datastream name
+    #  file: The file to add for this datastream
+    #  opts: Options hash.  See +add_named_datastream+ for expected keys and values
+    def add_named_file_datastream(name, file, opts={})
+      opts.merge!({:blob=>file,:controlGroup=>'M'})
+      add_named_datastream(name,opts)
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # This object is used by [datastream_name]_append helper to add a named datastream
+    # but can also be called directly.
+    # ====Parameters
+    #  name: name of datastream to add
+    #  opts: hash defining datastream attributes
+    # The following are expected keys in opts hash:
+    #   :label => Defaults to the file name
+    #   :blob or :file  => Required to point to the datastream file being added if managed content
+    #   :controlGroup => defaults to 'M' for managed, can also be 'E' external and 'R' for redirected
+    #   :content_type => required if the file does not respond to 'content_type' and should match :mimeType in has_datastream definition if defined
+    #   :dsLocation => holds uri location of datastream.  Required only if :controlGroup is type 'E' or 'R'.
+    #   :dsid or :dsId => Optional, and used to update an existing datastream with dsid supplied.  Will throw an error if dsid does not exist and does not match prefix pattern for datastream name
+    def add_named_datastream(name,opts={})
+      unless named_datastreams_desc.has_key?(name) && named_datastreams_desc[name].has_key?(:type) 
+        raise "Failed to add datastream. Named datastream #{name} not defined for object #{pid}." 
+      end
+
+      if opts.has_key?(:mime_type)
+        opts.merge!({:content_type=>opts[:mime_type]})
+      elsif opts.has_key?(:mimeType)
+        opts.merge!({:content_type=>opts[:mimeType]})
+      end
+      opts.merge!(named_datastreams_desc[name])
+        
+      label = opts.has_key?(:label) ? opts[:label] : ""
+
+      #only do these steps for managed datastreams
+      unless (opts.has_key?(:controlGroup)&&opts[:controlGroup]!="M")
+        if opts.has_key?(:file)
+          opts.merge!({:blob => opts[:file]}) 
+          opts.delete(:file)
+        end
+        
+        raise "You must define parameter blob for this managed datastream to load for #{pid}" unless opts.has_key?(:blob)
+        
+        #if no explicit label and is a file use original file name for label
+        if !opts.has_key?(:label)&&opts[:blob].respond_to?(:original_filename)
+          label = opts[:blob].original_filename
+        end
+        
+        if opts[:blob].respond_to?(:content_type)&&!opts[:blob].content_type.nil? && !opts.has_key?(:content_type)
+          opts.merge!({:content_type=>opts[:blob].content_type})
+        end
+
+        raise "The blob must respond to content_type or the hash must have :content_type or :mime_type property set" unless opts.has_key?(:content_type)
+        
+        #throw error for mimeType mismatch
+        if named_datastreams_desc[name].has_key?(:mimeType) && !named_datastreams_desc[name][:mimeType].eql?(opts[:content_type])
+          raise "Content type mismatch for add datastream #{name} to #{pid}.  Expected: #{named_datastreams_desc[name][:mimeType]}, Actual: #{opts[:content_type]}"
+        end
+      else 
+        label = opts[:dsLocation] if (opts.has_key?(:dsLocation)) 
+      end
+      
+      opts.merge!(:dsLabel => label)
+      
+      ds = create_datastream(named_datastreams_desc[name][:type], opts[:dsid], opts)
+      #Must be of type datastream
+      assert_kind_of 'datastream',  ds, ActiveFedora::Datastream
+      #make sure dsid is nil so that it uses the prefix for mapping purposes
+      #check dsid works for the prefix if it is set
+      if !ds.dsid.nil? && opts.has_key?(:prefix)
+        raise "dsid supplied does not conform to pattern #{opts[:prefix]}[number]" unless ds.dsid =~ /#{opts[:prefix]}[0-9]/
+      end
+      
+      add_datastream(ds,opts)
+    end
+
+    # ** EXPERIMENTAL **
+    #
+    # Update an existing named datastream.  It has same parameters as add_named_datastream
+    # except the :dsid key is now required.
+    #
+    # ====TODO
+    # Currently requires you to update file if a managed datastream 
+    # but could change to allow metadata only updates as well
+    def update_named_datastream(name, opts={})
+      #check that dsid provided matches existing datastream with that name
+      raise "You must define parameter dsid for datastream to update for #{pid}" unless opts.include?(:dsid)
+      raise "Datastream with name #{name} and dsid #{opts[:dsid]} does not exist for #{pid}" unless self.send("#{name}_ids").include?(opts[:dsid])
+      add_named_datastream(name,opts)
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Throws an assertion failure unless the object 'o' is kind_of? class 't'
+    # ====Parameters
+    #  n: Name of object
+    #  o: The object to test
+    #  t: The class type to check is kind_of?
+    def assert_kind_of(n, o,t)
+      raise "Assertion failure: #{n}: #{o} is not of type #{t}" unless o.kind_of?(t)
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Returns true if the name is a defined named datastream
+    def is_named_datastream?(name)
+      named_datastreams_desc.has_key?(name)
+    end
+
+    # ** EXPERIMENTAL **
+    #
+    # Returns hash of datastream names defined by has_datastream calls mapped to 
+    # array of datastream objects that have been added
+    # ====Example
+    # For the following has_datastream entries and a datastream defined for minivan only would be
+    #  has_datastream :name=>"minivan", :prefix => "VAN", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'M'
+    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
+    #
+    # Returns
+    #  {"external_images"=>[],"thumbnails"=>{#<ActiveFedora::Datastream:0x7ffd6512daf8 ...}} 
+    def named_datastreams
+      ds_values = {}
+      self.class.class_named_datastreams_desc.keys.each do |name|
+        ds_values.merge!({name=>self.send("#{name}")})
+      end
+      return ds_values
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Returns hash of datastream names mapped to an array
+    # of dsid's for named datastream objects
+    # === Example
+    # For the following has_datastream call, assume we have added two datastreams.
+    # 
+    #  has_datastream :name=>"thumbnails",:prefix => "THUMB",:type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'                     
+    #
+    # It would then return
+    #  {"thumbnails=>["THUMB1", "THUMB2"]}
+    def named_datastreams_ids
+      dsids = {}
+      self.class.class_named_datastreams_desc.keys.each do |name|
+        dsid_array = self.send("#{name}_ids")
+        dsids[name] = dsid_array
+      end
+      return dsids
+    end 
+    
+    # ** EXPERIMENTAL **
+    #
+    # Returns the hash that stores arguments passed to has_datastream calls within an
+    # ActiveFedora::Base child class.    
+    #  
+    #  has_datastream :name=>"audio_file", :prefix=>"AUDIO", :type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav" 
+    #  has_datastream :name=>"external_images", :prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'
+    #
+    # The above examples result in the following hash
+    #  {"audio_file"=>{:prefix=>"AUDIO",:type=>ActiveFedora::Datastream, :mimeType=>"audio/x-wav", :controlGroup=>'M'},
+    #   "external_images=>{:prefix=>"EXTIMG", :type=>ActiveFedora::Datastream,:mimeType=>"image/jpeg", :controlGroup=>'E'}}
+    #
+    # This hash is later used when adding a named datastream such as an "audio_file" as defined above.
+    def named_datastreams_desc
+      @named_datastreams_desc ||= self.class.class_named_datastreams_desc
+    end
+    
+    # ** EXPERIMENTAL **
+    #
+    # Get class variable hash that stores has_datastream arguments.
+    # It is used to initialize the value returned by public named_datastreams_desc method
+    # Deprecated
+    def named_datastreams_desc_from_class
+      logger.warn "named_datastreams_desc_from_class is deprecated and will be removed in the next version"
+      self.class.class_named_datastreams_desc
+    end
+
+end

data/lib/active_fedora/metadata_datastream.rb

@@ -8,10 +8,9 @@ module ActiveFedora
   #   </fields>
   class MetadataDatastream < Datastream
     
+    # .to_solr (among other things) is provided by ActiveFedora::MetadataDatastreamHelper
     include ActiveFedora::MetadataDatastreamHelper
 
-    # .to_solr and .to_xml (among other things) are provided by ActiveFedora::MetadataDatastreamHelper
-    self.xml_model = ActiveFedora::MetadataDatastream    
 
     def update_attributes(params={},opts={})
       result = params.dup
@@ -144,6 +143,29 @@ module ActiveFedora
       tmpl.send(:dirty=, false)
       tmpl
     end
+
+    def to_xml(xml = Nokogiri::XML::Document.parse("<fields />")) #:nodoc:
+      if xml.instance_of?(Nokogiri::XML::Builder)
+        xml_insertion_point = xml.doc.root 
+      elsif xml.instance_of?(Nokogiri::XML::Document) 
+        xml_insertion_point = xml.root
+      else
+        xml_insertion_point = xml
+      end
+      
+      builder = Nokogiri::XML::Builder.with(xml_insertion_point) do |xml|
+        fields.each_pair do |field,field_info|
+          element_attrs = field_info[:element_attrs].nil? ? {} : field_info[:element_attrs]
+          values = field_info[:values]
+          values = [values] unless values.respond_to? :each
+          values.each do |val|
+            builder_arg = "xml.#{field}(val, element_attrs)"
+            eval(builder_arg)
+          end
+        end
+      end
+      return builder.to_xml
+    end
     
     # This method generates the various accessor and mutator methods on self for the datastream metadata attributes.
     # each field will have the 3 magic methods:

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -7,8 +7,6 @@ module ActiveFedora::MetadataDatastreamHelper
   
   module ClassMethods
     
-    attr_accessor :xml_model
-    
     #get the Class's field list
     def fields
       @@classFields
@@ -28,7 +26,9 @@ module ActiveFedora::MetadataDatastreamHelper
   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. 
+    if dirty?
+      self.content = self.to_xml 
+    end
   end
 
   def to_solr(solr_doc = Hash.new) # :nodoc:
@@ -70,27 +70,5 @@ module ActiveFedora::MetadataDatastreamHelper
     end
   end
   
-  def to_xml(xml = Nokogiri::XML::Document.parse("<fields />")) #:nodoc:
-    if xml.instance_of?(Nokogiri::XML::Builder)
-      xml_insertion_point = xml.doc.root 
-    elsif xml.instance_of?(Nokogiri::XML::Document) 
-      xml_insertion_point = xml.root
-    else
-      xml_insertion_point = xml
-    end
-    
-    builder = Nokogiri::XML::Builder.with(xml_insertion_point) do |xml|
-      fields.each_pair do |field,field_info|
-        element_attrs = field_info[:element_attrs].nil? ? {} : field_info[:element_attrs]
-        values = field_info[:values]
-        values = [values] unless values.respond_to? :each
-        values.each do |val|
-          builder_arg = "xml.#{field}(val, element_attrs)"
-          eval(builder_arg)
-        end
-      end
-    end
-    return builder.to_xml
-  end
 
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.5"
+    VERSION = "3.1.6"
 end

data/spec/integration/associations_spec.rb

@@ -6,9 +6,13 @@ end
 
 class Book < ActiveFedora::Base 
   belongs_to :library, :property=>:has_constituent
+  belongs_to :author, :property=>:has_member, :class_name=>'Person'
   has_and_belongs_to_many :topics, :property=>:is_topic_of
 end
 
+class Person < ActiveFedora::Base
+end
+
 class Topic < ActiveFedora::Base 
   has_and_belongs_to_many :books, :property=>:is_topic_of
 end
@@ -112,6 +116,8 @@ describe ActiveFedora::Base do
         @library.save()
         @book = Book.new
         @book.save
+        @person = Person.new
+        @person.save
       end
       it "should have many books once it has been saved" do
         @library.books << @book
@@ -124,6 +130,14 @@ describe ActiveFedora::Base do
         @library2 = Library.find(@library.pid)
         @library2.books.map(&:pid).should == [@book.pid]
       end
+
+      it "should respect the :class_name parameter" do
+        @book.author = @person
+        @book.save
+        Book.find(@book.id).author_id.should == @person.pid
+        Book.find(@book.id).author.send(:find_target).should be_kind_of Person
+      end
+
       after do
         @library.delete
         @book.delete

data/spec/integration/full_featured_model_spec.rb

@@ -1,4 +1,3 @@
-# encoding: WINDOWS-1252
 require 'spec_helper'
 require 'rexml/document'
 require "active_fedora/samples"
@@ -69,7 +68,7 @@ describe ActiveFedora::Base do
 
     end
     sample_location = "Boston, Massachusetts"
-    sample_notes = 'Addelson, Frances. (1973?) “The Induced Abortion,” American Journal of Ortho-Psychiatry,  Addelson, Frances. “Abortion: Source of Guilt or Growth,” National Journal of Gynecology and Obstetrics., Addelson, Frances. “First Zionist Novel,” Jewish Frontier.'
+    sample_notes = 'Addelson, Frances. (1973?) "The Induced Abortion," American Journal of Ortho-Psychiatry,  Addelson, Frances. "Abortion: Source of Guilt or Growth," National Journal of Gynecology and Obstetrics., Addelson, Frances. "First Zionist Novel," Jewish Frontier.'
     sample_other_contributor = 'any other contributors, people or corporate names (eg. Temple Israel)'
     sample_transcript_editor = 'Siegel, Cheryl'
     sample_hard_copy_availability = <<-END
@@ -77,7 +76,7 @@ describe ActiveFedora::Base do
     END
     sample_narrator = 'Addelson, Frances'
     sample_bio = <<-END
-    Rochelle Ruthchild interviewed Frances Addleson on October 18, November 14, and December 10, 1997.   The interview thoroughly examined the trajectory of Frances’ life from birth until the time of the interview. As a young child, Frances’ father died during the influenza epidemic, and her mother was not equipped to care for her and her siblings.  Consequently, they were placed in a Jewish foster home. Although her experience was mostly positive, this experience would leave life-long effects.  Frances attended Radcliffe upon the urging of a mentor and later obtained her Master’s degree in social work from Simmons College in 1954.  In the 1940’s, she returned to work while her children were still young; a rather unusual event for that time period.  While working as a social worker at Beth Israel Hospital in the early 1970’s, she helped counsel countless women who came to the hospital seeking abortions before the procedure was officially legalized during the landmark Roe vs. Wade decision in 1973.  Frances would later write two articles that were published in medical journals about her experience during this time.  Although not a very religious person, Frances felt connected to the Jewish notion of social justice and remained very active until an accident in the late 1990’s.
+    Rochelle Ruthchild interviewed Frances Addleson on October 18, November 14, and December 10, 1997.   The interview thoroughly examined the trajectory of Frances\' life from birth until the time of the interview. As a young child, Frances\' father died during the influenza epidemic, and her mother was not equipped to care for her and her siblings.  Consequently, they were placed in a Jewish foster home. Although her experience was mostly positive, this experience would leave life-long effects.  Frances attended Radcliffe upon the urging of a mentor and later obtained her Master\'s degree in social work from Simmons College in 1954.  In the 1940\'s, she returned to work while her children were still young; a rather unusual event for that time period.  While working as a social worker at Beth Israel Hospital in the early 1970\'s, she helped counsel countless women who came to the hospital seeking abortions before the procedure was officially legalized during the landmark Roe vs. Wade decision in 1973.  Frances would later write two articles that were published in medical journals about her experience during this time.  Although not a very religious person, Frances felt connected to the Jewish notion of social justice and remained very active until an accident in the late 1990\'s.
     END
     sample_interviewer = "Ruthchild, & Rochelle"
     

data/spec/unit/base_named_datastream_spec.rb

@@ -59,82 +59,84 @@ describe ActiveFedora::Base do
       has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
       has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
     end
-      
-    it 'should add a named datastream to a fedora object' do
+
+    before do
       @test_object2 = MockAddNamedDatastream.new
-      f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
-      f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
-      f2.stubs(:original_filename).returns("dino.jpg")
-      f.stubs(:content_type).returns("image/jpeg")
-      #check cannot add a datastream with name that does not exist
-      had_exception = false
-      begin  
-        @test_object2.add_named_datastream("thumb",{:content_type=>"image/jpeg",:blob=>f})
-      rescue
-        had_exception = true
-      end
-      raise "Did not raise exception with datastream name that does not exist" unless had_exception 
-      #check that either blob or file opt must be set
-      had_exception = false
-      begin  
-        @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg"})
-      rescue
-        had_exception = true
-      end
-      raise "Did not raise exception with blob not set" unless had_exception 
+      @f = File.new(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"))
+      @f2 = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ))
+      @f.stubs(:content_type).returns("image/jpeg")
+      @f2.stubs(:original_filename).returns("dino.jpg")
+    end
       
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f})
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:file=>f})
-      #check dslabel set from either opt[label] or opt[blob].original_file_name
-      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>f2, :label=>"my_image"})
+    it 'cannot add a datastream with name that does not exist' do
+      expect { @test_object2.add_named_datastream("thumb",{:content_type=>"image/jpeg",:blob=>f}) }.to raise_error
+    end
+
+    it "should accept a file blob" do
+      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>@f})
+    end
+
+    it "should accept a file handle" do
+      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:file=>@f})
+    end
+
+    it "should raise an error if neither a blob nor file is set" do
+      expect { @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg"}) }.to raise_error
+    end
+
+    it "should use the given label for the dsLabel" do
+      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>@f2, :label=>"my_image"})
       @test_object2.high.first.dsLabel.should == "my_image"
-      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>f2})
+    end
+
+    it "should fallback on using the file name" do
+      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>@f2})
       @test_object2.high.first.dsLabel.should == "dino.jpg"
-      #check opt[content_type] must be set or opt[blob] responds to content_type, already checking if content_type option set above
-      f.expects(:content_type).returns("image/jpeg")
-      @test_object2.add_named_datastream("thumbnail",{:file=>f})
-      had_exception = false
-      begin
-        @test_object2.add_named_datastream("thumbnail",{:file=>f2})
-      rescue
-        had_exception = true
-      end
-      raise "Did not raise exception if content_type not set" unless had_exception
-      #check mimetype and content type must match if mimetype is specified (if not specified can be anything)
-      f.stubs(:content_type).returns("image/tiff")
-      had_exception = false
-      begin
-        @test_object2.add_named_datastream("thumbnail",{:file=>f})
-      rescue
-        had_exception = true
-      end
-      raise "Did not raise exception on content type and mime type mismatch" unless had_exception
+    end 
+
+    it "should check the file for a content type" do
+      @f.expects(:content_type).returns("image/jpeg")
+      @test_object2.add_named_datastream("thumbnail",{:file=>@f})
+    end
+
+    it "should raise an error if no content type is avialable" do
+      expect { @test_object2.add_named_datastream("thumbnail",{:file=>@f2}) }.to raise_error
+    end
+
+    it "should encsure mimetype and content type match" do
+      @f.stubs(:content_type).returns("image/tiff")
+      expect { @test_object2.add_named_datastream("thumbnail",{:file=>f}) }.to raise_error
+    end
       
+    it "should allow any mime type" do
       #check for if any mime type allowed
-      @test_object2.add_named_datastream("anymime",{:file=>f})
+      @test_object2.add_named_datastream("anymime",{:file=>@f})
       #check datastream created is of type ActiveFedora::Datastream
       @test_object2.anymime.first.class.should == ActiveFedora::Datastream
+    end
+
+    it "should cgecj that a dsid forms to the prefix" do
       #if dsid supplied check that conforms to prefix
-      f.stubs(:content_type).returns("image/jpeg")
-      had_exception = false
-      begin
-        @test_object2.add_named_datastream("thumbnail",{:file=>f,:dsid=>"DS1"})
-      rescue
-        had_exception = true
-      end
-      raise "Did not raise exception with dsid that does not conform to prefix" unless had_exception
+      @f.stubs(:content_type).returns("image/jpeg")
+      expect { @test_object2.add_named_datastream("thumbnail",{:file=>@f,:dsid=>"DS1"}) }.to raise_error
+    end
+
+    it "should have the right properties" do
+      @test_object2.add_named_datastream("high",{:content_type=>"image/jpeg",:blob=>@f2})
       #if prefix not set check uses name in CAPS and dsid uses prefix
       #@test_object2.high.first.attributes[:prefix].should == "HIGH"
       @test_object2.high.first.dsid.match(/HIGH[0-9]/)
       #check datastreams added with other right properties
       @test_object2.high.first.controlGroup.should == "M"
+    end
+
+    it "should work with external datastreams" do
       
       #check external datastream
       @test_object2.add_named_datastream("external",{:dsLocation=>"http://myreasource.com"})
       #check dslocation goes to dslabel
       @test_object2.external.first.dsLabel.should == "http://myreasource.com"
       #check datastreams added to fedora (may want to stub this at first)
-      
     end
   end
   

data/spec/unit/base_spec.rb

@@ -240,6 +240,23 @@ describe ActiveFedora::Base do
   end
 
 
+  describe ".datastreams" do
+    it "should create dynamic accessors" do
+      @test_history.withText.should == @test_history.datastreams['withText']
+    end
+    it "dynamic accessors should convert dashes to underscores" do
+      ds = stub('datastream', :dsid=>'eac-cpf')
+      @test_history.add_datastream(ds)
+      @test_history.eac_cpf.should == ds
+    end
+    it "dynamic accessors should not convert datastreams named with underscore" do
+      ds = stub('datastream', :dsid=>'foo_bar')
+      @test_history.add_datastream(ds)
+      @test_history.foo_bar.should == ds
+    end
+  end
+
+
 
   describe ".fields" do
     it "should provide fields" do

data/spec/unit/metadata_datastream_spec.rb

@@ -44,6 +44,7 @@ describe ActiveFedora::MetadataDatastream do
       @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'mdDs')
       @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'mdDs', :checksumType => 'DISABLED', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'text/xml')
       @test_ds.expects(:to_xml).returns("fake xml")
+      @test_ds.expects(:dirty?).returns(true)
       @test_ds.serialize!
       @test_ds.save
       @test_ds.mimeType.should == 'text/xml'

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -135,6 +135,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     it "should call .content= with to_dc_xml" do
       result = @test_ds.to_dc_xml
       @test_ds.expects(:content=).with(result)
+      @test_ds.expects(:dirty?).returns(true)
       @test_ds.serialize!
     end
   end

data/spec/unit/solr_config_options_spec.rb

@@ -81,9 +81,6 @@ describe ActiveFedora do
     it "should prevent Base.save from calling update_index if false" do
       dirty_ds = ActiveFedora::MetadataDatastream.new(@test_object.inner_object, 'ds1')
       @test_object.datastreams['ds1'] = dirty_ds
-      repo = @test_object.inner_object.repository
-      repo.expects(:add_datastream)
-      repo.expects(:ingest)
       @test_object.stubs(:datastreams).returns({:ds1 => dirty_ds})
       @test_object.expects(:update_index).never
       @test_object.expects(:refresh)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 3
   - 1
-  - 5
-  version: 3.1.5
+  - 6
+  version: 3.1.6
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -06:00
+date: 2012-01-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,12 +105,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 15
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        - 4
+        version: 1.4.4
   requirement: *id006
 - !ruby/object:Gem::Dependency 
   name: solrizer
@@ -561,6 +561,7 @@ files:
 - lib/active_fedora/base.rb
 - lib/active_fedora/content_model.rb
 - lib/active_fedora/datastream.rb
+- lib/active_fedora/datastream_collections.rb
 - lib/active_fedora/datastream_hash.rb
 - lib/active_fedora/delegating.rb
 - lib/active_fedora/digital_object.rb