active-fedora 9.0.0.rc3 → 9.0.0

data/spec/integration/attached_files_spec.rb

@@ -56,7 +56,7 @@ describe ActiveFedora::AttachedFiles do
         def load_attached_files
           super
           unless attached_files.keys.include? :test_ds
-            add_file_datastream("XXX", dsid: 'test_ds', mime_type: 'text/html')
+            add_file("XXX", path: 'test_ds', mime_type: 'text/html')
           end
         end
       end
@@ -120,10 +120,10 @@ describe ActiveFedora::AttachedFiles do
       end
     end
 
-    describe '.add_file_datastream' do
+    describe '#add_file' do
       before do
         f = File.new(File.join( File.dirname(__FILE__), "../fixtures/dino_jpg_no_file_ext" ))
-        obj.add_file_datastream(f, mime_type: "image/jpeg")
+        obj.add_file(f, mime_type: "image/jpeg")
         obj.save
       end
 

data/spec/integration/belongs_to_association_spec.rb

@@ -7,7 +7,7 @@ describe ActiveFedora::Base do
     end
 
     class Book < ActiveFedora::Base
-      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+      belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
     end
     class SpecialInheritedBook < Book
     end
@@ -86,23 +86,23 @@ describe ActiveFedora::Base do
   describe "casting inheritance detailed test cases" do
     before :all do
       class SimpleObject < ActiveFedora::Base
-        belongs_to :simple_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleCollection'
-        belongs_to :complex_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexCollection'
+        belongs_to :simple_collection, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'SimpleCollection'
+        belongs_to :complex_collection, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ComplexCollection'
       end
 
       class ComplexObject < SimpleObject
-        belongs_to :simple_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleCollection'
-        belongs_to :complex_collection, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexCollection'
+        belongs_to :simple_collection, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'SimpleCollection'
+        belongs_to :complex_collection, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ComplexCollection'
       end
 
       class SimpleCollection < ActiveFedora::Base
-        has_many :objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
-        has_many :complex_objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
+        has_many :objects, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
+        has_many :complex_objects, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
       end
 
       class ComplexCollection < SimpleCollection
-        has_many :objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
-        has_many :complex_objects, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
+        has_many :objects, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'SimpleObject', autosave: true
+        has_many :complex_objects, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ComplexObject', autosave: true
       end
 
     end

data/spec/integration/caching_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe "Caching" do
+  before do
+    class TestClass < ActiveFedora::Base
+      property :title, predicate: ::RDF::DC.title
+    end
+  end
+
+  after { Object.send(:remove_const, :TestClass) }
+
+  let!(:object) { TestClass.create(id: '123') }
+
+  describe "#cache" do
+    it "should find records in the cache" do
+      expect_any_instance_of(Faraday::Connection).to receive(:get).once.and_call_original
+      ActiveFedora::Base.cache do
+        o1 = TestClass.find(object.id)
+        o2 = TestClass.find(object.id)
+        expect(o1.ldp_source.get.body.object_id).to eq o2.ldp_source.get.body.object_id
+      end
+    end
+
+    it "should clear the cache at the end of the block" do
+      expect_any_instance_of(Faraday::Connection).to receive(:get).twice.and_call_original
+      ActiveFedora::Base.cache do
+        TestClass.find(object.id)
+      end
+      ActiveFedora::Base.cache do
+        TestClass.find(object.id)
+      end
+    end
+
+    context "an update" do
+      it "should flush the cache" do
+        expect_any_instance_of(Faraday::Connection).to receive(:get).twice.and_call_original
+        ActiveFedora::Base.cache do
+          TestClass.find(object.id)
+          object.title= ['foo']
+          object.save!
+          TestClass.find(object.id)
+        end
+      end
+    end
+  end
+
+  describe "#uncached" do
+    it "should not use the cache" do
+      expect_any_instance_of(Faraday::Connection).to receive(:get).twice.and_call_original
+      ActiveFedora::Base.cache do
+        TestClass.find(object.id)
+        ActiveFedora::Base.uncached do
+          TestClass.find(object.id)
+        end
+        TestClass.find(object.id)
+      end
+    end
+  end
+end

data/spec/integration/collection_association_spec.rb

@@ -6,7 +6,7 @@ describe ActiveFedora::Base do
       has_many :books
     end
     class Book < ActiveFedora::Base
