active-fedora 11.1.3 → 11.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbb07414e2177fa95ea8349817976b1b37a765c
-  data.tar.gz: 6d2310b2bd54270c779e9f3c183b3aad790b68ad
+  metadata.gz: 680a242f0b724c0f1159629c8881a1e90df14f85
+  data.tar.gz: 9631a6201e7c3cf4c76c6fa1688c0087af8377ca
 SHA512:
-  metadata.gz: 4fa39573b64bac45e116fbe334e657ef3f1b01e15a8a93cade30080c4d55fa2628e2b5de5bb15482880951f401fcea90b5736744ee141190f4ee03847015edd0
-  data.tar.gz: 14bf26166bc2d0a1e52455686a952922748036d3dd6a756be9e9264c3802032420ce0a0ddc608dcbb49050cea8d26ac3e339b38e3250b2177df4718e1eea2592
+  metadata.gz: c43409e731c3d9d9e1dc7b0d785ba233a33fe3f5204c49914a3c1bbd1aa29b4bb065bbad994c3cf97b382a0c89f685b8670c89689abb47d8d6433dc82094f051
+  data.tar.gz: f6227e309593c643a0d2d7234925478a869e99c1acd07f0376e2a81cf588373ebbea25af536ac9a30cc729b60fa21b56bc95c79659559c845420261baa8f9dfa

data/lib/active_fedora/attached_files.rb

@@ -33,7 +33,11 @@ module ActiveFedora
       resource.query(subject: resource, predicate: ::RDF::Vocab::LDP.contains).objects.map(&:to_s)
     end
 
+    # Load any undeclared relationships or has_subresource relationships.  These are non-idiomatic LDP
+    # because we are going to find the subresource by knowing it's subpath ahead of time.
+    # Does nothing if this object is using idiomatic basic containment, by declaring `is_a_container`
     def load_attached_files
+      return if reflections[:contains] && reflections[:contains].macro == :is_a_container
       contains_assertions.each do |file_uri|
         path = file_uri.to_s.sub(uri + '/', '')
         next if association(path.to_sym)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.1.3".freeze
+  VERSION = "11.1.4".freeze
 end

data/spec/unit/attached_files_spec.rb

@@ -187,4 +187,27 @@ describe ActiveFedora::AttachedFiles do
       expect(af_base.metadata_streams).to_not include(file_ds)
     end
   end
+
+  context "When the resource is using idiomatic basic containment" do
+    before do
+      class Sample1 < ActiveFedora::Base
+        is_a_container
+      end
+    end
+    after do
+      Object.send(:remove_const, :Sample1)
+    end
+
+    before do
+      child = obj.contains.build
+      child.content = "Stuff"
+      child.save!
+    end
+    let(:obj) { Sample1.create! }
+    let(:obj2) { Sample1.find(obj.id) }
+
+    it "doesn't conflate attached_file and contains" do
+      expect(obj2.attached_files.keys).to be_empty
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.1.3
+  version: 11.1.4
 platform: ruby
 authors:
 - Matt Zumwalt