active-fedora 2.3.1 → 2.3.3

data/spec/unit/base_spec.rb

@@ -14,7 +14,7 @@ class FooHistory < ActiveFedora::Base
   has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText" do |m|
     m.field "fubar", :text
   end
-  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2" do |m|
+  has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"withText2", :label=>"withLabel" do |m|
     m.field "fubar", :text
   end 
 end
@@ -65,12 +65,23 @@ describe ActiveFedora::Base do
   end
 
   describe "has_metadata" do
+    before :each do
+      @n = FooHistory.new(:pid=>"monkey:99")
+      @n.save
+    end
+
+    after :each do
+      begin
+        @n.delete
+      rescue
+      end
+    end
 
     it "should create specified datastreams with specified fields" do
-      n = FooHistory.new
-      n.datastreams["someData"].should_not be_nil
-      n.datastreams["someData"].fubar_values='bar'
-      n.datastreams["someData"].fubar_values.should == ['bar']
+      @n.datastreams["someData"].should_not be_nil
+      @n.datastreams["someData"].fubar_values='bar'
+      @n.datastreams["someData"].fubar_values.should == ['bar']
+      @n.datastreams["withText2"].label.should == "withLabel"
     end
 
   end

data/spec/unit/datastream_spec.rb

@@ -81,5 +81,45 @@ describe ActiveFedora::Datastream do
     ds2 = ActiveFedora::Datastream.new(:mime_type=>"text/bar")
     ds2.mime_type.should == "text/bar"
   end
-  
+
+  describe ".size" do
+    it "should lazily load the datastream size attribute from the fedora repository" do
+      ds_profile = <<-EOS
+        <datastreamProfile 
+            xmlns=\"http://www.fedora.info/definitions/1/0/management/\"  
+            xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
+            xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
+            xsi:schemaLocation=\"http://www.fedora.info/definitions/1/0/management/ http://www.fedora.info/definitions/1/0/datastreamProfile.xsd\" 
+            pid=\"#{@test_object.pid}\" 
+            dsID=\"#{@test_datastream.dsid}\" >
+         <dsLabel></dsLabel>
+         <dsVersionID>#{@test_datastream.dsid}.1</dsVersionID>
+         <dsCreateDate>2011-07-11T16:48:13.536Z</dsCreateDate>
+         <dsState>A</dsState>
+         <dsMIME>text/xml</dsMIME>
+         <dsFormatURI></dsFormatURI>
+         <dsControlGroup>X</dsControlGroup>
+         <dsSize>9999</dsSize>
+         <dsVersionable>true</dsVersionable>
+         <dsInfoType></dsInfoType>
+         <dsLocation>#{@test_object.pid}+#{@test_datastream.dsid}+#{@test_datastream.dsid}.1</dsLocation>
+         <dsLocationType></dsLocationType>
+         <dsChecksumType>DISABLED</dsChecksumType>
+         <dsChecksum>none</dsChecksum>
+         </datastreamProfile>"
+      EOS
+      Fedora::Repository.instance.expects(:fetch_custom).with(@test_object.pid, "datastreams/#{@test_datastream.dsid}").returns(ds_profile)
+      @test_datastream.expects(:new_object?).returns(false)
+      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
+      @test_datastream.size.should == "9999"
+      @test_datastream.attributes.fetch(:dsSize,nil).should_not be_nil
+    end
+
+    it "should default to an empty string if ds has not been saved" do
+      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
+      @test_datastream.size.should be_nil
+      @test_datastream.attributes.fetch(:dsSize,nil).should be_nil
+    end
+  end
+
 end

data/spec/unit/property_spec.rb

@@ -3,7 +3,7 @@ require File.join( File.dirname(__FILE__), "../spec_helper" )
 require 'active_fedora'
 require 'active_fedora/model'
 require 'mocha'
-include Mocha::Standalone
+include Mocha::API
 
 describe ActiveFedora::Property do
   

