active-fedora 10.3.0.rc1 → 10.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2ca88ff43a634f8f901f9903d0121e1401dddb
-  data.tar.gz: 4511d14bc32be2d2ca0b66ec375fbfe924a83628
+  metadata.gz: bfce14d5c623e569206f59c02700d667e34bde26
+  data.tar.gz: ead2d01f58a36fc8afac60ddfc9825fd1e581d53
 SHA512:
-  metadata.gz: df9190770e94bc983a500af74ad24860fee001d0bbbced86605d95bbf6d5a34199fa63ec7fa16947400f4b0509444fac8553b71f7bc9c8602bc422e67c2d23e1
-  data.tar.gz: 5a86bba90263e21c7d1fc30f8a9951939576d97488ae9e1f564aadf6fd279a47a38b2b3256a8c8cfdd95e2f957a95c145c3a27fd4a430f5bc669041f3c611295
+  metadata.gz: c61d8f7606b23f0cbff48e4280711cab4b1237d245590b775cead65ca4b65907ee6b000b8bcef23bafd41cc2bb8f84dd194edb220589f9e510e2712a47885cc8
+  data.tar.gz: b5af3107ec86f44ab5e56926e678601430f855ea8c962e193dc90eff90b2db46fde9bc6de6ed68f36cc64a7173986d6d56b05848b0f79e02b5c7788101758656

data/lib/active_fedora/associations/has_many_association.rb

@@ -83,7 +83,7 @@ module ActiveFedora
       protected
 
         def find_polymorphic_inverse(record)
-          record.reflections.values.find { |r| !r.has_many? && r.options[:property] == reflection.options[:property] }
+          record.reflections.values.find { |r| !r.has_many? && r.predicate == reflection.predicate }
         end
 
         # Deletes the records according to the <tt>:dependent</tt> option.

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "10.3.0.rc1".freeze
+  VERSION = "10.3.0.rc2".freeze
 end

data/spec/unit/has_many_association_spec.rb

@@ -32,19 +32,34 @@ describe ActiveFedora::Associations::HasManyAssociation do
     end
   end
 
-  describe "Finding a polymorphic inverse relation" do
-    before do
-      # :books must come first, so that we can test that is being passed over in favor of :contents
-      Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-      Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-    end
+  describe "#find_polymorphic_inverse" do
     let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
-    subject { association.send(:find_polymorphic_inverse, page) }
+    subject(:inverse) { association.send(:find_polymorphic_inverse, page) }
+
+    context "when a has_many is present" do
+      before do
+        # :books must come first, so that we can test that is being passed over in favor of :contents
+        Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+        Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      end
+
+      it "finds the HABTM reflection" do
+        expect(inverse.name).to eq :contents
+      end
+    end
+
+    context "when multiple belongs_to are present" do
+      before do
+        # :foo must come first, so that we can test that is being passed over in favor of :bar
+        Page.belongs_to :foo, predicate: ::RDF::Vocab::DC.isPartOf, class_name: 'ActiveFedora::Base'
+        Page.belongs_to :bar, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      end
 
-    it "finds the HABTM reflection" do
-      expect(subject.name).to eq :contents
+      it "finds the belongs_to reflection" do
+        expect(inverse.name).to eq :bar
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 10.3.0.rc1
+  version: 10.3.0.rc2
 platform: ruby
 authors:
 - Matt Zumwalt