active-fedora 6.2.0 → 6.3.0

data/spec/integration/datastream_collections_spec.rb

@@ -116,16 +116,17 @@ describe ActiveFedora::DatastreamCollections do
   describe '#named_datastreams_ids' do
     it 'should return a hash of datastream name to an array of dsids' do
       @test_object2 = MockAFBaseDatastream.new
-#      @test_object2.new_object = true
       f = File.open(File.join( File.dirname(__FILE__), "../fixtures/minivan.jpg"), 'rb')
       f2 = File.open(File.join( File.dirname(__FILE__), "../fixtures/dino.jpg" ), 'rb')
-      f2.stub(:original_filename).and_return("dino.jpg")
-      f.stub(:content_type).and_return("image/jpeg")
-      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f, :label=>"testDS"})
+      @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f})
       @test_object2.add_named_datastream("thumbnail",{:content_type=>"image/jpeg",:blob=>f2})
       @test_object2.save
       @test_object2 = MockAFBaseDatastream.find(@test_object2.pid)
-      @test_object2.named_datastreams_ids.should == {"high"=>[], "thumbnail"=>["THUMB1", "THUMB2"]}
+      named_datastreams_ids = @test_object2.named_datastreams_ids
+
+      expect(named_datastreams_ids.keys.sort).to eq(['high', 'thumbnail'])
+      expect(named_datastreams_ids['high']).to eq([])
+      expect(named_datastreams_ids['thumbnail'].sort).to eq(["THUMB1", "THUMB2"])
     end
   end
 

data/spec/integration/datastream_spec.rb

@@ -4,42 +4,45 @@ require 'active_fedora'
 require "rexml/document"
 
 describe ActiveFedora::Datastream do
+
+  before(:all) do
+    class MockAFBase < ActiveFedora::Base
+      has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream, :autocreate => true
+    end
+  end
   
   before(:each) do
-    @test_object = ActiveFedora::Base.new
+    @test_object = MockAFBase.new
     @test_object.save
   end
   
   after(:each) do
     @test_object.delete
   end
-  
-  it "should be able to access Datastreams using datastreams method" do    
-    dc = @test_object.datastreams["DC"]
-    dc.should be_an_instance_of(ActiveFedora::Datastream)
-    dc.dsid.should eql("DC")
-    dc.pid.should_not be_nil
-    # dc.control_group.should == "X"
+
+  it "should be able to access Datastreams using datastreams method" do
+    descMetadata = @test_object.datastreams["descMetadata"]
+    descMetadata.should be_a_kind_of(ActiveFedora::Datastream)
+    descMetadata.dsid.should eql("descMetadata")
   end
-  
+
   it "should be able to access Datastream content using content method" do    
-    dc = @test_object.datastreams["DC"].content
-    dc.should_not be_nil
+    descMetadata = @test_object.datastreams["descMetadata"].content
+    descMetadata.should_not be_nil
   end
   
   it "should be able to update XML Datastream content and save to Fedora" do    
-    xml_content = Nokogiri::XML::Document.parse(@test_object.datastreams["DC"].content)
+    xml_content = Nokogiri::XML::Document.parse(@test_object.datastreams["descMetadata"].content)
     title = Nokogiri::XML::Element.new "title", xml_content
     title.content = "Test Title"
-    title.namespace = xml_content.xpath('//oai_dc:dc/dc:identifier').first.namespace
     xml_content.root.add_child title
     
-    @test_object.datastreams["DC"].stub(:before_save)
-    @test_object.datastreams["DC"].content = xml_content.to_s
-    @test_object.datastreams["DC"].save
+    @test_object.datastreams["descMetadata"].stub(:before_save)
+    @test_object.datastreams["descMetadata"].content = xml_content.to_s
+    @test_object.datastreams["descMetadata"].save
     
-    found = Nokogiri::XML::Document.parse(@test_object.class.find(@test_object.pid).datastreams['DC'].content)
-    found.xpath('*/dc:title/text()').first.inner_text.should == title.content
+    found = Nokogiri::XML::Document.parse(@test_object.class.find(@test_object.pid).datastreams['descMetadata'].content)
+    found.xpath('//dc/title/text()').first.inner_text.should == title.content
   end
   
   it "should be able to update Blob Datastream content and save to Fedora" do    

data/spec/integration/datastreams_spec.rb

@@ -107,7 +107,6 @@ describe ActiveFedora::Datastreams do
       @has_file.file_ds.versionable.should be_false
       test_obj = HasFile.find(@has_file.pid)
       test_obj.file_ds.versionable.should be_false
-      test_obj.dc.changed?.should be_false
       test_obj.rels_ext.changed?.should be_false
       test_obj.file_ds.changed?.should be_false
       test_obj.file_ds2.changed?.should be_false
@@ -116,7 +115,6 @@ describe ActiveFedora::Datastreams do
     
     it "should use ds_specs on migrated objects" do
       test_obj = HasFile.find(@base.pid)
-      test_obj.dc.changed?.should be_false
       test_obj.file_ds.versionable.should be_false
       test_obj.file_ds.new?.should be_true
       test_obj.file_ds.content = "blah blah blah"
@@ -131,4 +129,4 @@ describe ActiveFedora::Datastreams do
       test_obj.file_ds.dsLabel.should == "Pre-existing DS"
     end
   end
-end
+end

data/spec/integration/model_spec.rb

@@ -38,22 +38,22 @@ describe ActiveFedora::Model do
       end
     end
     describe "#find with a valid pid with cast" do
-      subject { ActiveFedora::Base.find('hydrangea:fixture_mods_article1', :cast=>true) }
-      it { should be_instance_of HydrangeaArticle}
+      subject { ActiveFedora::Base.find('test:fixture_mods_article1', :cast=>true) }
+      it { should be_instance_of ModsArticle}
     end
     describe "#find with a valid pid without cast" do
-      subject { ActiveFedora::Base.find('hydrangea:fixture_mods_article1') }
+      subject { ActiveFedora::Base.find('test:fixture_mods_article1') }
       it { should be_instance_of ActiveFedora::Base}
     end
   end
 
   describe "#load_instance_from_solr" do
     describe "with a valid pid" do
-      subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
-      it { should be_instance_of HydrangeaArticle}
+      subject { ActiveFedora::Base.load_instance_from_solr('test:fixture_mods_article1') }
+      it { should be_instance_of ModsArticle}
     end
     describe "with metadata datastream spec" do
-      subject { ActiveFedora::Base.load_instance_from_solr('hydrangea:fixture_mods_article1') }
+      subject { ActiveFedora::Base.load_instance_from_solr('test:fixture_mods_article1') }
       it "should create an xml datastream" do
         subject.datastreams['properties'].should be_kind_of ActiveFedora::SimpleDatastream
       end

data/spec/integration/mods_article_integration_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   describe ".update_indexed_attributes" do
     before(:each) do
-      @test_article = HydrangeaArticle.find("hydrangea:fixture_mods_article1")
+      @test_article = ModsArticle.find("test:fixture_mods_article1")
       @test_article.update_indexed_attributes({[{:person=>0}, :first_name] => "GIVEN NAMES"}, :datastreams=>"descMetadata")
     end
     after(:each) do
@@ -15,7 +15,7 @@ describe ActiveFedora::Base do
       @test_article.update_indexed_attributes(test_args[:params], test_args[:opts])
       @test_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
       @test_article.save
-      retrieved_article = HydrangeaArticle.find("hydrangea:fixture_mods_article1")
+      retrieved_article = ModsArticle.find("test:fixture_mods_article1")
       retrieved_article.get_values_from_datastream("descMetadata", [{:person=>0}, :first_name]).should == ["Replacement FirstName"]
     end
   end

data/spec/integration/nested_attribute_spec.rb

@@ -11,30 +11,108 @@ describe "NestedAttribute behavior" do
       delegate :uno, :to=>'someData', :unique=>true
       delegate :dos, :to=>'someData', :unique=>true
     end
+
+    # base Car class, used in test for association updates and :allow_destroy flag
     class Car < ActiveFedora::Base
       has_many :bars, :property=>:has_member
