active-fedora 2.3.0 → 2.3.1

data/spec/unit/active_fedora_spec.rb

@@ -79,7 +79,7 @@ describe ActiveFedora do
       end
       it "should load the passed config if explicit config passed in" do
         ActiveFedora.init('./spec/fixtures/rails_root/config/fedora.yml')
-        ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+        ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora"
       end
     end
 
@@ -115,7 +115,7 @@ describe ActiveFedora do
             ActiveFedora.init()
             ActiveFedora.solr.class.should == ActiveFedora::SolrService
             ActiveFedora.fedora.class.should == Fedora::Repository
-            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@testhost.com:8983/fedora"
+            ActiveFedora.fedora.fedora_url.to_s.should == "http://fedoraAdmin:fedoraAdmin@localhost:8983/fedora"
           end
           it "should load the default file if no config is found at Rails.root" do
             Rails.expects(:root).returns(File.join(File.dirname(__FILE__),"../fixtures/bad/path/to/rails_root"))

data/spec/unit/semantic_node_spec.rb

@@ -187,6 +187,7 @@ describe ActiveFedora::SemanticNode do
     end
       
     #can only duplicate predicates if not both inbound or not both outbound
+=begin
     class MockHasRelationshipDuplicatePredicate < SpecNode2
       has_relationship "testing", :has_member, :type=>SpecNode2
       had_exception = false
@@ -197,7 +198,9 @@ describe ActiveFedora::SemanticNode do
       end
       raise "Did not raise exception if duplicate predicate used" unless had_exception 
     end
-      
+=end
+
+=begin      
     #can only duplicate predicates if not both inbound or not both outbound
     class MockHasRelationshipDuplicatePredicate2 < SpecNode2
       has_relationship "testing", :has_member, :type=>SpecNode2, :inbound=>true
@@ -209,6 +212,7 @@ describe ActiveFedora::SemanticNode do
       end
       raise "Did not raise exception if duplicate predicate used" unless had_exception 
     end
+=end
       
     it 'should create relationship descriptions both inbound and outbound' do
       @test_object2 = MockHasRelationship.new
@@ -265,7 +269,8 @@ describe ActiveFedora::SemanticNode do
       mock_repo.expects(:find_model).with("_PID3_", "AudioRecord").returns("AR3")
       SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
       local_node = SpecNode.new()
-      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
+      local_node.expects(:pid).returns("test:sample_pid")
+      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
       ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(solr_result)
       Fedora::Repository.expects(:instance).returns(mock_repo).times(3)
       Kernel.expects(:const_get).with("AudioRecord").returns("AudioRecord").times(3)
@@ -278,7 +283,8 @@ describe ActiveFedora::SemanticNode do
       local_node = SpecNode.new
       mock_repo = mock("repo")
       mock_repo.expects(:find_model).never
-      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
+      local_node.expects(:pid).returns("test:sample_pid")
+      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
       ActiveFedora::SolrService.instance.conn.expects(:query).with("is_constituent_of_s:info\\:fedora/test\\:sample_pid", :rows=>101).returns(solr_result)
       local_node.constituents(:response_format => :solr, :rows=>101).should equal(solr_result)
     end
@@ -287,7 +293,8 @@ describe ActiveFedora::SemanticNode do
     it "resulting _ids finder should search against solr and return an array of fedora PIDs" do
       SpecNode.create_inbound_relationship_finders("parts", :is_part_of, :inbound => true)
       local_node = SpecNode.new
-      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
+      local_node.expects(:pid).returns("test:sample_pid")
+      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once() 
       ActiveFedora::SolrService.instance.conn.expects(:query).with("is_part_of_s:info\\:fedora/test\\:sample_pid", :rows=>25).returns(mock("solr result", :hits => [Hash["id"=>"pid1"], Hash["id"=>"pid2"]]))
       local_node.parts(:response_format => :id_array).should == ["pid1", "pid2"]
     end
@@ -399,10 +406,10 @@ describe ActiveFedora::SemanticNode do
     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"])
+      @local_node.expects(:outbound_relationships).returns({:has_part=>["mypid:1"]}).at_least_once()
       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}", :rows=>25).returns(solr_result)
+      ActiveFedora::SolrService.instance.conn.expects(:query).with("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(solr_result)
       @local_node.all_parts(:response_format=>:solr)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active-fedora
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 Z
+date: 2011-07-06 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: solr-ruby
@@ -465,6 +466,7 @@ files:
 - lib/active_fedora/samples/hydra-mods_article_datastream.rb
 - lib/active_fedora/samples/hydra-rights_metadata_datastream.rb
 - lib/active_fedora/samples/marpa-dc_datastream.rb
+- lib/active_fedora/samples/sample_af_obj_relationship_query_param.rb
 - lib/active_fedora/samples/special_thing.rb
 - lib/active_fedora/semantic_node.rb
 - lib/active_fedora/solr_service.rb
@@ -586,6 +588,7 @@ files:
 - spec/unit/semantic_node_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
+has_rdoc: true
 homepage: http://yourmediashelf.com/activefedora
 licenses: []
 
@@ -615,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfedora
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A convenience libary for manipulating MODS (Metadata Object Description Schema) documents.
@@ -718,4 +721,3 @@ test_files:
 - spec/unit/semantic_node_spec.rb
 - spec/unit/solr_config_options_spec.rb
 - spec/unit/solr_service_spec.rb
-has_rdoc: