active-fedora 8.7.0 → 9.0.0.beta1

data/spec/integration/delete_all_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-  
+
   before(:all) do
     module SpecModel
       class Basic < ActiveFedora::Base
         class_attribute :callback_counter
-        
+
         before_destroy :inc_counter
 
         def inc_counter
@@ -15,7 +15,7 @@ describe ActiveFedora::Base do
       end
     end
   end
-  
+
   after(:all) do
     Object.send(:remove_const, :SpecModel)
   end
@@ -29,35 +29,38 @@ describe ActiveFedora::Base do
 
 
   describe ".destroy_all" do
-    it "should remove both and run callbacks" do 
+    it "should remove both and run callbacks" do
       SpecModel::Basic.destroy_all
-      expect(SpecModel::Basic.count).to eq(0) 
-      expect(SpecModel::Basic.callback_counter).to eq(2)
+      expect(SpecModel::Basic.count).to eq 0
+      expect(SpecModel::Basic.callback_counter).to eq 2
     end
 
     describe "when a model is missing" do
       let(:model3) { SpecModel::Basic.create! }
-      let!(:pid) { model3.pid }
-      before { model3.inner_object.delete }
+      let!(:id) { model3.id }
+
+      before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, model3.uri).delete }
+
       after do
         ActiveFedora::SolrService.instance.conn.tap do |conn|
-          conn.delete_by_query "id:\"#{pid}\""
+          conn.delete_by_query "id:\"#{id}\""
           conn.commit
         end
       end
-      it "should be able to skip a missing model" do 
-        expect(ActiveFedora::Base.logger).to receive(:error).with("Although #{pid} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
+
+      it "should be able to skip a missing model" do
+        expect(ActiveFedora::Base.logger).to receive(:error).with("Although #{id} was found in Solr, it doesn't seem to exist in Fedora. The index is out of synch.")
         SpecModel::Basic.destroy_all
-        expect(SpecModel::Basic.count).to eq(1) 
+        expect(SpecModel::Basic.count).to eq 1
       end
     end
   end
 
   describe ".delete_all" do
-    it "should remove both and not run callbacks" do 
+    it "should remove both and not run callbacks" do
       SpecModel::Basic.delete_all
-      expect(SpecModel::Basic.count).to eq(0)
-      expect(SpecModel::Basic.callback_counter).to eq(0)
+      expect(SpecModel::Basic.count).to eq 0
+      expect(SpecModel::Basic.callback_counter).to eq 0
     end
   end
 end

data/spec/integration/eradicate_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe ActiveFedora::Base do
+
+  before(:all) do
+    class ResurrectionModel < ActiveFedora::Base
+      after_destroy :eradicate
+    end
+  end
+
+  after(:all) do
+    Object.send(:remove_const, :ResurrectionModel)
+  end
+
+  context "when an object is has already been deleted" do
+    let(:ghost) do
+      obj = ActiveFedora::Base.create
+      obj.destroy
+      obj.id
+    end
+    context "in a typical sitation" do
+      specify "it cannot be reused" do
+        expect { ActiveFedora::Base.create(ghost) }.to raise_error(Ldp::Gone)
+      end
+    end
+    specify "remove its tombstone" do
+      expect(ActiveFedora::Base.eradicate(ghost)).to be true
+    end
+  end
+
+  context "when an object has just been deleted" do
+    let(:zombie) do
+      obj = ActiveFedora::Base.create
+      obj.destroy
+      return obj
+    end
+    specify "remove its tombstone" do
+      expect(zombie.eradicate).to be true
+    end
+  end
+
+  describe "a model with no tombstones" do
+    let(:lazarus) do
+      body = ResurrectionModel.create
+      soul = body.id
+      body.destroy
+      return soul
+    end
+    it "should allow reusing a uri" do
+      expect(ResurrectionModel.create(id: lazarus)).to be_kind_of(ResurrectionModel)
+    end
+  end
+
+end

data/spec/integration/fedora_solr_sync_spec.rb

@@ -4,11 +4,11 @@ require 'timeout'
 describe "fedora_solr_sync_issues" do
   before :all do
     class ParentThing < ActiveFedora::Base
-      has_many :things, :class_name=>'ChildThing', :property=>:is_part_of
+      has_many :things, :class_name=>'ChildThing', predicate: ActiveFedora::RDF::RelsExt.isPartOf
     end
 
     class ChildThing < ActiveFedora::Base
-      belongs_to :parent, :class_name=>'ParentThing', :property=>:is_part_of
+      belongs_to :parent, :class_name=>'ParentThing', predicate: ActiveFedora::RDF::RelsExt.isPartOf
     end
   end
 
@@ -18,11 +18,13 @@ describe "fedora_solr_sync_issues" do
   end
 
   let(:parent) { ParentThing.create }
-  subject { ChildThing.create :parent => parent }
+  subject { ChildThing.create parent: parent }
+
+  before { Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, subject.uri).delete }
 
   it "should not go into an infinite loop" do
