active-fedora 5.2.0 → 5.2.1

data/Gemfile

@@ -10,3 +10,4 @@ group :development, :test do
 end
 
 gem 'jruby-openssl', :platform=> :jruby
+gem 'nom-xml', :git => 'git://github.com/cbeer/nom-xml.git'

data/active-fedora.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency('rsolr')
-  s.add_dependency('om', '~> 1.8.0.rc1')
+  s.add_dependency('om', '~> 1.8.0')
   s.add_dependency('solrizer', '~>2.0.0')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')

data/lib/active_fedora.rb

@@ -44,7 +44,9 @@ module ActiveFedora #:nodoc:
     autoload :Model
     autoload :MetadataDatastreamHelper
     autoload :NokogiriDatastream
+    autoload :NomDatastream
     autoload :NtriplesRDFDatastream
+    autoload :OmDatastream
     autoload :Property
     autoload :Persistence
     autoload :QualifiedDublinCoreDatastream

data/lib/active_fedora/nokogiri_datastream.rb

@@ -48,7 +48,7 @@ module ActiveFedora
     end
 
     def save
-      @content = to_xml
+      @content = to_xml if ng_xml_changed? and content_will_change!
       super
     end
 

data/lib/active_fedora/nom_datastream.rb

@@ -0,0 +1,88 @@
+require  "nom"
+
+module ActiveFedora
+  class NomDatastream < Datastream
+      def self.set_terminology &block
+        @terminology = block
+      end
+
+      def self.terminology
+        @terminology
+      end
+
+    def self.default_attributes
+      super.merge(:controlGroup => 'X', :mimeType => 'text/xml')
+    end
+
+    # Create an instance of this class based on xml content
+    # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
+    # @param [ActiveFedora::MetadataDatastream] tmpl the Datastream object that you are building @default a new instance of this class
+    # 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=nil)
+      ds = self.new nil, nil
+      ds.content = xml.to_s
+      ds
+    end
+
+    def ng_xml
+      @ng_xml ||= begin
+         xml = Nokogiri::XML content
+         xml.set_terminology &self.class.terminology
+         xml.nom!
+         xml
+      end
+    end
+    
+    def ng_xml= ng_xml
+      @ng_xml = ng_xml
+      @ng_xml.set_terminology &self.class.terminology
+      content_will_change!
+      @ng_xml
+    end
+
+    def serialize!
+       self.content = @ng_xml.to_s if @ng_xml
+    end
+
+    def content
+      @content || super
+    end
+
+    def content=(content)
+      super
+      @ng_xml = nil
+    end
+
+    def to_solr
+      solr_doc = {}
+
+      ng_xml.terminology.flatten.select { |x| x.options[:index] }.each do |term|
+        term.values.each do |v|
+          Array(term.options[:index]).each do |index_as|
+            solr_doc[index_as] ||= []
+            if v.is_a? Nokogiri::XML::Node
+              solr_doc[index_as] << v.text
+            else
+              solr_doc[index_as] << v
+            end
+          end
+        end
+      end
+
+      solr_doc 
+    end
+
+    def method_missing method, *args, &block
+      if ng_xml.respond_to? method
+        ng_xml.send(method, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to? *args
+      super || self.class.terminology.respond_to?(*args)
+    end
+  end
+end
+

data/lib/active_fedora/om_datastream.rb

@@ -0,0 +1,7 @@
+require  "om"
+
+module ActiveFedora
+  class OmDatastream < NokogiriDatastream
+    # right now, OmDatastream is just an alias for NokogiriDatastream
+  end
+end

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -5,7 +5,7 @@ module ActiveFedora
   #Fedora Dublin Core XML datastreams structure.
   #
   #Fields can still be overridden if more specificity is desired (see ActiveFedora::Datastream#fields method).
-  class QualifiedDublinCoreDatastream < NokogiriDatastream
+  class QualifiedDublinCoreDatastream < OmDatastream
 
     class_attribute :class_fields
     self.class_fields = []

data/lib/active_fedora/rdf_datastream.rb

@@ -156,8 +156,7 @@ module ActiveFedora
     end
 
     def save
-      @content = serialize
-
+      @content = serialize  if graph_changed? and content_will_change!
 
       super
     end

data/lib/active_fedora/simple_datastream.rb

@@ -1,6 +1,6 @@
 module ActiveFedora
   #This class represents a simple xml datastream. 
-  class SimpleDatastream < NokogiriDatastream
+  class SimpleDatastream < OmDatastream
 
     class_attribute :class_fields
     self.class_fields = []

data/lib/active_fedora/solr_digital_object.rb

@@ -19,7 +19,7 @@ module ActiveFedora
       missing.each do |dsid|
         #Initialize the datastreams that are in the solr document, but not found in the classes spec.
         mime_type = profile_hash['datastreams'][dsid]['dsMIME']
-        ds_class = mime_type =~ /[\/\+]xml$/ ? NokogiriDatastream : Datastream
+        ds_class = mime_type =~ /[\/\+]xml$/ ? OmDatastream : Datastream
         @datastreams[dsid] = ds_class.new(self, dsid)
       end
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

data/spec/integration/base_spec.rb

@@ -298,7 +298,7 @@ describe ActiveFedora::Base do
   end
   
   describe ".metadata_streams" do
-    it "should return all of the datastreams from the object that are kinds of NokogiriDatastream " do
+    it "should return all of the datastreams from the object that are kinds of OmDatastream " do
       mds1 = ActiveFedora::SimpleDatastream.new(@test_object.inner_object, "md1")
       mds2 = ActiveFedora::QualifiedDublinCoreDatastream.new(@test_object.inner_object, "qdc")
       fds = ActiveFedora::Datastream.new(@test_object.inner_object, "fds")

data/spec/integration/datastreams_spec.rb

@@ -7,8 +7,8 @@ describe ActiveFedora::Datastreams do
   describe "serializing datastreams" do
     before :all do
       class TestingMetadataSerializing < ActiveFedora::Base
-        has_metadata :name => "nokogiri_autocreate_on", :autocreate => true, :type => ActiveFedora::NokogiriDatastream
-        has_metadata :name => "nokogiri_autocreate_off", :autocreate => false, :type => ActiveFedora::NokogiriDatastream
+        has_metadata :name => "nokogiri_autocreate_on", :autocreate => true, :type => ActiveFedora::OmDatastream
+        has_metadata :name => "nokogiri_autocreate_off", :autocreate => false, :type => ActiveFedora::OmDatastream
       end
     end
 

data/spec/integration/full_featured_model_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
           m.field "location", :string
         end
         
-        # has_metadata :name=>"arbitrary_xml", :type=> ActiveFedora::NokogiriDatastream do |m|
+        # has_metadata :name=>"arbitrary_xml", :type=> ActiveFedora::OmDatastream do |m|
         #   m.root_property :myxml, "my_xml", "http://www.example.gov/schema/v3"
         # end
         

data/spec/integration/ntriples_datastream_spec.rb

@@ -26,6 +26,18 @@ describe ActiveFedora::NtriplesRDFDatastream do
     Object.send(:remove_const, :MyDatastream)
   end
 
+  it "should set and recall" do
+    @subject.title = "John Doe"
+    @subject.save
+    f = RdfTest.find(@subject.pid)
+    f.title.should == "John Doe"
+    f.title = "Jane Doe"
+    f.save
+    new_object = RdfTest.find(@subject.pid)
+    new_object.title.should == "Jane Doe"
+
+  end
+
   it "should set and recall values" do
     @subject.title = 'War and Peace'
     @subject.based_near = "Moscow, Russia"

data/spec/integration/{nokogiri_datastream_spec.rb → om_datastream_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require "solrizer"
 
-describe ActiveFedora::NokogiriDatastream do
+describe ActiveFedora::OmDatastream do
   
   before(:all) do
     class HydrangeaArticle2 < ActiveFedora::Base

data/spec/samples/hydra-mods_article_datastream.rb

@@ -1,7 +1,7 @@
 require "active-fedora"
 module Hydra
   
-  # This is an example of a NokogiriDatastream that defines an OM terminology for MODS xml
+  # This is an example of a OmDatastream that defines an OM terminology for MODS xml
   # It focuses on the aspects of MODS that deal with descriptive metadata for published articles
   # This is not the hydra-head plugin version of this OM Terminology; See https://github.com/projecthydra/hydra-head/blob/master/lib/hydra/mods_article.rb
   #
@@ -18,7 +18,7 @@ module Hydra
   # * Defines a series of templates, person_template, organization_template, etc. for generating a whole set of xml nodes to insert into the document (note: the new OM::TemplateRegistry provides an even better way to do this)
   # * Defines a custom method, insert_contributor, that uses the Terminology to manipulate xml documents in specialized ways
   # * Defines a series of relator_term Hashes that can then be used when generating views, etc.  In this case, the Hashes are hard-coded into the Class.  Ideally, they might be read from a configuration file or mixed into the class using a module
-  class ModsArticleDatastream < ActiveFedora::NokogiriDatastream       
+  class ModsArticleDatastream < ActiveFedora::OmDatastream       
 
     set_terminology do |t|
       t.root(:path=>"mods", :xmlns=>"http://www.loc.gov/mods/v3", :schema=>"http://www.loc.gov/standards/mods/v3/mods-3-2.xsd")

data/spec/samples/hydra-rights_metadata_datastream.rb

@@ -1,5 +1,5 @@
 module Hydra
-  # This is an example of a NokogiriDatastream that defines a terminology for Hydra rightsMetadata xml
+  # This is an example of a OmDatastream that defines a terminology for Hydra rightsMetadata xml
   # The documentation for Hydra rightsMetadata is on the Hydra wiki at https://wiki.duraspace.org/display/hydra/Hydra+rights+metadata
   # The real version of this Terminology is part of the hydra-head plugin.  See https://github.com/projecthydra/hydra-head/blob/master/lib/hydra/rights_metadata.rb
   #
@@ -12,7 +12,7 @@ module Hydra
   #
   # Another interesting thing in this Class: it extends to_solr, first calling "super" (the default to_solr behavior) and then inserting an additional embargo_release_date_dt field
   # It uses Solrizer::Extractor.insert_solr_field_value to do this.  That method handles inserting new values into a Hash while ensuring that you don't destroy or overwrite any existing values in the hash.
-  class RightsMetadataDatastream < ActiveFedora::NokogiriDatastream       
+  class RightsMetadataDatastream < ActiveFedora::OmDatastream       
   
     set_terminology do |t|
       t.root(:path=>"rightsMetadata", :xmlns=>"http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1", :schema=>"http://github.com/projecthydra/schemas/tree/v1/rightsMetadata.xsd") 

data/spec/samples/marpa-dc_datastream.rb

@@ -1,7 +1,7 @@
 require "active-fedora"
 module Marpa
 
-  # This is an example of a NokogiriDatastream that defines a terminology for Dublin Core xml
+  # This is an example of a OmDatastream that defines a terminology for Dublin Core xml
   #
   # Some things to observe about this Class:
   # * Defines a couple of custom terms, tibetan_title and english_title, that map to dc:title with varying @language attributes
@@ -10,7 +10,7 @@ module Marpa
   # * Sets the namespace using :xmlns argument on the root term
   # * Does not override or extend to_solr, so the default solrization approach will be used (Solrizer::XML::TerminologyBasedSolrizer)
   #
-  class DcDatastream < ActiveFedora::NokogiriDatastream
+  class DcDatastream < ActiveFedora::OmDatastream
   
     set_terminology do |t|
       t.root(:path=>"dc", :xmlns=>'http://purl.org/dc/terms/')

data/spec/unit/base_active_model_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
 
   describe "active model methods" do 
-    class BarStream < ActiveFedora::NokogiriDatastream 
+    class BarStream < ActiveFedora::OmDatastream 
       set_terminology do |t|
         t.root(:path=>"first", :xmlns=>"urn:foobar")
         t.duck()

data/spec/unit/base_delegate_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
 
   describe "first level delegation" do 
-    class BarStream2 < ActiveFedora::NokogiriDatastream 
+    class BarStream2 < ActiveFedora::OmDatastream 
       set_terminology do |t|
         t.root(:path=>"animals", :xmlns=>"urn:zoobar")
         t.waterfowl do

data/spec/unit/base_delegate_to_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
 
   describe "deletgating multiple terms to one datastream" do
-    class BarnyardDocument < ActiveFedora::NokogiriDatastream
+    class BarnyardDocument < ActiveFedora::OmDatastream
       set_terminology do |t|
         t.root(:path=>"animals", :xmlns=>"urn:zoobar")
         t.waterfowl do

data/spec/unit/base_spec.rb

@@ -92,7 +92,7 @@ describe ActiveFedora::Base do
         delegate :swank, :to=>'someData'
       end
       class FooAdaptation < ActiveFedora::Base
-        has_metadata :type=>ActiveFedora::NokogiriDatastream, :name=>'someData'
+        has_metadata :type=>ActiveFedora::OmDatastream, :name=>'someData'
       end
     end
 
@@ -145,7 +145,7 @@ describe ActiveFedora::Base do
 
     describe ".datastream_class_for_name" do
       it "should return the specifed class" do
-        FooAdaptation.datastream_class_for_name('someData').should == ActiveFedora::NokogiriDatastream
+        FooAdaptation.datastream_class_for_name('someData').should == ActiveFedora::OmDatastream
       end
       it "should return the specifed class" do
         FooAdaptation.datastream_class_for_name('content').should == ActiveFedora::Datastream
@@ -367,7 +367,7 @@ describe ActiveFedora::Base do
         @test_object = FooHistory.new()
         adapted = @test_object.adapt_to(FooAdaptation)
         adapted.datastreams.keys.should include 'someData'
-        adapted.datastreams['someData'].class.should == ActiveFedora::NokogiriDatastream
+        adapted.datastreams['someData'].class.should == ActiveFedora::OmDatastream
       end
     end
 
@@ -441,7 +441,7 @@ describe ActiveFedora::Base do
         solr_doc["active_fedora_model_field"].should eql(@test_object.class.inspect)
       end
       
-      it "should call .to_solr on all SimpleDatastreams and NokogiriDatastreams, passing the resulting document to solr" do
+      it "should call .to_solr on all SimpleDatastreams and OmDatastreams, passing the resulting document to solr" do
         mock1 = mock("ds1", :to_solr => {})
         mock2 = mock("ds2", :to_solr => {})
         ngds = mock("ngds", :to_solr => {})

data/spec/unit/nom_datastream_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ActiveFedora::NomDatastream do
+  describe "test" do
+    subject {
+      class MyNomDatastream < ActiveFedora::NomDatastream
+       
+        set_terminology do |t|
+          t.a :path => '//a', :accessor => lambda { |x| x.text }, :index => 'a_s'
+          t.b :path => '//b', :index => 'b_s'
+        end
+      end	
+
+      MyNomDatastream.from_xml '<root><a>123</a><b><c>asdf</c></b></root>'
+    }
+
+    it "should work" do
+      subject.a.should include("123")
+    end
+
+    it "should to_solr" do
+      subject.to_solr['a_s'].should include('123')
+      subject.to_solr['b_s'].should include('asdf')
+    end
+  end
+end

data/spec/unit/{nokogiri_datastream_spec.rb → om_datastream_spec.rb}

@@ -1,5 +1,5 @@
 require 'spec_helper'
-describe ActiveFedora::NokogiriDatastream do
+describe ActiveFedora::OmDatastream do
   
   before(:all) do
     @sample_fields = {:publisher => {:values => ["publisher1"], :type => :string}, 
@@ -19,7 +19,7 @@ describe ActiveFedora::NokogiriDatastream do
     @mock_inner.stub(:repository).and_return(@mock_repo)
     @mock_inner.stub(:pid)
     @mock_inner.stub(:new? => false)
-    @test_ds = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
+    @test_ds = ActiveFedora::OmDatastream.new(@mock_inner, "descMetadata")
     @test_ds.stub(:new? => false, :profile => {}, :datastream_content => '<test_xml/>')
     @test_ds.content="<test_xml/>"
   end
@@ -30,34 +30,34 @@ describe ActiveFedora::NokogiriDatastream do
   its(:metadata?) { should be_true}
 
   it "should include the Solrizer::XML::TerminologyBasedSolrizer for .to_solr support" do
-    ActiveFedora::NokogiriDatastream.included_modules.should include(Solrizer::XML::TerminologyBasedSolrizer)
+    ActiveFedora::OmDatastream.included_modules.should include(Solrizer::XML::TerminologyBasedSolrizer)
   end
   
   describe '#new' do
     it 'should provide #new' do
-      ActiveFedora::NokogiriDatastream.should respond_to(:new)
+      ActiveFedora::OmDatastream.should respond_to(:new)
       @test_ds.ng_xml.should be_instance_of(Nokogiri::XML::Document)
     end
     it 'should load xml from blob if provided' do
-      test_ds1 = ActiveFedora::NokogiriDatastream.new(nil, 'ds1')
+      test_ds1 = ActiveFedora::OmDatastream.new(nil, 'ds1')
       test_ds1.content="<xml><foo/></xml>"
       test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
     end
     it "should initialize from #xml_template if no xml is provided" do
-      ActiveFedora::NokogiriDatastream.should_receive(:xml_template).and_return("<fake template/>")
-      n = ActiveFedora::NokogiriDatastream.new
+      ActiveFedora::OmDatastream.should_receive(:xml_template).and_return("<fake template/>")
+      n = ActiveFedora::OmDatastream.new
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
   
   describe '#xml_template' do
     it "should return an empty xml document" do
-      ActiveFedora::NokogiriDatastream.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n<xml/>\n"
+      ActiveFedora::OmDatastream.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n<xml/>\n"
     end
   end
 
   describe "an instance" do
-    subject { ActiveFedora::NokogiriDatastream.new }
+    subject { ActiveFedora::OmDatastream.new }
     it{ should.respond_to? :to_solr }
     its(:to_solr) {should == { }}
   end
@@ -153,7 +153,7 @@ describe ActiveFedora::NokogiriDatastream do
       @mods_ds.get_values("--my xpath--").should == ["value1", "value2"]
     end
     it "should assume that field_names that are strings are xpath queries" do
-      ActiveFedora::NokogiriDatastream.should_receive(:accessor_xpath).never
+      ActiveFedora::OmDatastream.should_receive(:accessor_xpath).never
       @mods_ds.should_receive(:term_values).with("--my xpath--").and_return(["abstract1", "abstract2"])
       @mods_ds.get_values("--my xpath--").should == ["abstract1", "abstract2"]
     end
@@ -188,7 +188,7 @@ describe ActiveFedora::NokogiriDatastream do
   end
   
   describe '.content=' do
-    subject { ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata") }
+    subject { ActiveFedora::OmDatastream.new(@mock_inner, "descMetadata") }
     it "should update the content" do
       subject.stub(:new? => false )
       subject.content = "<a />"
@@ -211,7 +211,7 @@ describe ActiveFedora::NokogiriDatastream do
   
   describe 'ng_xml=' do
     before do
-      @test_ds2 = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
+      @test_ds2 = ActiveFedora::OmDatastream.new(@mock_inner, "descMetadata")
     end
     it "should parse raw xml for you" do
       @test_ds2.ng_xml = @sample_raw_xml
@@ -275,7 +275,7 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.get_values_from_solr' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new
+      @mods_ds = ActiveFedora::OmDatastream.new
       @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
@@ -288,7 +288,7 @@ describe ActiveFedora::NokogiriDatastream do
       mock_term.stub(:type).and_return(:text)
       mock_terminology = mock("OM::XML::Terminology")
       mock_terminology.stub(:retrieve_term).and_return(mock_term)
-      ActiveFedora::NokogiriDatastream.stub(:terminology).and_return(mock_terminology)
+      ActiveFedora::OmDatastream.stub(:terminology).and_return(mock_terminology)
       @mods_ds.from_solr(@solr_doc)
       term_pointer = [:name,:role,:roleTerm]
       @mods_ds.get_values_from_solr(:name,:role,:roleTerm).should == ["creator","submitter","teacher"]
@@ -331,7 +331,7 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.update_values' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new
+      @mods_ds = ActiveFedora::OmDatastream.new
       @mods_ds.content= fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
@@ -363,7 +363,7 @@ describe ActiveFedora::NokogiriDatastream do
   describe '.term_values' do
 
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new
+      @mods_ds = ActiveFedora::OmDatastream.new
       @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 

data/spec/unit/solr_digital_object_spec.rb

@@ -30,14 +30,14 @@ describe ActiveFedora::SolrDigitalObject do
       end
       subject { ActiveFedora::SolrDigitalObject.new({}, {'datastreams'=>{'properties'=>{'dsMIME'=>'text/xml'}}},WithoutMetadataDs) }
       it "should create an xml datastream" do
-        subject.datastreams['properties'].should be_kind_of ActiveFedora::NokogiriDatastream
+        subject.datastreams['properties'].should be_kind_of ActiveFedora::OmDatastream
       end
     end
     
     describe "with a ds spec that's not part of the solrized object" do
       before do
         class MissingMetadataDs < ActiveFedora::Base
-          has_metadata :name => "foo", :type => ActiveFedora::NokogiriDatastream, :label => 'Foo Data'
+          has_metadata :name => "foo", :type => ActiveFedora::OmDatastream, :label => 'Foo Data'
         end
         after do
           Object.send(:remove_const, MissingMetadataDs)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0.rc1
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.0.rc1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
@@ -350,7 +350,9 @@ files:
 - lib/active_fedora/named_relationships.rb
 - lib/active_fedora/nested_attributes.rb
 - lib/active_fedora/nokogiri_datastream.rb
+- lib/active_fedora/nom_datastream.rb
 - lib/active_fedora/ntriples_rdf_datastream.rb
+- lib/active_fedora/om_datastream.rb
 - lib/active_fedora/persistence.rb
 - lib/active_fedora/predicates.rb
 - lib/active_fedora/property.rb
@@ -428,8 +430,8 @@ files:
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
-- spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
+- spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
@@ -502,8 +504,9 @@ files:
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/model_spec.rb
-- spec/unit/nokogiri_datastream_spec.rb
+- spec/unit/nom_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
+- spec/unit/om_datastream_spec.rb
 - spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
@@ -544,7 +547,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1765541384270860265
+      hash: -1381095155313457398
 requirements: []
 rubyforge_project: rubyfedora
 rubygems_version: 1.8.23
@@ -585,8 +588,8 @@ test_files:
 - spec/integration/model_spec.rb
 - spec/integration/mods_article_integration_spec.rb
 - spec/integration/nested_attribute_spec.rb
-- spec/integration/nokogiri_datastream_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
+- spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
 - spec/integration/rels_ext_datastream_spec.rb
 - spec/integration/semantic_node_spec.rb
@@ -659,8 +662,9 @@ test_files:
 - spec/unit/has_many_collection_spec.rb
 - spec/unit/inheritance_spec.rb
 - spec/unit/model_spec.rb
-- spec/unit/nokogiri_datastream_spec.rb
+- spec/unit/nom_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
+- spec/unit/om_datastream_spec.rb
 - spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb