active-fedora 5.0.0.rc4 → 5.0.0.rc5

data/lib/active_fedora/datastream.rb

@@ -7,7 +7,7 @@ module ActiveFedora
     attr_accessor :last_modified, :fields
     before_create :add_mime_type, :add_ds_location, :validate_content_present
   
-    def initialize(digital_object, dsid, options={})
+    def initialize(digital_object=nil, dsid=nil, options={})
       ## When you use the versions feature of rubydora (0.5.x), you need to have a 3 argument constructor
       self.fields={}
       super
@@ -43,6 +43,12 @@ module ActiveFedora
       changed?
     end
     
+    # @abstract Override this in your concrete datastream class. 
+    # @return [boolean] does this datastream contain metadata (not file data)
+    def metadata?
+      false
+    end
+    
     # Deprecated
     def dirty
       changed?
@@ -77,7 +83,6 @@ module ActiveFedora
         return create if new?
         repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
         reset_profile_attributes
-        #Datastream.new(digital_object, dsid)
         self
       end
     end

data/lib/active_fedora/datastreams.rb

@@ -22,9 +22,9 @@ module ActiveFedora
     def serialize_datastreams
       datastreams.each {|k, ds| ds.serialize! }
       self.metadata_is_dirty = datastreams.any? do |k,ds| 
-        ds.changed? && (ds.kind_of?(ActiveFedora::NokogiriDatastream) || ds.instance_of?(ActiveFedora::RelsExtDatastream) || ds.kind_of?(ActiveFedora::RDFDatastream))
+        ds.changed? && ds.metadata?
       end
-     true
+      true
     end
 
     # Adds the disseminator location to the datastream after the pid has been established
@@ -106,7 +106,7 @@ module ActiveFedora
     def metadata_streams
       results = []
       datastreams.each_value do |ds|
-        if ds.kind_of?(ActiveFedora::RDFDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
+        if ds.metadata? && !ds.kind_of?(ActiveFedora::RelsExtDatastream)
           results << ds
         end
       end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -24,7 +24,7 @@ module ActiveFedora
     # @param [ActiveFedora::NokogiriDatastream] 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)
-      tmpl = self.new(nil, nil) if tmpl.nil?  ## This path is used only for unit testing (e.g. MarpaDCDatastream.from_xml(fixture("data.xml")) )
+      tmpl = self.new if tmpl.nil?  ## This path is used only for unit testing (e.g. MarpaDCDatastream.from_xml(fixture("data.xml")) )
 
       if !xml.present?
         tmpl.ng_xml = self.xml_template
@@ -78,6 +78,12 @@ module ActiveFedora
     def ng_xml_changed?
       changed_attributes.has_key? 'ng_xml'
     end
+
+    # Indicates that this datastream has metadata content. 
+    # @return true 
+    def metadata?
+      true
+    end
     
     def content=(content)
       super

data/lib/active_fedora/persistence.rb

@@ -8,12 +8,12 @@ module ActiveFedora
       # If it's a new object, set the conformsTo relationship for Fedora CMA
       if new_object? 
         result = create
-        update_index if ENABLE_SOLR_UPDATES
+        update_index if create_needs_index?
       else
         result = update
-        update_index if @metadata_is_dirty == true && ENABLE_SOLR_UPDATES
+        update_index if update_needs_index?
       end
-      @metadata_is_dirty = false
+      self.metadata_is_dirty = false
       return result
     end
 
@@ -82,6 +82,19 @@ module ActiveFedora
       end
     end
 
+  protected
+
+    # Determines whether a create operation cause a solr index of this object.
+    # Override this if you need different behavior
+    def create_needs_index?
+      ENABLE_SOLR_UPDATES
+    end
+
+    # Determines whether an update operation cause a solr index of this object.
+    # Override this if you need different behavior
+    def update_needs_index?
+      @metadata_is_dirty && ENABLE_SOLR_UPDATES
+    end
 
   private
     

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -29,8 +29,8 @@ module ActiveFedora
 
     #Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
     #when this method returns. Each term is marked as a multivalue string.
-    def initialize(digital_object, dsid )
-      super(digital_object, dsid)
+    def initialize(digital_object=nil, dsid=nil, options={})
+      super
       DCTERMS.each do |el|
         field el, :string, :multiple=>true
       end

data/lib/active_fedora/rdf_datastream.rb

@@ -157,6 +157,10 @@ module ActiveFedora
       graph.dirty
     end
 
+    def metadata?
+      true
+    end
+
     def save
       super
       graph.dirty = false
@@ -263,6 +267,7 @@ module ActiveFedora
       graph.delete(predicate)
       args = [args] unless args.respond_to? :each
       args.each do |arg|
+        arg = arg.to_s if arg.kind_of? RDF::Literal
         graph.add(predicate, arg, true) unless arg.empty?
       end
       graph.dirty = true

data/lib/active_fedora/rels_ext_datastream.rb

@@ -17,6 +17,10 @@ module ActiveFedora
       model.relationships_are_dirty or super
     end
 
+    def metadata?
+      true
+    end
+
     def serialize!
       self.content = to_rels_ext() if model.relationships_are_dirty
       model.relationships_are_dirty = false

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.0.0.rc4"
+  VERSION = "5.0.0.rc5"
 end

data/spec/unit/base_extra_spec.rb

@@ -5,36 +5,6 @@ describe ActiveFedora::Base do
   before(:each) do
     @test_object = ActiveFedora::Base.new
   end
-  
-  
-  describe ".metadata_streams" do
-    #TODO move to datastreams_spec
-    it "should return all of the datastreams from the object that are kinds of SimpleDatastreams " do
-      mock_mds1 = mock("metadata ds1")
-      mock_mds2 = mock("metadata ds2")
-      mock_fds = mock("file ds")
-      mock_fds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-      mock_ngds = mock("nokogiri ds")
-      mock_ngds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-      mock_ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      
-      
-      [mock_mds1,mock_mds2].each do |ds|
-        ds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-        ds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
-      end
-      mock_fds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false) 
-      
-      @test_object.expects(:datastreams).returns({:foo => mock_mds1, :bar => mock_mds2, :baz => mock_fds, :bork=>mock_ngds})
-      
-      result = @test_object.metadata_streams
-      result.length.should == 3
-      result.should include(mock_mds1)
-      result.should include(mock_mds2)
-      result.should include(mock_ngds)
-    end
-  end
-  
 
   describe ".update_index" do
     before do

data/spec/unit/datastream_spec.rb

@@ -8,10 +8,11 @@ describe ActiveFedora::Datastream do
   before(:each) do
     @test_object = ActiveFedora::Base.new
     @test_datastream = ActiveFedora::Datastream.new(@test_object.inner_object, 'abcd')
-    #:pid=>@test_object.pid, :dsid=>'abcd', :blob=>StringIO.new("hi there"))
     @test_datastream.content = "hi there"
   end
 
+  its(:metadata?) { should be_false}
+
   it "should escape dots in  to_param" do
     @test_datastream.stubs(:dsid).returns('foo.bar')
     @test_datastream.to_param.should == 'foo%2ebar'
@@ -94,10 +95,10 @@ describe ActiveFedora::Datastream do
   end 
   
   it "should have mimeType accessors" do
-    ds1 = ActiveFedora::Datastream.new(nil, nil)#:mime_type=>"text/foo")    
+    ds1 = ActiveFedora::Datastream.new
     ds1.mimeType = "text/foo"
     ds1.mimeType.should == "text/foo"
-    ds2 = ActiveFedora::Datastream.new(nil, nil)#:mime_type=>"text/bar")
+    ds2 = ActiveFedora::Datastream.new
     ds2.mimeType = "text/bar"
     ds2.mimeType.should == "text/bar"
   end

data/spec/unit/datastreams_spec.rb

@@ -9,6 +9,29 @@ describe ActiveFedora::Datastreams do
     ActiveFedora::Base.respond_to?(:has_metadata).should be_true
   end
 
+  describe ".metadata_streams" do
+    it "should return all of the datastreams from the object that are kinds of SimpleDatastreams " do
+      mock_mds1 = mock("metadata ds1")
+      mock_mds2 = mock("metadata ds2")
+      mock_fds = mock("file ds")
+      mock_fds.expects(:metadata?).returns(false)
+      mock_ngds = mock("nokogiri ds")
+      mock_ngds.expects(:metadata?).returns(true)
+      
+      [mock_mds1,mock_mds2].each do |ds|
+        ds.expects(:metadata?).returns(true)
+      end
+      
+      @test_object.expects(:datastreams).returns({:foo => mock_mds1, :bar => mock_mds2, :baz => mock_fds, :bork=>mock_ngds})
+      
+      result = @test_object.metadata_streams
+      result.length.should == 3
+      result.should include(mock_mds1)
+      result.should include(mock_mds2)
+      result.should include(mock_ngds)
+    end
+  end
+
   describe "datastream_from_spec" do
     it "should accept versionable" do
       ds = @test_object.datastream_from_spec({:type=>ActiveFedora::Datastream, :versionable=>false}, 'test')

data/spec/unit/nokogiri_datastream_spec.rb

@@ -25,6 +25,8 @@ describe ActiveFedora::NokogiriDatastream do
   after(:each) do
   end
 
+  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)
   end
@@ -41,7 +43,7 @@ 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/>")
-      n = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      n = ActiveFedora::NokogiriDatastream.new
       n.ensure_xml_loaded
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end
@@ -54,7 +56,7 @@ describe ActiveFedora::NokogiriDatastream do
   end
 
   describe "an instance" do
-    subject { ActiveFedora::NokogiriDatastream.new(nil, nil) }
+    subject { ActiveFedora::NokogiriDatastream.new }
     it{ should.respond_to? :to_solr }
     its(:to_solr) {should == { }}
   end
@@ -159,7 +161,7 @@ describe ActiveFedora::NokogiriDatastream do
   describe '#from_xml' do
     it "should work when a template datastream is passed in" do
       mods_xml = Nokogiri::XML::Document.parse( fixture(File.join("mods_articles", "hydrangea_article1.xml")) )
-      tmpl = Hydra::ModsArticleDatastream.new(nil, nil)
+      tmpl = Hydra::ModsArticleDatastream.new
       Hydra::ModsArticleDatastream.from_xml(mods_xml,tmpl).ng_xml.root.to_xml.should == mods_xml.root.to_xml
       tmpl.dirty?.should be_false
     end
@@ -263,7 +265,7 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.get_values_from_solr' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds = ActiveFedora::NokogiriDatastream.new
       @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
@@ -319,7 +321,7 @@ describe ActiveFedora::NokogiriDatastream do
 
   describe '.update_values' do
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds = ActiveFedora::NokogiriDatastream.new
       @mods_ds.content= fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 
@@ -341,7 +343,7 @@ describe ActiveFedora::NokogiriDatastream do
     end
 
     it "should set @dirty to true" do
-      mods_ds = Hydra::ModsArticleDatastream.new(nil, nil)
+      mods_ds = Hydra::ModsArticleDatastream.new
       mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
       mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
       mods_ds.dirty?.should be_true
@@ -351,7 +353,7 @@ describe ActiveFedora::NokogiriDatastream do
   describe '.term_values' do
 
     before(:each) do
-      @mods_ds = ActiveFedora::NokogiriDatastream.new(nil, nil)
+      @mods_ds = ActiveFedora::NokogiriDatastream.new
       @mods_ds.content=fixture(File.join("mods_articles","hydrangea_article1.xml")).read
     end
 

data/spec/unit/ntriples_datastream_spec.rb

@@ -9,6 +9,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
           map.created(:in => RDF::DC)
           map.title(:in => RDF::DC)
           map.publisher(:in => RDF::DC)