-      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasMember
+      belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasMember
     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', predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      has_many :things, :class_name=>'ChildThing', predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
 
     class ChildThing < ActiveFedora::Base
-      belongs_to :parent, :class_name=>'ParentThing', predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :parent, :class_name=>'ParentThing', predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
   end
 

data/spec/integration/file_spec.rb

@@ -4,64 +4,62 @@ 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
+  describe "#save" do
+    context "with a string" do
+      it "should save" do
+        subject.content = "some stuff"
+        subject.save
+        expect(subject).not_to be_new_record
+      end
     end
-  end
 
-  context "stand alone operation with UploadedFile" do
-    before(:all) do
-      module ActionDispatch
-        module Http
-          class UploadedFile
+    context "with UploadedFile" do
+      before do
+        module ActionDispatch
+          module Http
+            class UploadedFile
 
-            def initialize
-              @content = StringIO.new("hello world")
-            end
+              def initialize
+                @content = StringIO.new("hello world")
+              end
 
-            def read(a, b)
-              return @content.read(a, b)
-            end
-            
-            def size
-              @content.length
-            end
+              def read(a, b)
+                return @content.read(a, b)
+              end
+
+              def size
+                @content.length
+              end
 
+            end
           end
         end
       end
-    end
 
-    it "should save" do
-      subject.content = ActionDispatch::Http::UploadedFile.new
-      subject.save
-      expect(subject).not_to be_new_record
+      it "should save" do
+        subject.content = ActionDispatch::Http::UploadedFile.new
+        subject.save
+        expect(subject).not_to be_new_record
+      end
     end
   end
 
   context "when autocreate is true" do
-    before(:all) do
+    before do
       class MockAFBase < ActiveFedora::Base
         has_metadata "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream, autocreate: true
       end
     end
 
-    after(:all) do
+    after 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
+    describe "the metadata file" do
       subject { descMetadata }
       it { should be_a_kind_of(ActiveFedora::File) }
     end
@@ -77,7 +75,7 @@ describe ActiveFedora::File do
     end
 
 
-    context "an XML datastream" do
+    context "an XML file" do
       let(:xml_content) { Nokogiri::XML::Document.parse(descMetadata.content) }
       let(:title) { Nokogiri::XML::Element.new "title", xml_content }
       before do
@@ -95,38 +93,38 @@ describe ActiveFedora::File do
       it { should eq title.content }
     end
 
-    context "a blob datastream" do
-      let(:dsid) { "ds#{Time.now.to_i}" }
+    context "a binary file" do
+      let(:path) { "ds#{Time.now.to_i}" }
       let(:content) { fixture('dino.jpg') }
-      let(:datastream) { ActiveFedora::File.new.tap { |ds| ds.content = content } }
+      let(:file) { ActiveFedora::File.new.tap { |ds| ds.content = content } }
 
       before do
-        test_object.attach_file(datastream, dsid)
+        test_object.attach_file(file, path)
         test_object.save
       end
 
       it "should not be changed" do
