active-fedora 2.3.4 → 2.3.7

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "2.3.4"
+    VERSION = "2.3.7"
 end

data/spec/integration/base_spec.rb

@@ -309,11 +309,11 @@ describe ActiveFedora::Base do
         @test_object5 = MockAFBaseRelationship.new
         @test_object5.new_object = true
         @test_object5.save
-        #append to named relationship 'testing'
-        @test_object2.add_named_relationship("testing",@test_object3)
-        @test_object2.add_named_relationship("testing2",@test_object4)
-        @test_object5.add_named_relationship("testing",@test_object2)
-        @test_object5.add_named_relationship("testing2",@test_object3)
+        #append to relationship by 'testing'
+        @test_object2.add_relationship_by_name("testing",@test_object3)
+        @test_object2.add_relationship_by_name("testing2",@test_object4)
+        @test_object5.add_relationship_by_name("testing",@test_object2)
+        @test_object5.add_relationship_by_name("testing2",@test_object3)
         @test_object2.save
         @test_object5.save
         r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -322,43 +322,18 @@ describe ActiveFedora::Base do
         r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
         model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
         #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-        @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                              "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                           :inbound=>{"testing_inbound"=>[r2.object],
-                                                                      "testing_inbound2"=>[r5.object],
-                                                                      "testing_bidirectional_inbound"=>[],
-                                                                      "testing_inbound3"=>[]}}
-        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-        @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                    "testing2"=>[r3.object],
-                                                                    "testing_bidirectional_outbound"=>[],
-                                                                    "testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+        @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
+        @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
         @test_object2.delete
         #need to reload since removed from rels_ext in memory
         @test_object5 = MockAFBaseRelationship.load_instance(@test_object5.pid)
       
         #check any test_object2 inbound rels gone from source
-        @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],
-                                                                       "testing_inbound2"=>[r5.object],
-                                                                       "testing_bidirectional_inbound"=>[],
-                                                                       "testing_inbound3"=>[]}}
-        @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-        @test_object5.named_relationships(false).should == {:self=>{"testing"=>[],
-                                                                  "testing2"=>[r3.object],
-                                                                  "testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                            :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                       "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-   
+        @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+        @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
     end
   end
     
@@ -481,7 +456,7 @@ describe ActiveFedora::Base do
     end
   end
   
-  describe '#named_inbound_relationships' do
+  describe '#inbound_relationships_by_name' do
     it 'should return a hash of inbound relationship names to array of objects' do
       @test_object2 = MockAFBaseRelationship.new
       @test_object2.new_object = true
@@ -508,18 +483,18 @@ describe ActiveFedora::Base do
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.named_inbound_relationships.should == {"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
-      @test_object3.named_inbound_relationships.should == {"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
-      @test_object4.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
-      @test_object5.named_inbound_relationships.should == {"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}
+      @test_object2.inbound_relationships_by_name.should == {"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
+      @test_object3.inbound_relationships_by_name.should == {"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
+      @test_object4.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
+      @test_object5.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[],
+                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
     end
   end
   
-  describe '#named_relationships' do
+  describe '#relationships_by_name' do
     it '' do
       @test_object2 = MockAFBaseRelationship.new
       @test_object2.new_object = true
@@ -546,37 +521,19 @@ describe ActiveFedora::Base do
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object],
-                                                               "testing_bidirectional_inbound"=>[],
-                                                               "testing_inbound3"=>[]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                               "testing_bidirectional_inbound"=>[], "testing_inbound3"=>[]}}
-      @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object],
-                                                                  "testing_bidirectional_outbound"=>[],
-                                                                  "testing3"=>[]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
+      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
       #all inbound should now be empty if no parameter supplied to relationships
-      @test_object2.named_relationships.should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object],
-                                                            "testing_bidirectional_outbound"=>[],
-                                                            "testing3"=>[]}}
-      @test_object3.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
-      @test_object4.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
-      @test_object5.named_relationships.should == {:self=>{"testing"=>[r2.object],
-                                                           "testing2"=>[r3.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]}}
+      @test_object2.relationships_by_name.should == {:self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
+      @test_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object5.relationships_by_name.should == {:self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
     end
   end
   
-  describe '#add_named_relationship' do
+  describe '#add_relationship_by_name' do
     it 'should add a named relationship to an object' do
       @test_object2 = MockAFBaseRelationship.new
       @test_object2.new_object = true
@@ -591,10 +548,10 @@ describe ActiveFedora::Base do
       @test_object5.new_object = true
       @test_object5.save
       #append to named relationship 'testing'
-      @test_object2.add_named_relationship("testing",@test_object3)
-      @test_object2.add_named_relationship("testing2",@test_object4)
-      @test_object5.add_named_relationship("testing",@test_object2)
-      @test_object5.add_named_relationship("testing2",@test_object3)
+      @test_object2.add_relationship_by_name("testing",@test_object3)
+      @test_object2.add_relationship_by_name("testing2",@test_object4)
+      @test_object5.add_relationship_by_name("testing",@test_object2)
+      @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -603,24 +560,10 @@ describe ActiveFedora::Base do
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
-                                                            "testing2"=>[r4.object],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object],
-                                                               "testing_bidirectional_inbound"=>[],
-                                                               "testing_inbound3"=>[]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object],
-                                                                  "testing_bidirectional_outbound"=>[],
-                                                                  "testing3"=>[]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
+      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object], "testing_bidirectional_outbound"=>[]}}
+      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
     end
   end
   