-    subject.inner_object.delete
     parent.reload
-    expect(parent.things).to eq([])
+    expect(ActiveFedora::Base.logger).to receive(:error).with("Solr and Fedora may be out of sync:\n")
+    expect(parent.things).to eq []
   end
 end

data/spec/integration/field_to_solr_name_spec.rb

@@ -5,10 +5,10 @@ describe "An object with RDF backed attributes" do
   before do
     class TestOne < ActiveFedora::Base
       class MyMetadata < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: RDF::DC.title do |index|
+        property :title, predicate: ::RDF::DC.title do |index|
           index.as :stored_searchable
         end
-        property :date_uploaded, predicate: RDF::DC.dateSubmitted do |index|
+        property :date_uploaded, predicate: ::RDF::DC.dateSubmitted do |index|
           index.type :date
           index.as :stored_searchable, :sortable
         end
@@ -18,15 +18,15 @@ describe "An object with RDF backed attributes" do
     end
   end
 
-  after do 
+  after do
     Object.send(:remove_const, :TestOne)
   end
 
   it "should be able to grab the solr name" do
-    expect(TestOne.defined_attributes[:title].primary_solr_name).to eq 'desc_metadata__title_tesim'
+    expect(TestOne.delegated_attributes[:title].primary_solr_name).to eq 'desc_metadata__title_tesim'
   end
 
   it "should be able to grab the solr name for a date" do
-    expect(TestOne.defined_attributes[:date_uploaded].primary_solr_name).to eq 'desc_metadata__date_uploaded_dtsim'
+    expect(TestOne.delegated_attributes[:date_uploaded].primary_solr_name).to eq 'desc_metadata__date_uploaded_dtsim'
   end
 end

data/spec/integration/file_fixity_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Checking fixity" do
+
+  before(:all) do
+    class MockAFBase < ActiveFedora::Base
+      contains "data", autocreate: true
+    end
+  end
+
+  after(:all) do
+    Object.send(:remove_const, :MockAFBase)
+  end
+
+  subject do
+    obj = MockAFBase.create
+    obj.data.content = "some content"
+    obj.save
+    obj.data
+  end
+
+  context "with a valid resource" do
+    it "should return true for a successful fixity check" do
+      expect(subject.check_fixity).to be true
+    end
+  end
+  context "when no uri has been set" do
+    subject { ActiveFedora::File.new }
+    it "should raise an error" do
+      expect { subject.check_fixity }.to raise_error(ArgumentError, "You must provide a uri")
+    end
+  end
+  context "with missing resource" do
+    subject { ActiveFedora::File.new(ActiveFedora::Base.id_to_uri('123')) }
+    it "should raise an error" do
+      expect { subject.check_fixity }.to raise_error(Ldp::NotFound)
+    end
+  end
+
+end

data/spec/integration/file_spec.rb