-      accepts_nested_attributes_for :bars#, :allow_destroy=>true
+      accepts_nested_attributes_for :bars, :allow_destroy=>true
+    end
+
+    # class used in test for :reject_if=>:all_blank
+    class CarAllBlank < Car
+      accepts_nested_attributes_for :bars, :reject_if=>:all_blank
     end
 
-    @car = Car.new
-    @car.save
-    @bar1 = Bar.new(:car=>@car)
-    @bar1.save
+    # class used in test for :reject_if with proc object
+    class CarProc < Car
+      accepts_nested_attributes_for :bars, :reject_if=>proc { |attributes| attributes['uno'].blank? }
+    end
 
-    @bar2 = Bar.new(:car=>@car)
-    @bar2.save
+    # class used in test for :reject_if with method name as symbol
+    class CarSymbol < Car
+      accepts_nested_attributes_for :bars, :reject_if=>:uno_blank
+
+      def uno_blank(attributes)
+        attributes['uno'].blank?
+      end
+    end
 
+    # class used in test for :limit
+    class CarWithLimit < Car
+      accepts_nested_attributes_for :bars, :limit => 1
+    end
   end
 
   it "should update the child objects" do
+    @car, @bar1, @bar2 = create_car_with_bars
+
     @car.attributes = {:bars_attributes=>[{:id=>@bar1.pid, :uno=>"bar1 uno"}, {:uno=>"newbar uno"}, {:id=>@bar2.pid, :_destroy=>'1', :uno=>'bar2 uno'}]}
     Bar.find(@bar1.pid).uno.should == 'bar1 uno'
-    # pending the fix of nested_attributes_options
-    #Bar.find(@bar2.pid).should be_nil
+    Bar.where(:id => @bar2.pid).first.should be_nil
+    Bar.where(:uno => "newbar uno").first.should_not be_nil
+
+    bars = @car.bars(true)
+    bars.should include(@bar1)
+    bars.should_not include(@bar2)
+  end
+
+  it "should reject attributes when all blank" do
+    @car, @bar1, @bar2 = create_car_with_bars(CarAllBlank)
+
+    @car.bars.count.should == 2
+    @car.attributes = {:bars_attributes=>[{}, {:id=>@bar1.pid, :uno=>"bar1 uno"}]}
+    @car.bars(true).count.should == 2
 
+    @bar1.reload
+    @bar1.uno.should == "bar1 uno"
   end
 
-    
+  it "should reject attributes based on proc" do
+    @car, @bar1, @bar2 = create_car_with_bars(CarProc)
 
+    @car.attributes = {:bars_attributes=>[{}, {:id=>@bar1.pid, :uno=>"bar1 uno"}, {:id=>@bar2.pid, :dos=>"bar2 dos"}]}
+    @bar1.reload
+    @bar2.reload
+    @bar1.uno.should == "bar1 uno"
+    @bar2.dos.should be_nil
+  end
+
+  it "should reject attributes base on method name" do
+    @car, @bar1, @bar2 = create_car_with_bars(CarSymbol)
+
+    @car.attributes = {:bars_attributes=>[{}, {:id=>@bar1.pid, :uno=>"bar1 uno"}, {:id=>@bar2.pid, :dos=>"bar2 dos"}]}
+    @bar1.reload
+    @bar2.reload
+    @bar1.uno.should == "bar1 uno"
+    @bar2.dos.should be_nil
+  end
+
+  it "should throw TooManyRecords" do
+    @car, @bar1, @bar2 = create_car_with_bars(CarWithLimit)
+
+    lambda {
+      @car.attributes = {:bars_attributes=>[{}]}
+    }.should_not raise_exception
+
+    lambda {
+      @car.attributes = {:bars_attributes=>[{}, {}]}
+    }.should raise_exception(ActiveFedora::NestedAttributes::TooManyRecords)
+  end
+
+  private
+
+  # Helper method used to create 1 Car and 2 Bars (with option to provide classes for both models)
+  #
+  # @param car_class [class] class for new `car` object, default Car
+  # @param bar_class [class] class for new `bar` object, default Bar
+  #
+  # @return [car,bar,bar] returns 1 Car and 2 Bars
+  def create_car_with_bars(car_class = Car, bar_class = Bar)
+    car = car_class.new; car.save
+
+    bar1 = bar_class.new(:car=>car); bar1.save
+    bar2 = bar_class.new(:car=>car); bar2.save
+    [car, bar1, bar2]
+  end
 
 end

