active-fedora 1.1.8 → 1.1.9

data/README.textile

@@ -31,6 +31,11 @@ export FEDORA_HOME=/path/to/hydra/jetty/fedora/default
 $FEDORA_HOME/client/bin/fedora-ingest-demos.sh localhost 8983 fedoraAdmin fedoraAdmin http
 <pre>
   
+You must ingest one fixture using the import_fixture rake task provided by the hydra project:
+<pre>
+  rake hydra:import_fixture pid=hydrangea:fixture_mods_article1
+</pre>
+
 Now you're ready to run 
 
 <pre>

data/Rakefile

@@ -21,7 +21,7 @@ begin
     gem.add_dependency('mime-types', '>= 1.16')
     gem.add_dependency('multipart-post')
     gem.add_dependency('nokogiri')
-    gem.add_dependency('om', '>= 0.1.5')
+    gem.add_dependency('om', '>= 0.1.7')
     # gem.add_dependency('yaml')
 
     gem.add_development_dependency "rspec", ">= 1.2.9"

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/active-fedora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.8"
+  s.version = "1.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-07-02}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.email = %q{matt.zumwalt@yourmediashelf.com}
   s.extra_rdoc_files = [
@@ -209,8 +209,7 @@ Gem::Specification.new do |s|
      "lib/fedora/generic_search.rb",
      "lib/fedora/repository.rb",
      "lib/hydra.rb",
-     "lib/hydra/mods_article.rb",
-     "lib/hydra/opinionated_mods_document.rb",
+     "lib/hydra/sample_mods_datastream.rb",
      "lib/ruby-fedora.rb",
      "lib/util/class_level_inheritable_attributes.rb",
      "script/console",
@@ -226,6 +225,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/mods_articles/hydrangea_article1.xml",
      "spec/fixtures/oh_qdc.xml",
      "spec/fixtures/test_12.foxml.xml",
+     "spec/hydrangea_fixture_mods_article1.foxml.xml",
      "spec/integration/base_file_management_spec.rb",
      "spec/integration/base_loader_spec.rb",
      "spec/integration/base_spec.rb",
@@ -235,6 +235,7 @@ Gem::Specification.new do |s|
      "spec/integration/fedora_object_spec.rb",
      "spec/integration/full_featured_model_spec.rb",
      "spec/integration/model_spec.rb",
+     "spec/integration/mods_article_integration_spec.rb",
      "spec/integration/rels_ext_datastream_spec.rb",
      "spec/integration/repository_spec.rb",
      "spec/integration/rf_fedora_object_spec.rb",
@@ -294,6 +295,7 @@ Gem::Specification.new do |s|
      "spec/integration/fedora_object_spec.rb",
      "spec/integration/full_featured_model_spec.rb",
      "spec/integration/model_spec.rb",
+     "spec/integration/mods_article_integration_spec.rb",
      "spec/integration/rels_ext_datastream_spec.rb",
      "spec/integration/repository_spec.rb",
      "spec/integration/rf_fedora_object_spec.rb",
@@ -343,7 +345,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_runtime_dependency(%q<multipart-post>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<om>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<om>, [">= 0.1.7"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -353,7 +355,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<multipart-post>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<om>, [">= 0.1.5"])
+      s.add_dependency(%q<om>, [">= 0.1.7"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 1.2.9"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -364,7 +366,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<multipart-post>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<om>, [">= 0.1.5"])
+    s.add_dependency(%q<om>, [">= 0.1.7"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 1.2.9"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/lib/active_fedora/base.rb

@@ -172,7 +172,7 @@ module ActiveFedora
     def metadata_streams
       results = []
       datastreams.each_value do |ds|
-        if ds.kind_of?(ActiveFedora::MetadataDatastream) 
+        if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
           results<<ds
         end
       end
@@ -356,8 +356,9 @@ module ActiveFedora
             # Nokogiri Datstreams use a new syntax for .from_xml (tmpl is optional!) and expects the actual xml content rather than the foxml datstream xml
             # NB: Base.deserialize, or a separately named method, should set any other info from the foxml if necessary though by this point it's all been grabbed elsewhere... 
             if ds.kind_of?(ActiveFedora::NokogiriDatastream) 
-              node = node.search('./foxml:datastreamVersion[last()]/foxml:xmlContent/*').first
-              proto.datastreams[name]=ds.class.from_xml(node, ds)
+              xml_content = Fedora::Repository.instance.fetch_custom(pid, "datastreams/#{name}/content")
+              # node = node.search('./foxml:datastreamVersion[last()]/foxml:xmlContent/*').first
+              proto.datastreams[name]=ds.class.from_xml(xml_content, ds)
             else
               proto.datastreams[name]=ds.class.from_xml(ds, node)          
             end
@@ -395,8 +396,9 @@ module ActiveFedora
       #   el.text = value
       #   fields_xml << el
       # end
-      datastreams.each_value do |ds|        
-        ds.to_xml(fields_xml) if ds.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.kind_of?(ActiveFedora::RelsExtDatastream)
+      
+      datastreams.each_value do |ds|  
+        ds.to_xml(fields_xml) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.kind_of?(ActiveFedora::RelsExtDatastream)
       end
       return xml.to_s
     end
@@ -437,24 +439,20 @@ module ActiveFedora
     # or
     #  m.update_attributes({:fubar=>'baz'}, :datastreams=>["my_ds", "my_other_ds"])
     def update_attributes(params={}, opts={})
-      params.each do |k,v|
-        if v == :delete || v == "" || v == nil
-          v = []
-        end
-        if opts[:datastreams]
-          ds_array = []
-          opts[:datastreams].each do |dsname|
-            ds_array << datastreams[dsname]
-          end
-        else
-          ds_array = datastreams.values
-        end
-        ds_array.each do |d|
-          if d.fields[k.to_sym]
-            d.send("#{k}_values=", v)
-          end
+      result = {}
+      if opts[:datastreams]
+        ds_array = []
+        opts[:datastreams].each do |dsname|
+          ds_array << datastreams[dsname]
         end
+      else
+        ds_array = metadata_streams
+      end
+      ds_array.each do |d|
+        ds_result = d.update_attributes(params,opts)
+        result[d.dsid] = ds_result
       end
+      return result
     end
 
     # A convenience method  for updating indexed attributes.  The passed in hash
@@ -481,40 +479,35 @@ module ActiveFedora
           ds_array << datastreams[dsname]
         end
       else
-        ds_array = datastreams.values
+        ds_array = metadata_streams
+      end
+      result = {}
+      ds_array.each do |d|
+        result[d.dsid] = d.update_indexed_attributes(params,opts)
       end
+      return result
+    end
+    
+    def update_datastream_attributes(params={}, opts={})
       result = params.dup
-      params.each do |key,value|
-        result[key] = value.dup
-        ds_array.each do |dstream|
-          if dstream.fields[key.to_sym]
-            aname="#{key}_values"
-            curval = dstream.send("#{aname}")
-            cpv=value.dup#copy this, we'll need the original for the next ds
-            cpv.delete_if do |y,z| 
-              if curval[y.to_i] and y.to_i > -1
-                curval[y.to_i]=z
-                true
-              else
-                false
-              end
-            end 
-            cpv.each do |y,z| 
-              curval<<z #just append everything left
-              if y == "-1"
-                new_array_index = curval.length - 1
-                result[key][new_array_index.to_s] = params[key]["-1"]
-              end
-            end
-            curval.delete_if {|x| x == :delete || x == "" || x == nil}
-            dstream.send("#{aname}=", curval) #write it back to the ds
-          end
+      params.each_pair do |dsid, ds_params| 
+        if datastreams_in_memory.include?(dsid)
+          result[dsid] = datastreams_in_memory[dsid].update_attributes(ds_params)
+        else
+          result.delete(dsid)
         end
-        result[key].delete("-1")
       end
       return result
     end
     
+    def get_values_from_datastream(dsid,field_key,default=[])
+      if datastreams_in_memory.include?(dsid)
+        return datastreams_in_memory[dsid].get_values(field_key,default)
+      else
+        return nil
+      end
+    end
+    
     def self.pids_from_uris(uris) 
       if uris.class == String
         return uris.gsub("info:fedora/", "")
@@ -557,10 +550,11 @@ module ActiveFedora
     
     # Pushes the object and all of its new or dirty datastreams into Fedora
     def update
-      result = Fedora::Repository.instance.save(@inner_object)
+      result = Fedora::Repository.instance.save(@inner_object)      
       datastreams_in_memory.each do |k,ds|
         if ds.dirty? || ds.new_object? 
-          if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.instance_of?(ActiveFedora::RelsExtDatastream)
+          if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream)
+          # if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream) || ds.instance_of?(ActiveFedora::RelsExtDatastream)
             @metadata_is_dirty = true
           end
           result = ds.save

data/lib/active_fedora/metadata_datastream.rb

@@ -4,40 +4,112 @@ module ActiveFedora
     
     include ActiveFedora::MetadataDatastreamHelper
 
-    self.xml_model = ActiveFedora::MetadataDatastream
+    # .to_solr and .to_xml (among other things) are provided by ActiveFedora::MetadataDatastream
+    self.xml_model = ActiveFedora::MetadataDatastream    
+
+    def update_attributes(params={},opts={})
+      result = params.dup
+      params.each do |k,v|
+        if v == :delete || v == "" || v == nil
+          v = []
+        end
+        if self.fields.has_key?(k.to_sym)
+          result[k] = set_value(k, v)
+        else
+          result.delete(k)
+        end
+      end
+      return result
+    end
+    
+    # An ActiveRecord-ism to udpate metadata values.
+    #
+    # The passed in hash must look like this : 
+    #   {:name=>{"0"=>"a","1"=>"b"}}
+    #
+    # This will attempt to set the values for any field named fubar in the datastream. 
+    # If there is no field by that name, it returns an empty hash and doesn't change the object at all.
+    # If there is a field by that name, it will set the values for field of name :name having the value [a,b]
+    # and it returns a hash with the field name, value index, and the value as it was set.    
+    #
+    # An index of -1 will insert a new value. any existing value at the relevant index 
+    # will be overwritten.
+    #
+    # As in update_attributes, this overwrites _all_ available fields by default.
+    #
+    # Example Usage:
+    #
+    # ds.update_attributes({:myfield=>{"0"=>"a","1"=>"b"},:myotherfield=>{"-1"=>"c"}})
+    #
+    def update_indexed_attributes(params={}, opts={})
+      # remove any fields from params that this datastream doesn't recognize
+      params.delete_if {|field_name,new_values| !self.fields.include?(field_name.to_sym) }
+      
+      result = params.dup
+      params.each do |field_name,new_values|
+        field_accessor_method = "#{field_name}_values"
+        
+        if new_values.kind_of?(Hash)
+            result[field_name] = new_values.dup
+      
+            current_values = instance_eval(field_accessor_method)
+        
+            # current_values = get_values(field_name) # for some reason this leaves current_values unset?
+                
+            new_values.delete_if do |y,z| 
+              if current_values[y.to_i] and y.to_i > -1
+                current_values[y.to_i]=z
+                true
+              else
+                false
+              end
+            end 
+        
+            new_values.each do |y,z| 
+              result[field_name].delete(y)
+              current_values<<z #just append everything left
+              new_array_index = current_values.length - 1
+              result[field_name][new_array_index.to_s] = z
+            end
+            current_values.delete_if {|x| x == :delete || x == "" || x == nil}
+            #set_value(field_name, current_values)
+            instance_eval("#{field_accessor_method}=(current_values)") #write it back to the ds
+            # result[field_name].delete("-1")
+        else
+          values = instance_eval("#{field_name}_values=(new_values)")
+          result[field_name] = {"0"=>values}           
+        end
+      end
+      return result
+    end
+    
+    
+    def get_values(field_name, default=[])
+      field_accessor_method = "#{field_name}_values"
+      if respond_to? field_accessor_method
+        values = self.send(field_accessor_method)
+      else
+        values = []
+      end
+      if values.empty?
+        if default.nil?
+          return default
+        else
+          return default
+        end
+      else
+        return values
+      end
+    end
+    
+    def set_value(field_name, values)
+      field_accessor_method = "#{field_name}_values="
+      if respond_to? field_accessor_method
+        values = self.send(field_accessor_method, values)
+        return self.send("#{field_name}_values")
+      end
+    end
     
-    # def to_solr(solr_doc = Solr::Document.new) # :nodoc:
-    #   fields.each do |field_key, field_info|
-    #     if field_info.has_key?(:values) && !field_info[:values].nil?
-    #       field_symbol = generate_solr_symbol(field_key, field_info[:type])
-    #       field_info[:values].each do |val|             
-    #         solr_doc << Solr::Field.new(field_symbol => val)
-    #       end
-    #     end
-    #   end
-    # 
-    #   return solr_doc
-    # end
-    # 
-    # def to_xml(xml = REXML::Document.new("<fields />")) #:nodoc:
-    #   fields.each_pair do |field,field_info|
-    #     el = REXML::Element.new("#{field.to_s}")
-    #       if field_info[:element_attrs]
-    #         field_info[:element_attrs].each{|k,v| el.add_attribute(k.to_s, v.to_s)}
-    #       end
-    #     field_info[:values].each do |val|
-    #       el = el.clone
-    #       el.text = val.to_s
-    #       if xml.class == REXML::Document
-    #         xml.root.elements.add(el)
-    #       else
-    #         xml.add(el)
-    #       end
-    #     end
-    #   end
-    #   return xml.to_s
-    # end
-    # 
     # @tmpl ActiveFedora::MetadataDatastream
     # @node Nokogiri::XML::Node
     def self.from_xml(tmpl, node) # :nodoc:

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -49,7 +49,9 @@ module ActiveFedora::MetadataDatastreamHelper
   end
   
   def to_xml(xml = Nokogiri::XML::Document.parse("<fields />")) #:nodoc:
-    if xml.instance_of?(Nokogiri::XML::Document)
+    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

data/lib/active_fedora/nokogiri_datastream.rb

@@ -5,7 +5,8 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     
   include ActiveFedora::MetadataDatastreamHelper
   include OM::XML
-    
+  # extend(OM::XML::Container::ClassMethods)
+  
   attr_accessor :ng_xml
   
   #constructor, calls up to ActiveFedora::Datastream's constructor
@@ -14,11 +15,41 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
     @fields={}
     self.class.from_xml(blob, self)
   end
+
+  # @xml String, File or Nokogiri::XML::Node
+  # @tmpl ActiveFedora::MetadataDatastream
+  # Careful! If you call this from a constructor, be sure to provide something 'ie. self' as the @tmpl. Otherwise, you will get an infinite loop!
+  def self.from_xml(xml, tmpl=self.new) # :nodoc:
+    if xml.kind_of? Nokogiri::XML::Node
+      tmpl.ng_xml = xml
+    else
+      tmpl.ng_xml = Nokogiri::XML::Document.parse(xml)
+    end    
+    tmpl.send(:dirty=, false)
+    return tmpl
+  end
+  
+  # class << self
+  #   from_xml_original = self.instance_method(:from_xml)
+  #   
+  #   define_method(:from_xml, xml, tmpl=self.new) do
+  #     from_xml_original.bind(self).call(xml, tmpl)
+  #     tmpl.send(:dirty=, false)
+  #   end
+  #   
+  #   # def from_xml_custom(xml, tmpl=self.new)
+  #   #   from_xml_original(xml, tmpl)
+  #   #   tmpl.send(:dirty=, false)
+  #   # end
+  #   # 
+  #   # alias_method :from_xml_original, :from_xml 
+  #   # alias_method :from_xml, :from_xml_custom
+  # end
   
   
   def to_xml(xml = self.ng_xml)
     ng_xml = self.ng_xml
-    if ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
+    if ng_xml.respond_to?(:root) && ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
       ng_xml = self.class.generate(self.class.root_property_ref, "")
       if xml.root.nil?
         xml = ng_xml
@@ -89,5 +120,23 @@ class ActiveFedora::NokogiriDatastream < ActiveFedora::Datastream
       solr_doc << Solr::Field.new(hierarchical_field_name => node.text)
     end
   end
+  
+  def update_indexed_attributes(params={}, opts={})    
+    # remove any fields from params that this datastream doesn't recognize    
+    params.delete_if do |field_key,new_values| 
+      if field_key.kind_of?(String)
+        true
+      else
+        self.class.accessor_xpath(*OM.destringify(field_key) ).nil?
+      end
+    end
+    result = update_properties( params )
+    self.dirty = true
+    return result
+  end
+  
+  def get_values(field_key,default=[])
+    property_values(*field_key)
+  end
 
 end