active-fedora 1.1.2 → 1.1.4.pre2

data/{README.txt → README.textile}

@@ -1,37 +1,27 @@
-== Getting Help
+h2. Description
+
+RubyFedora and ActiveFedora provide a set of Ruby gems for creating and managing objects in the Fedora Repository Architecture (http://fedora-commons.org).
+
+h2. Getting Help
 
 * http://yourmediashelf.com/activefedora
 * Project Homepage: <http://yourmediashelf.com/activefedora>
 * Further documentation is available at <http://projects.mediashelf.us/show/active-fedora>
 * Community Discussions & Mailing List are located at <http://groups.google.com/group/active-fedora>
 
-= active-fedora gem
-
-* http://rubyforge.org/projects/rubyfedora/
-
-== DESCRIPTION:
-
-RubyFedora and ActiveFedora provide a set of Ruby gems for creating and managing objects in the Fedora Repository Architecture (http://fedora-commons.org).
-
-
-== FEATURES/PROBLEMS:
-
-
-== SYNOPSIS:
-
-  See usage documentation on the wiki: http://projects.mediashelf.us/wiki/active-fedora/Documentation
+h2. Installation
 
-== REQUIREMENTS:
+The gem is hosted on gemcutter.
 
-* ruby-fedora
+<pre>gem install active-fedora</pre>
 
-== INSTALL:
+h2. Getting Started
 
-sudo gem install active-fedora
+The "ActiveFedora Console Tour":http://projects.mediashelf.us/wiki/active-fedora/Getting_Started gives you a brief tour through ActiveFedora's features on the command line.
 
-== LICENSE:
+h2. LICENSE:
 
-Copyright (c) 2009 Matt Zumwalt
+Copyright (c) 2009-2010 Matt Zumwalt
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License (LGPL) as 

data/Rakefile

@@ -14,6 +14,8 @@ begin
     gem.email = "matt.zumwalt@yourmediashelf.com"
     gem.homepage = "http://yourmediashelf.com/activefedora"
     gem.authors = ["Matt Zumwalt", "McClain Looney"]
+    gem.rubyforge_project = 'rubyfedora'
+    
     gem.add_dependency('solr-ruby', '>= 0.0.6')
     gem.add_dependency('xml-simple', '>= 1.0.12')
     gem.add_dependency('mime-types', '>= 1.16')
@@ -26,6 +28,7 @@ begin
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
+  # Jeweler::RubyforgeTasks.new 
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-1.1.2
+0.1.4.pre1

data/active-fedora.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active-fedora}
-  s.version = "1.1.2"
+  s.version = "1.1.4.pre2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Zumwalt", "McClain Looney"]
-  s.date = %q{2010-03-31}
+  s.date = %q{2010-05-15}
   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 = [
     "LICENSE",
      "README.rdoc",
-     "README.txt"
+     "README.textile"
   ]
   s.files = [
     ".document",
@@ -176,7 +176,7 @@ Gem::Specification.new do |s|
      "Manifest.txt",
      "PostInstall.txt",
      "README.rdoc",
-     "README.txt",
+     "README.textile",
      "Rakefile",
      "VERSION",
      "active-fedora.gemspec",
@@ -217,6 +217,7 @@ Gem::Specification.new do |s|
      "spec/fixtures/changeme155.xml",
      "spec/fixtures/dino.jpg",
      "spec/fixtures/minivan.jpg",
+     "spec/fixtures/oh_qdc.xml",
      "spec/fixtures/test_12.foxml.xml",
      "spec/integration/base_file_management_spec.rb",
      "spec/integration/base_loader_spec.rb",
@@ -237,7 +238,6 @@ Gem::Specification.new do |s|
      "spec/samples/models/oral_history.rb",
      "spec/samples/models/seminar.rb",
      "spec/samples/models/seminar_audio_file.rb",
-     "spec/samples/oh_qdc.xml",
      "spec/samples/oral_history_sample.xml",
      "spec/samples/oral_history_sample_model.rb",
      "spec/samples/oral_history_xml.xml",
@@ -273,6 +273,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://yourmediashelf.com/activefedora}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rubyfedora}
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.}
   s.test_files = [
@@ -311,6 +312,8 @@ Gem::Specification.new do |s|
      "spec/unit/inheritance_spec.rb",
      "spec/unit/metadata_datastream_spec.rb",
      "spec/unit/model_spec.rb",
+     "spec/unit/mods_datastream_spec.rb",
+     "spec/unit/nokogiri_datastream_spec.rb",
      "spec/unit/property_spec.rb",
      "spec/unit/qualified_dublin_core_datastream_spec.rb",
      "spec/unit/relationship_spec.rb",

data/lib/active_fedora.rb

@@ -40,7 +40,8 @@ module ActiveFedora #:nodoc:
       if defined?(RAILS_ROOT)
         config_path = "#{RAILS_ROOT}/config/fedora.yml"
       else
-        raise "Don't know where to look for fedora.yml.  You should either set RAILS_ROOT or pass the path to fedora.yml as an argument to ActiveFedora.init"
+        config_path = File.join(File.dirname(__FILE__), "..", "config", "fedora.yml")
+        logger.info "Using the default fedora.yml that comes with active-fedora.  If you want to override this, pass the path to fedora.yml as an argument to ActiveFedora.init or set RAILS_ROOT and put fedora.yml into \#{RAILS_ROOT}/config."
       end
     end
     

data/lib/active_fedora/base.rb

@@ -1,6 +1,7 @@
 require 'util/class_level_inheritable_attributes'
 require 'active_fedora/model'
 require 'active_fedora/semantic_node'
+require 'nokogiri'
 
 SOLR_DOCUMENT_ID = "id" unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
@@ -328,18 +329,33 @@ module ActiveFedora
 
 
     def self.deserialize(doc) #:nodoc:
-      pid = doc.elements['/foxml:digitalObject'].attributes['PID']
+      if doc.instance_of?(REXML::Document)
+        pid = doc.elements['/foxml:digitalObject'].attributes['PID']
       
-      proto = self.new(:pid=>pid, :new_object=>false)
-      proto.datastreams.each do |name,ds|
-        doc.elements.each("//foxml:datastream[@ID='#{name}']") do |el|
-          # datastreams remain marked as new if the foxml doesn't have an entry for that datastream
-          ds.new_object = false
-          proto.datastreams[name]=ds.class.from_xml(ds, el)          
+        proto = self.new(:pid=>pid, :new_object=>false)
+        proto.datastreams.each do |name,ds|
+          doc.elements.each("//foxml:datastream[@ID='#{name}']") do |el|
+            # datastreams remain marked as new if the foxml doesn't have an entry for that datastream
+            ds.new_object = false
+            proto.datastreams[name]=ds.class.from_xml(ds, el)          
+          end
+        end
+        proto.inner_object.new_object = false
+        return proto
+      elsif doc.instance_of?(Nokogiri::XML::Document)
+        pid = doc.xpath('/foxml:digitalObject').first["PID"]
+      
+        proto = self.new(:pid=>pid, :new_object=>false)
+        proto.datastreams.each do |name,ds|
+          doc.xpath("//foxml:datastream[@ID='#{name}']").each do |node|
+            # datastreams remain marked as new if the foxml doesn't have an entry for that datastream
+            ds.new_object = false
+            proto.datastreams[name]=ds.class.from_xml(ds, node)          
+          end
         end
+        proto.inner_object.new_object = false
+        return proto
       end
-      proto.inner_object.new_object = false
-      return proto
     end
 
     #Return a hash of all available metadata fields for all 

data/lib/active_fedora/content_model.rb

@@ -18,5 +18,57 @@ module ActiveFedora
       return "#{namespace}:#{sanitized_class_name}#{pid_suffix}" 
     end
     
+    def self.models_asserted_by(obj)
+      Array obj.relationships[:self][:has_model]
+    end
+    
+    def self.known_models_for(obj)
+      models_array = []
+      models_asserted_by( obj ).each do |model_uri|
+        m = uri_to_model_class(model_uri)
+        if m
+          models_array << m
+        end
+      end
+      
+      if models_array.empty?
+        models_array = [ActiveFedora::Base]
+      end
+      
+      return models_array
+    end
+    
+    # Returns a ruby class corresponding to the given uri if one can be found.
+    # Returns false if no corresponding class can be found.
+    def self.uri_to_ruby_class( uri )
+      classname  = uri.gsub("info:fedora/afmodel:", "")
+      
+      if class_exists?(classname)
+        Kernel.const_get(classname)
+      else
+        false
+      end
+    end
+    
+    # Returns an ActiveFedora Model class corresponding to the given uri if one can be found.
+    # Returns false if no corresponding model can be found.
+    def self.uri_to_model_class( uri )
+      rc = uri_to_ruby_class(uri)
+      if rc && rc.superclass == ActiveFedora::Base
+        rc
+      else
+        false
+      end
+    end
+    
+    private 
+    
+    def self.class_exists?(class_name)
+      klass = Module.const_get(class_name)
+      return klass.is_a?(Class)
+    rescue NameError
+      return false
+    end
+    
   end
 end

data/lib/active_fedora/datastream.rb

@@ -70,12 +70,15 @@ module ActiveFedora
     def before_save # :nodoc:
       #check_concurrency
     end
-    def self.from_xml(tmpl, el)
-      el.elements.each("foxml:xmlContent/fields") do |f|
-        tmpl.send("#{f.name}_append", f.text)
+    
+    # @tmpl ActiveFedora::Datastream
+    # @node Nokogiri::XML::Node
+    def self.from_xml(tmpl, node)
+      node.xpath("foxml:xmlContent/fields").each do |f|
+        # tmpl.send("#{f.name}_append", f.content)
       end
       tmpl.instance_variable_set(:@dirty, false)
-      tmpl.control_group= el.attributes['CONTROL_GROUP']
+      tmpl.control_group= node['CONTROL_GROUP']
       tmpl
     end
     

data/lib/active_fedora/metadata_datastream.rb

@@ -53,9 +53,12 @@ module ActiveFedora
       end
       return xml.to_s
     end
-    def self.from_xml(tmpl, el) # :nodoc:
-      el.elements.each("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()")do |f|
-          tmpl.send("#{f.name}_append", f.text)
+    
+    # @tmpl ActiveFedora::MetadataDatastream
+    # @node Nokogiri::XML::Node
+    def self.from_xml(tmpl, node) # :nodoc:
+      node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/fields/node()").each do |f|
+          tmpl.send("#{f.name}_append", f.text) unless f.class == Nokogiri::XML::Text
       end
       tmpl.send(:dirty=, false)
       tmpl

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -26,21 +26,23 @@ module ActiveFedora
       self.blob = self.to_dc_xml
     end
     
-   def self.from_xml(tmpl, el) # :nodoc:
+    # @tmpl ActiveFedora::Datastream
+    # @node Nokogiri::XML::Node
+    def self.from_xml(tmpl, node) # :nodoc:
      tmpl.fields.each do |z|
        fname = z.first
        fspec = z.last
-       node = "dcterms:#{fspec[:xml_node] ? fspec[:xml_node] : fname}"
+       node_name = "dcterms:#{fspec[:xml_node] ? fspec[:xml_node] : fname}"
        attr_modifier= "[@xsi:type='#{fspec[:encoding]}']" if fspec[:encoding]
-       query = "./foxml:datastreamVersion[last()]/foxml:xmlContent/dc/#{node}#{attr_modifier}"
-       el.elements.each(query) do |f|
+       query = "./foxml:datastreamVersion[last()]/foxml:xmlContent/dc/#{node_name}#{attr_modifier}"
+       node.xpath(query, {"foxml"=>"info:fedora/fedora-system:def/foxml#", "dcterms"=>'http://purl.org/dc/terms/', "xsi"=>'http://www.w3.org/2001/XMLSchema-instance'}).each do |f|
           tmpl.send("#{fname}_append", f.text)
         end
 
      end
      tmpl.instance_variable_set(:@dirty, false)
      tmpl
-   end
+    end
 
    #Render self as a Fedora DC xml document.
    def to_dc_xml

data/lib/active_fedora/rels_ext_datastream.rb

@@ -28,12 +28,13 @@ module ActiveFedora
       EOL
     end
     
-    # Expects a RelsExtDatastream and a REXML Element as inputs.
-    def self.from_xml(tmpl, el) 
-      #puts el.elements["./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/"]
-      el.elements.each("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*") do |f|
-          #puts "Element" + f.inspect
-          r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>ActiveFedora::SemanticNode::PREDICATE_MAPPINGS.invert[f.name], :object=>f.attributes["rdf:resource"])
+    # @tmpl ActiveFedora::MetadataDatastream
+    # @node Nokogiri::XML::Node
+    def self.from_xml(tmpl, node) 
+      # node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*").each do |f|
+      node.xpath("./foxml:datastreamVersion[last()]/foxml:xmlContent/rdf:RDF/rdf:Description/*", {"rdf"=>"http://www.w3.org/1999/02/22-rdf-syntax-ns#", "foxml"=>"info:fedora/fedora-system:def/foxml#"}).each do |f|
+          r = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>ActiveFedora::SemanticNode::PREDICATE_MAPPINGS.invert[f.name], :object=>f["resource"])
+          puts "adding #{r.inspect} to template"
           tmpl.add_relationship(r)
       end
       tmpl.send(:dirty=, false)

data/lib/fedora/repository.rb

@@ -4,6 +4,7 @@ require 'fedora/connection'
 require 'fedora/formats'
 require 'fedora/fedora_object'
 require 'fedora/datastream'
+require "nokogiri"
 
 module Fedora
   NAMESPACE = "fedora:info/"
@@ -96,9 +97,11 @@ module Fedora
       
       convert_xml(connection.get("#{fedora_url.path}/objects?#{params.to_fedora_query}#{includes}"))
     end
+    
     def find_model(pid, klazz)
       obj = self.find_objects("pid=#{pid}").first
-      doc = REXML::Document.new(obj.object_xml, :ignore_whitespace_nodes=>:all)
+      #doc = REXML::Document.new(obj.object_xml, :ignore_whitespace_nodes=>:all)
+      doc = Nokogiri::XML::Document.parse(obj.object_xml)     
       klazz.deserialize(doc)
     end
     

data/spec/integration/base_loader_spec.rb

@@ -3,6 +3,7 @@ require 'active_fedora'
 require 'active_fedora/base'
 require 'active_fedora/metadata_datastream'
 require 'ruby-debug'
+require 'nokogiri'
 
 # Load Sample OralHistory Model
 require File.join( File.dirname(__FILE__), "..","samples","oral_history_sample_model" )
