active-fedora 3.1.0.pre10 → 3.1.0.pre11

data/lib/active_fedora/nokogiri_datastream.rb

@@ -32,7 +32,7 @@ module ActiveFedora
     def self.from_xml(xml, tmpl=nil)
       tmpl = self.new(nil, nil) if tmpl.nil?  ## This path is used only for unit testing (e.g. MarpaDCDatastream.from_xml(fixture("data.xml")) )
 
-      if xml.nil?
+      if !xml.present?
         tmpl.ng_xml = self.xml_template
       elsif xml.kind_of? Nokogiri::XML::Node || xml.kind_of?(Nokogiri::XML::Document)
         tmpl.ng_xml = xml

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -20,16 +20,14 @@ module ActiveFedora
       DCTERMS.each do |el|
         field el, :string, :multiple=>true
       end
-      ###TODO this is loading eagerly, but we could make it lazy
-      self.class.from_xml(content, self)
-      self
+      self.class.from_xml(nil, self)
     end
     
     # Populate a QualifiedDublinCoreDatastream object based on the "datastream" node from a FOXML file
     # @param [String] node the xml from the content.  Assumes that the content of this datastream is that of an ActiveFedora QualifiedDublinCoreDatastream 
     # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are building
     def self.from_xml(xml, tmpl) # :nodoc:
-      return if xml.nil?
+      return if !xml.present?
       node = Nokogiri::XML::Document.parse(xml)
       tmpl.fields.each do |z|
         fname = z.first
@@ -47,9 +45,13 @@ module ActiveFedora
       tmpl
     end
 
-  def to_xml() 
-    to_dc_xml() 
-  end
+    def to_xml() 
+      to_dc_xml() 
+    end
+
+    def self.xml_template
+       Nokogiri::XML::Document.parse("<dc xmlns:dcterms='http://purl.org/dc/terms/' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'/>")
+    end
 
    #Render self as a Fedora DC xml document.
    def to_dc_xml

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "3.1.0.pre10"
+    VERSION = "3.1.0.pre11"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832013
+  hash: 1923832015
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 10
-  version: 3.1.0.pre10
+  - 11
+  version: 3.1.0.pre11
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 -05:00
+date: 2011-10-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency