active-fedora 5.0.0 → 5.1.0

data/spec/unit/datastream_spec.rb

@@ -19,7 +19,7 @@ describe ActiveFedora::Datastream do
   end
   
   it "should be inspectable" do
-    @test_datastream.inspect.should match /#<ActiveFedora::Datastream:-?\d+ @pid=\"__DO_NOT_USE__\" @dsid=\"abcd\" @controlGroup=\"M\" @dirty=\"true\" @mimeType=\"\" >/
+    @test_datastream.inspect.should match /#<ActiveFedora::Datastream:-?\d+ @pid=\"__DO_NOT_USE__\" @dsid=\"abcd\" @controlGroup=\"M\" changed=\"true\" @mimeType=\"\" >/
   end
 
   describe '#validate_content_present' do
@@ -62,14 +62,14 @@ describe ActiveFedora::Datastream do
   end
   
   describe '#save' do
-    it "should set dirty? to false" do
-      mock_repo = mock('repository', :config=>{})
-      mock_repo.stubs(:add_datastream).with(:mimeType=>'text/xml', :versionable => true, :pid => @test_object.pid, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there')
-      mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns('')
+    it "should set changed" do
+      mock_repo = mock('repository')
+      mock_repo.stubs(:config).returns({})
+      mock_repo.stubs(:add_datastream).with(:versionable => true, :pid => @test_object.pid, :dsid => 'abcd', :controlGroup => 'M', :dsState => 'A', :content => 'hi there')
+      mock_repo.expects(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).returns('').at_least_once
       @test_object.inner_object.stubs(:repository).returns(mock_repo)
-      @test_datastream.dirty?.should be_true
       @test_datastream.save
-      @test_datastream.dirty?.should be_false
+      @test_datastream.should_not be_changed
     end
   end
   
@@ -85,15 +85,6 @@ describe ActiveFedora::Datastream do
     end
   end
   
-  describe ".dirty?" do
-    it "should return the value of the @dirty attribute or changed?" do
-      @test_datastream.instance_variable_get(:@changed_attributes).clear
-      @test_datastream.dirty?.should be_false  
-      @test_datastream.dirty = "boo"
-      @test_datastream.dirty?.should be_true   
-    end
-  end 
-  
   it "should have mimeType accessors" do
     ds1 = ActiveFedora::Datastream.new
     ds1.mimeType = "text/foo"

data/spec/unit/datastreams_spec.rb

@@ -98,11 +98,11 @@ describe ActiveFedora::Datastreams do
     describe "creates datastreams" do
       before(:each) do
         class FooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
+          has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData", :autocreate => true do |m|
             m.field "fubar", :string
             m.field "swank", :text
           end
-          has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+          has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel", :autocreate => true do |m|
             m.field "fubar", :text
           end 
           

data/spec/unit/nokogiri_datastream_spec.rb

@@ -18,7 +18,9 @@ describe ActiveFedora::NokogiriDatastream do
     @mock_repo.stubs(:datastream_dissemination=>'My Content', :config=>{})
     @mock_inner.stubs(:repository).returns(@mock_repo)
     @mock_inner.stubs(:pid)
+    @mock_inner.stubs(:new? => false)
     @test_ds = ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata")
+    @test_ds.stubs(:new? => false, :profile => {}, :datastream_content => '<test_xml/>')
     @test_ds.content="<test_xml/>"
   end
   
@@ -44,7 +46,6 @@ describe ActiveFedora::NokogiriDatastream do
     it "should initialize from #xml_template if no xml is provided" do
       ActiveFedora::NokogiriDatastream.expects(:xml_template).returns("<fake template/>")
       n = ActiveFedora::NokogiriDatastream.new
-      n.ensure_xml_loaded
       n.ng_xml.should be_equivalent_to("<fake template/>")
     end
   end
@@ -133,10 +134,10 @@ describe ActiveFedora::NokogiriDatastream do
     #   @test_ds.fubar_values.should == ["val1", "val2"]
     # end
     
-    it "should set @dirty to true" do
+    it "should set changed to true" do
       @mods_ds.get_values([{:title_info=>0},:main_title]).should == ["ARTICLE TITLE", "TITLE OF HOST JOURNAL"]
       @mods_ds.update_indexed_attributes [{"title_info"=>"0"},"main_title"]=>{"-1"=>"mork"}
-      @mods_ds.dirty?.should be_true
+      @mods_ds.should be_changed
     end
   end
   
@@ -163,7 +164,7 @@ describe ActiveFedora::NokogiriDatastream do
       mods_xml = Nokogiri::XML::Document.parse( fixture(File.join("mods_articles", "hydrangea_article1.xml")) )
       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
+      tmpl.should_not be_changed
     end
   end
   
@@ -177,10 +178,10 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds.should respond_to(:save)
     end
     it "should persist the product of .to_xml in fedora" do
-      @test_ds.expects(:new?).returns(true).twice
-      @mock_repo.expects(:datastream).with(:pid => nil, :dsid => 'descMetadata').returns('').twice
+      @test_ds.expects(:new?).returns(true).at_least_once
+      @test_ds.stubs(:to_xml => "fake xml")
       @mock_repo.expects(:add_datastream).with(:pid => nil, :dsid => 'descMetadata', :versionable => true, :content => 'fake xml', :controlGroup => 'X', :dsState => 'A', :mimeType=>'text/xml')
-      @test_ds.expects(:to_xml).returns("fake xml")
+
       @test_ds.serialize!
       @test_ds.save
       @test_ds.mimeType.should == 'text/xml'
@@ -188,14 +189,24 @@ describe ActiveFedora::NokogiriDatastream do
   end
   
   describe '.content=' do
-    it "should update the content and ng_xml, marking the datastream as dirty" do
-      @test_ds.dirty = false  # pretend it isn't dirty to show that content= does it
-      @test_ds.content.should_not be_equivalent_to(@sample_raw_xml)
-      @test_ds.ng_xml.to_xml.should_not be_equivalent_to(@sample_raw_xml)
-      @test_ds.content = @sample_raw_xml
-      @test_ds.should be_dirty
-      @test_ds.content.should be_equivalent_to(@sample_raw_xml)
-      @test_ds.ng_xml.to_xml.should be_equivalent_to(@sample_raw_xml)
+    subject { ActiveFedora::NokogiriDatastream.new(@mock_inner, "descMetadata") }
+    it "should update the content" do
+      subject.stubs(:new? => false )
+      subject.content = "<a />"
+      subject.datastream_content.should == '<a />'
+    end
+
+    it "should mark the object as changed" do
+      subject.stubs(:new? => false )
+      subject.content = "<a />"
+      subject.should be_changed
+    end
+
+    it "update ngxml and mark the xml as loaded" do
+      subject.stubs(:new? => false )
+      subject.content = "<a />"
+      subject.ng_xml.to_xml.should =~ /<a\/>/
+      subject.xml_loaded.should be_true
     end
   end
   
@@ -214,11 +225,11 @@ describe ActiveFedora::NokogiriDatastream do
       @test_ds2.ng_xml.should be_kind_of Nokogiri::XML::Document
       @test_ds2.ng_xml.to_xml.should be_equivalent_to("<xmlelement/>")
     end
-    it "should mark the datastream as dirty" do
-      @test_ds2.dirty.should be_false 
+    it "should mark the datastream as changed" do
+      @test_ds2.should_not be_changed 
       @test_ds2.ng_xml = @sample_raw_xml
       @test_ds2.ng_xml_changed?.should be_true
-      @test_ds2.should be_dirty
+      @test_ds2.should be_changed
       @test_ds2.instance_variable_get(:@content).should be_nil
     end
   end
@@ -342,11 +353,11 @@ describe ActiveFedora::NokogiriDatastream do
       @mods_ds.update_values([{":person"=>"0"}, "role", "text"]=>{"0"=>"role1", "1"=>"role2", "2"=>"role3"})
     end
 
-    it "should set @dirty to true" do
+    it "should set changed to true" do
       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
+      mods_ds.should be_changed
     end
   end
 

data/spec/unit/ntriples_datastream_spec.rb

@@ -126,15 +126,11 @@ describe ActiveFedora::NtriplesRDFDatastream do
         end
       end
       @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stubs(:pid => 'test:1')
+      @subject.stubs(:pid => 'test:1', :repository => ActiveFedora::Base.connection_for_pid(0))
     end
     after(:each) do
       Object.send(:remove_const, :MyDatastream)
     end
-    it "should save and reload" do
-      @subject.publisher = ["St. Martin's Press"]
-      @subject.save
-    end
     it "should support to_s method" do
       @subject.publisher.to_s.should == [].to_s
       @subject.publisher = "Bob"
@@ -261,6 +257,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
           delegate :rights, :to => :descMetadata
         end
         @obj = MyDatastream.new(@inner_object, 'solr_rdf')
+          @obj.stubs(:repository => mock(), :pid => 'test:1')
+          @obj.repository.stubs(:modify_datastream)
+          @obj.repository.stubs(:add_datastream)
         @obj.created = "2012-03-04"
         @obj.title = "Of Mice and Men, The Sequel"
         @obj.publisher = "Bob's Blogtastic Publishing"
@@ -271,18 +270,16 @@ describe ActiveFedora::NtriplesRDFDatastream do
       end
       describe '#save' do
         it "should set dirty? to false" do
-          @obj.dirty?.should be_false
+          @obj.should_not be_changed
           @obj.title = "something"
-          @obj.dirty?.should be_true
+          @obj.should be_changed
           @obj.save
-          @obj.dirty?.should be_false
+          @obj.should_not be_changed
         end
       end
       describe '.content=' do
         it "should update the content and graph, marking the datastream as changed" do
           mock_repo = mock('repository')
-          mock_repo.expects(:datastream_dissemination).with(:pid => 'test:123', 
-                                                            :dsid => 'solr_rdf')
           sample_rdf = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
           @obj.stubs(:pid).returns('test:123')
           @obj.stubs(:repository).returns(mock_repo)

data/spec/unit/persistence_spec.rb

@@ -19,20 +19,9 @@ describe ActiveFedora::Persistence do
   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
 
 

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -60,8 +60,7 @@ describe ActiveFedora::QualifiedDublinCoreDatastream do
     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"]
-    n.dirty?.should == false
-
+    n.should_not be_changed
   end
 
 

data/spec/unit/relationships_spec.rb

@@ -90,7 +90,7 @@ describe ActiveFedora::Relationships do
         #local_node.internal_uri = "info:fedora/#{@pid}"
         local_node.pid = @pid
         
-        local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
+        local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
         local_node.add_relationship(:is_member_of, "info:fedora/container:A")
         local_node.add_relationship(:is_member_of, "info:fedora/container:B")
 
@@ -122,7 +122,7 @@ describe ActiveFedora::Relationships do
           @test_object2 = MockHasRelationship.new
           @test_object2.pid = increment_pid
           @test_object2.stubs(:testing_inbound).returns({})
-          @test_object2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content =>'')).at_least_once
+          @test_object2.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content =>'')).at_least_once
           @test_object2.add_relationship(:has_model, SpecNode.to_class_uri)
           @test_object2.should respond_to(:testing_append)
           @test_object2.should respond_to(:testing_remove)
@@ -273,7 +273,7 @@ describe ActiveFedora::Relationships do
         it "(:response_format => :id_array) should return an array of fedora PIDs" do
           SpecNode.create_outbound_relationship_finders("containers", :is_member_of)
           local_node = SpecNode.new
-          local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
+          local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
           local_node.add_relationship(:is_member_of, "demo:10")
           result = local_node.containers_ids
           result.should be_instance_of(Array)
@@ -363,9 +363,9 @@ describe ActiveFedora::Relationships do
         @local_node2 = SpecNode.new
         @local_node2.pid = "mypid2"
         model_def = SpecNode.to_class_uri
-        @local_node.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
+        @local_node.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
         @local_node.add_relationship(:has_model, model_def)
-        @local_node2.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
+        @local_node2.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
         @local_node2.add_relationship(:has_model, model_def)
         @local_node.add_relationship(:has_part, @local_node2)
         @local_node2.add_relationship(:has_part, @local_node)

data/spec/unit/rels_ext_datastream_spec.rb

@@ -20,21 +20,26 @@ describe ActiveFedora::RelsExtDatastream do
       mock_inner.stubs(:repository).returns(@mock_repo)
       mock_inner.stubs(:pid).returns(@pid)
       @test_ds = ActiveFedora::RelsExtDatastream.new(mock_inner, "RELS-EXT")
