active-fedora 6.6.0.rc4 → 6.6.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91704416bcc480154725e95946c40f9be9c459b
-  data.tar.gz: 71b13aaf17f894796c68bd314933e2ae4f6c4708
+  metadata.gz: c25ddcf281f3eb10b558ee44dc144880d3551c31
+  data.tar.gz: f2f13e587a927cfe015eec879a023c8407eb2fac
 SHA512:
-  metadata.gz: decd34709952404b85375d8c87aac27a8054e61d5a2b9c0d5c600aa53d1c8f7eda7c6693fb9a64ef44b34229a602a1e797fb342f6afae0a398dd65e6c69b37b5
-  data.tar.gz: a59b2fbf7e2023e6bbc321428202816d0d3f85798814d86351a1e0819f3cfbffff88a10db2db61a9cd7002f9ee5448816fb4ad88160768759dcb81fe730df71b
+  metadata.gz: 317a0a139aa98883265545996a6587a8f26020a38d3aefbd001770f30c756a35c60079b49b9cd9deabf6ac357f7d204b2f36191b1b222af165e43a186bddd88d
+  data.tar.gz: 5777d15192af9d28f43f59c6f27640b55419cb74fc50df642981d038825a259504e54d086a9694eedec07ae700890cae55125fa8a70a8f147529a2e62606c59e

data/History.txt

@@ -1,4 +1,9 @@
-v6.6.0 (rc4)
+v6.6.0 (rc5)
+Gracefully handle an ObjectNotFound in find_all [Justin Coyne]
+Revert "Removed unused code that breaks certain use cases (Fixes #234)." [Jeremy Friesen]
+Removed unset opts parameter from call to reify_solr_results, introduced in PR #236. [David Chandek-Stark]
+Removed unused code that breaks certain use cases (Fixes #234).  [David Chandek-Stark]
+Fix deprecation warning when using the ids setter of a has_many collection relationship that has class_name set to 'ActiveFedora::Base [Justin Coyne]
 Fix deprecation warning when loading a has_many association [Justin Coyne]
 Explicitly set cast to false on reload to avoid deprecation warnings [Justin Coyne]
 Cast relationship results if class is ActiveFedora::Base [Justin Coyne]

data/lib/active_fedora/associations.rb

@@ -280,7 +280,8 @@ module ActiveFedora
               ids = (new_value || []).reject { |nid| nid.blank? }
               #TODO, like this when find() can return multiple records
               #send("#{reflection.name}=", reflection.klass.find(ids))
-              send("#{reflection.name}=", ids.collect { |id| reflection.klass.find(id)})
+              opts = reflection.klass == ActiveFedora::Base ? {cast: true} : nil
+              send("#{reflection.name}=", ids.collect { |id| reflection.klass.find(id, opts)})
             end
           end
         end

data/lib/active_fedora/associations/association_collection.rb

@@ -156,7 +156,7 @@ module ActiveFedora
         opts[:class] = @reflection.class_name.constantize.to_class_uri unless @reflection.class_name.nil?
 
 #TODO, don't reify, just store the solr results and lazily reify.
-        return ActiveFedora::SolrService.reify_solr_results(solr_result, opts)
+        return ActiveFedora::SolrService.reify_solr_results(solr_result)
       end
 
       def load_from_solr

data/lib/active_fedora/querying.rb

@@ -63,7 +63,11 @@ module ActiveFedora
       cast = opts.delete(:cast)
       find_in_batches(conditions, opts.merge({:fl=>SOLR_DOCUMENT_ID})) do |group|
         group.each do |hit|
-          yield(find_one(hit[SOLR_DOCUMENT_ID], cast))
+          begin 
+            yield(find_one(hit[SOLR_DOCUMENT_ID], cast))
+          rescue ActiveFedora::ObjectNotFoundError
+            logger.error "When trying to find_each #{hit[SOLR_DOCUMENT_ID]}, encountered an ObjectNotFoundError. Solr may be out of sync with Fedora"
+          end
         end
       end
     end

data/lib/active_fedora/relation.rb

@@ -103,8 +103,9 @@ module ActiveFedora
     def find(*args)
       return to_a.find { |*block_args| yield(*block_args) } if block_given?
       options = args.extract_options!
+      options = options.dup
 
-      cast = if self == ActiveFedora::Base && !options.has_key?(:cast)
+      cast = if @klass == ActiveFedora::Base && !options.has_key?(:cast)
         Deprecation.warn(Relation, "find's cast option will default to true in ActiveFedora 7.0.0.  To preserve existing behavior send parameter: `:cast=> false`", caller)
         false
       else 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0.rc4"
+  VERSION = "6.6.0.rc5"
 end

data/spec/integration/has_many_associations_spec.rb

@@ -45,11 +45,8 @@ describe "When relationship is restricted to AF::Base" do
     class PDF < ActiveFedora::Base
       belongs_to :email, :property=>:is_part_of
     end
-
-    @book = Email.create!
-    @image = Image.create!(:email=>@book)
-    @pdf = PDF.create!(:email=>@book)
   end
+
   after do
       Object.send(:remove_const, :Image)
       Object.send(:remove_const, :PDF)
@@ -57,8 +54,34 @@ describe "When relationship is restricted to AF::Base" do
   end
 
 
-  it "Should not restrict relationships " do
-    @book.reload
-    @book.attachments.should == [@image, @pdf]
+  describe "creating new objects with object relationships" do
+    before do
+      @book = Email.create!
+      @image = Image.create!(:email=>@book)
+      @pdf = PDF.create!(:email=>@book)
+    end
+    it "Should not restrict relationships " do
+      @book.reload
+      @book.attachments.should == [@image, @pdf]
+    end
+  end
+
+  describe "creating new objects with id setter" do
+    let!(:image) { Image.create }
+    let!(:email) { Email.create }
+    let!(:pdf) { PDF.create }
+
+    after do
+      email.destroy
+      pdf.destroy
+      image.destroy
+    end
+
+    it "Should not restrict relationships " do
+      Deprecation.should_not_receive(:warn) # a deprecation in 6.6.0 that's going away in 7.0.0
+      email.attachment_ids = [image.id, pdf.id]
+      email.reload
+      email.attachments.should == [image, pdf]
+    end
   end
 end

data/spec/integration/scoped_query_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedora::Model do
+describe "scoped queries" do
   
   before(:each) do 
     module ModelIntegrationSpec
@@ -30,15 +30,11 @@ describe ActiveFedora::Model do
 
 
   describe "When there is one object in the store" do
-    before do
-      @test_instance = ModelIntegrationSpec::Basic.new
-      @test_instance.save
-    end
+    let!(:test_instance) { ModelIntegrationSpec::Basic.create!()}
 
     after do
-      @test_instance.delete
+      test_instance.delete
     end
-
     
     describe ".all" do
       it "should return an array of instances of the calling Class" do
@@ -54,40 +50,49 @@ describe ActiveFedora::Model do
 
     describe ".first" do
       it "should return one instance of the calling class" do
-        ModelIntegrationSpec::Basic.first.should == @test_instance
+        ModelIntegrationSpec::Basic.first.should == test_instance
       end
     end
   end
 
   describe "with multiple objects" do
-    before do
-      @test_instance1 = ModelIntegrationSpec::Basic.create!(:foo=>'Beta', :bar=>'Chips')
-      @test_instance2 = ModelIntegrationSpec::Basic.create!(:foo=>'Alpha', :bar=>'Peanuts')
-      @test_instance3 = ModelIntegrationSpec::Basic.create!(:foo=>'Sigma', :bar=>'Peanuts')
-    end
+    let!(:test_instance1) { ModelIntegrationSpec::Basic.create!(:foo=>'Beta', :bar=>'Chips')}
+    let!(:test_instance2) { ModelIntegrationSpec::Basic.create!(:foo=>'Alpha', :bar=>'Peanuts')}
+    let!(:test_instance3) { ModelIntegrationSpec::Basic.create!(:foo=>'Sigma', :bar=>'Peanuts')}
+
     after do
-      @test_instance1.delete
-      @test_instance2.delete
-      @test_instance3.delete
+      test_instance1.delete
+      test_instance2.delete
+      test_instance3.delete
     end
     it "should query" do
-      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('foo', type: :string)=> 'Beta').should == [@test_instance1]
-      ModelIntegrationSpec::Basic.where('foo' => 'Beta').should == [@test_instance1]
+      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('foo', type: :string)=> 'Beta').should == [test_instance1]
+      ModelIntegrationSpec::Basic.where('foo' => 'Beta').should == [test_instance1]
     end
     it "should order" do
-      ModelIntegrationSpec::Basic.order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').should == [@test_instance2, @test_instance1, @test_instance3]
+      ModelIntegrationSpec::Basic.order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').should == [test_instance2, test_instance1, test_instance3]
     end
     it "should limit" do
-      ModelIntegrationSpec::Basic.limit(1).should == [@test_instance1]
+      ModelIntegrationSpec::Basic.limit(1).should == [test_instance1]
     end
 
     it "should chain queries" do
-      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [@test_instance2]
+      ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').order(ActiveFedora::SolrService.solr_name('foo', :sortable) + ' asc').limit(1).should == [test_instance2]
     end
 
     it "should chain count" do
       ModelIntegrationSpec::Basic.where(ActiveFedora::SolrService.solr_name('bar', type: :string) => 'Peanuts').count.should == 2 
     end
+
+    describe "when one of the objects in solr isn't in fedora" do
+      it "should log an error" do
+        ModelIntegrationSpec::Basic.should_receive(:find_one).with(test_instance1.pid, nil).and_call_original
+        ModelIntegrationSpec::Basic.should_receive(:find_one).with(test_instance2.pid, nil).and_raise(ActiveFedora::ObjectNotFoundError)
+        ModelIntegrationSpec::Basic.should_receive(:find_one).with(test_instance3.pid, nil).and_call_original
+        ActiveFedora::Relation.logger.should_receive(:error).with("When trying to find_each #{test_instance2.pid}, encountered an ObjectNotFoundError. Solr may be out of sync with Fedora")
+        ModelIntegrationSpec::Basic.all.should == [test_instance1, test_instance3]
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0.rc4
+  version: 6.6.0.rc5
 platform: ruby
 authors:
 - Matt Zumwalt