active-fedora 3.1.0.pre11 → 3.1.0.pre12

data/lib/active_fedora/nokogiri_datastream.rb

@@ -17,13 +17,6 @@ module ActiveFedora
     
     attr_accessor :internal_solr_doc
     attr_reader :ng_xml
-
-    def initialize(digital_object, dsid)
-      super
-      self.class.from_xml(nil, self)
-    end
-
-
     
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
@@ -64,7 +57,9 @@ module ActiveFedora
     end
     
     
-    def to_xml(xml = self.ng_xml)
+    def to_xml(xml = nil)
+      ensure_xml_loaded
+      xml = self.ng_xml if xml.nil?
       ng_xml = self.ng_xml
       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, "")
@@ -323,6 +318,12 @@ module ActiveFedora
       term_values(*field_key)
     end
 
+
+    def find_by_terms(*termpointer)
+      ensure_xml_loaded
+      super
+    end
+
     # Update values in the datastream's xml
     # This wraps {http://rdoc.info/gems/om/1.2.4/OM/XML/TermValueOperators#update_values-instance_method OM::TermValueOperators#update_values} so that returns an error if we have loaded from solr since datastreams loaded that way should be read-only
     #

data/lib/active_fedora/version.rb

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

data/spec/integration/full_featured_model_spec.rb

@@ -114,25 +114,6 @@ describe ActiveFedora::Base do
     @test_history.should be_kind_of(ActiveFedora::Base)
   end
   
-  it "should reflect all of the metadata fields" do
-    pending
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    
-    @properties_sample_values.each do |field, value|
-      properties_ds.send("#{field.to_s}_values=",value)
-    end
-    
-    @dublin_core_sample_values.each do |field, value|
-      dublin_core_ds.send("#{field.to_s}_values=",[value])
-    end
-    
-    @test_history.save
-    
-    retrieved_obj = OralHistory.find(@test_history.pid)
-    retrieved_obj.inner_object.should_not be_new_object
-    
-  end
 
   it "should create proxies to all the datastreams" do
     properties_ds = @test_history.datastreams["properties"]
@@ -143,35 +124,6 @@ describe ActiveFedora::Base do
     OralHistory.new.should respond_to(:properties)
   end 
 
-  it "t1" do# should load all of the metadata fields from fedora xml" do
-    pending
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    
-    
-    @properties_sample_values.each do |field, value|
-      properties_ds.send("#{field.to_s}_values=", [value])
-    end
-    
-    @dublin_core_sample_values.each do |field, value|
-      dublin_core_ds.send("#{field.to_s}_values=", [value])
-    end
-    
-    @test_history.save
-    
-    @retrieved_history = OralHistory.find(@test_history.pid).first
-    retrieved_properties_ds = @retrieved_history.datastreams["properties"]
-    retrieved_dublin_core_ds = @retrieved_history.datastreams["dublin_core"]
-    retrieved_properties_ds.should_not be_nil
-    retrieved_dublin_core_ds.should_not be_nil
-    @properties_sample_values.each do |field, value|
-      retrieved_properties_ds.send("#{field.to_s}_values").should == [value]
-    end
-    
-    @dublin_core_sample_values.each do |field, value|
-      retrieved_dublin_core_ds.send("#{field.to_s}_values").should == [value]
-    end    
-  end
     
   it "should push all of the metadata fields into solr" do
     # TODO: test must test values using solr symbol names (ie. _field, _text and _date)

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 ENV["environment"] ||= 'test'
 require 'active-fedora'
 require 'spec'
+require 'equivalent-xml/rspec_matchers'
+
 
 logger.level = Logger::WARN if logger.respond_to? :level ###MediaShelf StubLogger doesn't have a level= method
 

data/spec/unit/nokogiri_datastream_spec.rb

@@ -9,7 +9,6 @@ describe ActiveFedora::NokogiriDatastream do
                       :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>")
     @sample_raw_xml = "<foo><xmlelement/></foo>"
     @solr_doc = {"id"=>"hydrange_article1","name_role_roleTerm_t"=>["creator","submitter","teacher"],"name_0_role_t"=>"\r\ncreator\r\nsubmitter\r\n","name_1_role_t"=>"\r\n teacher \r\n","name_0_role_0_roleTerm_t"=>"creator","name_0_role_1_roleTerm_t"=>"submitter","name_1_role_0_roleTerm_t"=>["teacher"]}
   end
@@ -43,7 +42,10 @@ describe ActiveFedora::NokogiriDatastream do
     end
     it "should initialize from #xml_template if no xml is provided" do
       ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
-      ActiveFedora::NokogiriDatastream.new(nil, nil).ng_xml.should be_equivalent_to("<fake template/>")
+      n = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      n.expects(:content).returns('')
+      n.ensure_xml_loaded
+      n.ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
   
@@ -88,14 +90,6 @@ describe ActiveFedora::NokogiriDatastream do
     
     ### Examples copied over form metadata_datastream_spec
     
-    # it "should support single-value arguments (as opposed to a hash of values with array indexes as keys)" do
-    #   # In other words, { "fubar"=>"dork" } should have the same effect as { "fubar"=>{"0"=>"dork"} }
-    #   pending "this should be working, but for some reason, the updates don't stick"
-    #   result = @test_ds.update_indexed_attributes( { "fubar"=>"dork" } )
-    #   result.should == {"fubar"=>{"0"=>"dork"}}
-    #   @test_ds.fubar_values.should == ["dork"]
-    # end
-    # 
     it "should work for text fields" do 
       pending if ENV['HUDSON_BUILD'] == 'true'  # This test fails en suite in hudson
       att= {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "1"=>"york"}}
@@ -113,43 +107,7 @@ describe ActiveFedora::NokogiriDatastream do
       result = @mods_ds.update_indexed_attributes [{"title_info"=>"0"},"main_title"]=>{"-1"=>"mork"}
       result.should == {"title_info_0_main_title"=>{"2"=>"mork"}}
     end
-    # 
-    # it "should return accurate response when multiple values have been added in a single run" do
-    #   pending
-    #   att= {"swank"=>{"-1"=>"mork", "0"=>"york"}}
-    #   @test_ds.update_indexed_attributes(att).should == {"swank"=>{"0"=>"york", "1"=>"mork"}}
-    # end
-    
-    # it "should deal gracefully with adding new values at explicitly declared indexes" do
-    #   @mods_ds.update_indexed_attributes([:journal, :title]=>["all", "for", "the"]
-    #   att = {"fubar"=>{"3"=>'glory'}}
-    #   result = @test_ds.update_indexed_attributes(att)
-    #   result.should == {"fubar"=>{"3"=>"glory"}}
-    #   @test_ds.fubar_values.should == ["all", "for", "the", "glory"]
-    #   
-    #   @test_ds.fubar_values = []
-    #   result = @test_ds.update_indexed_attributes(att)
-    #   result.should == {"fubar"=>{"0"=>"glory"}}
-    #   @test_ds.fubar_values.should == ["glory"]
-    # end
-    # 
-    # it "should allow deleting of values and should delete values so that to_xml does not return emtpy nodes" do
-    #   att= {[{"person"=>"0"},"description"]=>{"-1"=>"mork", "0"=>"york", "1"=>"mangle"}} 
-    #   @mods_ds.update_indexed_attributes(att)
-    #   @mods_ds.fubar_values.should == ['mork', 'york', 'mangle']
-    #   rexml = REXML::Document.new(@test_ds.to_xml)
-    #   #puts rexml.root.elements.each {|el| el.to_s}
-    #   #puts rexml.root.elements.to_a.inspect
-    #   rexml.root.elements.to_a.length.should == 3
-    #   @mods_ds.update_indexed_attributes({[{"person"=>"0"},"description"]=>{"1"=>""}})
-    #   @mods_ds.fubar_values.should == ['mork', 'mangle']
-    #   rexml = REXML::Document.new(@test_ds.to_xml)
-    #   rexml.root.elements.to_a.length.should == 2
-    #   @mods_ds.update_indexed_attributes({[{"person"=>"0"},"description"]=>{"0"=>:delete}})
-    #   @mods_ds.fubar_values.should == ['mangle']
-    #   rexml = REXML::Document.new(@test_ds.to_xml)
-    #   rexml.root.elements.to_a.length.should == 1
-    # end
+
     it "should allow deleting of values and should delete values so that to_xml does not return emtpy nodes" do
       pending if ENV['HUDSON_BUILD'] == 'true'  # This test fails en suite in hudson
       att= {[{"person"=>"0"},"description"]=>{"0"=>"york", "1"=>"mangle","2"=>"mork"}}
@@ -191,20 +149,6 @@ describe ActiveFedora::NokogiriDatastream do
       @mods_ds.expects(:term_values).with("--my xpath--").returns(["abstract1", "abstract2"])
       @mods_ds.get_values("--my xpath--").should == ["abstract1", "abstract2"]
     end
-    it "should assume field_names that are symbols or arrays are pointers to accessors declared in this datastreams model" do
-      pending "This shouldn't be necessary -- OX::XML::PropertyValueOpertators.property_values deals with it internally..."
-      ActiveFedora::NokogiriDatastream.expects(:accessor_xpath).with(:abstract).returns("--abstract xpath--")
-      ActiveFedora::NokogiriDatastream.expects(:accessor_xpath).with(*[{:person=>1}]).returns("--person xpath--")
-      ActiveFedora::NokogiriDatastream.expects(:accessor_xpath).with(*[{:person=>1},{:role=>1},:text]).returns("--person role text xpath--")     
-      
-      @mods_ds.expects(:property_values).with("--abstract xpath--").returns(["abstract1", "abstract2"])
-      @mods_ds.expects(:property_values).with("--person xpath--").returns(["person1", "person2"])
-      @mods_ds.expects(:property_values).with("--person role text xpath--").returns(["text1"])
-      
-      @mods_ds.get_values(:abstract).should == ["abstract1", "abstract2"]
-      @mods_ds.get_values([{:person=>1}]).should == ["person1", "person2"]
-      @mods_ds.get_values([{:person=>1},{:role=>1},:text]).should == ["text1"]
-    end
   end
   
   describe '#from_xml' do
@@ -214,12 +158,6 @@ describe ActiveFedora::NokogiriDatastream do
       Hydra::ModsArticleDatastream.from_xml(mods_xml,tmpl).ng_xml.root.to_xml.should == mods_xml.root.to_xml
       tmpl.dirty?.should be_false
     end
-    it "should work when foxml datastream xml is passed in" do
-      pending "at least for now, just updated Base.deserialize to feed in the xml content rather than the foxml datstream xml.  Possibly we can update MetadataDatstream to assume the same and leave it at that? -MZ 23-06-2010"
-      hydrangea_article_foxml = Nokogiri::XML::Document.parse( fixture("hydrangea_fixture_mods_article1.foxml.xml") )
-      ds_xml = hydrangea_article_foxml.at_xpath("//foxml:datastream[@ID='descMetadata']")
-      Hydra::ModsArticleDatastream.from_xml(ds_xml).ng_xml.to_xml.should == hydrangea_article_foxml.at_xpath("//foxml:datastream[@ID='descMetadata']/foxml:datastreamVersion[last()]/foxml:xmlContent").first_element_child.to_xml
-    end
   end
   
 
@@ -272,34 +210,29 @@ describe ActiveFedora::NokogiriDatastream do
     end
     
     it "should ng_xml.to_xml" do
-      @test_ds.ng_xml.expects(:to_xml).returns("xml")
-      @test_ds.to_xml.should == "xml"       
+      @test_ds.expects(:ng_xml).returns(Nokogiri::XML::Document.parse("<text_document/>")).twice
+      @test_ds.to_xml.should == "<text_document/>\n"       
     end
     
     it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (mocked test)' do
       doc = Nokogiri::XML::Document.parse("<test_document/>")
-      doc.root.expects(:add_child).with(@test_ds.ng_xml.root)
+      doc.root.expects(:add_child)#.with(@test_ds.ng_xml.root)
       @test_ds.to_xml(doc)
     end
     
     it 'should accept an optional Nokogiri::XML Document as an argument and insert its fields into that (functional test)' do
-      expected_result = XmlSimple.xml_in("<test_document><foo/><test_xml/></test_document>")
+      expected_result = "<test_document><foo/><test_xml/></test_document>"
       doc = Nokogiri::XML::Document.parse("<test_document><foo/></test_document>")
       result = @test_ds.to_xml(doc)
-      XmlSimple.xml_in(doc.to_s).should == expected_result
-      XmlSimple.xml_in(result).should == expected_result
+      doc.should be_equivalent_to expected_result
+      result.should be_equivalent_to expected_result
     end
     
     it 'should add to root of Nokogiri::XML::Documents, but add directly to the elements if a Nokogiri::XML::Node is passed in' do
-      mock_new_node = mock("new node")
-      mock_new_node.stubs(:to_xml).returns("foo")
-      
       doc = Nokogiri::XML::Document.parse("<test_document/>")
       el = Nokogiri::XML::Node.new("test_element", Nokogiri::XML::Document.new)
-      doc.root.expects(:add_child).with(@test_ds.ng_xml.root).returns(mock_new_node)
-      el.expects(:add_child).with(@test_ds.ng_xml.root).returns(mock_new_node)
-      @test_ds.to_xml(doc).should 
-      @test_ds.to_xml(el)
+      @test_ds.to_xml(doc).should be_equivalent_to "<test_document><test_xml/></test_document>"
+      @test_ds.to_xml(el).should be_equivalent_to "<test_element/>"
     end
     
   end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -15,8 +15,8 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   
   before(:each) do
     ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("_nextid_")
-    ActiveFedora::QualifiedDublinCoreDatastream.any_instance.expects(:content).at_least_once
     @test_ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
+    @test_ds.stubs(:content).returns('')
 
   end
   it "from_xml should parse everything correctly" do
@@ -64,6 +64,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   it "should have identity in and out" do
     sample = fixture('oh_qdc.xml')
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
+    tmpl.expects(:content).returns('')
     x1 = Nokogiri::XML::Document.parse(sample).xpath('/wrapper/foxml:datastream/foxml:datastreamVersion/foxml:xmlContent/dc').first.to_xml
     z = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(x1, tmpl)
     y = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(z.to_dc_xml, tmpl)
@@ -72,6 +73,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
 
   it "should handle arbitrary attribs" do
     tmpl = OralHistorySampleModel.new.datastreams['dublin_core']
+    tmpl.expects(:content).returns('')
     tmpl.field :mycomplicated, :string, :xml_node=>'alt', :element_attrs=>{:foo=>'bar'}
     tmpl.mycomplicated_values='fubar'
     tmpl.to_dc_xml.should == '<dc xmlns:xsi=\'http://www.w3.org/2001/XMLSchema-instance\' xmlns:dcterms=\'http://purl.org/dc/terms/\'><dcterms:alt foo=\'bar\'>fubar</dcterms:alt></dc>'
@@ -83,7 +85,9 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
   it "should parse dcterms and dcelements from xml" do
     doc = Nokogiri::XML::Document.parse(File.open( File.dirname(__FILE__)+'/../fixtures/changeme155.xml') )
     stream = doc.xpath('//foxml:datastream[@ID=\'dublin_core\']/foxml:datastreamVersion/foxml:xmlContent/dc')
-    n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil))
+    ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
+    ds.expects(:content).returns('')
+    n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ds)
     n.spatial_values.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title_values.should ==  ["Oral history with Frances Addelson, 1997 November 14"]
     n.dirty?.should == false

data/spec/unit/rels_ext_datastream_spec.rb

@@ -1,7 +1,5 @@
 require File.join( File.dirname(__FILE__), "../spec_helper" )
 
-require 'equivalent-xml'
-
 describe ActiveFedora::RelsExtDatastream do
   
   before(:all) do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 1923832015
+  hash: 1923832001
   prerelease: 6
   segments: 
   - 3
   - 1
   - 0
   - pre
-  - 11
-  version: 3.1.0.pre11
+  - 12
+  version: 3.1.0.pre12
 platform: ruby
 authors: 
 - Matt Zumwalt