active-fedora 9.10.4 → 9.11.0

data/lib/active_fedora/validations.rb

@@ -9,7 +9,7 @@ module ActiveFedora
   #   rescue ActiveFedora::RecordInvalid => invalid
   #     puts invalid.record.errors
   #   end
-  class RecordInvalid < StandardError
+  class RecordInvalid < ActiveFedoraError
     attr_reader :record
     def initialize(record)
       @record = record

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.10.4".freeze
+  VERSION = "9.11.0".freeze
 end

data/lib/generators/active_fedora/config/solr/templates/solr/config/schema.xml

@@ -103,7 +103,7 @@
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+      geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
     
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>

data/solr/config/schema.xml

@@ -103,7 +103,7 @@
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+      geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
     
     <fieldType name="text" class="solr.TextField" omitNorms="false">
       <analyzer>

data/spec/integration/attributes_spec.rb

@@ -147,4 +147,12 @@ describe "delegating attributes" do
       end
     end
   end
+
+  describe 'dangerous attributes' do
+    it 'raises an exception if a dangerous attribute is defined' do
+      Deprecation.silence(ActiveFedora::Attributes) do
+        expect { TitledObject.has_attributes :save, datastream: 'foo', multiple: false }.to raise_error ActiveFedora::DangerousAttributeError
+      end
+    end
+  end
 end

data/spec/integration/file_spec.rb

@@ -149,6 +149,28 @@ describe ActiveFedora::File do
             it { should eq 'two2thre' }
           end
         end
+
+        context "when the request results in a redirect" do
+          before do
+            test_object.add_file('one1two2threfour', path: 'webm', mime_type: 'video/webm')
+            test_object.add_file('', path: 'redirector', mime_type: "message/external-body; access-type=URL; url=\"#{test_object.webm.uri}\"")
+            test_object.save!
+          end
+          subject { str = ''; test_object.redirector.stream.each { |chunk| str << chunk }; str }
+          it { should eq 'one1two2threfour' }
+        end
+
+        context "when there are more than 3 requests because of redirects" do
+          before do
+            test_object.add_file('', path: 'one', mime_type: "message/external-body; access-type=URL; url=\"#{test_object.attached_files[path].uri}\"")
+            test_object.add_file('', path: 'two', mime_type: "message/external-body; access-type=URL; url=\"#{test_object.one.uri}\"")
+            test_object.add_file('', path: 'three', mime_type: "message/external-body; access-type=URL; url=\"#{test_object.two.uri}\"")
+            test_object.save!
+          end
+          it "raises a HTTP redirect too deep Error" do
+            expect { test_object.three.stream.each { |chunk| chunk } }.to raise_error('HTTP redirect too deep')
+          end
+        end
       end
     end
   end

data/spec/integration/has_many_associations_spec.rb

@@ -423,4 +423,27 @@ describe ActiveFedora::Associations::HasManyAssociation do
       end
     end
   end
+
+  describe "when destroying the owner" do
+    before do
+      class Book < ActiveFedora::Base
+        has_many :permissions, dependent: :destroy
+      end
+
+      class Permission < ActiveFedora::Base
+        belongs_to :book, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
+      end
+    end
+    let(:book) { Book.create! }
+    let!(:permissions) { Permission.create!(book: book) }
+
+    after do
+      Object.send(:remove_const, :Book)
+      Object.send(:remove_const, :Permission)
+    end
+
+    it "the object is destroyed" do
+      expect { book.destroy }.to change { Permission.count }.by(-1)
+    end
+  end
 end

data/spec/integration/versionable_spec.rb

@@ -179,8 +179,8 @@ describe ActiveFedora::Versionable do
           @original_size = subject.size
         end
 
-        it "sets model_type to versionable" do
-          expect(subject.model_type).to include RDF::URI.new('http://www.jcp.org/jcr/mix/1.0versionable')
+        it "links to versions endpoint" do
+          expect(subject.metadata.ldp_source.graph.query(predicate: ::RDF::Vocab::Fcrepo4.hasVersions).objects).to_not be_empty
         end
 
         it "has one version" do
@@ -305,8 +305,8 @@ describe ActiveFedora::Versionable do
           @original_size = subject.size
         end
 
-        it "sets model_type to versionable" do
-          expect(subject.model_type).to include RDF::URI.new('http://www.jcp.org/jcr/mix/1.0versionable')
+        it "links to versions endpoint" do
+          expect(subject.metadata.ldp_source.graph.query(predicate: ::RDF::Vocab::Fcrepo4.hasVersions).objects).to_not be_empty
         end
 
         it "has one version" do
@@ -427,8 +427,8 @@ describe ActiveFedora::Versionable do
           subject.create_version
         end
 
-        it "sets model_type to versionable" do
-          expect(subject.model_type).to include RDF::URI.new('http://www.jcp.org/jcr/mix/1.0versionable')
+        it "links to versions endpoint" do
+          expect(subject.metadata.ldp_source.graph.query(predicate: ::RDF::Vocab::Fcrepo4.hasVersions).objects).to_not be_empty
         end
 
         it "has one version" do