data/spec/integration/ntriples_datastream_spec.rb

@@ -148,7 +148,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
 
     it "should write rdf with proper subjects" do
       @subject.rdf.type = "Frog"
-      @subject.inner_object.pid = 'foo:99'
+      @subject.inner_object.pid = 'test:99'
       @subject.save!
       @subject.reload
       @subject.rdf.graph.dump(:ntriples).should == "<http://oregondigital.org/ns/99> <http://purl.org/dc/terms/type> \"Frog\" .\n"

data/spec/integration/om_datastream_spec.rb

@@ -5,19 +5,19 @@ describe ActiveFedora::OmDatastream do
   
   describe "an new instance with a inline datastream" do
     before do 
-      class HydrangeaArticle3 < ActiveFedora::Base
+      class ModsArticle3 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
         has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream, :control_group => 'X'
 
       end
 
-      @obj = HydrangeaArticle3.new
+      @obj = ModsArticle3.new
       @obj.save
       @obj.descMetadata.should be_inline
     end
     after do
       @obj.destroy
-      Object.send(:remove_const, :HydrangeaArticle3)
+      Object.send(:remove_const, :ModsArticle3)
     end
     it "should not be changed when no fields have been set" do
       @obj.descMetadata.should_not be_content_changed
@@ -28,15 +28,15 @@ describe ActiveFedora::OmDatastream do
     end
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do
-        @pid = "hydrangea:fixture_mods_article2"
-        @test_object = HydrangeaArticle3.find(@pid)
+        @pid = "test:fixture_mods_article2"
+        @test_object = ModsArticle3.find(@pid)
 
         @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
         @test_object.descMetadata.should_not be_changed
       end
 
       it "should not be changed if there are minor differences in whitespace" do
-        obj = HydrangeaArticle3.new
+        obj = ModsArticle3.new
         obj.descMetadata.content = "<a>1</a>"
         obj.save
         obj.descMetadata.should_not be_changed
@@ -49,27 +49,27 @@ describe ActiveFedora::OmDatastream do
 
   describe "an instance that is a managed datastream" do
     before(:all) do
-      class HydrangeaArticle2 < ActiveFedora::Base
+      class ModsArticle2 < ActiveFedora::Base
         # Uses the Hydra MODS Article profile for tracking most of the descriptive metadata
         has_metadata :name => "descMetadata", :type => Hydra::ModsArticleDatastream
       end
     end
 
     after(:all) do
-      Object.send(:remove_const, :HydrangeaArticle2)
+      Object.send(:remove_const, :ModsArticle2)
     end
 
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do
-        @pid = "hydrangea:fixture_mods_article2"
-        @test_object = HydrangeaArticle2.find(@pid)
+        @pid = "test:fixture_mods_article2"
+        @test_object = ModsArticle2.find(@pid)
 
         @test_object.descMetadata.ng_xml = @test_object.descMetadata.ng_xml
         @test_object.descMetadata.should_not be_changed
       end
 
       it "should be changed if there are minor differences in whitespace" do
-        obj = HydrangeaArticle2.new
+        obj = ModsArticle2.new
         obj.descMetadata.content = "<a>1</a>"
         obj.save
         obj.descMetadata.should_not be_changed
@@ -82,7 +82,7 @@ describe ActiveFedora::OmDatastream do
 
     describe "empty datastream content" do
       it "should not break when there is empty datastream content" do
-        obj = HydrangeaArticle2.new
+        obj = ModsArticle2.new
         obj.descMetadata.content = ""
         obj.save
 
@@ -91,11 +91,11 @@ describe ActiveFedora::OmDatastream do
 
     describe '.term_values' do
       before do