+      @test_ds.stubs(:profile).returns({})
   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')
-      @mock_repo.expects(:datastream).with(:pid => 'test:sample_pid', :dsid => 'RELS-EXT').returns("")
-    end
-    it 'should set the mime type' do
-      @test_ds.content = 'fake xml'
-      @test_ds.save
+  describe "#mimeType" do
+    it 'should use the application/rdf+xml mime type' do
       @test_ds.mimeType.should == 'application/rdf+xml'
     end
   end
+
+  describe "#changed?" do
+    it "should be false when no changes have been made" do
+      subject.changed?.should == false
+    end
+    it "should be true when the model has changes" do
+      subject.model = stub(:relationships_are_dirty=>true)
+      subject.changed?.should == true
+    end
+  end
   
   
   describe '#serialize!' do
@@ -44,7 +49,7 @@ describe ActiveFedora::RelsExtDatastream do
       subject = RDF::URI.new "info:fedora/test:sample_pid"
       graph.insert RDF::Statement.new(subject, ActiveFedora::Predicates.find_graph_predicate(:is_member_of),  RDF::URI.new('demo:10'))
       
-      @test_ds.expects(:model).returns(stub("model", :outbound_relationships=>graph, :relationships=>graph,  :relationships_are_dirty =>true, :relationships_are_dirty= => true)).times(3)
+      @test_ds.stubs(:new? => true, :relationships_are_dirty? =>true, :relationships => graph, :model => mock(:relationships_are_dirty= => true))
       @test_ds.serialize!
       EquivalentXml.equivalent?(@test_ds.content, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>\n        <rdf:Description rdf:about='info:fedora/test:sample_pid'>\n        <isMemberOf rdf:resource='demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/></rdf:Description>\n      </rdf:RDF>").should be_true
     end

data/spec/unit/semantic_node_spec.rb

@@ -47,11 +47,11 @@ describe ActiveFedora::SemanticNode do
       end
       
       @node = SpecNode.new
-      @node.stubs(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>''))
+      @node.stubs(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>''))
       @node.pid = increment_pid
       @test_object = SpecNode2.new
       @test_object.pid = increment_pid    