data/spec/unit/active_fedora_spec.rb

@@ -28,7 +28,7 @@ describe ActiveFedora do
     it "does not connect and warn" do
       expect(ActiveFedora::Base.logger).to receive(:warn)
       expect {
-        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test', user: user, password: password)
+        ActiveFedora::Fedora.new(url: bad_url, base_path: '/test', user: user, password: password).connection
       }.to raise_error Ldp::HttpError
     end
   end

data/spec/unit/aggregation/list_source_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Aggregation::ListSource do
+  subject { described_class.new }
+
+  describe "#head" do
+    it "is nil by default" do
+      expect(subject.head).to eq nil
+    end
+
+    it "is settable" do
+      subject.head = RDF::URI("test.org")
+
+      expect(subject.head_id.first).to eq RDF::URI("test.org")
+    end
+
+    it "maps to IANA.first" do
+      expect(subject.class.properties["head"].predicate).to eq ::RDF::Vocab::IANA["first"]
+    end
+  end
+
+  describe "#order_will_change!" do
+    it "marks it as changed" do
+      expect(subject).not_to be_changed
+      subject.order_will_change!
+      expect(subject).to be_changed
+      expect(subject.ordered_self).to be_changed
+    end
+  end
+
+  describe "#tail" do
+    it "is nil by default" do
+      expect(subject.tail).to eq nil
+    end
+
+    it "is settable" do
+      subject.tail = RDF::URI("test.org")
+
+      expect(subject.tail_id.first).to eq RDF::URI("test.org")
+    end
+
+    it "maps to IANA.last" do
+      expect(subject.class.properties["tail"].predicate).to eq ::RDF::Vocab::IANA["last"]
+    end
+  end
+
+  describe "#changed?" do
+    context "when nothing has changed" do
+      it "is false" do
+        expect(subject).not_to be_changed
+      end
+    end
+    context "when the ordered list is changed" do
+      it "is true" do
+        allow(subject.ordered_self).to receive(:changed?).and_return(true)
+
+        expect(subject).to be_changed
+      end
+    end
+    context "when the ordered list is not changed" do
+      it "is false" do
+        allow(subject.ordered_self).to receive(:changed?).and_return(false)
+
+        expect(subject).not_to be_changed
+      end
+    end
+  end
+
+  describe "#save" do
+    context "when nothing has changed" do
+      it "does not persist ordered_self" do
+        allow(subject.ordered_self).to receive(:to_graph)
+
+        subject.save
+
+        expect(subject.ordered_self).not_to have_received(:to_graph)
+      end
+    end
+    context "when attributes have changed, but not ordered list" do
+      it "does not persist ordered self" do
+        allow(subject.ordered_self).to receive(:to_graph)
+        subject.nodes += [RDF::URI("http://test.org")]
+
+        subject.save
+
+        expect(subject.ordered_self).not_to have_received(:to_graph)
+      end
+    end
+    context "when ordered list has changed" do
+      it "persists it" do
+        allow(subject.ordered_self).to receive(:to_graph).and_call_original
+        allow(subject.ordered_self).to receive(:changed?).and_return(true)
+
+        subject.save
+
+        expect(subject.ordered_self).to have_received(:to_graph)
+      end
+    end
+  end
+
+  describe "#serializable_hash" do
+    it "does not serialize nodes" do
+      subject.nodes += [RDF::URI("http://test.org")]
+
+      expect(subject.serializable_hash).not_to have_key "nodes"
+    end
+    it "does not serialize head" do
+      subject.head = RDF::URI("http://test.org")
+
+      expect(subject.serializable_hash).not_to have_key "head"
+    end
+    it "does not serialize tail" do
+      subject.tail = RDF::URI("http://test.org")
+
+      expect(subject.serializable_hash).not_to have_key "tail"
+    end
+  end
+
+  describe "#to_solr" do
+    before do
+      class Member < ActiveFedora::Base
+      end
+    end
+    after do
+      Object.send(:remove_const, :Member)
+    end
+    it "can index" do
+      m = Member.create
+      proxy_in = RDF::URI(ActiveFedora::Base.translate_id_to_uri.call("banana"))
+      subject.ordered_self.append_target m, proxy_in: proxy_in
+      expect(subject.to_solr).to include ordered_targets_ssim: [m.id], proxy_in_ssi: "banana"
+    end
+  end
+end