@@ -0,0 +1,122 @@
+require 'spec_helper'
+
+require 'active_fedora'
+require "rexml/document"
+
+describe ActiveFedora::File do
+  context "stand alone operation" do
+    it "should save" do
+      subject.content = "some stuff"
+      subject.save
+      expect(subject).not_to be_new_record
+    end
+  end
+
+  context "when autocreate is true" do
+    before(:all) do
+      class MockAFBase < ActiveFedora::Base
+        has_metadata "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream, autocreate: true
+      end
+    end
+
+    after(:all) do
+      Object.send(:remove_const, :MockAFBase)
+    end
+
+    let(:test_object) { MockAFBase.create }
+
+    after do
+      test_object.destroy
+    end
+
+    let(:descMetadata) {  test_object.attached_files["descMetadata"] }
+
+    describe "the datastream" do
+      subject { descMetadata }
+      it { should be_a_kind_of(ActiveFedora::File) }
+    end
+
+    describe "#content" do
+      subject { descMetadata.content }
+      it { should_not be_nil }
+    end
+
+    describe "#described_by" do
+      subject { descMetadata.described_by }
+      it { should eq descMetadata.uri + '/fcr:metadata' }
+    end
+
+
+    context "an XML datastream" do
+      let(:xml_content) { Nokogiri::XML::Document.parse(descMetadata.content) }
+      let(:title) { Nokogiri::XML::Element.new "title", xml_content }
+      before do
+        title.content = "Test Title"
+        xml_content.root.add_child title
+
+        allow(descMetadata).to receive(:before_save)
+        descMetadata.content = xml_content.to_s
+        descMetadata.save
+      end
+
+      let(:found) { Nokogiri::XML::Document.parse(test_object.reload.descMetadata.content) }
+
+      subject { found.xpath('//dc/title/text()').first.inner_text }
+      it { should eq title.content }
+    end
+
+    context "a blob datastream" do
+      let(:dsid) { "ds#{Time.now.to_i}" }
+      let(:content) { fixture('dino.jpg') }
+      let(:datastream) { ActiveFedora::File.new.tap { |ds| ds.content = content } }
+
+      before do
+        test_object.attach_file(datastream, dsid)
+        test_object.save
+      end
+
+      it "should not be changed" do
+        expect(test_object.attached_files[dsid]).to_not be_changed
+      end
+
+      it "should be able to read the content from fedora" do
+        content.rewind
+        expect(test_object.attached_files[dsid].content).to eq content.read
+      end
+
+      describe "streaming the response" do
+        let(:stream_reader) { double }
+        it "should stream the response" do
+          expect(stream_reader).to receive(:read).at_least(:once)
+          test_object.attached_files[dsid].stream { |buff| stream_reader.read(buff) }
+        end
+
+        context "with a range request" do
+          before do
+            test_object.add_file_datastream('one1two2threfour', dsid: 'webm', mime_type: 'video/webm')
+            test_object.save!
+          end
+          subject { str = ''; test_object.webm.stream(range) {|chunk| str << chunk }; str }
+          context "whole thing" do
+            let(:range) { 'bytes=0-15' }
+            it { should eq 'one1two2threfour'}
+          end
+          context "open ended" do
+            let(:range) { 'bytes=0-' }
+            it "should get a response" do
+              expect(subject).to eq 'one1two2threfour'
+            end
+          end
+          context "not starting at the beginning" do
+            let(:range) { 'bytes=3-15' }
+            it { should eq '1two2threfour'}
+          end
+          context "not ending at the end" do
+            let(:range) { 'bytes=4-11' }
+            it { should eq 'two2thre'}
+          end
+        end
+      end
+    end
+  end
+end

data/spec/integration/full_featured_model_spec.rb

@@ -22,10 +22,10 @@ describe ActiveFedora::Base do
           m.field "series", :string
           m.field "location", :string
         end