@@ -639,10 +582,10 @@ describe ActiveFedora::Base do
       @test_object5.new_object = true
       @test_object5.save
       #append to named relationship 'testing'
-      @test_object2.add_named_relationship("testing",@test_object3)
-      @test_object2.add_named_relationship("testing2",@test_object4)
-      @test_object5.add_named_relationship("testing",@test_object2)
-      @test_object5.add_named_relationship("testing2",@test_object3)
+      @test_object2.add_relationship_by_name("testing",@test_object3)
+      @test_object2.add_relationship_by_name("testing2",@test_object4)
+      @test_object5.add_relationship_by_name("testing",@test_object2)
+      @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -651,51 +594,26 @@ describe ActiveFedora::Base do
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
       #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],
+      @test_object2.relationships_by_name(false).should == {:self=>{"testing"=>[r3.object],
                                                             "testing2"=>[r4.object],
-                                                            "testing_bidirectional_outbound"=>[],"testing3"=>[]},
+                                                            "testing_bidirectional_outbound"=>[],"testing3"=>[], 
+                                                            "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[r3.object]},
                                                     :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r2.object],
-                                                               "testing_inbound2"=>[r5.object],
-                                                               "testing_bidirectional_inbound"=>[],
-                                                               "testing_inbound3"=>[]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object],
-                                                                  "testing_bidirectional_outbound"=>[],
-                                                                  "testing3"=>[]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object2.remove_named_relationship("testing",@test_object3)
+          "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound"=>[]}}
+      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r2.object], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
+      @test_object2.remove_relationship_by_name("testing",@test_object3)
       @test_object2.save
       #check now removed for both outbound and inbound
-      @test_object2.named_relationships(false).should == {:self=>{"testing"=>[],
-                                                            "testing2"=>[r4.object],
-                                                            "testing_bidirectional_outbound"=>[],
-                                                            "testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],
-                                                               "testing_inbound2"=>[r5.object],
-                                                                "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[],"testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                    :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object],
-                                                               "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-      @test_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],
-                                                                  "testing2"=>[r3.object],
-                                                                  "testing_bidirectional_outbound"=>[],"testing3"=>[]},
-                                                          :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                                     "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[]}}
-   
+      @test_object2.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[r5.object], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r4.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object3.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r5.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object4.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
+      @test_object5.relationships_by_name(false).should == {:inbound=>{"testing_inbound3"=>[], "testing_bidirectional_inbound"=>[], "parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object], "testing_bidirectional_outbound"=>[]}}
     end
   end
 
-  describe '#named_relationship' do
+  describe '#find_relationship_by_name' do
     it 'should find relationships based on name passed in for inbound or outbound' do
       @test_object2 = MockAFBaseRelationship.new
       @test_object2.new_object = true
@@ -710,10 +628,10 @@ describe ActiveFedora::Base do
       @test_object5.new_object = true
       @test_object5.save
       #append to named relationship 'testing'
-      @test_object2.add_named_relationship("testing",@test_object3)
-      @test_object2.add_named_relationship("testing2",@test_object4)
-      @test_object5.add_named_relationship("testing",@test_object2)
-      @test_object5.add_named_relationship("testing2",@test_object3)
+      @test_object2.add_relationship_by_name("testing",@test_object3)
+      @test_object2.add_relationship_by_name("testing2",@test_object4)
+      @test_object5.add_relationship_by_name("testing",@test_object2)
+      @test_object5.add_relationship_by_name("testing2",@test_object3)
       @test_object2.save
       @test_object5.save
       r2 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object2)
@@ -721,22 +639,22 @@ describe ActiveFedora::Base do
       r4 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object4)
       r5 = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>@test_object5)
       model_rel = ActiveFedora::Relationship.new(:subject=>:self, :predicate=>:dummy, :object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockAFBaseRelationship))