@@ -28,7 +29,7 @@ describe ActiveFedora::Base do
       #mocko = mock("object")
       #ActiveFedora::Base.expects(:new).returns(mocko)
       @test_object.datastreams["sensitive_passages"].delete
-      doc = REXML::Document.new(@test_object.inner_object.object_xml, :ignore_whitespace_nodes=>:all)
+      doc = Nokogiri::XML::Document.parse(@test_object.inner_object.object_xml)
       result = OralHistorySampleModel.deserialize(doc)
       result.new_object?.should be_false
       result.datastreams_in_memory.should have_key("dublin_core")

data/spec/unit/content_model_spec.rb

@@ -6,6 +6,11 @@ require 'mocha'
 
 describe ActiveFedora::ContentModel do
   
+  before(:all) do
+    class SampleModel < ActiveFedora::Base
+    end
+  end
+  
   before(:each) do
     Fedora::Repository.instance.stubs(:nextid).returns("_nextid_")
     @test_cmodel = ActiveFedora::ContentModel.new
@@ -47,5 +52,51 @@ describe ActiveFedora::ContentModel do
     end
   end
   
+  describe "models_asserted_by" do
+    it "should return an array of all of the content models asserted by the given object" do
+      mock_object = mock("ActiveFedora Object")
+      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]} )
+      ActiveFedora::ContentModel.models_asserted_by(mock_object).should == ["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]
+    end
+    it "should return an empty array if the object doesn't have a RELS-EXT datastream" do
+      mock_object = mock("ActiveFedora Object")
+      mock_object.expects(:relationships).returns( :self=>{} )
+      ActiveFedora::ContentModel.models_asserted_by(mock_object).should == []
+    end
+  end
+  
+  describe "known_models_asserted_by" do
+    it "should figure out the applicable models to load" do
+      mock_object = mock("ActiveFedora Object")
+      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/fedora-system:ServiceDefinition-3.0", "info:fedora/afmodel:SampleModel", "info:fedora/afmodel:NonDefinedModel"]} )
+      ActiveFedora::ContentModel.known_models_for(mock_object).should == [SampleModel]
+    end
+    it "should default to using ActiveFedora::Base as the model" do
+      mock_object = mock("ActiveFedora Object")
+      mock_object.expects(:relationships).returns( :self=>{:has_model=>["info:fedora/afmodel:NonDefinedModel"]} )
+      ActiveFedora::ContentModel.known_models_for(mock_object).should == [ActiveFedora::Base]
+    end
+    it "should still work even if the object doesn't have a RELS-EXT datastream" do
+      mock_object = mock("ActiveFedora Object")
+      mock_object.expects(:relationships).returns( :self=>{} )
+      ActiveFedora::ContentModel.known_models_for(mock_object).should == [ActiveFedora::Base]
+    end
+  end
+  
+  describe "uri_to_ruby_class" do
+    it "should return ruby class corresponding to the given uri if a valid class can be found" do
+      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:SampleModel").should == SampleModel
+      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:NonDefinedModel").should == false
+      ActiveFedora::ContentModel.uri_to_ruby_class("info:fedora/afmodel:String").should == String
+    end
+  end
+  
+  describe "uri_to_model_class" do
+    it "should return an ActiveFedora Model class corresponding to the given uri if a valid model can be found" do
+      ActiveFedora::ContentModel.uri_to_model_class("info:fedora/afmodel:SampleModel").should == SampleModel
+      ActiveFedora::ContentModel.uri_to_model_class("info:fedora/afmodel:NonDefinedModel").should == false
+      ActiveFedora::ContentModel.uri_to_model_class("info:fedora/afmodel:String").should == false
+    end
+  end
 
 end

data/spec/unit/datastream_spec.rb

@@ -1,7 +1,7 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 require 'active_fedora'
-require "rexml/document"
+require "nokogiri"
 require 'ftools'
 
 describe ActiveFedora::Datastream do
@@ -27,7 +27,7 @@ describe ActiveFedora::Datastream do
         </foxml:datastreamVersion>
       </foxml:datastream>
     EOF
-    n = ActiveFedora::Datastream.from_xml(ActiveFedora::Datastream.new, REXML::Document.new(xml).elements.first)
+    n = ActiveFedora::Datastream.from_xml(ActiveFedora::Datastream.new, Nokogiri::XML::Document.parse(xml).root)
     n.control_group.should == 'M'
 
   end

data/spec/unit/mods_datastream_spec.rb

@@ -0,0 +1,289 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+require 'active_fedora'
+require 'hydra'
+
+describe ModsDatastream do
+  
+  before(:all) do
+    @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
+                      :coverage => {:values => ["coverage1", "coverage2"], :type => :text}, 
+                      :creation_date => {:values => "fake-date", :type => :date},
+                      :mydate => {:values => "fake-date", :type => :date},
+                      :empty_field => {:values => {}}
+                      } 
+    @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
+    
+  end
+  
+  before(:each) do
+    @test_ds = ModsDatastream.new
+  end
+  
+  after(:each) do
+  end
+  
+  describe '#new' do
+    it 'should provide #new' do
+      ModsDatastream.should respond_to(:new)
+      @test_ds.ng_xml.should be_instance_of(OpinionatedModsDocument)
+    end
+  end
+  
+
+  it 'should provide .fields' do
+    @test_ds.should respond_to(:fields)
+  end
+  
+  describe '.save' do
+    it "should provide .save" do
+      @test_ds.should respond_to(:save)
+    end
+    it "should persist the product of .to_xml in fedora" do
+      Fedora::Repository.instance.expects(:save)
+      @test_ds.expects(:to_xml).returns("fake xml")
+      @test_ds.expects(:blob=).with("fake xml")
+      @test_ds.save
+    end
+  end
+  
+  describe '.to_xml' do
+    it "should provide .to_xml" do
+      @test_ds.should respond_to(:to_xml)
+    end
+    it 'should output the fields hash as XML' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      #sample_rexml = REXML::Document.new(sample_xml)
+      #returned_rexml = REXML::Document.new(@test_ds.to_dc_xml)
+      #returned_rexml.to_s.should == sample_rexml.to_s
+      returned_xml = XmlSimple.xml_in(@test_ds.to_xml)
+      returned_xml.should == @sample_xml
+    end
+    
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      rexml.root.elements.expects(:add).times(5)
+      result = @test_ds.to_xml(rexml)
+    end
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      result = @test_ds.to_xml(rexml)
+      XmlSimple.xml_in(rexml.to_s).should == @sample_xml
+      XmlSimple.xml_in(result).should == @sample_xml
+    end
+    
+    it 'should add to root of REXML::Documents, but add directly to the elements if a REXML::Element is passed in' do
+      @test_ds.expects(:fields).returns(@sample_fields).times(2)
+      doc = REXML::Document.new("<test_document/>")
+      el = REXML::Element.new("<test_element/>")
+      doc.root.elements.expects(:add).times(5)
+      el.expects(:add).times(5)
+      @test_ds.to_xml(doc)
+      @test_ds.to_xml(el)
+    end
+    
+  end
+  
+  describe '.set_blob_for_save' do
+    it "should provide .set_blob_for_save" do
+      @test_ds.should respond_to(:set_blob_for_save)
+    end
+    
+    it "should set the blob to to_xml" do
+      @test_ds.expects(:blob=).with(@test_ds.to_xml)
+      @test_ds.set_blob_for_save
+    end
+  end
+  
+  describe '#field' do
+    
+    before(:each) do
+      class SpecDatastream < ActiveFedora::MetadataDatastream
+        def initialize
+        super
+        field :publisher, :string
+        field :coverage, :text
+        field :creation_date, :date
+        field :mydate, :date
+        field :mycomplicated_field, :string, :multiple=>false, :encoding=>'LCSH', :element_attrs=>{:foo=>:bar, :baz=>:bat}
+        end
+      end
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :SpecDatastream)
+    end
+    
+    it 'should add corresponding field to the @fields hash and set the field :type ' do
+      sds = SpecDatastream.new
+      sds.fields.should_not have_key(:bio)
+      sds.field :bio, :text
+      sds.fields.should have_key(:bio)
+      sds.fields[:bio].should have_key(:type)
+      sds.fields[:bio][:type].should == :text
+      sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    end
+    
+    # it "should insert custom element attrs into the xml stream" do
+    #   sds = SpecDatastream.new
+    #   sds.mycomplicated_field_values='foo'
+    #   sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    #   sds.to_xml.should == '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
+    # end
+    
+    it "should add getters and setters and appenders with field name" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should respond_to(:publisher_values)
+      local_test_ds.should respond_to(:publisher_append)
+      local_test_ds.should respond_to(:publisher_values=)
+      local_test_ds.publisher_values.class.should == Array
+      local_test_ds.should respond_to(:coverage_values)
+      local_test_ds.should respond_to(:coverage_values=)
+      local_test_ds.should respond_to(:coverage_append)
+      local_test_ds.should respond_to(:creation_date_values)
+      local_test_ds.should respond_to(:creation_date_append)
+      local_test_ds.should respond_to(:creation_date_values=)
+      local_test_ds.should respond_to(:mydate_values)
+      local_test_ds.should respond_to(:mydate_append)
+      local_test_ds.should respond_to(:mydate_values=)
+    end
+    
+    it "should track field values at instance level, not at class level" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds2 = SpecDatastream.new
+      local_test_ds1.publisher_values = ["publisher1", "publisher2"]
+      local_test_ds2.publisher_values = ["publisherA", "publisherB"]
+      
+      local_test_ds2.publisher_values.should == ["publisherA", "publisherB"]      
+      local_test_ds1.publisher_values.should == ["publisher1", "publisher2"]
+    end
+    
+    it "should allow you to add field values using <<" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds1.publisher_values << "publisher1"
+      local_test_ds1.publisher_values.should == ["publisher1"] 
+    end
+    
+    it "should create setter that always turns non-arrays into arrays" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.publisher_values.should == ["Foo"]
+    end
+    
+    it "should create setter that sets datastream.dirty? to true" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should_not be_dirty
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.should be_dirty
+      
+      # Note: If you use << to append values, the datastream will not be marked as dirty!
+      #local_test_ds.dirty = false
+      
+      #local_test_ds.should_not be_dirty
+      #local_test_ds.publisher_values << "Foo"
+      #local_test_ds.should be_dirty      
+    end
+    
+    it "should add any extra opts to the field hash" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.field "myfield", :string, :foo => "foo", :bar => "bar"      
+      local_test_ds.fields[:myfield].should have_key(:foo)
+      local_test_ds.fields[:myfield][:foo].should == "foo"
+      local_test_ds.fields[:myfield].should have_key(:bar)
+      local_test_ds.fields[:myfield][:bar].should == "bar"      
+    end
+    
+  end
+  
+  describe ".to_solr" do
+    
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    it "should provide .to_solr and return a SolrDocument" do
+      @test_ds.should respond_to(:to_solr)
+      @test_ds.to_solr.should be_kind_of(Solr::Document)
+    end
+    
+    it "should optionally allow you to provide the Solr::Document to add fields to and return that document when done" do
+      doc = Solr::Document.new
+      @test_ds.to_solr(doc).should equal(doc)
+    end
+    
+    it "should iterate through @fields hash" do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      solr_doc[:publisher_t].should == "publisher1"
+      solr_doc[:coverage_t].should == "coverage1"
+      solr_doc[:creation_date_dt].should == "fake-date"
+      solr_doc[:mydate_dt].should == "fake-date"
+      
+      solr_doc[:empty_field_t].should be_nil
+    end
+    
+    it "should allow multiple values for a single field"
+    
+    it 'should append create keys in format field_name + _ + field_type' do
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      
+      #should have these
+            
+      @test_ds.to_solr[:publisher_t].should_not be_nil
+      @test_ds.to_solr[:coverage_t].should_not be_nil
+      @test_ds.to_solr[:creation_date_dt].should_not be_nil
+      
+      #should NOT have these
+      @test_ds.to_solr[:narrator].should be_nil
+      @test_ds.to_solr[:title].should be_nil
+      @test_ds.to_solr[:empty_field].should be_nil
+      
+    end
+    
+    it "should use Solr mappings to generate field names" do
+      ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      #should have these
+            
+      solr_doc[:publisher_field].should == "publisher1"
+      solr_doc[:coverage_field].should == "coverage1"
+      solr_doc[:creation_date_date].should == "fake-date"
+      solr_doc[:mydate_date].should == "fake-date"
+      
+      solr_doc[:publisher_t].should be_nil
+      solr_doc[:coverage_t].should be_nil
+      solr_doc[:creation_date_dt].should be_nil
+      
+      # Reload default mappings
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    it 'should append _dt to dates' do
+      @test_ds.expects(:fields).returns(@sample_fields).at_least_once
+      
+      #should have these
+      
+      @test_ds.to_solr[:creation_date_dt].should_not be_nil
+      @test_ds.to_solr[:mydate_dt].should_not be_nil
+      
+      #should NOT have these
+      
+      @test_ds.to_solr[:mydate].should be_nil
+      @test_ds.to_solr[:creation_date_date].should be_nil
+    end
+    
+  end
+  
+  describe '.fields' do
+    it "should return a Hash" do
+      @test_ds.fields.should be_instance_of(Hash)
+    end
+  end
+  
+end

data/spec/unit/nokogiri_datastream_spec.rb

@@ -0,0 +1,301 @@
+require File.join( File.dirname(__FILE__), "../spec_helper" )
+
+require 'active_fedora'
+require 'active_fedora/nokogiri_datastream'
+
+describe ActiveFedora::NokogiriDatastream do
+  
+  before(:all) do
+    @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
+                      :coverage => {:values => ["coverage1", "coverage2"], :type => :text}, 
+                      :creation_date => {:values => "fake-date", :type => :date},
+                      :mydate => {:values => "fake-date", :type => :date},
+                      :empty_field => {:values => {}}
+                      } 
+    @sample_xml = XmlSimple.xml_in("<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>fake-date</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>")
+    
+  end
+  
+  before(:each) do
+    @test_ds = ActiveFedora::NokogiriDatastream.new
+  end
+  
+  after(:each) do
+  end
+  
+  describe '#new' do
+    it 'should provide #new' do
+      ActiveFedora::NokogiriDatastream.should respond_to(:new)
+      @test_ds.ng_xml.should be_instance_of(Nokogiri::XML::Document)
+    end
+  end
+  
+
+  it 'should provide .fields' do
+    @test_ds.should respond_to(:fields)
+  end
+  
+  describe '.save' do
+    it "should provide .save" do
+      @test_ds.should respond_to(:save)
+    end
+    it "should persist the product of .to_xml in fedora" do
+      Fedora::Repository.instance.expects(:save)
+      @test_ds.expects(:to_xml).returns("fake xml")
+      @test_ds.expects(:blob=).with("fake xml")
+      @test_ds.save
+    end
+  end
+  
+  describe '.to_xml' do
+    it "should provide .to_xml" do
+      @test_ds.should respond_to(:to_xml)
+    end
+    it 'should output the fields hash as XML' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      returned_xml = XmlSimple.xml_in(@test_ds.to_xml)
+      returned_xml.should == @sample_xml
+    end
+    
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      rexml.root.elements.expects(:add).times(5)
+      result = @test_ds.to_xml(rexml)
+    end
+    it 'should accept an optional REXML Document as an argument and insert its fields into that' do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      rexml = REXML::Document.new("<test_rexml/>")
+      result = @test_ds.to_xml(rexml)
+      XmlSimple.xml_in(rexml.to_s).should == @sample_xml
+      XmlSimple.xml_in(result).should == @sample_xml
+    end
+    
+    it 'should add to root of REXML::Documents, but add directly to the elements if a REXML::Element is passed in' do
+      @test_ds.expects(:fields).returns(@sample_fields).times(2)
+      doc = REXML::Document.new("<test_document/>")
+      el = REXML::Element.new("<test_element/>")
+      doc.root.elements.expects(:add).times(5)
+      el.expects(:add).times(5)
+      @test_ds.to_xml(doc)
+      @test_ds.to_xml(el)
+    end
+    
+  end
+  
+  describe '.set_blob_for_save' do
+    it "should provide .set_blob_for_save" do
+      @test_ds.should respond_to(:set_blob_for_save)
+    end
+    
+    it "should set the blob to to_xml" do
+      @test_ds.expects(:blob=).with(@test_ds.to_xml)
+      @test_ds.set_blob_for_save
+    end
+  end
+  
+  describe '#field' do
+    
+    before(:each) do
+      class SpecDatastream < ActiveFedora::MetadataDatastream
+        def initialize
+        super
+        field :publisher, :string
+        field :coverage, :text
+        field :creation_date, :date
+        field :mydate, :date
+        field :mycomplicated_field, :string, :multiple=>false, :encoding=>'LCSH', :element_attrs=>{:foo=>:bar, :baz=>:bat}
+        end
+      end
+    end
+    
+    after(:each) do
+      Object.send(:remove_const, :SpecDatastream)
+    end
+    
+    
+    decribe ".values" 
+      it "should call ng_xml.values_for(#{field_name}) OR call corresponding lookup method and build an array of values by calling .value on each node in the set"
+    end
+
+    decribe ".values<<" 
+      it "should call corresponding builder method"
+    end
+  
+    decribe ".values=" 
+      it "should wipe out any existing nodes, use the corresponding builder, and insert new node(s) as the replacement"
+    end
+    
+    it 'should add corresponding field to the @fields hash and set the field :type ' do
+      sds = SpecDatastream.new
+      sds.fields.should_not have_key(:bio)
+      sds.field :bio, :text
+      sds.fields.should have_key(:bio)
+      sds.fields[:bio].should have_key(:type)
+      sds.fields[:bio][:type].should == :text
+      sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    end
+    
+    # it "should insert custom element attrs into the xml stream" do
+    #   sds = SpecDatastream.new
+    #   sds.mycomplicated_field_values='foo'
+    #   sds.fields[:mycomplicated_field][:element_attrs].should == {:foo=>:bar, :baz=>:bat}
+    #   sds.to_xml.should == '<fields><mycomplicated_field baz=\'bat\' foo=\'bar\'>foo</mycomplicated_field></fields>'
+    # end
+    
+    it "should add getters and setters and appenders with field name" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should respond_to(:publisher_values)
+      local_test_ds.should respond_to(:publisher_append)
+      local_test_ds.should respond_to(:publisher_values=)
+      local_test_ds.publisher_values.class.should == Array
+      local_test_ds.should respond_to(:coverage_values)
+      local_test_ds.should respond_to(:coverage_values=)
+      local_test_ds.should respond_to(:coverage_append)
+      local_test_ds.should respond_to(:creation_date_values)
+      local_test_ds.should respond_to(:creation_date_append)
+      local_test_ds.should respond_to(:creation_date_values=)
+      local_test_ds.should respond_to(:mydate_values)
+      local_test_ds.should respond_to(:mydate_append)
+      local_test_ds.should respond_to(:mydate_values=)
+    end
+    
+    it "should track field values at instance level, not at class level" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds2 = SpecDatastream.new
+      local_test_ds1.publisher_values = ["publisher1", "publisher2"]
+      local_test_ds2.publisher_values = ["publisherA", "publisherB"]
+      
+      local_test_ds2.publisher_values.should == ["publisherA", "publisherB"]      
+      local_test_ds1.publisher_values.should == ["publisher1", "publisher2"]
+    end
+    
+    it "should allow you to add field values using <<" do
+      local_test_ds1 = SpecDatastream.new
+      local_test_ds1.publisher_values << "publisher1"
+      local_test_ds1.publisher_values.should == ["publisher1"] 
+    end
+    
+    it "should create setter that always turns non-arrays into arrays" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.publisher_values.should == ["Foo"]
+    end
+    
+    it "should create setter that sets datastream.dirty? to true" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.should_not be_dirty
+      local_test_ds.publisher_values = "Foo"
+      local_test_ds.should be_dirty
+      
+      # Note: If you use << to append values, the datastream will not be marked as dirty!
+      #local_test_ds.dirty = false
+      
+      #local_test_ds.should_not be_dirty
+      #local_test_ds.publisher_values << "Foo"
+      #local_test_ds.should be_dirty      
+    end
+    
+    it "should add any extra opts to the field hash" do
+      local_test_ds = SpecDatastream.new
+      local_test_ds.field "myfield", :string, :foo => "foo", :bar => "bar"      
+      local_test_ds.fields[:myfield].should have_key(:foo)
+      local_test_ds.fields[:myfield][:foo].should == "foo"
+      local_test_ds.fields[:myfield].should have_key(:bar)
+      local_test_ds.fields[:myfield][:bar].should == "bar"      
+    end
+    
+  end
+  
+  describe ".to_solr" do
+    
+    after(:all) do
+      # Revert to default mappings after running tests
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    it "should iterate through the class fields, calling .values on each and appending the values to the solr doc"
+    
+    it "should provide .to_solr and return a SolrDocument" do
+      @test_ds.should respond_to(:to_solr)
+      @test_ds.to_solr.should be_kind_of(Solr::Document)
+    end
+    
+    it "should optionally allow you to provide the Solr::Document to add fields to and return that document when done" do
+      doc = Solr::Document.new
+      @test_ds.to_solr(doc).should equal(doc)
+    end
+    
+    it "should iterate through @fields hash" do
+      @test_ds.expects(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      solr_doc[:publisher_t].should == "publisher1"
+      solr_doc[:coverage_t].should == "coverage1"
+      solr_doc[:creation_date_dt].should == "fake-date"
+      solr_doc[:mydate_dt].should == "fake-date"
+      
+      solr_doc[:empty_field_t].should be_nil
+    end
+    
+    it "should allow multiple values for a single field"
+    
+    it 'should append create keys in format field_name + _ + field_type' do
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      
+      #should have these
+            
+      @test_ds.to_solr[:publisher_t].should_not be_nil
+      @test_ds.to_solr[:coverage_t].should_not be_nil
+      @test_ds.to_solr[:creation_date_dt].should_not be_nil
+      
+      #should NOT have these
+      @test_ds.to_solr[:narrator].should be_nil
+      @test_ds.to_solr[:title].should be_nil
+      @test_ds.to_solr[:empty_field].should be_nil
+      
+    end
+    
+    it "should use Solr mappings to generate field names" do
+      ActiveFedora::SolrService.load_mappings(File.join(File.dirname(__FILE__), "..", "..", "config", "solr_mappings_af_0.1.yml"))
+      @test_ds.stubs(:fields).returns(@sample_fields)
+      solr_doc =  @test_ds.to_solr
+      
+      #should have these
+            
+      solr_doc[:publisher_field].should == "publisher1"
+      solr_doc[:coverage_field].should == "coverage1"
+      solr_doc[:creation_date_date].should == "fake-date"
+      solr_doc[:mydate_date].should == "fake-date"
+      
+      solr_doc[:publisher_t].should be_nil
+      solr_doc[:coverage_t].should be_nil
+      solr_doc[:creation_date_dt].should be_nil
+      
+      # Reload default mappings
+      ActiveFedora::SolrService.load_mappings
+    end
+    
+    it 'should append _dt to dates' do
+      @test_ds.expects(:fields).returns(@sample_fields).at_least_once
+      
+      #should have these
+      
+      @test_ds.to_solr[:creation_date_dt].should_not be_nil
+      @test_ds.to_solr[:mydate_dt].should_not be_nil
+      
+      #should NOT have these
+      
+      @test_ds.to_solr[:mydate].should be_nil
+      @test_ds.to_solr[:creation_date_date].should be_nil
+    end
+    
+  end
+  
+  describe '.fields' do
+    it "should return a Hash" do
+      @test_ds.fields.should be_instance_of(Hash)
+    end
+  end
+  
+end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -2,6 +2,7 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 require 'active_fedora'
 require 'xmlsimple'
+require 'nokogiri'
 
 describe ActiveFedora::QualifiedDublinCoreDatastream do
 
@@ -44,8 +45,10 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     tmpl.expects(:publisher_append).with('jwa')
     tmpl.expects(:description_append).with('desc')
 
-    sample = File.join(File.dirname(__FILE__), '../samples/oh_qdc.xml')
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, REXML::Document.new(File.open(sample)).root.elements.first)
+    sample_xml = fixture('oh_qdc.xml')
+    sample_ds_xml = Nokogiri::XML::Document.parse(sample_xml).xpath('//foxml:datastream').first
+    
+    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, sample_ds_xml)
     z.should === tmpl
   end
 
