active-fedora 4.0.0.rc5 → 4.0.0.rc6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active-fedora (4.0.0.rc5)
+    active-fedora (4.0.0.rc6)
       activeresource (>= 3.0.0)
       activesupport (>= 3.0.0)
       equivalent-xml

data/History.txt

@@ -1,4 +1,4 @@
-4.0.0.rc5
+4.0.0.rc6
 Removed deprecations
   * allowing :fedora level in fedora.yml
   * automatic includes of Relationships and FileMethods is removed
@@ -10,6 +10,7 @@ Replaced solr-ruby with rsolr. Note: remove any calls to .hits
 load_instance is now deprecated, replaced with find
 Find alwasy casts to the appropriate object.
 Run a stub :environment task in the fixture loading rake tasks (which is overridden by rails)
+Find raises ObjectNotFoundError when the object isn't found
 
 3.3.2
 HYDRA-745 No need to require :url be present on external datastreams

data/lib/active_fedora.rb

@@ -17,7 +17,7 @@ module ActiveFedora #:nodoc:
   class UnknownAttributeError < NoMethodError; end; # :nodoc:
   class ConfigurationError < RuntimeError; end # :nodoc:
   class AssociationTypeMismatch < RuntimeError; end # :nodoc:
-  class UnregisteredPredicateError < RuntimeError; end
+  class UnregisteredPredicateError < RuntimeError; end # :nodoc:
 
 
   eager_autoload do

data/lib/active_fedora/associations/association_proxy.rb

@@ -122,7 +122,7 @@ module ActiveFedora
         # If the \target is already \loaded it is just returned. Thus, you can call
         # +load_target+ unconditionally to get the \target.
         #
-        # ActiveFedora::RecordNotFound is rescued within the method, and it is
+        # ActiveFedora::ObjectNotFoundError is rescued within the method, and it is
         # not reraised. The proxy is \reset and +nil+ is the return value.
         def load_target
           return nil unless defined?(@loaded)

data/lib/active_fedora/model.rb

@@ -263,12 +263,15 @@ module ActiveFedora
       private 
       # Retrieve the Fedora object with te given pid, explore the returned object, determine its model 
       # using #{ActiveFedora::ContentModel.known_models_for} and cast to that class.
+      # Raises a ObjectNotFoundError if the object is not found.
       # @param [String] pid of the object to load
       #
       # @example because the object hydra:dataset1 asserts it is a Dataset (hasModel info:fedora/afmodel:Dataset), return a Dataset object (not a Book).
-      #   Book.find_document("hydra:dataset1") 
+      #   Book.find_one("hydra:dataset1") 
       def find_one(pid)
-        af_base = self.allocate.init_with(DigitalObject.find(self, pid))
+        inner = DigitalObject.find(self, pid)
+        raise ActiveFedora::ObjectNotFoundError if inner.new?
+        af_base = self.allocate.init_with(inner)
         the_model = ActiveFedora::ContentModel.known_models_for( af_base ).first
         if af_base.class != the_model
           return af_base.adapt_to(the_model)

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc5"
+    VERSION = "4.0.0.rc6"
 end

data/spec/unit/model_spec.rb

@@ -68,12 +68,7 @@ describe ActiveFedora::Model do
       
   end
   
-  it 'should provide #find' do
-    SpecModel::Basic.should respond_to(:find)
-  end
-  
   describe '#find' do
-    
     it "(:all) should query solr for all objects with :active_fedora_model_s of self.class" do
       ActiveFedora::SolrService.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
       SpecModel::Basic.expects(:find_one).with("changeme:30").returns("Fake Object1")
@@ -83,9 +78,13 @@ describe ActiveFedora::Model do
     it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
       ActiveFedora::ContentModel.expects(:known_models_for).returns([SpecModel::Basic])
       SpecModel::Basic.any_instance.expects(:init_with).returns(mock("Model", :adapt_to=>SpecModel::Basic ))
-      SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
+      ActiveFedora::DigitalObject.expects(:find).returns(stub("inner obj", :'new?'=>false))
       SpecModel::Basic.find("_PID_")
     end
+    it "should raise an exception if it is not found" do
+      SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
+      lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
+    end
   end
 
   describe '#count' do

data/spec/unit/relationships_spec.rb

@@ -240,6 +240,9 @@ describe ActiveFedora::Relationships do
           ActiveFedora::SolrService.expects(:query).with("id:my\\:_PID1_ OR id:my\\:_PID2_ OR id:my\\:_PID3_").returns([{"id"=> "my:_PID1_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]},
                          {"id"=> "my:_PID2_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}, 
                          {"id"=> "my:_PID3_", "has_model_s"=>["info:fedora/afmodel:SpecNode"]}])
+          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID1_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID1_'))
+          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID2_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID2_'))
+          ActiveFedora::DigitalObject.expects(:find).with(SpecNode, 'my:_PID3_').returns(stub("inner obj", :'new?'=>false, :pid=>'my:_PID3_'))
           local_node.containers.map(&:pid).should == ["my:_PID1_", "my:_PID2_", "my:_PID3_"]
         end
       

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 15424159
+  hash: 15424153
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - rc
-  - 5
-  version: 4.0.0.rc5
+  - 6
+  version: 4.0.0.rc6
 platform: ruby
 authors: 
 - Matt Zumwalt