-      @test_object2.named_relationship("testing").should == [r3.object]
-      @test_object2.named_relationship("testing2").should == [r4.object]
-      @test_object2.named_relationship("testing_inbound").should == [r5.object]
-      @test_object2.named_relationship("testing_inbound2").should == []
-      @test_object3.named_relationship("testing").should == []
-      @test_object3.named_relationship("testing2").should == []
-      @test_object3.named_relationship("testing_inbound").should == [r2.object]
-      @test_object3.named_relationship("testing_inbound2").should == [r5.object]
-      @test_object4.named_relationship("testing").should == []
-      @test_object4.named_relationship("testing2").should == []
-      @test_object4.named_relationship("testing_inbound").should == []
-      @test_object4.named_relationship("testing_inbound2").should == [r2.object]
-      @test_object5.named_relationship("testing").should == [r2.object]
-      @test_object5.named_relationship("testing2").should == [r3.object]
-      @test_object5.named_relationship("testing_inbound").should == []
-      @test_object5.named_relationship("testing_inbound2").should == []
+      @test_object2.find_relationship_by_name("testing").should == [r3.object]
+      @test_object2.find_relationship_by_name("testing2").should == [r4.object]
+      @test_object2.find_relationship_by_name("testing_inbound").should == [r5.object]
+      @test_object2.find_relationship_by_name("testing_inbound2").should == []
+      @test_object3.find_relationship_by_name("testing").should == []
+      @test_object3.find_relationship_by_name("testing2").should == []
+      @test_object3.find_relationship_by_name("testing_inbound").should == [r2.object]
+      @test_object3.find_relationship_by_name("testing_inbound2").should == [r5.object]
+      @test_object4.find_relationship_by_name("testing").should == []
+      @test_object4.find_relationship_by_name("testing2").should == []
+      @test_object4.find_relationship_by_name("testing_inbound").should == []
+      @test_object4.find_relationship_by_name("testing_inbound2").should == [r2.object]
+      @test_object5.find_relationship_by_name("testing").should == [r2.object]
+      @test_object5.find_relationship_by_name("testing2").should == [r3.object]
+      @test_object5.find_relationship_by_name("testing_inbound").should == []
+      @test_object5.find_relationship_by_name("testing_inbound2").should == []
       
     end
   end
@@ -951,34 +869,33 @@ describe ActiveFedora::Base do
                                                             :has_part=>[r3.object],
                                                             :has_member=>[r4.object]},
                                                     :inbound=>{:has_part=>[r5.object]}}
-      test_from_solr_object2.named_relationships(false).should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]},
-                                                                   :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[]}}                                              
+      test_from_solr_object2.relationships_by_name(false).should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object],
+        "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[r3.object]},
+        :inbound=>{"testing_inbound"=>[r5.object],"testing_inbound2"=>[],"parts_inbound"=>[]}}
       test_from_solr_object3.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
                                                    :inbound=>{:has_part=>[r2.object],
                                                                :has_member=>[r5.object]}}
-      test_from_solr_object3.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                                   :inbound=>{"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object]}}                                                                  
+      test_from_solr_object3.relationships_by_name(false).should == {:self=>{"testing"=>[],"testing2"=>[], "collection_members"=>[],"part_of"=>[],"parts_outbound"=>[]},
+                                                                   :inbound=>{"testing_inbound"=>[r2.object],"testing_inbound2"=>[r5.object], "parts_inbound"=>[]}}                                                                  
       test_from_solr_object4.relationships(false).should == {:self=>{:has_model=>[model_rel.object]},
                                                     :inbound=>{:has_member=>[r2.object]}}
-      test_from_solr_object4.named_relationships(false).should == {:self=>{"testing"=>[],"testing2"=>[]},
-                                                                   :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[r2.object]}}                                                      
+      test_from_solr_object4.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[r2.object]}, :self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}                       
       test_from_solr_object5.relationships(false).should == {:self=>{:has_model=>[model_rel.object],
                                                             :has_part=>[r2.object],
                                                             :has_member=>[r3.object]},
                                                     :inbound=>{}}
