active-fedora 1.2.2 → 1.2.3

data/lib/fedora/connection.rb

@@ -19,7 +19,7 @@ module Fedora
     end
 
     def to_s
-      "Failed with #{response.code} #{response.message if response.respond_to?(:message)}"
+      "Failed with #{response.code} #{@message.to_s}"
     end
   end
 
@@ -155,29 +155,30 @@ module Fedora
 
     # Handles response and error codes from remote service.
     def handle_response(response)
+      message = "Error from Fedora: #{response.body}"
       case response.code.to_i
       when 301,302
         raise(Redirection.new(response))
       when 200...400
         response
       when 400
-        raise(BadRequest.new(response))
+        raise(BadRequest.new(response, message))
       when 401
-        raise(UnauthorizedAccess.new(response))
+        raise(UnauthorizedAccess.new(response, message))
       when 403
-        raise(ForbiddenAccess.new(response))
+        raise(ForbiddenAccess.new(response, message))
       when 404
-        raise(ResourceNotFound.new(response))
+        raise(ResourceNotFound.new(response, message))
       when 405
-        raise(MethodNotAllowed.new(response))
+        raise(MethodNotAllowed.new(response, message))
       when 409
-        raise(ResourceConflict.new(response))
+        raise(ResourceConflict.new(response, message))
       when 422
-        raise(ResourceInvalid.new(response))
-      when 401...500
-        raise(ClientError.new(response))
+        raise(ResourceInvalid.new(response, message))
+      when 423...500
+        raise(ClientError.new(response, message))
       when 500...600
-        raise(ServerError.new(response))
+        raise(ServerError.new(response, message))
       else
         raise(ConnectionError.new(response, "Unknown response code: #{response.code}"))
       end
@@ -211,4 +212,4 @@ module Fedora
       (@site.user || @site.password ? { 'Authorization' => 'Basic ' + ["#{@site.user}:#{ @site.password}"].pack('m').delete("\r\n") } : {})
     end
   end
-end
+end

data/lib/fedora/repository.rb

@@ -100,7 +100,9 @@ module Fedora
     
     def find_model(pid, klazz)
       obj = self.find_objects("pid=#{pid}").first
-      #doc = REXML::Document.new(obj.object_xml, :ignore_whitespace_nodes=>:all)
+      if obj.nil?
+        raise ActiveFedora::ObjectNotFoundError, "The repository does not have an object with pid #{pid}.  The repository URL is #{self.base_url}"
+      end
       doc = Nokogiri::XML::Document.parse(obj.object_xml)     
       klazz.deserialize(doc)
     end

data/spec/unit/base_extra_spec.rb

@@ -98,7 +98,7 @@ describe ActiveFedora::Base do
     end
     
     it "should delete object from repository and index" do
-      @test_object.expects(:pid).returns("foo")
+      @test_object.stubs(:pid).returns("foo")
       ActiveFedora::SolrService.instance.conn.expects(:delete).with("foo")      
       Fedora::Repository.instance.stubs(:delete).with(@test_object.inner_object)
       @test_object.delete

data/spec/unit/base_file_management_spec.rb

@@ -15,22 +15,38 @@ describe ActiveFedora::Base do
     it "should be a supported method" do
       @base.should respond_to("file_objects")
     end
-    it "should wrap .collection_members" do
-      @base.expects(:collection_members)
+    it "should wrap .collection_members and .parts" do
+      @base.expects(:collection_members).returns([])
+      @base.expects(:parts).returns(["Foo"])
       @base.file_objects
     end
-    describe "_append" do
-      it "should wrap collection_members_append" do
-        mocko = mock("object")
-        @base.expects(:collection_members_append).with(mocko)
-        @base.file_objects_append(mocko)
-      end
-    end
     describe "_remove" do
       it "should wrap collection_members_remove"
     end
   end
   
+  describe ".file_objects_append" do
+    it "should make the file object being appended assert isPartOf pointing back at the current object" do
+      mock_child = ActiveFedora::Base.new
+      mock_child.expects(:add_relationship).with(:is_part_of, @base)
+      @base.file_objects_append(mock_child)
+    end
+    it "should load the file object being appended if only a pid is provided" do
+      mock_child = mock("object")
+      mock_child.expects(:add_relationship).with(:is_part_of, @base)
+      ActiveFedora::Base.expects(:load_instance).with("_PID_").returns(mock_child)
+      @base.file_objects_append("_PID_")
+    end
+  end
+  
+  describe ".parts" do
+    it "should search for both (outbound) has_part and (inbound) is_part_of relationships, removing duplicates" do
+      @base.expects(:parts_outbound).returns(["A", "B"])
+      @base.expects(:parts_inbound).returns(["B", "C"])
+      @base.parts.should == ["B", "C", "A"]
+    end
+  end
+  
   describe ".collection_members" do
     it "should return an array" do
       @base.collection_members.should be_kind_of(Array)

data/spec/unit/metadata_datastream_spec.rb

@@ -146,6 +146,12 @@ describe ActiveFedora::MetadataDatastream do
       @test_ds.fubar_values.should == ["val1", "val2"]
     end
     
+    it "should not get tripped up by field names wrapped in arrays" do
+      att = {[:fubar]=>{"0"=>"eco3bv"}}
+      @test_ds.update_indexed_attributes(att)
+      @test_ds.fubar_values.should == ['eco3bv']
+    end
+    
   end
   
   describe ".get_values" do

data/spec/unit/repository_spec.rb

@@ -111,6 +111,13 @@ describe Fedora::Repository do
     end
   end
   