+          map.creator(:in => RDF::DC)
           map.based_near(:in => RDF::FOAF)
           map.related_url(:to => "seeAlso", :in => RDF::RDFS)
         end
@@ -59,6 +60,10 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.publisher = "St. Martin's Press"
       @subject.publisher.should == ["St. Martin's Press"]
     end
+    it "should set rdf literal fields" do
+      @subject.creator = RDF.Literal("Geoff Ryman")
+      @subject.creator.should == ["Geoff Ryman"]
+    end
     it "should append fields" do
       @subject.publisher << "St. Martin's Press"
       @subject.publisher.should == ["Penn State", "St. Martin's Press"]

data/spec/unit/persistence_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe ActiveFedora::Persistence do
+  before :all do
+    class SpecNode
+      include ActiveFedora::Persistence
+    end
+  end
+  after :all do
+    Object.send(:remove_const, :SpecNode)
+  end
+
+  subject { SpecNode.new }
+
+  describe "#create_needs_index?" do
+    it "should be true" do
+      subject.send(:create_needs_index?).should be_true
+    end
+  end
+
+  describe "#update_needs_index?" do
+    describe "when metadata is dirty" do
+      before do
+        subject.send(:metadata_is_dirty=, true)
+      end
+      it "should be true" do
+        subject.send(:update_needs_index?).should be_true
+      end
+    end
+
+    describe "when metadata is not dirty" do
+      it "should be false" do
+        subject.send(:update_needs_index?).should be_false
+      end
+    end
+  end
+
+
+end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -56,7 +56,7 @@ 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')
-    ds = ActiveFedora::QualifiedDublinCoreDatastream.new(nil, nil)
+    ds = ActiveFedora::QualifiedDublinCoreDatastream.new
     n = ActiveFedora::QualifiedDublinCoreDatastream.from_xml(stream.to_xml, ds)
     n.spatial.should == ["Boston [7013445]", "Dorchester [7013575]", "Roxbury [7015002]"] 
     n.title.should ==  ["Oral history with Frances Addelson, 1997 November 14"]

data/spec/unit/rdf_datastream_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ActiveFedora::RDFDatastream do
+  its(:metadata?) { should be_true}
+end

data/spec/unit/rels_ext_datastream_spec.rb

@@ -22,6 +22,8 @@ describe ActiveFedora::RelsExtDatastream do
       @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
   end
 
+  its(:metadata?) { should be_true}
+
   describe "#save" do
     before do
       @mock_repo.expects(:add_datastream).with(:pid => 'test:sample_pid', :dsid => 'RELS-EXT', :versionable => true, :content => 'fake xml', :controlGroup => 'M', :dsState => 'A', :mimeType=>'application/rdf+xml')
@@ -139,7 +141,7 @@ describe ActiveFedora::RelsExtDatastream do
         </rdf:RDF>
       EOS
       model = ActiveFedora::Base.new
-      new_ds = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      new_ds = ActiveFedora::RelsExtDatastream.new
       new_ds.model = model
       lambda { ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds) }.should_not raise_exception
       new_ds.to_rels_ext.should =~ /missing:hasOtherRelationship/
@@ -155,7 +157,7 @@ describe ActiveFedora::RelsExtDatastream do
                   </rdf:Description>
                 </rdf:RDF>"
       model = ActiveFedora::Base.new
-      new_ds = ActiveFedora::RelsExtDatastream.new(nil, nil)
+      new_ds = ActiveFedora::RelsExtDatastream.new
       new_ds.model = model
       ActiveFedora::RelsExtDatastream.from_xml(xml, new_ds)
       new_ext = new_ds.to_rels_ext()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.0.0.rc4
+  version: 5.0.0.rc5
   prerelease: 6
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -502,9 +502,11 @@ files:
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
+- spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
@@ -653,9 +655,11 @@ test_files:
 - spec/unit/model_spec.rb
 - spec/unit/nokogiri_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
+- spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
 - spec/unit/property_spec.rb
 - spec/unit/qualified_dublin_core_datastream_spec.rb
+- spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb