active-fedora 9.10.4 → 9.11.0

data/spec/unit/orders/ordered_list_spec.rb

@@ -0,0 +1,335 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Orders::OrderedList do
+  subject { described_class.new(graph, head_uri, tail_uri) }
+
+  let(:graph) { ActiveTriples::Resource.new(RDF::URI("stuff")) }
+  let(:head_uri) { nil }
+  let(:tail_uri) { nil }
+  describe "#last" do
+    context "with no nodes" do
+      it "is nil" do
+        expect(subject.last).to eq nil
+      end
+    end
+    context "with one node" do
+      it "is that node" do
+        member = instance_double(ActiveFedora::Base)
+        subject.append_target member
+
+        expect(subject.last.target).to eq member
+      end
+    end
+    context "with two nodes" do
+      it "is the last node" do
+        member = instance_double(ActiveFedora::Base)
+        member_2 = instance_double(ActiveFedora::Base)
+        subject.append_target member
+        subject.append_target member_2
+
+        expect(subject.last.target).to eq member_2
+      end
+    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
+    end
+  end
+
+  describe "#target_ids" do
+    context "from a graph" do
+      let(:head_uri) { RDF::URI.new("parent#bla") }
+      let(:tail_uri) { RDF::URI.new("parent#bla") }
+      it "returns the IDs without building the object" do
+        node_subject = RDF::URI.new("parent#bla")
+        member_uri = RDF::URI.new(ActiveFedora::Base.translate_id_to_uri.call("member1"))
+        parent_uri = RDF::URI.new("parent")
+        graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
+        graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
+        allow(ActiveFedora::Base).to receive(:from_uri)
+
+        expect(subject.target_ids).to eq ["member1"]
+        expect(ActiveFedora::Base).not_to have_received(:from_uri)
+      end
+    end
+    context "from a built up list" do
+      it "returns the IDs" do
+        member = instance_double(ActiveFedora::Base, id: "member1")
+        subject.append_target member
+
+        expect(subject.target_ids).to eq ["member1"]
+      end
+    end
+  end
+
+  describe "#proxy_in" do
+    context "when there's one proxy in" do
+      it "returns it" do
+        member = instance_double(ActiveFedora::Base)
+        subject.append_target member, proxy_in: RDF::URI("http://tar.dis")
+
+        expect(subject.proxy_in).to eq RDF::URI("http://tar.dis")
+      end
+    end
+    context "when the proxy in is an AF::Base object" do
+      it "returns the ID" do
+        member = instance_double(ActiveFedora::Base)
+        owner = instance_double(ActiveFedora::Base, id: "member1")
+        subject.append_target member, proxy_in: owner
+
+        expect(subject.proxy_in).to eq "member1"
+      end
+    end
+    context "when there's two proxy ins" do
+      it "returns the first and throws a warning" do
+        member = instance_double(ActiveFedora::Base)
+        subject.append_target member, proxy_in: RDF::URI("http://tar.dis")
+        subject.append_target member, proxy_in: RDF::URI("http://tar.di")
+        ActiveFedora::Base.logger = Logger.new(STDERR)
+        allow(ActiveFedora::Base.logger).to receive(:warn)
+
+        expect(subject.proxy_in).to eq RDF::URI("http://tar.dis")
+        expect(ActiveFedora::Base.logger).to have_received(:warn).with("WARNING: List contains nodes aggregated under different URIs. Returning only the first.")
+      end
+    end
+  end
+
+  describe "#[]" do
+    context "with no nodes" do
+      it "is always nil" do
+        expect(subject[0]).to eq nil
+      end
+    end
+    context "with two nodes" do
+      let(:member) { instance_double(ActiveFedora::Base) }
+      let(:member_2) { instance_double(ActiveFedora::Base) }
+      before do
+        subject.append_target member
+        subject.append_target member_2
+      end
+      it "can return the first" do
+        expect(subject[0].target).to eq member
+      end
+      it "can return the last" do
+        expect(subject[1].target).to eq member_2
+      end
+      it "returns nil for out of bounds values" do
+        expect(subject[3]).to eq nil
+      end
+    end
+  end
+  describe "#first" do
+    context "with no nodes" do
+      it "is nil" do
+        expect(subject.first).to eq nil
+      end
+    end
+    context "with a node" do
+      it "returns that node" do
+        member = instance_double(ActiveFedora::Base)
+        subject.append_target member
+        expect(subject.first.target).to eq member
+        expect(subject).to be_changed
+      end
+    end
+    context "with an item from the graph" do
+      let(:head_uri) { RDF::URI.new("parent#bla") }
+      let(:tail_uri) { RDF::URI.new("parent#bla") }
+      it "builds the node" do
+        node_subject = RDF::URI.new("parent#bla")
+        member_uri = RDF::URI.new("member1")
+        parent_uri = RDF::URI.new("parent")
+        graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
+        graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
+        expect(subject.first.proxy_for).to eq member_uri
+        expect(subject.first.proxy_for).to be_kind_of RDF::URI
+        expect(subject.first.proxy_in).to eq parent_uri
+        expect(subject.first).not_to eq nil
+      end
+      it "is changed by a delete" do
+        node_subject = RDF::URI.new("parent#bla")
+        member_uri = RDF::URI.new("member1")
+        parent_uri = RDF::URI.new("parent")
+        graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
+        graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
+
+        expect(subject).not_to be_changed
+        subject.delete_at(0)
+        expect(subject).to be_changed
+      end
+      context "with multiple nodes" do
+        let(:tail_uri) { RDF::URI.new("parent#bla2") }
+        it "can build multiple nodes" do
+          node_subject = RDF::URI.new("parent#bla")
+          node_2_subject = RDF::URI.new("parent#bla2")
+          member_uri = RDF::URI.new("member1")
+          parent_uri = RDF::URI.new("parent")
+          graph << [node_subject, RDF::Vocab::ORE.proxyFor, member_uri]
+          graph << [node_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
+          graph << [node_subject, RDF::Vocab::IANA.next, node_2_subject]
+          graph << [node_2_subject, RDF::Vocab::IANA.prev, node_subject]
+          graph << [node_2_subject, RDF::Vocab::ORE.proxyFor, member_uri]
+          graph << [node_2_subject, RDF::Vocab::ORE.proxyIn, parent_uri]
+          expect(subject.length).to eq 2
+          expect(subject.tail.prev.prev).to eq subject.head.next
+          expect(subject.map(&:target).map(&:rdf_subject)).to eq [member_uri, member_uri]
+          expect(subject).not_to be_changed
+        end
+      end
+    end
+  end
+
+  describe "#append_target" do
+    it "appends multiple targets" do
+      member = instance_double(ActiveFedora::Base)
+      proxy_in = instance_double(ActiveFedora::Base, uri: RDF::URI("obj1"))
+      600.times do
+        subject.append_target member, proxy_in: proxy_in
+      end
+      expect(subject.length).to eq 600
+      expect(subject.to_a.last.next).not_to eq nil
+      expect(subject.to_a.last.proxy_in).to eq proxy_in
+    end
+  end
+
+  describe "#insert_at" do
+    it "can insert in the middle" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      3.times do
+        subject.append_target member
+      end
+
+      subject.insert_at(1, member_2)
+
+      expect(subject.to_a.map(&:target)).to eq [member, member_2, member, member]
+      expect(subject).to be_changed
+    end
+    it "can insert at the beginning" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      2.times do
+        subject.append_target member
+      end
+
+      subject.insert_at(0, member_2)
+
+      expect(subject.to_a.map(&:target)).to eq [member_2, member, member]
+    end
+  end
+
+  describe "#delete_node" do
+    it "can delete a node in the middle" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member
+      subject.append_target member_2
+      subject.append_target member
+
+      subject.delete_node(subject.to_a[1])
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+    it "can delete a node at the start" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member_2
+      subject.append_target member
+      subject.append_target member
+
+      subject.delete_node(subject.to_a[0])
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+    it "can delete a node at the end" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member
+      subject.append_target member
+      subject.append_target member_2
+
+      subject.delete_node(subject.to_a[2])
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+  end
+
+  describe "#delete_at" do
+    it "can delete a node in the middle" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member
+      subject.append_target member_2
+      subject.append_target member
+
+      subject.delete_at(1)
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+    it "can delete a node at the start" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member_2
+      subject.append_target member
+      subject.append_target member
+
+      subject.delete_at(0)
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+    it "can delete a node at the end" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member
+      subject.append_target member
+      subject.append_target member_2
+
+      subject.delete_at(2)
+
+      expect(subject.map(&:target)).to eq [member, member]
+    end
+    it "does not delete nodes if the loc is out of bounds" do
+      member = instance_double(ActiveFedora::Base)
+      member_2 = instance_double(ActiveFedora::Base)
+      subject.append_target member
+      subject.append_target member
+      subject.append_target member_2
+
+      subject.delete_at(3)
+      subject.delete_at(nil)
+
+      expect(subject.map(&:target)).to eq [member, member, member_2]
+    end
+  end
+
+  describe "#to_graph" do
+    it "creates a good graph" do
+      member = instance_double(ActiveFedora::Base, id: '123/456')
+      owner = instance_double(ActiveFedora::Base, uri: RDF::URI("http://owner.org"))
+      subject.append_target member
+      subject.append_target member, proxy_in: owner
+
+      graph = subject.to_graph
+
+      expect(graph.statements.to_a.length).to eq 5
+      expect(graph.subjects.to_a).to eq subject.to_a.map(&:rdf_subject)
+      expect(graph.query([nil, RDF::Vocab::ORE.proxyFor, nil]).to_a.last.object).to be_kind_of RDF::URI
+    end
+  end
+
+  describe "#changes_committed!" do
+    it "sets changed back to false" do
+      member = instance_double(ActiveFedora::Base, uri: RDF::URI("http://test.org"))
+      subject.append_target member
+      expect(subject).to be_changed
+
+      subject.changes_committed!
+
+      expect(subject).not_to be_changed
+    end
+  end
+end

data/spec/unit/orders/reflection_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Reflection::OrdersReflection do
+  subject { described_class.new(name, scope, options, active_fedora) }
+  let(:macro) { :orders }
+  let(:name) { "ordered_member_proxies" }
+  let(:options) { {} }
+  let(:scope) { nil }
+  let(:active_fedora) { double("active_fedora") }
+
+  describe "#klass" do
+    it "is a proxy" do
+      expect(subject.klass).to eq ActiveFedora::Orders::ListNode
+    end
+  end
+
+  describe "#class_name" do
+    it "is a list node" do
+      expect(subject.class_name).to eq "ActiveFedora::Orders::ListNode"
+    end
+  end
+end

data/spec/unit/reflection_spec.rb

@@ -5,11 +5,10 @@ describe ActiveFedora::Reflection::AssociationReflection do
     let(:name) { 'dummy' }
     let(:options) { { inverse_of: :default_permissions } }
     let(:active_fedora) { double }
-    let(:instance) { described_class.new(macro, name, nil, options, active_fedora) }
     subject { instance.send :derive_foreign_key }
 
     context "when a has_many" do
-      let(:macro) { :has_many }
+      let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }
 
       context "and the inverse is a collection association" do
         let(:inverse) { double(collection?: true) }
