combine prs

OregonDigital · Jul 20, 2016 · bc18583 · bc18583
1 parent 25f6007
commit bc18583
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/lib/oregon_digital/oai/model/active_fedora_wrapper.rb b/lib/oregon_digital/oai/model/active_fedora_wrapper.rb
@@ -137,7 +137,7 @@ def remove_chaff(items,start, numFound)
         include_item = false
       end
       #check primarySet is not corrupt
-      if (!pseudo.descMetadata.primarySet.empty?) && (!pseudo.descMetadata.primarySet.first.respond_to? :id)
+      if (pseudo.descMetadata.primarySet.empty?) || (!pseudo.descMetadata.primarySet.first.respond_to? :id)
         include_item = false
       end
       if include_item

diff --git a/spec/controllers/oai_controller_spec.rb b/spec/controllers/oai_controller_spec.rb
@@ -9,6 +9,14 @@
       let(:lcname2) {RDF::URI.new("http://id.loc.gov/authorities/names/no00013511")}
       let(:type) {RDF::URI.new("http://purl.org/dc/dcmitype/Image")}
       let(:rights){RDF::URI.new("http://creativecommons.org/licenses/by-nc-nd/4.0/")}
+      let(:generic_coll_1) do
+        g = FactoryGirl.build(:generic_collection)
+        g.title = "Collection_1"
+        g.description = "The first collection"
+        g.save
+        g
+      end
+
       let(:generic_asset_1) do
         f = FactoryGirl.build(:generic_asset)
         f.title = "gen asset 1"
@@ -20,6 +28,8 @@
         f.descMetadata.date = "2012-12-12"
         f.descMetadata.description = "This thing is a thing."
         f.descMetadata.identifier = "blahblah123"
+        f.descMetadata.set = generic_coll_1
+        f.descMetadata.primarySet = generic_coll_1
         f.save
         f
       end
@@ -28,28 +38,24 @@
         f = FactoryGirl.build(:generic_asset)
         f.descMetadata.format = format
         f.title = "gen asset 2"
+        f.descMetadata.set = generic_coll_1
+        f.descMetadata.primarySet = generic_coll_1
         f.save
         f
       end
       let(:generic_asset_3) do
         f = FactoryGirl.create(:generic_asset)
         f.descMetadata.format = format
         f.title = "gen asset 3"
-        f.save
-        f
-      end
-      let(:generic_asset_4) do
-        f = FactoryGirl.create(:generic_asset)
-        f.set << RDF::URI("http://oregondigital.org/resource/oregondigital:badset")
-        f.title = "gen asset 4"
+        f.descMetadata.set = RDF::URI("http://oregondigital.org/resource/oregondigital:badset")
+        f.descMetadata.primarySet = RDF::URI("http://oregondigital.org/resource/oregondigital:badset")
         f.save
         f
       end
       before (:each) do
         generic_asset_1.reload
         generic_asset_2
         generic_asset_3
-        generic_asset_4
       end
       context "and request is list" do
         before do
@@ -58,6 +64,10 @@
         it "should work" do
           expect(response).to be_success
         end
+        it "should not include the item with the bad set" do
+          expect(response.body).not_to include("badset")
+          expect(response.body).not_to include("unknown")
+        end
       end
       context 'and request is get' do
         before do

diff --git a/spec/lib/oregon_digital/oai/model/active_fedora_wrapper_spec.rb b/spec/lib/oregon_digital/oai/model/active_fedora_wrapper_spec.rb
@@ -11,11 +11,15 @@
     end
     let(:generic_asset_1) do
       f = FactoryGirl.build(:generic_asset)
+      f.descMetadata.set = collection_1
+      f.descMetadata.primarySet = collection_1
       f.save
       f
     end
     let(:generic_asset_2) do
       f = FactoryGirl.build(:generic_asset)
+      f.descMetadata.set = collection_1
+      f.descMetadata.primarySet = collection_1
       f.save
       f
     end
@@ -38,6 +42,9 @@
         before do
           sleep(1)
           generic_asset_3
+          generic_asset_3.descMetadata.set = collection_1
+          generic_asset_3.descMetadata.primarySet = collection_1
+          generic_asset_3.save
         end
         subject {OregonDigital::OAI::Model::ActiveFedoraWrapper.new(GenericAsset, :limit => 1)}
         it "should return only that many" do
@@ -73,12 +80,8 @@
         end
       end
       context "when given a set" do
-        before do
-          generic_asset_1.set = collection_1
-          generic_asset_1.save
-        end
         it "should return records belonging to set " do
-          expect(subject.find('', :set => collection_1.pid).first).to eq generic_asset_1
+          expect(subject.find('', :set => collection_1.pid).length).to eq 2
         end
       end
     end