-        @pid = "hydrangea:fixture_mods_article2"
-        @test_object = HydrangeaArticle2.find(@pid)
-        @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+        @pid = "test:fixture_mods_article2"
+        @test_object = ModsArticle2.find(@pid)
+        @test_object.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
         @test_object.save
-        @test_object = HydrangeaArticle2.find(@pid)
+        @test_object = ModsArticle2.find(@pid)
         @test_solr_object = ActiveFedora::Base.load_instance_from_solr(@pid)
       end
 
@@ -130,11 +130,11 @@ describe ActiveFedora::OmDatastream do
     
     describe '.update_values' do
       before do
-        @pid = "hydrangea:fixture_mods_article2"
-        @test_object = HydrangeaArticle2.find(@pid)
-        @test_object.descMetadata.content = File.read(fixture('mods_articles/hydrangea_article1.xml'))
+        @pid = "test:fixture_mods_article2"
+        @test_object = ModsArticle2.find(@pid)
+        @test_object.descMetadata.content = File.read(fixture('mods_articles/mods_article1.xml'))
         @test_object.save
-        @test_object = HydrangeaArticle2.find(@pid)
+        @test_object = ModsArticle2.find(@pid)
       end
 
       it "should not be dirty after .update_values is saved" do
@@ -149,10 +149,10 @@ describe ActiveFedora::OmDatastream do
 
     describe ".to_solr" do
       before do
-        object = HydrangeaArticle2.new
+        object = ModsArticle2.new
         object.descMetadata.journal.issue.publication_date = Date.parse('2012-11-02')
         object.save!
-        @test_object = HydrangeaArticle2.find(object.pid)
+        @test_object = ModsArticle2.find(object.pid)
 
       end
       it "should solrize terms with :type=>'date' to *_dt solr terms" do

data/spec/integration/solr_instance_loader_spec.rb

@@ -10,7 +10,7 @@ describe ActiveFedora::SolrInstanceLoader do
   subject { ActiveFedora::SolrInstanceLoader.new(context, pid, solr_doc) }
 
   describe 'existing pid' do
-    let(:pid) { 'hydrangea:fixture_mods_article1' }
+    let(:pid) { 'test:fixture_mods_article1' }
     describe 'without a solr document' do
       it 'it finds the SOLR document and casts into an AF::Base object' do
         expect(subject.object).to eq(active_fedora_object)
@@ -23,7 +23,7 @@ describe ActiveFedora::SolrInstanceLoader do
       end
     end
     describe 'with a mismatching solr document' do
-      let(:mismatching_pid) { 'hydrangea:fixture_mods_article2' }
+      let(:mismatching_pid) { 'test:fixture_mods_article2' }
       let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>mismatching_pid).first }
       it 'it raise ObjectNotFoundError' do
         expect {
@@ -33,7 +33,7 @@ describe ActiveFedora::SolrInstanceLoader do
     end
   end
   describe 'missing pid' do
-    let(:pid) { 'hydrangea:fixture_mods_article8675309' }
+    let(:pid) { 'test:fixture_mods_article8675309' }
     describe 'without a solr document' do
       it 'it raise ObjectNotFoundError' do
         expect {
@@ -50,7 +50,7 @@ describe ActiveFedora::SolrInstanceLoader do
       end
     end
     describe 'with a mismatching solr document' do
-      let(:mismatching_pid) { 'hydrangea:fixture_mods_article2' }
+      let(:mismatching_pid) { 'test:fixture_mods_article2' }
       let(:solr_doc) { ActiveFedora::Base.find_with_conditions(:id=>mismatching_pid).first }
       it 'it raise ObjectNotFoundError' do
         expect {

data/spec/integration/solr_service_spec.rb

@@ -68,7 +68,7 @@ describe ActiveFedora::SolrService do
     end
     
     it 'should instantiate all datastreams in the solr doc, even ones undeclared by the class' do
-      obj = ActiveFedora::Base.load_instance_from_solr "hydrangea:fixture_mods_article1"
+      obj = ActiveFedora::Base.load_instance_from_solr "test:fixture_mods_article1"
       obj.datastreams.keys.should include('descMetadata')
     end