@@ -30,11 +29,10 @@ describe ActiveFedora::Reflection::AssociationReflection do
     let(:name) { 'dummy' }
     let(:options) { { as: 'foothing' } }
     let(:active_fedora) { double }
-    let(:instance) { described_class.new(macro, name, nil, options, active_fedora) }
     subject { instance.send :automatic_inverse_of }
 
     context "when a has_many" do
-      let(:macro) { :has_many }
+      let(:instance) { ActiveFedora::Reflection::HasManyReflection.new(name, nil, options, active_fedora) }
 
       context "and the inverse is a collection association" do
         it { is_expected.to eq :foothing }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.10.4
+  version: 9.11.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-28 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -368,6 +368,11 @@ files:
 - config/solr.yml
 - lib/active-fedora.rb
 - lib/active_fedora.rb
+- lib/active_fedora/aggregation.rb
+- lib/active_fedora/aggregation/base_extension.rb
+- lib/active_fedora/aggregation/list_source.rb
+- lib/active_fedora/aggregation/ordered_reader.rb
+- lib/active_fedora/aggregation/proxy.rb
 - lib/active_fedora/association_hash.rb
 - lib/active_fedora/association_relation.rb
 - lib/active_fedora/associations.rb
@@ -375,15 +380,18 @@ files:
 - lib/active_fedora/associations/association_scope.rb
 - lib/active_fedora/associations/basic_contains_association.rb
 - lib/active_fedora/associations/belongs_to_association.rb