data/spec/unit/aggregation/ordered_reader_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Aggregation::OrderedReader do
+  subject { described_class.new(root) }
+  let(:root) { instance_double(ActiveFedora::Aggregation::ListSource) }
+
+  describe "#each" do
+    it "iterates a linked list" do
+      head = build_node
+      tail = build_node(prev_node: head)
+      allow(head).to receive(:next).and_return(tail)
+      allow(root).to receive(:head).and_return(head)
+      expect(subject.to_a).to eq [head, tail]
+    end
+    it "only goes as deep as necessary" do
+      head = build_node
+      tail = build_node(prev_node: head)
+      allow(head).to receive(:next).and_return(tail)
+      allow(root).to receive(:head).and_return(head)
+      expect(subject.first).to eq head
+      expect(head).not_to have_received(:next)
+    end
+    context "when the prev is wrong" do
+      it "fixes it up" do
+        head = build_node
+        bad_node = build_node
+        tail = build_node(prev_node: bad_node)
+        allow(head).to receive(:next).and_return(tail)
+        allow(root).to receive(:head).and_return(head)
+        allow(tail).to receive(:prev=)
+        expect(subject.to_a).to eq [head, tail]
+        expect(tail).to have_received(:prev=).with(head)
+      end
+    end
+  end
+
+  def build_node(prev_node: nil, next_node: nil)
+    node = instance_double(ActiveFedora::Orders::ListNode)
+    allow(node).to receive(:next).and_return(next_node)
+    allow(node).to receive(:prev).and_return(prev_node)
+    node
+  end
+end

data/spec/unit/fedora_spec.rb

@@ -12,7 +12,7 @@ describe ActiveFedora::Fedora do
         }
       }
       specify {
-        expect(Faraday).to receive(:new).with("https://example.com", ssl: { ca_path: '/path/to/certs' }).twice.and_call_original
+        expect(Faraday).to receive(:new).with("https://example.com", ssl: { ca_path: '/path/to/certs' }).and_call_original
         subject.authorized_connection
       }
     end

data/spec/unit/filter_spec.rb

@@ -0,0 +1,133 @@
+require 'spec_helper'
+
+describe ActiveFedora::Associations::FilterAssociation do
+  before do
+    class Image < ActiveFedora::Base
+      ordered_aggregation :members, through: :list_source, class_name: 'ActiveFedora::Base'
+
+      filters_association :members, as: :child_objects, condition: :pcdm_object?
+      filters_association :members, as: :child_collections, condition: :pcdm_collection?
+    end
+
+    class TestObject < ActiveFedora::Base
+      def pcdm_object?
+        true
+      end
+
+      def pcdm_collection?
+        false
+      end
+    end
+
+    class TestCollection < ActiveFedora::Base
+      def pcdm_object?
+        false
+      end
+
+      def pcdm_collection?
+        true
+      end
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :Image)
+    Object.send(:remove_const, :TestObject)
+    Object.send(:remove_const, :TestCollection)
+  end
+
+  let(:image) { Image.new }
+  let(:test_object) { TestObject.new }
+  let(:test_collection) { TestCollection.new }
+
+  describe "setting" do
+    context "when an incorrect object type is sent" do
+      it "raises an error" do
+        image.child_collections
+        expect { image.child_collections = [test_object] }.to raise_error ArgumentError
+      end
+    end
+
+    context "when the parent is already loaded" do
+      let(:another_collection) { TestCollection.new }
+      before do
+        image.members = [test_object, test_collection]
+        image.child_collections = [another_collection]
+      end
+      it "overwrites existing matches" do
+        expect(image.members).to eq [test_object, another_collection]
+      end
+    end
+  end
+
+  describe "appending" do
+    context "when an incorrect object type is sent" do
+      it "raises an error" do
+        expect { image.child_collections << test_object }.to raise_error ArgumentError
+      end
+    end
+
+    context "when the parent is already loaded" do
+      let(:another_collection) { TestCollection.new }
+      before do
+        image.members = [test_object, test_collection]
+        image.child_collections << [another_collection]
+      end
+
+      it "updates the parent" do
+        expect(image.members).to eq [test_object, test_collection, another_collection]
+      end
+    end
+  end
+
+  describe "#size" do
+    it "returns the size" do
+      # Need to persist so that count_records will be called.
+      image.save
+      test_object.save
+      image.members = [test_object]
+
+      expect(image.reload.child_objects.size).to eq 1
+    end
+  end
+
+  describe "reading" do
+    before do
+      image.members = [test_object, test_collection]
+    end
+
+    it "returns the objects of the correct type" do
+      expect(image.child_objects).to eq [test_object]
+    end
+
+    describe "when the parent association is changed" do
+      before do
+        image.child_objects = [test_object]
+        image.child_objects.to_a # this would cause the @target of the association to be populated
+        image.members = [test_collection]
+      end
+
+      it "updates the filtered relation" do
+        expect(image.child_objects).to eq []
+      end
+    end
+
+    describe "#_ids" do
+      it "returns just the ids" do
+        expect(image.child_object_ids).to eq [test_object.id]
+      end
+    end
+  end
+
+  describe "#delete" do
+    let(:another_object) { TestObject.new }
+    before do
+      image.members = [test_object, test_collection, another_object]
+      image.child_objects.delete(test_object)
+    end
+
+    subject { image.members }
+
+    it { is_expected.to eq [test_collection, another_object] }
+  end
+end