-      test_from_solr_object5.named_relationships(false).should == {:self=>{"testing"=>[r2.object],"testing2"=>[r3.object]},
-                                                                   :inbound=>{"testing_inbound"=>[],"testing_inbound2"=>[]}}                                                     
+      test_from_solr_object5.relationships_by_name(false).should == {:inbound=>{"parts_inbound"=>[], "testing_inbound"=>[], "testing_inbound2"=>[]}, :self=>{"testing2"=>[r3.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object]}}
       #all inbound should now be empty if no parameter supplied to relationships
       test_from_solr_object2.relationships.should == {:self=>{:has_part=>[r3.object],:has_member=>[r4.object],:has_model=>[model_rel.object]}}
-      test_from_solr_object2.named_relationships.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]}}
+      test_from_solr_object2.relationships_by_name.should == {:self=>{"testing2"=>[r4.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r3.object], "parts_outbound"=>[r3.object]}}
       test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      test_from_solr_object3.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+      test_from_solr_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
       test_from_solr_object4.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      test_from_solr_object4.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+      test_from_solr_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}} 
       test_from_solr_object5.relationships.should == {:self=>{:has_model=>[model_rel.object],
                                                              :has_part=>[r2.object],
                                                              :has_member=>[r3.object]}}
-      test_from_solr_object5.named_relationships.should == {:self=>{"testing"=>[r2.object],"testing2"=>[r3.object]}}
+      test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[r3.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object]}}
       # need to check metadata
       test_from_solr_object2.fields[:language][:values].should == ["Italian"]
       test_from_solr_object2.fields[:creator][:values].should == ["Linguist, A."]

data/spec/integration/datastream_spec.rb

@@ -44,15 +44,15 @@ describe ActiveFedora::Datastream do
   it "should be able to update Blob Datastream content and save to Fedora" do    
     dsid = "ds#{Time.now.to_i}"
     ds = ActiveFedora::Datastream.new(:dsID => dsid, :dsLabel => 'hello', :altIDs => '3333', 
-      :controlGroup => 'M', :blob => fixture('dino.jpg'))
-    File.identical?(ds.blob, fixture('dino.jpg')).should be_true
+      :controlGroup => 'M', :blob => fixture('dino.jpg').read)
+    ds.blob.should == fixture('dino.jpg').read
     @test_object.add_datastream(ds).should be_true
     @test_object.save
     to = ActiveFedora::Base.load_instance(@test_object.pid) 
     to.should_not be_nil 
     to.datastreams[dsid].should_not be_nil
     # to.datastreams[dsid].control_group.should == "M"
-    to.datastreams[dsid].content.length.should eql(fixture('dino.jpg').read.length)
+    to.datastreams[dsid].content.should == fixture('dino.jpg').read
     
   end
   

data/spec/integration/datastreams_crud_spec.rb

@@ -141,7 +141,7 @@ end
   
   it "should create/update image/file datastream" do
     ds = Fedora::Datastream.new(:pid => @test_object.pid, :dsID => 'DS1', :dsLabel => 'hello', :altIDs => '3333', 
-      :controlGroup => 'M', :blob => fixture('dino.jpg'))
+      :controlGroup => 'M', :blob => fixture('dino.jpg').read, :mimeType=>'image/jpeg')
       
     @fedora.save(ds).should be_true
     

data/spec/integration/rels_ext_datastream_spec.rb

@@ -139,15 +139,15 @@ describe ActiveFedora::RelsExtDatastream do
       test_from_solr_object5.rels_ext.from_solr(solr_doc)
       
       test_from_solr_object2.relationships.should == {:self=>{:has_part=>[r3.object],:has_member=>[r4.object],:has_model=>[model_rel.object]}}
-      test_from_solr_object2.named_relationships.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]}}
+      test_from_solr_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object], "collection_members"=>[], "part_of"=>[], "parts_outbound"=>[r3.object]}}
       test_from_solr_object3.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      test_from_solr_object3.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+      test_from_solr_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
       test_from_solr_object4.relationships.should == {:self=>{:has_model=>[model_rel.object]}}
-      test_from_solr_object4.named_relationships.should == {:self=>{"testing"=>[],"testing2"=>[]}}
+      test_from_solr_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[]}}
       test_from_solr_object5.relationships.should == {:self=>{:has_model=>[model_rel.object],
                                                              :has_part=>[r2.object],
                                                              :has_member=>[r3.object]}}