-        expect(test_object.attached_files[dsid]).to_not be_changed
+        expect(test_object.attached_files[path]).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
+        expect(test_object.attached_files[path].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) }
+          test_object.attached_files[path].stream.each { |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.add_file('one1two2threfour', path: 'webm', mime_type: 'video/webm')
             test_object.save!
           end
-          subject { str = ''; test_object.webm.stream(range) {|chunk| str << chunk }; str }
+          subject { str = ''; test_object.webm.stream(range).each {|chunk| str << chunk }; str }
           context "whole thing" do
             let(:range) { 'bytes=0-15' }
             it { should eq 'one1two2threfour'}

data/spec/integration/has_and_belongs_to_many_associations_spec.rb

@@ -5,7 +5,7 @@ describe ActiveFedora::Base do
     before do
       class Book < ActiveFedora::Base
         has_and_belongs_to_many :topics, predicate: ::RDF::FOAF.primaryTopic, inverse_of: :books
-        has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection
+        has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
       end
 
       class SpecialInheritedBook < Book
@@ -113,11 +113,11 @@ describe ActiveFedora::Base do
   describe "when inverse is not specified" do
     before do
       class Book < ActiveFedora::Base
-        has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection
+        has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
       end
 
       class Collection < ActiveFedora::Base
-        has_and_belongs_to_many :books, predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection
+        has_and_belongs_to_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
       end
     end
 
@@ -166,7 +166,7 @@ describe ActiveFedora::Base do
     describe "without callbacks" do
       before do
         class Book < ActiveFedora::Base
-          has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection
+          has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
         end
 
         class Collection < ActiveFedora::Base
@@ -211,7 +211,7 @@ describe ActiveFedora::Base do
       before do
         class Book < ActiveFedora::Base
           has_and_belongs_to_many :collections,
-                                  predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection,
+                                  predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection,
                                   before_remove: :foo, after_remove: :bar
         end
 
@@ -258,7 +258,7 @@ describe ActiveFedora::Base do
       before do
         class Book < ActiveFedora::Base
           has_and_belongs_to_many :collections,
-                                  predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection,
+                                  predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection,
                                   before_add: :foo, after_add: :bar
         end
 
@@ -302,7 +302,7 @@ end
 describe "create" do
   before do
     class Book < ActiveFedora::Base
-      has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::RelsExt.isMemberOfCollection
+      has_and_belongs_to_many :collections, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isMemberOfCollection
     end
 
     class Collection < ActiveFedora::Base
@@ -338,7 +338,7 @@ describe "Autosave" do
     end
 
     class Component < ActiveFedora::Base
-      has_and_belongs_to_many :items, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      has_and_belongs_to_many :items, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
       has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
         m.field "description", :string
       end

data/spec/integration/has_many_associations_spec.rb

@@ -7,7 +7,7 @@ describe "Collection members" do
     end
 
     class Book < ActiveFedora::Base
-      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+      belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
     end
   end
   after :all do
@@ -69,7 +69,7 @@ describe "After save callbacks" do
     end
 
     class Book < ActiveFedora::Base
-      belongs_to :library, predicate: ActiveFedora::RDF::RelsExt.hasConstituent
+      belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
       after_save :find_self
       attr_accessor :library_books
 
@@ -101,11 +101,11 @@ describe "When two or more relationships share the same property" do
     end
 
     class Person < ActiveFedora::Base
-      belongs_to :book, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :book, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
 
     class Collection < ActiveFedora::Base
-      belongs_to :book, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :book, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
 
     @book = Book.create!
@@ -128,14 +128,14 @@ end
 describe "with an polymorphic association" do
   before do
     class Permissionable1 < ActiveFedora::Base
-      has_many :permissions, predicate: ActiveFedora::RDF::RelsExt.isPartOf, inverse_of: :access_to
+      has_many :permissions, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, inverse_of: :access_to
     end
     class Permissionable2 < ActiveFedora::Base
-      has_many :permissions, predicate: ActiveFedora::RDF::RelsExt.isPartOf, inverse_of: :access_to
+      has_many :permissions, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, inverse_of: :access_to
     end
 
     class Permission < ActiveFedora::Base
-      belongs_to :access_to, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      belongs_to :access_to, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
     end
   end
 
@@ -155,15 +155,15 @@ end
 describe "When relationship is restricted to AF::Base" do
   before do
     class Email < ActiveFedora::Base
-      has_many :attachments, predicate: ActiveFedora::RDF::RelsExt.isPartOf, :class_name=>'ActiveFedora::Base'
+      has_many :attachments, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, :class_name=>'ActiveFedora::Base'
     end
 
     class Image < ActiveFedora::Base
-      belongs_to :email, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :email, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
 
     class PDF < ActiveFedora::Base
-      belongs_to :email, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :email, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
   end
 
@@ -211,7 +211,7 @@ describe "Deleting a dependent relationship" do
       has_many :components
     end
     class Component < ActiveFedora::Base
-      belongs_to :item, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+      belongs_to :item, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
     end
   end
 
@@ -279,7 +279,7 @@ describe "Autosave" do
         has_attributes :title, datastream: 'foo'
       end
       class Component < ActiveFedora::Base
-        belongs_to :item, predicate: ActiveFedora::RDF::RelsExt.isPartOf
+        belongs_to :item, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf
         has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
           m.field "description", :string
         end
@@ -315,11 +315,11 @@ describe "Autosave" do
     context "with ActiveFedora::Base as classes" do
       before do
         class Novel < ActiveFedora::Base
-          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
         class Text < ActiveFedora::Base
-          has_many :books, predicate: ActiveFedora::RDF::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+          has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
         end
       end
       let(:text) { Text.create}