+  describe ".find_model" do
+    it "should raise an ObjectNotFound error if there is no object" do
+      Fedora::Repository.instance.expects(:find_objects).returns([])
+      lambda { Fedora::Repository.instance.find_model("mypid", ActiveFedora::Base) }.should raise_error(ActiveFedora::ObjectNotFoundError)  
+    end
+  end
+  
   describe "#register" do
     after(:all) do
       Fedora::Repository.register(ActiveFedora.fedora_config[:url])

data/spec/unit/semantic_node_spec.rb

@@ -45,6 +45,8 @@ describe ActiveFedora::SemanticNode do
     @test_relationship1 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_member_of, :object => "demo:10")  
     @test_relationship2 = ActiveFedora::Relationship.new(:subject => :self, :predicate => :is_part_of, :object => "demo:11")  
     @test_relationship3 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => :has_part, :object => "demo:12")
+    @test_cmodel_relationship1 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => :has_model, :object => "afmodel:SampleModel")
+    @test_cmodel_relationship2 = ActiveFedora::Relationship.new(:subject => @pid, :predicate => "hasModel", :object => "afmodel:OtherModel")
   end
   
   after(:each) do
@@ -352,6 +354,44 @@ describe ActiveFedora::SemanticNode do
     end
   end
   
+  describe ".create_bidirectional_relationship_finder" do
+    before(:each) do
+      SpecNode.create_bidirectional_relationship_finders("all_parts", :has_part, :is_part_of)
+      @local_node = SpecNode.new
+      @local_node.pid = @pid
+      @local_node.internal_uri = @uri
+    end
+    it "should create inbound & outbound finders" do
+      @local_node.should respond_to(:all_parts_inbound)
+      @local_node.should respond_to(:all_parts_outbound)
+    end
+    it "should rely on inbound & outbound finders" do      
+      @local_node.expects(:all_parts_inbound).returns(["foo1"])
+      @local_node.expects(:all_parts_outbound).returns(["foo2"])
+      @local_node.all_parts.should == ["foo1", "foo2"]
+    end
+    it "(:response_format => :id_array) should rely on inbound & outbound finders" do
+      @local_node.expects(:all_parts_inbound).with(:response_format=>:id_array).returns(["fooA"])
+      @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array).returns(["fooB"])
+      @local_node.all_parts(:response_format=>:id_array).should == ["fooA", "fooB"]
+    end
+    it "(:response_format => :solr) should construct a solr query that combines inbound and outbound searches" do
+      # get the id array for outbound relationships then construct solr query by combining id array with inbound relationship search
+      @local_node.expects(:all_parts_outbound).with(:response_format=>:id_array).returns(["mypid:1"])
+      id_array_query = ActiveFedora::SolrService.construct_query_for_pids(["mypid:1"])
+      solr_result = mock("solr result")
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid OR #{id_array_query}").returns(solr_result)
+      @local_node.all_parts(:response_format=>:solr)
+    end
+  end
+  
+  describe "#has_bidirectional_relationship" do
+    it "should ..." do
+      SpecNode.expects(:create_bidirectional_relationship_finders).with("all_parts", :has_part, :is_part_of, {})
+      SpecNode.has_bidirectional_relationship("all_parts", :has_part, :is_part_of)
+    end
+  end
+  
   describe ".add_relationship" do
     it "should add relationship to the relationships hash" do
       @node.add_relationship(@test_relationship)
@@ -419,6 +459,8 @@ describe ActiveFedora::SemanticNode do
           <isMemberOf rdf:resource='info:fedora/demo:10' xmlns='info:fedora/fedora-system:def/relations-external#'/>
           <isPartOf rdf:resource='info:fedora/demo:11' xmlns='info:fedora/fedora-system:def/relations-external#'/>
           <hasPart rdf:resource='info:fedora/demo:12' xmlns='info:fedora/fedora-system:def/relations-external#'/>
+          <hasModel rdf:resource='info:fedora/afmodel:OtherModel' xmlns='info:fedora/fedora-system:def/model#'/>
+          <hasModel rdf:resource='info:fedora/afmodel:SampleModel' xmlns='info:fedora/fedora-system:def/model#'/>
         </rdf:Description>
       </rdf:RDF>
       EOS
@@ -428,6 +470,8 @@ describe ActiveFedora::SemanticNode do
       @node.add_relationship(@test_relationship1)
       @node.add_relationship(@test_relationship2)
       @node.add_relationship(@test_relationship3)
+      @node.add_relationship(@test_cmodel_relationship1)
+      @node.add_relationship(@test_cmodel_relationship2)
       @node.internal_uri = @uri
       returned_xml = XmlSimple.xml_in(@node.to_rels_ext(@pid))
       returned_xml.should == XmlSimple.xml_in(@sample_rels_ext_xml)

data/spec/unit/solr_config_options_spec.rb

@@ -92,7 +92,7 @@ describe ActiveFedora do
     end
     it "should prevent Base.delete from deleting the corresponding Solr document if false" do
       Fedora::Repository.instance.expects(:delete)
-      ActiveFedora::SolrService.expects(:instance).never
+      ActiveFedora::SolrService.instance.conn.expects(:delete).with(@test_object.pid).never 
       @test_object.delete
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 2
-  - 2
-  version: 1.2.2
+  - 3
+  version: 1.2.3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 -05:00
+date: 2010-10-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -321,6 +321,7 @@ files:
 - LICENSE
 - License.txt
 - Manifest.txt
+- NG_XML_DATASTREAM.textile
 - PostInstall.txt
 - README.textile
 - Rakefile