-      test_from_solr_object5.named_relationships.should == {:self=>{"testing"=>[r2.object],"testing2"=>[r3.object]}}
+      test_from_solr_object5.relationships_by_name.should == {:self=>{"testing2"=>[r3.object], "collection_members"=>[], "part_of"=>[], "testing"=>[r2.object], "parts_outbound"=>[r2.object]}} 
     end
   end
 end

data/spec/integration/semantic_node_spec.rb

@@ -5,7 +5,7 @@ require 'active_fedora'
 describe ActiveFedora::SemanticNode do
   
   before(:all) do 
-    class SpecNode 
+    class SpecNode
       include ActiveFedora::SemanticNode
       has_relationship "collection_members", :has_collection_member
     end
@@ -13,8 +13,17 @@ describe ActiveFedora::SemanticNode do
     class SNSpecModel < ActiveFedora::Base
       has_relationship("parts", :is_part_of, :inbound => true)
       has_relationship("containers", :is_member_of)
+      has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
     end
-    
+    class SpecNodeSolrFilterQuery < ActiveFedora::Base
+      has_relationship("parts", :is_part_of, :inbound => true)
+      has_relationship("special_parts", :is_part_of, :inbound => true, :solr_fq=>"has_model_s:info\\:fedora/SpecialPart")
+      has_relationship("containers", :is_member_of)
+      has_relationship("special_containers", :is_member_of, :solr_fq=>"has_model_s:info\\:fedora/SpecialContainer")
+      has_bidirectional_relationship("bi_containers", :is_member_of, :has_member)
+      has_bidirectional_relationship("bi_special_containers", :is_member_of, :has_member, :solr_fq=>"has_model_s:info\\:fedora/SpecialContainer")
+    end
+
     @test_object = SNSpecModel.new
     @test_object.save
     
@@ -30,19 +39,101 @@ describe ActiveFedora::SemanticNode do
     @container1.save
     @container2 = ActiveFedora::Base.new()    
     @container2.save
+    @container3 = ActiveFedora::Base.new()    
+    @container3.save
+    @container4 = ActiveFedora::Base.new()    
+    @container4.save
     
     @test_object.add_relationship(:is_member_of, @container1)
     @test_object.add_relationship(:is_member_of, @container2)
+    @test_object.add_relationship(:is_member_of, @container3)
     @test_object.save
+
+    @container4.add_relationship(:has_member,@test_object)
+    @container4.save
+
+    @special_container = ActiveFedora::Base.new()
+    @special_container.add_relationship(:has_model,"SpecialContainer")
+    @special_container.save
+
+    @special_container3 = ActiveFedora::Base.new()
+    @special_container3.add_relationship(:has_model,"SpecialContainer")
+    @special_container3.save
+
+    @special_container4 = ActiveFedora::Base.new()
+    @special_container4.add_relationship(:has_model,"SpecialContainer")
+    @special_container4.save
+
+    #even though adding container3 and 3 special containers, it should only include the special containers when returning via relationship name finder methods
+    #also should only return special part similarly
+    @test_object_query = SpecNodeSolrFilterQuery.new
+    @test_object_query.add_relationship(:is_member_of, @container3)
+    @test_object_query.add_relationship(:is_member_of, @special_container)
+    @test_object_query.add_relationship(:is_member_of, @special_container3)
+    @test_object_query.add_relationship(:is_member_of, @special_container4)
+    @test_object_query.save
+
+    @special_container2 = ActiveFedora::Base.new()
+    @special_container2.add_relationship(:has_model,"SpecialContainer")
+    @special_container2.add_relationship(:has_member,@test_object_query.pid)
+    @special_container2.save
+
+    @part3 = ActiveFedora::Base.new()
+    @part3.add_relationship(:is_part_of, @test_object_query)
+    @part3.save
+
+    @special_part = ActiveFedora::Base.new()
+    @special_part.add_relationship(:has_model,"SpecialPart")
+    @special_part.add_relationship(:is_part_of, @test_object_query)
+    @special_part.save
+   
   end
   
   after(:all) do
+    begin
     @part1.delete 
+    rescue
+    end
+    begin
     @part2.delete
+    rescue
+    end
+    begin
+    @part3.delete
+    rescue
+    end
+    begin
     @container1.delete