-        
-        
-        has_metadata :name=>"mods_article", :type=> Hydra::ModsArticleDatastream 
-        
+
+
+        has_metadata :name=>"mods_article", :type=> Hydra::ModsArticleDatastream
+
         has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
           # Default :multiple => true
           #
@@ -34,24 +34,24 @@ describe ActiveFedora::Base do
           #
           # aimint to use method-missing to support calling methods like
           # my_oral_history.subjects  OR   my_oral_history.titles  OR EVEN my_oral_history.title whenever possible
-          
+
           # Setting new Types for dates and text content
           #m.field "creation_date", :date, :xml_node => "date"
           #m.field "abstract", :text, :xml_node => "abstract"
           #m.field "rights", :text, :xml_node => "rights"
-          
+
           # Setting up special named fields
-          #m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH" 
+          #m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH"
           #m.field "spatial_coverage", :string, :xml_node => "spatial", :encoding => "TGN"
           #m.field "temporal_coverage", :string, :xml_node => "temporal", :encoding => "Period"
           #m.field "type", :string, :xml_node => "type", :encoding => "DCMITYPE"
           #m.field "alt_title", :string, :xml_node => "alternative"
         end
-        
+
         has_metadata :name => "significant_passages", :type => ActiveFedora::SimpleDatastream do |m|
           m.field "significant_passage", :text
         end
-        
+
         has_metadata :name => "sensitive_passages", :type => ActiveFedora::SimpleDatastream do |m|
           m.field "sensitive_passage", :text
         end
@@ -66,19 +66,19 @@ describe ActiveFedora::Base do
     END
     sample_narrator = 'Addelson, Frances'
     sample_bio = <<-END
-    Rochelle Ruthchild interviewed Frances Addleson on October 18, November 14, and December 10, 1997.   The interview thoroughly examined the trajectory of Frances\' life from birth until the time of the interview. As a young child, Frances\' father died during the influenza epidemic, and her mother was not equipped to care for her and her siblings.  Consequently, they were placed in a Jewish foster home. Although her experience was mostly positive, this experience would leave life-long effects.  Frances attended Radcliffe upon the urging of a mentor and later obtained her Master\'s degree in social work from Simmons College in 1954.  In the 1940\'s, she returned to work while her children were still young; a rather unusual event for that time period.  While working as a social worker at Beth Israel Hospital in the early 1970\'s, she helped counsel countless women who came to the hospital seeking abortions before the procedure was officially legalized during the landmark Roe vs. Wade decision in 1973.  Frances would later write two articles that were published in medical journals about her experience during this time.  Although not a very religious person, Frances felt connected to the Jewish notion of social justice and remained very active until an accident in the late 1990\'s.
+    Rochelle Ruthchild interviewed Frances Addleson on October 18, November 14, and December 10, 1997.   The interview thoroughly examined the trajectory of Frances\' life from birth until the time of the interview. As a young child, Frances\' father died during the influenza eidemic, and her mother was not equipped to care for her and her siblings.  Consequently, they were placed in a Jewish foster home. Although her experience was mostly positive, this experience would leave life-long effects.  Frances attended Radcliffe upon the urging of a mentor and later obtained her Master\'s degree in social work from Simmons College in 1954.  In the 1940\'s, she returned to work while her children were still young; a rather unusual event for that time period.  While working as a social worker at Beth Israel Hospital in the early 1970\'s, she helped counsel countless women who came to the hospital seeking abortions before the procedure was officially legalized during the landmark Roe vs. Wade decision in 1973.  Frances would later write two articles that were published in medical journals about her experience during this time.  Although not a very religious person, Frances felt connected to the Jewish notion of social justice and remained very active until an accident in the late 1990\'s.
     END
     sample_interviewer = "Ruthchild, & Rochelle"