+- lib/active_fedora/associations/builder/aggregation.rb
 - lib/active_fedora/associations/builder/association.rb
 - lib/active_fedora/associations/builder/belongs_to.rb
 - lib/active_fedora/associations/builder/collection_association.rb
 - lib/active_fedora/associations/builder/contains.rb
 - lib/active_fedora/associations/builder/directly_contains.rb
 - lib/active_fedora/associations/builder/directly_contains_one.rb
+- lib/active_fedora/associations/builder/filter.rb
 - lib/active_fedora/associations/builder/has_and_belongs_to_many.rb
 - lib/active_fedora/associations/builder/has_many.rb
 - lib/active_fedora/associations/builder/indirectly_contains.rb
+- lib/active_fedora/associations/builder/orders.rb
 - lib/active_fedora/associations/builder/property.rb
 - lib/active_fedora/associations/builder/singular_association.rb
 - lib/active_fedora/associations/builder/singular_property.rb
@@ -395,11 +403,13 @@ files:
 - lib/active_fedora/associations/delete_proxy.rb
 - lib/active_fedora/associations/directly_contains_association.rb
 - lib/active_fedora/associations/directly_contains_one_association.rb
+- lib/active_fedora/associations/filter_association.rb
 - lib/active_fedora/associations/has_and_belongs_to_many_association.rb
 - lib/active_fedora/associations/has_many_association.rb
 - lib/active_fedora/associations/id_composite.rb
 - lib/active_fedora/associations/indirectly_contains_association.rb
 - lib/active_fedora/associations/null_validator.rb