@@ -59,10 +62,10 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   end
 
   it "should have identity in and out" do
-    sample = File.join(File.dirname(__FILE__), '../samples/oh_qdc.xml')
+    sample = fixture('oh_qdc.xml')
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
-    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, REXML::Document.new(File.open(sample)).root.elements.first)
-    y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, REXML::Document.new(z.to_dc_xml))
+    z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, Nokogiri::XML::Document.parse(sample).root.children.first)
+    y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(tmpl, Nokogiri::XML::Document.parse(z.to_dc_xml))
     y.to_dc_xml.should == z.to_dc_xml
   end
 
@@ -77,8 +80,8 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
 
   it "should parse dcterms and dcelements from xml" do
-    doc = REXML::Document.new(File.open(File.dirname(__FILE__)+'/../fixtures/changeme155.xml'), :force_array=>true)
-    stream = doc.elements['//foxml:datastream[@ID=\'dublin_core\']']
+    doc = Nokogiri::XML::Document.parse(File.open( File.dirname(__FILE__)+'/../fixtures/changeme155.xml') )
+    stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']')
     n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(ActiveFedora::QualifiedDublinCoreDatastream.new, stream)
     n.spatial_values.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title_values.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
@@ -134,7 +137,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
 
     #
-    # I think the fields should just be tracked as a REXML::Document internally.  Too much BS otherwise.
+    # I think the fields should just be tracked as a Nokogiri::XML::Document internally.  Too much BS otherwise.
     #
 
 