-    
-    @properties_sample_values2 = Hash[:narrator => "Narrator1 & Narrator2", :interviewer => "Interviewer", :transcript_editor => "Transcript Editor", :bio => "Biographic info", 
-                                    :notes => "My Note\\\'s a good one", :hard_copy_availability => "Yes", :hard_copy_location => "Archives", :other_contributor => "Sally Ride", 
+
+    @properties_sample_values2 = Hash[:narrator => "Narrator1 & Narrator2", :interviewer => "Interviewer", :transcript_editor => "Transcript Editor", :bio => "Biographic info",
+                                    :notes => "My Note\\\'s a good one", :hard_copy_availability => "Yes", :hard_copy_location => "Archives", :other_contributor => "Sally Ride",
                                     :restrictions => "None", :series => "My Series", :location => "location"]
-    
-    @properties_sample_values = Hash[:narrator => sample_narrator, :interviewer => sample_interviewer, :transcript_editor => sample_transcript_editor, :bio => sample_bio, 
-                                    :notes => sample_notes, :hard_copy_availability => sample_hard_copy_availability, :hard_copy_location => "Archives", :other_contributor => sample_other_contributor, 
+
+    @properties_sample_values = Hash[:narrator => sample_narrator, :interviewer => sample_interviewer, :transcript_editor => sample_transcript_editor, :bio => sample_bio,
+                                    :notes => sample_notes, :hard_copy_availability => sample_hard_copy_availability, :hard_copy_location => "Archives", :other_contributor => sample_other_contributor,
                                     :restrictions => "None", :series => "My Series", :location => sample_location]
 
-    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => "Jewish Womens's Archive", :description => "description", :identifier => "jwa:sample_pid", 
+    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => "Jewish Womens's Archive", :description => "description", :identifier => "jwa:sample_id", 
                                     :title => "title", 
                                     #:alt_title => "alt_title", :subject => "subject", 
                                     #:subject_heading => "subject heading", 
@@ -91,89 +91,79 @@ describe ActiveFedora::Base do
                                     #:extent => "extent", 
                                     :format => "format", :medium => "medium"]
     @signigicant_passages_sample_values = {}
-    @sensitive_passages_sample_values = {}     
-    @sample_xml = "<xml><fields><system_create_date>REMOVED</system_create_date><system_modified_date>REMOVED</system_modified_date><active_fedora_model_s>OralHistory</active_fedora_model_s><id>changeme:14527</id><subject_heading>subject heading</subject_heading><type>type</type><rights>rights</rights><publisher>publisher</publisher><creation_date>creation date</creation_date><identifier>jwa:sample_pid</identifier><format>format</format><extent>extent</extent><language>language</language><description>description</description><title>title</title><medium>medium</medium><spatial_coverage>spatial coverage</spatial_coverage><alt_title>alt_title</alt_title><temporal_coverage>temporal coverage</temporal_coverage><subject>subject</subject><creator>creator</creator><abstract>abstract</abstract><other_contributor>Sally Ride</other_contributor><transcript_editor>Transcript Editor</transcript_editor><restrictions>None</restrictions><bio>Biographic info</bio><series>My Series</series><notes>My Note</notes><location>location</location><hard_copy_availability>Yes</hard_copy_availability><narrator>Narrator</narrator><hard_copy_location>Archives</hard_copy_location><interviewer>Interviewer</interviewer></fields><content/></xml>"
-               
-  end  
-  
+    @sensitive_passages_sample_values = {}
+    @sample_xml = "<xml><fields><system_create_date>REMOVED</system_create_date><system_modified_date>REMOVED</system_modified_date><active_fedora_model_s>OralHistory</active_fedora_model_s><id>changeme:14527</id><subject_heading>subject heading</subject_heading><type>type</type><rights>rights</rights><publisher>publisher</publisher><creation_date>creation date</creation_date><identifier>jwa:sample_id</identifier><format>format</format><extent>extent</extent><language>language</language><description>description</description><title>title</title><medium>medium</medium><spatial_coverage>spatial coverage</spatial_coverage><alt_title>alt_title</alt_title><temporal_coverage>temporal coverage</temporal_coverage><subject>subject</subject><creator>creator</creator><abstract>abstract</abstract><other_contributor>Sally Ride</other_contributor><transcript_editor>Transcript Editor</transcript_editor><restrictions>None</restrictions><bio>Biographic info</bio><series>My Series</series><notes>My Note</notes><location>location</location><hard_copy_availability>Yes</hard_copy_availability><narrator>Narrator</narrator><hard_copy_location>Archives</hard_copy_location><interviewer>Interviewer</interviewer></fields><content/></xml>"
+
+  end
+
   before(:each) do
     @test_history = OralHistory.new
   end
-  
+
   after(:each) do
   end
-  
+
   after(:all) do
     Object.send(:remove_const, :OralHistory)
   end
-  
+
   it "should be an instance of ActiveFedora::Base" do
     expect(@test_history).to be_kind_of(ActiveFedora::Base)
   end
-  
 
-  it "should create proxies to all the datastreams" do
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    expect(@test_history.properties).to be properties_ds    
+
+  it "should create proxies to all the attached_files" do
+    properties_ds = @test_history.attached_files["properties"]
+    dublin_core_ds = @test_history.attached_files["dublin_core"]
+    expect(@test_history.properties).to be properties_ds
     expect(@test_history).to respond_to(:properties)
     expect(OralHistory.new).to respond_to(:properties)
-  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)
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-        
+    properties_ds = @test_history.attached_files["properties"]
+    dublin_core_ds = @test_history.attached_files["dublin_core"]
+
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
       properties_ds.send("#{field.to_s}=", [value])
     end