+- lib/active_fedora/associations/orders_association.rb
 - lib/active_fedora/associations/rdf.rb
 - lib/active_fedora/associations/record_composite.rb
 - lib/active_fedora/associations/singular_association.rb
@@ -474,6 +484,11 @@ files:
 - lib/active_fedora/nom_datastream.rb
 - lib/active_fedora/null_relation.rb
 - lib/active_fedora/om_datastream.rb
+- lib/active_fedora/orders.rb
+- lib/active_fedora/orders/collection_proxy.rb
+- lib/active_fedora/orders/list_node.rb
+- lib/active_fedora/orders/ordered_list.rb
+- lib/active_fedora/orders/target_proxy.rb
 - lib/active_fedora/pathing.rb
 - lib/active_fedora/persistence.rb
 - lib/active_fedora/predicates.rb
@@ -651,6 +666,8 @@ files:
 - spec/spec_helper.rb
 - spec/support/an_active_model.rb
 - spec/unit/active_fedora_spec.rb
+- spec/unit/aggregation/list_source_spec.rb
+- spec/unit/aggregation/ordered_reader_spec.rb
 - spec/unit/association_hash_spec.rb
 - spec/unit/attached_files_spec.rb
 - spec/unit/attributes_spec.rb
@@ -675,6 +692,7 @@ files:
 - spec/unit/file_path_builder_spec.rb
 - spec/unit/file_spec.rb
 - spec/unit/files_hash_spec.rb
+- spec/unit/filter_spec.rb
 - spec/unit/finder_methods_spec.rb
 - spec/unit/fixity_service_spec.rb
 - spec/unit/forbidden_attributes_protection_spec.rb
@@ -692,6 +710,10 @@ files:
 - spec/unit/nom_datastream_spec.rb
 - spec/unit/ntriples_datastream_spec.rb
 - spec/unit/om_datastream_spec.rb
+- spec/unit/ordered_spec.rb
+- spec/unit/orders/list_node_spec.rb
+- spec/unit/orders/ordered_list_spec.rb
+- spec/unit/orders/reflection_spec.rb
 - spec/unit/pathing_spec.rb
 - spec/unit/persistence_spec.rb
 - spec/unit/predicates_spec.rb
@@ -741,7 +763,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.