@@ -158,7 +161,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
     it "should use specified :xml_node if it is available in the field Hash" do
       @test_ds.stubs(:fields).returns({:myfieldname => {:values => ["sample spatial coverage"], :xml_node => "nodename" }})
-      REXML::Document.new(@test_ds.to_dc_xml).elements['./dc/dcterms:nodename'].text.should ==  'sample spatial coverage'
+      Nokogiri::XML::Document.parse(@test_ds.to_dc_xml).xpath('./dc/dcterms:nodename').text.should ==  'sample spatial coverage'
     end
 
     it "should use specified :xml_node if it was specified when .field was called" do

data/spec/unit/rels_ext_datastream_spec.rb

@@ -2,6 +2,7 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 
 require 'active_fedora'
 require "rexml/document"
+require "nokogiri"
 require 'ftools'
 
 describe ActiveFedora::RelsExtDatastream do
@@ -12,7 +13,7 @@ describe ActiveFedora::RelsExtDatastream do
     @test_relationship2 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_part_of, :object => "demo:11")  
     @test_relationship3 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => :has_part, :object => "demo:12")  
   
-    @sample_xml = REXML::Document.new(@sample_xml_string)
+    @sample_xml = Nokogiri::XML::Document.parse(@sample_xml_string)
   end
   
   before(:each) do