-    
+
     @dublin_core_sample_values.each_pair do |field, value|
       next if [:format, :type].include?(field)  #format and type are methods declared on Object
       dublin_core_ds.send("#{field.to_s}=", [value])
     end
-    
+
     @test_history.save
-    
-    @solr_result = OralHistory.find_with_conditions(:id=>@test_history.pid)[0]
+
+    @solr_result = OralHistory.find_with_conditions(:id=>@test_history.id)[0]
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
-      next if field == :location #FIXME HYDRA-825 
-      expect(@solr_result[ActiveFedora::SolrService.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrService.solr_name(field, type: :date)]).to eq([::Solrizer::Extractor.format_node_value(value)]) 
+      next if field == :location #FIXME HYDRA-825
+      expect((@solr_result[ActiveFedora::SolrService.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrService.solr_name(field, type: :date)])).to eq [::Solrizer::Extractor.format_node_value(value)]
     end
-    
+
     @dublin_core_sample_values.each_pair do |field, value|
       next if [:format, :type].include?(field)  #format and type are methods declared on Object
-      expect(dublin_core_ds.send("#{field.to_s}")).to eq([value])
-    end    
+      expect(dublin_core_ds.send("#{field.to_s}")).to eq [value]
+    end
   end
-  
+
   it "should have Qualified Dublin core, with custom accessors" do
-    
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    
+
+    dublin_core_ds = @test_history.attached_files["dublin_core"]
+
     dublin_core_ds.subject = "My Subject Heading"
     dc_xml = REXML::Document.new(dublin_core_ds.to_xml)
-    
-    expect(dc_xml.root.elements["dcterms:subject"].text).to eq("My Subject Heading")
-    
+
+    expect(dc_xml.root.elements["dcterms:subject"].text).to eq "My Subject Heading"
+
   end
-  
+
   it "should support #find_with_conditions" do
     solr_result = OralHistory.find_with_conditions({})
-    expect(solr_result).not_to be_nil
-  end
-  
-  describe '#new' do
-    it "should support custom pids" do
-      oh = OralHistory.new(:pid=>"uuid:blah-blah-blah")
-      expect(oh.pid).to eq("uuid:blah-blah-blah")
-    end
+    expect(solr_result).to_not be_nil
   end
-  
-
-  
 end