data/spec/unit/relationship_spec.rb

@@ -4,7 +4,7 @@ require 'active_fedora'
 require "rexml/document"
 require 'mocha'
 
-include Mocha::Standalone
+include Mocha::API
 
 describe ActiveFedora::Relationship do
   

data/spec/unit/rf_datastream_spec.rb

@@ -45,5 +45,19 @@ describe Fedora::Datastream do
       @test_datastream.attributes[:dsLabel].should == "Foo dsLabel"
     end
   end
+  
+  describe ".mime_type" do
+    it "should return the mimeType attribute" do
+      @test_datastream.mime_type.should == @test_datastream.attributes["mimeType"]
+    end
+  end
 
+  describe ".mime_type=" do
+    it "should set the mimeType attribute" do
+      @test_datastream.mime_type.should_not == "foo/bar"
+      @test_datastream.attributes["mimeType"].should_not == "foo/bar"
+      @test_datastream.mime_type= "foo/bar"
+      @test_datastream.mime_type.should == "foo/bar"
+    end
+  end
 end

data/spec/unit/semantic_node_spec.rb

@@ -5,7 +5,7 @@ require 'xmlsimple'
 #require 'mocha'
 
 #include ActiveFedora::SemanticNode
-#include Mocha::Standalone
+#include Mocha::API
 
 @@last_pid = 0
 
@@ -187,7 +187,6 @@ 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
@@ -198,9 +197,7 @@ 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
@@ -212,7 +209,6 @@ 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
@@ -269,8 +265,7 @@ 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(:pid).returns("test:sample_pid")
-      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once()
+      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
       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)
@@ -283,8 +278,7 @@ describe ActiveFedora::SemanticNode do
       local_node = SpecNode.new
       mock_repo = mock("repo")
       mock_repo.expects(:find_model).never
-      local_node.expects(:pid).returns("test:sample_pid")
-      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"constituents"=>{:predicate=>:is_constituent_of}}}).at_least_once()
+      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
       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
@@ -293,8 +287,7 @@ 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(:pid).returns("test:sample_pid")
-      SpecNode.expects(:named_relationships_desc).returns({:inbound=>{"parts"=>{:predicate=>:is_part_of}}}).at_least_once() 
+      local_node.expects(:internal_uri).returns("info:fedora/test:sample_pid")
       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
@@ -406,10 +399,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(:outbound_relationships).returns({:has_part=>["mypid:1"]}).at_least_once()
+      @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("#{id_array_query} OR (is_part_of_s:info\\:fedora/test\\:sample_pid)", :rows=>25).returns(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)
       @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: 1
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 3
-  - 1
-  version: 2.3.1
+  - 3
+  version: 2.3.3
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-06 00:00:00 -05:00
+date: 2011-07-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -444,6 +444,7 @@ files:
 - active-fedora.gemspec
 - config/fedora.yml
 - config/predicate_mappings.yml
+- config/solr.yml
 - config/solr_mappings.yml
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
@@ -466,7 +467,6 @@ 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

data/lib/active_fedora/samples/sample_af_obj_relationship_query_param.rb

@@ -1,11 +0,0 @@
-class SampleAFObjRelationshipQueryParam < ActiveFedora::Base
-  #points to all parents linked via is_member_of
-  has_relationship "parents", :is_member_of
-  #returns only parents that have a level value set to "series"
-  has_relationship "series_parents", :is_member_of, :query_params=>{:q=>{"level_t"=>"series"}}
-  #returns all parts
-  has_relationship "parts", :is_part_of, :inbound=>true
-  #returns only parts that have level to "series"
-  has_relationship "series_parts", :is_part_of, :inbound=>true, :query_params=>{:q=>{"level_t"=>"series"}}
-  has_bidirectional_relationship "bi_series_parts", :has_part, :is_part_of, :query_params=>{:q=>{"level_t"=>"series"}}
-end