@@ -65,8 +66,8 @@ describe ActiveFedora::RelsExtDatastream do
     end
     it "should load RELS-EXT relationships into relationships hash" do
       @test_obj.relationships.should == {:self=>{:is_member_of=>["info:fedora/demo:10"], :is_part_of=>["info:fedora/demo:11"], :has_model=>["info:fedora/afmodel:ActiveFedora_Base"]}}
-      doc = REXML::Document.new(@test_obj.inner_object.object_xml)
-      el = doc.elements["/foxml:digitalObject//foxml:datastream[@ID='RELS-EXT']"]
+      doc = Nokogiri::XML::Document.parse(@test_obj.inner_object.object_xml)
+      el = doc.xpath("/foxml:digitalObject//foxml:datastream[@ID='RELS-EXT']").first
       new_ds = ActiveFedora::RelsExtDatastream.new
       new_ds.relationships.should == {:self=>{}}
       ActiveFedora::RelsExtDatastream.from_xml(new_ds,el)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 4
+  - pre2
+  version: 1.1.4.pre2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -05:00
+date: 2010-05-15 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,7 +121,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
-- README.txt
+- README.textile
 files: 
 - .document
 - .gitignore
@@ -280,7 +281,7 @@ files:
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
-- README.txt
+- README.textile
 - Rakefile
 - VERSION
 - active-fedora.gemspec
@@ -321,6 +322,7 @@ files:
 - spec/fixtures/changeme155.xml
 - spec/fixtures/dino.jpg
 - spec/fixtures/minivan.jpg
+- spec/fixtures/oh_qdc.xml
 - spec/fixtures/test_12.foxml.xml
 - spec/integration/base_file_management_spec.rb
 - spec/integration/base_loader_spec.rb
@@ -341,7 +343,6 @@ files:
 - spec/samples/models/oral_history.rb
 - spec/samples/models/seminar.rb
 - spec/samples/models/seminar_audio_file.rb
-- spec/samples/oh_qdc.xml
 - spec/samples/oral_history_sample.xml
 - spec/samples/oral_history_sample_model.rb
 - spec/samples/oral_history_xml.xml
@@ -391,14 +392,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: rubyfedora
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
@@ -439,6 +442,8 @@ test_files:
 - spec/unit/inheritance_spec.rb
 - spec/unit/metadata_datastream_spec.rb
 - spec/unit/model_spec.rb
+- spec/unit/mods_datastream_spec.rb
+- spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/relationship_spec.rb