+    rescue
+    end
+    begin
     @container2.delete
+    rescue
+    end
+    begin
+    @container3.delete
+    rescue
+    end
+    begin
     @test_object.delete
-    
+    rescue
+    end
+    begin
+    @test_object_query.delete
+    rescue
+    end
+    begin
+    @special_part.delete
+    rescue
+    end
+    begin
+    @special_container.delete
+    rescue
+    end
+    begin
+    @special_container2.delete
+    rescue
+    end
     Object.send(:remove_const, :SNSpecModel)
 
   end
@@ -62,6 +153,84 @@ describe ActiveFedora::SemanticNode do
   end
   
   describe "inbound relationship finders" do
+    describe "when inheriting from parents" do
+      before do
+        class Test2 < ActiveFedora::Base
+          # has_bidirectional_relationship "components", :has_component, :is_component_of
+        end
+        class Test3 < Test2
+          # has_bidirectional_relationship "components", :has_component, :is_component_of
+          has_relationship "testing", :has_member
+        end
+
+        class Test4 < Test3
+          has_relationship "testing_inbound", :is_member_of, :inbound=>true
+        end
+
+        class Test5 < Test4
+          has_relationship "testing_inbound", :is_part_of, :inbound=>true
+        end 
+ 
+        @test_object2 = Test2.new
+        @test_object2.save
+        @part4 = ActiveFedora::Base.new()
+      end
+      it "should have relationships defined" do
+        # puts "Test2 relationships_desc:"
+        # puts Test2.relationships_desc.inspect
+        # puts "ActiveFedora::Base relationships_desc:"
+        # puts ActiveFedora::Base.relationships_desc.inspect
+        ActiveFedora::Base.relationships_desc.should have_key(:inbound)
+        Test2.relationships_desc.should have_key(:inbound)
+        ActiveFedora::Base.relationships_desc[:inbound].each_pair do |key, value|
+          Test2.relationships_desc[:inbound].should have_key(key)
+          Test2.relationships_desc[:inbound][key].should == value
+          Test2.inbound_relationship_query("foo:1",key.to_s).should_not be_empty
+        end
+        ActiveFedora::Base.relationships_desc[:self].each_pair do |key, value|
+          Test2.relationships_desc[:self].should have_key(key)
+          Test2.relationships_desc[:self][key].should == value
+        end
+      end
+
+      it "should have relationships defined from more than one ancestor class" do
+        Test4.relationships_desc[:self].should have_key("collection_members")
+        Test4.relationships_desc[:self].should have_key("testing")
+        Test4.relationships_desc[:inbound].should have_key("testing_inbound")
+      end
+
+      it "should override a parents relationship description if defined in the child" do
+        #check parent description
+        Test4.relationships_desc[:inbound]["testing_inbound"][:predicate].should == :is_member_of
+        #check child with overwritten relationship description has different predicate
+        Test5.relationships_desc[:inbound]["testing_inbound"][:predicate].should == :is_part_of
+      end
+
+      it "should not have relationships bleeding over from other sibling classes" do
+        SpecNodeSolrFilterQuery.relationships_desc[:inbound].should have_key("bi_special_containers_inbound")
+        ActiveFedora::Base.relationships_desc[:inbound].should_not have_key("bi_special_containers_inbound")
+        Test2.relationships_desc[:inbound].should_not have_key("bi_special_containers_inbound")
+      end
+      it "should return an empty set" do
+        @test_object2.parts.should == []
+        @test_object2.parts_outbound.should == []
+      end
+      it "should return stuff" do
+        @part4.add_relationship(:is_part_of, @test_object2)
+        @test_object2.add_relationship(:has_part, @test_object)
+        @part4.save
+        @test_object2.parts_inbound.map(&:pid).should == [@part4.pid]
+        @test_object2.parts_outbound.map(&:pid).should == [@test_object.pid]
+        @test_object2.parts.map(&:pid).should == [@part4.pid, @test_object.pid]
+      end 
+      after do
+        @test_object2.delete
+        begin
+          @part4.delete
+        rescue
+        end
+      end
+    end
     it "should return an array of Base objects" do
       parts = @test_object.parts
       parts.each do |part|
@@ -70,12 +239,79 @@ describe ActiveFedora::SemanticNode do
     end
     it "_ids should return an array of pids" do
       ids = @test_object.parts_ids
-      ids.each do |id|
-        id.should satisfy {|id| id == @part1.pid || @part2.pid}
-      end  
+      ids.size.should == 2
+      ids.include?(@part1.pid).should == true
+      ids.include?(@part2.pid).should == true
+    end
+    it "should return an array of Base objects with some filtered out if using solr_fq" do
+      @test_object_query.special_parts_ids.should == [@special_part.pid]
+    end
+
+    it "should return an array of all Base objects with relationship if not using solr_fq" do
+      @test_object_query.parts_ids.size.should == 2
+      @test_object_query.parts_ids.include?(@special_part.pid).should == true
+      @test_object_query.parts_ids.include?(@part3.pid).should == true
+    end
+
+    it "should return a solr query for an inbound relationship" do
+      @test_object_query.special_parts_query.should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
     end
   end
-  
+
+  describe "inbound relationship query" do
+    it "should return a properly formatted query for a relationship that has a solr filter query defined" do
+      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"special_parts").should == "#{@test_object_query.relationship_predicates[:inbound]['special_parts']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialPart"
+    end
+
+    it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
+      SpecNodeSolrFilterQuery.inbound_relationship_query(@test_object_query.pid,"parts").should == "is_part_of_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')}"
+    end
+  end
+
+  describe "outbound relationship query" do
+    it "should return a properly formatted query for a relationship that has a solr filter query defined" do
+      expected_string = ""
+      @test_object_query.containers_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+      end
+      SpecNodeSolrFilterQuery.outbound_relationship_query("special_containers",@test_object_query.containers_ids).should == expected_string
+    end
+
+    it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
+      expected_string = ""
+      @test_object_query.containers_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "id:" + id.gsub(/(:)/, '\\:')
+      end
+      SpecNodeSolrFilterQuery.outbound_relationship_query("containers",@test_object_query.containers_ids).should == expected_string
+    end
+  end
+
+  describe "bidirectional relationship query" do
+    it "should return a properly formatted query for a relationship that has a solr filter query defined" do
+      expected_string = ""
+      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+      end
+      expected_string << " OR "
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
+      SpecNodeSolrFilterQuery.bidirectional_relationship_query(@test_object_query.pid,"bi_special_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
+    end
+
+    it "should return a properly formatted query for a relationship that does not have a solr filter query defined" do
+      expected_string = ""
+      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "id:" + id.gsub(/(:)/, '\\:')
+      end
+      expected_string << " OR "
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')})"
+      SpecNodeSolrFilterQuery.bidirectional_relationship_query(@test_object_query.pid,"bi_containers",@test_object_query.bi_containers_outbound_ids).should == expected_string
+    end
+  end
+
   describe "outbound relationship finders" do
     it "should return an array of Base objects" do
       containers = @test_object.containers
@@ -86,9 +322,132 @@ describe ActiveFedora::SemanticNode do
     end
     it "_ids should return an array of pids" do
       ids = @test_object.containers_ids
-      ids.each do |id|
-        id.should satisfy {|id| id == @container1.pid || @container2.pid}
-      end  
+      ids.size.should == 3
+      ids.include?(@container1.pid).should == true
+      ids.include?(@container2.pid).should == true
+      ids.include?(@container3.pid).should == true
+      ids.include?(@container4.pid).should == false
     end
+
+    it "should return an array of Base objects with some filtered out if using solr_fq" do
+      @test_object_query.special_containers_ids.size.should == 3
+      @test_object_query.special_containers_ids.include?(@container3.pid).should == false
+      @test_object_query.special_containers_ids.include?(@special_container.pid).should == true
+      @test_object_query.special_containers_ids.include?(@special_container3.pid).should == true
+      @test_object_query.special_containers_ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return an array of all Base objects with relationship if not using solr_fq" do
+      @test_object_query.containers_ids.size.should == 4
+      @test_object_query.containers_ids.include?(@special_container2.pid).should == false
+      @test_object_query.containers_ids.include?(@special_container.pid).should == true
+      @test_object_query.containers_ids.include?(@container3.pid).should == true
+      @test_object_query.containers_ids.include?(@special_container3.pid).should == true
+      @test_object_query.containers_ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return a solr query for an outbound relationship" do
+    end
+
+    it "should return an array of Base objects with some filtered out if using solr_fq" do
+      @test_object_query.special_containers_ids.size.should == 3
+      @test_object_query.special_containers_ids.include?(@container3.pid).should == false
+      @test_object_query.special_containers_ids.include?(@special_container.pid).should == true
+      @test_object_query.special_containers_ids.include?(@special_container3.pid).should == true
+      @test_object_query.special_containers_ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return an array of all Base objects with relationship if not using solr_fq" do
+      @test_object_query.containers_ids.size.should == 4
+      @test_object_query.containers_ids.include?(@special_container2.pid).should == false
+      @test_object_query.containers_ids.include?(@special_container.pid).should == true
+      @test_object_query.containers_ids.include?(@container3.pid).should == true
+      @test_object_query.containers_ids.include?(@special_container3.pid).should == true
+      @test_object_query.containers_ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return a solr query for an outbound relationship" do
+      expected_string = ""
+      @test_object_query.containers_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+      end
+      @test_object_query.special_containers_query.should == expected_string
+    end 
   end  
+
+  describe "bidirectional relationship finders" do
+    it "should return an array of Base objects" do
+      containers = @test_object.bi_containers
+      containers.length.should > 0
+      containers.each do |container|
+        container.should be_kind_of(ActiveFedora::Base)
+      end  
+    end
+    it "_ids should return an array of pids" do
+      ids = @test_object.bi_containers_ids
+      ids.size.should == 4
+      ids.include?(@container1.pid).should == true
+      ids.include?(@container2.pid).should == true
+      ids.include?(@container3.pid).should == true
+      ids.include?(@container4.pid).should == true
+    end
+
+    it "should return an array of Base objects with some filtered out if using solr_fq" do
+      ids = @test_object_query.bi_special_containers_ids
+      ids.size.should == 4
+      ids.include?(@container1.pid).should == false
+      ids.include?(@container2.pid).should == false
+      ids.include?(@container3.pid).should == false
+      ids.include?(@special_container.pid).should == true
+      ids.include?(@special_container2.pid).should == true
+      ids.include?(@special_container3.pid).should == true
+      ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return an array of all Base objects with relationship if not using solr_fq" do
+      ids = @test_object_query.bi_containers_ids
+      ids.size.should == 5
+      ids.include?(@container3.pid).should == true
+      ids.include?(@special_container.pid).should == true
+      ids.include?(@special_container2.pid).should == true
+      ids.include?(@special_container3.pid).should == true
+      ids.include?(@special_container4.pid).should == true
+    end
+
+    it "should return a solr query for a bidirectional relationship" do
+      expected_string = ""
+      @test_object_query.bi_containers_outbound_ids.each_with_index do |id,index|
+        expected_string << " OR " if index > 0
+        expected_string << "(id:" + id.gsub(/(:)/, '\\:') + " AND has_model_s:info\\:fedora/SpecialContainer)"
+      end
+      expected_string << " OR "
+      expected_string << "(#{@test_object_query.relationship_predicates[:inbound]['bi_special_containers_inbound']}_s:#{@test_object_query.internal_uri.gsub(/(:)/, '\\:')} AND has_model_s:info\\:fedora/SpecialContainer)"
+      @test_object_query.bi_special_containers_query.should == expected_string
+    end
+  end
+
+  #putting this test here instead of relationships_helper because testing that relationships_by_name hash gets refreshed if the relationships hash is changed
+  describe "relationships_by_name" do
+    class MockSemNamedRelationships 
+      include ActiveFedora::SemanticNode
+      has_relationship "testing", :has_part
+      has_relationship "testing2", :has_member
+      has_relationship "testing_inbound", :has_part, :inbound=>true
+    end
+
+    it 'should automatically update the relationships_by_name if relationships has changed (no refresh of relationships_by_name hash unless relationships hash has changed' do
+      @test_object2 = MockSemNamedRelationships.new
+      r = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_model,:object=>ActiveFedora::ContentModel.pid_from_ruby_class(MockSemNamedRelationships)}) 
+      @test_object2.add_relationship(r)
+      #should return expected named relationships
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[],"testing2"=>[]},:inbound=>{"testing_inbound"=>[]}}
+      r3 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_part,:object=>@test_object})
+      @test_object2.add_relationship(r3)
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[]},:inbound=>{"testing_inbound"=>[]}}
+      r4 = ActiveFedora::Relationship.new({:subject=>:self,:predicate=>:has_member,:object=>"3"})
+      @test_object2.add_relationship(r4)
+      @test_object2.relationships_by_name.should == {:self=>{"testing"=>[r3.object],"testing2"=>[r4.object]},:inbound=>{"testing_inbound"=>[]}}
+    end
+  end
 end