-      @test_object.stubs(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>''))
+      @test_object.stubs(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>''))
     end
     
     after(:each) do
@@ -105,7 +105,7 @@ describe ActiveFedora::SemanticNode do
       it "adding relationship to an instance should not affect class-level relationships hash" do 
         local_test_node1 = SpecNode.new
         local_test_node2 = SpecNode.new
-        local_test_node1.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).at_least_once
+        local_test_node1.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).at_least_once
         local_test_node1.add_relationship(:is_member_of, 'demo:10')
         local_test_node2.expects(:rels_ext).returns(stub('rels-ext', :content=>''))
         
@@ -137,7 +137,7 @@ describe ActiveFedora::SemanticNode do
       
     describe '#remove_relationship' do
       it 'should remove a relationship from the relationships hash' do
-        @test_object.expects(:rels_ext).returns(stub("rels_ext", :dirty= => true, :content=>'')).times(4)
+        @test_object.expects(:rels_ext).returns(stub("rels_ext", :content_will_change! => true, :content=>'')).times(4)
         @test_object.add_relationship(:has_part, "info:fedora/3")
         @test_object.add_relationship(:has_part, "info:fedora/4")
         #check both are there

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -132,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.13
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.13
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -371,6 +371,7 @@ files:
 - lib/active_fedora/predicates.rb
 - lib/active_fedora/property.rb
 - lib/active_fedora/qualified_dublin_core_datastream.rb
+- lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf_datastream.rb
 - lib/active_fedora/rdf_xml_writer.rb
 - lib/active_fedora/rdfxml_rdf_datastream.rb
@@ -384,9 +385,25 @@ files:
 - lib/active_fedora/simple_datastream.rb
 - lib/active_fedora/solr_digital_object.rb
 - lib/active_fedora/solr_service.rb
+- lib/active_fedora/test_support.rb
 - lib/active_fedora/unsaved_digital_object.rb
 - lib/active_fedora/validations.rb
 - lib/active_fedora/version.rb
+- lib/generators/active_fedora/config/USAGE
+- lib/generators/active_fedora/config/config_generator.rb
+- lib/generators/active_fedora/config/fedora/fedora_generator.rb
+- lib/generators/active_fedora/config/fedora/templates/fedora.yml
+- lib/generators/active_fedora/config/fedora/templates/fedora_conf/conf/development/fedora.fcfg
+- lib/generators/active_fedora/config/fedora/templates/fedora_conf/conf/test/fedora.fcfg
+- lib/generators/active_fedora/config/solr/solr_generator.rb
+- lib/generators/active_fedora/config/solr/templates/solr.yml
+- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/schema.xml
+- lib/generators/active_fedora/config/solr/templates/solr_conf/conf/solrconfig.xml
+- lib/generators/active_fedora/config/solr/templates/solr_conf/solr.xml
+- lib/generators/active_fedora/model/USAGE
+- lib/generators/active_fedora/model/model_generator.rb
+- lib/generators/active_fedora/model/templates/model.rb.erb
+- lib/generators/active_fedora/model/templates/model_spec.rb.erb
 - lib/tasks/active_fedora.rake
 - lib/tasks/active_fedora_dev.rake
 - script/console
@@ -400,6 +417,7 @@ files:
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
+- spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml
@@ -542,10 +560,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3035887802839477048
+      hash: -1107417416523628890
 requirements: []
 rubyforge_project: rubyfedora
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating documents in the Fedora Repository.
@@ -556,6 +574,7 @@ test_files:
 - spec/fixtures/dino_jpg_no_file_ext
 - spec/fixtures/dublin_core_rdf_descMetadata.nt
 - spec/fixtures/hydrangea_fixture_mods_article1.foxml.xml
+- spec/fixtures/hydrangea_fixture_mods_article2.foxml.xml
 - spec/fixtures/minivan.jpg
 - spec/fixtures/mixed_rdf_descMetadata.nt
 - spec/fixtures/mods_articles/hydrangea_article1.xml