active-fedora 6.0.0 → 6.1.0

data/lib/generators/active_fedora/config/solr/templates/solr_conf/conf/solrconfig.xml

@@ -37,23 +37,27 @@
        -->
         <str name="qf">
           id
-          all_text_timv
           active_fedora_model_ssi
-          object_type_si
+          title_tesim
+          author_tesim
+          subject_tesim
         </str>
         <str name="pf">
           all_text_timv^10
         </str>
 
        <str name="author_qf">
+          author_tesim
        </str>
        <str name="author_pf">
        </str>
        <str name="title_qf">
+          title_tesim
        </str>
        <str name="title_pf">
        </str>
        <str name="subject_qf">
+          subject_tesim
        </str>
        <str name="subject_pf">
        </str>
@@ -67,7 +71,7 @@
        <str name="facet.mincount">1</str>
        <str name="facet.limit">10</str>
        <str name="facet.field">active_fedora_model_ssi</str>
-       <str name="facet.field">object_type_si</str>
+       <str name="facet.field">subject_sim</str>
        
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
@@ -90,12 +94,17 @@
       <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
       <str name="fl">
         id,
-        access_tim,
-        discover_access_group_tim,discover_access_person_tim,
-        read_access_group_tim,read_access_person_tim,
-        edit_access_group_tim,edit_access_person_tim,
+        access_ssim,
+        discover_access_group_ssim,discover_access_person_ssim,
+        read_access_group_ssim,read_access_person_ssim,
+        edit_access_group_ssim,edit_access_person_ssim,
         depositor_ti,
         embargo_release_date_dtsi
+        inheritable_access_ssim,
+        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
+        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
+        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_embargo_release_date_dtsi
       </str>
     </lst>
   </requestHandler>

data/lib/tasks/active_fedora_dev.rake

@@ -53,7 +53,7 @@ require 'rspec/core/rake_task'
 
   desc "Copies the default SOLR config for the bundled Testing Server"
   task :configure_jetty do
-    FileList['solr/conf/*'].each do |f|  
+    FileList['lib/generators/active_fedora/config/solr/templates/solr_conf/conf/*'].each do |f|  
       cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
       cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
     end

data/spec/fixtures/auditable.foxml.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<foxml:digitalObject VERSION="1.1" PID="changeme:242"
+xmlns:foxml="info:fedora/fedora-system:def/foxml#"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/definitions/1/0/foxml1-1.xsd">
+<foxml:objectProperties>
+<foxml:property NAME="info:fedora/fedora-system:def/model#state" VALUE="Active"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#label" VALUE=""/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#ownerId" VALUE="fedoraAdmin"/>
+<foxml:property NAME="info:fedora/fedora-system:def/model#createdDate" VALUE="2013-02-25T16:43:05.802Z"/>
+<foxml:property NAME="info:fedora/fedora-system:def/view#lastModifiedDate" VALUE="2013-02-25T16:43:06.379Z"/>
+</foxml:objectProperties>
+<foxml:datastream ID="AUDIT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="false">
+<foxml:datastreamVersion ID="AUDIT.0" LABEL="Audit Trail for this object" CREATED="2013-02-25T16:43:05.802Z" MIMETYPE="text/xml" FORMAT_URI="info:fedora/fedora-system:format/xml.fedora.audit">
+<foxml:xmlContent>
+<audit:auditTrail xmlns:audit="info:fedora/fedora-system:def/audit#">
+<audit:record ID="AUDREC1">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>RELS-EXT</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2013-02-25T16:43:06.219Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC2">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>descMetadata</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2013-02-25T16:43:06.315Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+<audit:record ID="AUDREC3">
+<audit:process type="Fedora API-M"/>
+<audit:action>addDatastream</audit:action>
+<audit:componentID>rightsMetadata</audit:componentID>
+<audit:responsibility>fedoraAdmin</audit:responsibility>
+<audit:date>2013-02-25T16:43:06.379Z</audit:date>
+<audit:justification></audit:justification>
+</audit:record>
+</audit:auditTrail>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="DC" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2013-02-25T16:43:05.802Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="341">
+<foxml:contentDigest TYPE="SHA-256" DIGEST="eb075bf6da5903e54464631dc998f66f95bffde9f4137132796457d31de5cd44"/>
+<foxml:xmlContent>
+<oai_dc:dc xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
+  <dc:identifier>changeme:242</dc:identifier>
+</oai_dc:dc>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="RELS-EXT" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="RELS-EXT.0" LABEL="Fedora Object-to-Object Relationship Metadata" CREATED="2013-02-25T16:43:06.219Z" MIMETYPE="application/rdf+xml" SIZE="284">
+<foxml:contentDigest TYPE="SHA-256" DIGEST="013d2229de7bd91c61256563eff1b475cd1e8f7e45a2f15de5a36f2d20ec2852"/>
+<foxml:xmlContent>
+<rdf:RDF xmlns:ns0="info:fedora/fedora-system:def/model#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+  <rdf:Description rdf:about="info:fedora/changeme:242">
+    <ns0:hasModel rdf:resource="info:fedora/afmodel:TestModel"></ns0:hasModel>
+  </rdf:Description>
+</rdf:RDF>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="descMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="descMetadata.0" LABEL="" CREATED="2013-02-25T16:43:06.315Z" MIMETYPE="text/xml" SIZE="215">
+<foxml:contentDigest TYPE="SHA-256" DIGEST="3f588eca58dea77b31c9ed0b90e4560288a419856c4bb744fab9c7fe8749ad19"/>
+<foxml:xmlContent>
+<dc xmlns:dcterms="http://purl.org/dc/terms/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <dcterms:title>DulHydra Test Object</dcterms:title>
+  <dcterms:identifier>test00001</dcterms:identifier>
+</dc>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+<foxml:datastream ID="rightsMetadata" STATE="A" CONTROL_GROUP="X" VERSIONABLE="true">
+<foxml:datastreamVersion ID="rightsMetadata.0" LABEL="" CREATED="2013-02-25T16:43:06.379Z" MIMETYPE="text/xml" SIZE="596">
+<foxml:contentDigest TYPE="SHA-256" DIGEST="472f8634b31bd425dadd9206531ab02a70c08c22e4250bb2b0d3dd0314cfb240"/>
+<foxml:xmlContent>
+<rightsMetadata xmlns="http://hydra-collab.stanford.edu/schemas/rightsMetadata/v1" version="0.1">
+  <copyright>
+    <human type="title"></human>
+    <human type="description"></human>
+    <machine type="uri"></machine>
+  </copyright>
+  <access type="discover">
+    <human></human>
+    <machine></machine>
+  </access>
+  <access type="read">
+    <human></human>
+    <machine>
+      <group>public</group>
+    </machine>
+  </access>
+  <access type="edit">
+    <human></human>
+    <machine></machine>
+  </access>
+  <embargo>
+    <human></human>
+    <machine></machine>
+  </embargo>
+</rightsMetadata>
+</foxml:xmlContent>
+</foxml:datastreamVersion>
+</foxml:datastream>
+</foxml:digitalObject>

data/spec/integration/base_spec.rb

@@ -431,8 +431,14 @@ describe ActiveFedora::Base do
     it "should return true for objects that exist" do
       ActiveFedora::Base.exists?('hydrangea:fixture_mods_article1').should be_true
     end
-    it "should return false for objects that dont exist" do
+    it "should return false for objects that don't exist" do
       ActiveFedora::Base.exists?('nil:object').should be_false
     end
+    it "should return false for nil" do
+      ActiveFedora::Base.exists?(nil).should be_false
+    end
+    it "should return false for empty" do
+      ActiveFedora::Base.exists?('').should be_false
+    end
   end
 end

data/spec/unit/auditable_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe ActiveFedora::Auditable do
+
+  before(:all) do
+    class AuditableModel < ActiveFedora::Base
+      include ActiveFedora::Auditable
+    end
+    path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'auditable.foxml.xml')
+    pid = ActiveFedora::FixtureLoader.import_to_fedora(path)
+    ActiveFedora::FixtureLoader.index(pid)
+    @test_object = AuditableModel.find(pid)
+  end
+  after(:all) do
+    @test_object.delete
+  end
+  it "should have the correct number of audit records" do
+    @test_object.audit_trail.records.length.should == 3
+  end
+  it "should return all the data from each audit record" do
+    record = @test_object.audit_trail.records.first
+    record.id.should == "AUDREC1"
+    record.process_type.should == "Fedora API-M"
+    record.action.should == "addDatastream"
+    record.component_id.should == "RELS-EXT"
+    record.responsibility.should == "fedoraAdmin"
+    record.date.should == "2013-02-25T16:43:06.219Z"
+    record.justification.should == ""
+  end
+  
+end

data/spec/unit/base_delegate_spec.rb

@@ -1,56 +1,68 @@
 require 'spec_helper'
 
 describe ActiveFedora::Base do
-
-  describe "first level delegation" do 
-    class BarStream2 < ActiveFedora::OmDatastream 
-      set_terminology do |t|
-        t.root(:path=>"animals", :xmlns=>"urn:zoobar")
-        t.waterfowl do
-          t.ducks do 
-            t.duck
+  before :all do
+      class BarStream2 < ActiveFedora::OmDatastream 
+        set_terminology do |t|
+          t.root(:path=>"animals", :xmlns=>"urn:zoobar")
+          t.waterfowl do
+            t.ducks do 
+              t.duck
+            end
           end
+          t.donkey()
+          t.cow()
+        end
+
+        def self.xml_template
+              Nokogiri::XML::Document.parse '<animals xmlns="urn:zoobar"> 
+                <waterfowl>
+                  <ducks>
+                    <duck/>
+                  </ducks>
+                </waterfowl>
+                <donkey></donkey>
+                <cow></cow>
+              </animals>'
         end
-        t.donkey()
-        t.cow()
       end
+  end
+  after :all do
+    Object.send(:remove_const, :BarStream2)
+  end
 
-      def self.xml_template
-            Nokogiri::XML::Document.parse '<animals xmlns="urn:zoobar"> 
-              <waterfowl>
-                <ducks>
-                  <duck/>
-                </ducks>
-              </waterfowl>
-              <donkey></donkey>
-              <cow></cow>
-            </animals>'
+  describe "first level delegation" do 
+    before :all do
+      class BarHistory2 < ActiveFedora::Base
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
+          m.field "fubar", :string
+          m.field "bandana", :string
+          m.field "swank", :text
+        end
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText" do |m|
+          m.field "fubar", :text
+        end
+        has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel" do |m|
+          m.field "fubar", :text
+        end 
+
+        has_metadata :type=>BarStream2, :name=>"xmlish"
+        delegate :fubar, :to=>'withText', :unique=>true
+        delegate :donkey, :to=>'xmlish', :unique=>true
+        delegate :cow, :to=>'xmlish'
+        delegate :duck, :to=>'xmlish', :at=>[:waterfowl, :ducks]
       end
     end
 
-    class BarHistory2 < ActiveFedora::Base
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"someData" do |m|
-        m.field "fubar", :string
-        m.field "bandana", :string
-        m.field "swank", :text
-      end
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText" do |m|
-        m.field "fubar", :text
-      end
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"withText2", :label=>"withLabel" do |m|
-        m.field "fubar", :text
-      end 
-
-      has_metadata :type=>BarStream2, :name=>"xmlish"
-      delegate :fubar, :to=>'withText', :unique=>true
-      delegate :donkey, :to=>'xmlish', :unique=>true
-      delegate :cow, :to=>'xmlish'
-      delegate :duck, :to=>'xmlish', :at=>[:waterfowl, :ducks]
+    after :all do
+      Object.send(:remove_const, :BarHistory2)
     end
+
     before :each do
       @n = BarHistory2.new()
     end
 
+
     it "should save a delegated property uniquely" do
       @n.fubar="Quack"
       @n.fubar.should == "Quack"
@@ -74,6 +86,30 @@ describe ActiveFedora::Base do
       @n[:duck]= ["Cluck", "Gobble"]
       @n[:duck].should == ["Cluck", "Gobble"]
     end
+
+  end
+
+  describe "with a superclass" do
+    before :all do
+      class BarHistory2 < ActiveFedora::Base
+        has_metadata 'xmlish', :type=>BarStream2
+        delegate_to 'xmlish', [:donkey, :cow]
+      end
+      class BarHistory3 < BarHistory2
+      end
+    end
+
+    after :all do
+      Object.send(:remove_const, :BarHistory3)
+      Object.send(:remove_const, :BarHistory2)
+    end
+
+    subject { BarHistory3.new }
+
+    it "should be able to delegate deeply into the terminology" do
+      subject.donkey=["Bray", "Hee-haw"]
+      subject.donkey.should == ["Bray", "Hee-haw"]
+    end
   end
 end
 

data/spec/unit/base_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 @@last_pid = 0  
 
 describe ActiveFedora::Base do
+  describe 'descendants' do
+    it "should record the decendants" do
+      ActiveFedora::Base.descendants.should include(HydrangeaArticle, SpecialThing)
+    end
+  end
   describe "sharding" do
     it "should have a shard_index" do
       ActiveFedora::Base.shard_index(@this_pid).should == 0
@@ -424,7 +429,7 @@ describe ActiveFedora::Base do
         stub_get_content(@this_pid, ['RELS-EXT', 'someData', 'withText2', 'withText'])
         @test_history = FooHistory.new()
         solr_doc = @test_history.to_solr
-        solr_doc[ActiveFedora::SolrService.solr_name("active_fedora_model", :symbol)].should eql(["FooHistory"])
+        solr_doc[ActiveFedora::SolrService.solr_name("active_fedora_model", :stored_sortable)].should eql(["FooHistory"])
       end
 
       it "should call .to_solr on all SimpleDatastreams and OmDatastreams, passing the resulting document to solr" do

data/spec/unit/has_and_belongs_to_many_collection_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe ActiveFedora::Associations::HasAndBelongsToManyAssociation do
+  it "should call add_relationship" do
+    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
+    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
+    ActiveFedora::SolrService.stub(:query).and_return([])
+    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
+    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+  
+    subject.should_receive(:add_relationship).with('predicate', object)
+ 
+    ac << object
+
+  end
+
+  it "should call add_relationship on subject and object when inverse_of given" do
+    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a', :ids_for_outbound => [])
+    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate', :inverse_of => 'inverse_predicate'}, :class_name=> nil)
+    ActiveFedora::SolrService.stub(:query).and_return([])
+    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
+    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+  
+    subject.should_receive(:add_relationship).with('predicate', object)
+ 
+    object.should_receive(:add_relationship).with('inverse_predicate', subject)
+ 
+    ac << object
+
+  end
+  
+  it "should call remove_relationship" do
+    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
+    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate'}, :class_name=> nil)
+    ActiveFedora::SolrService.stub(:query).and_return([])
+    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
+    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+  
+    subject.should_receive(:remove_relationship).with('predicate', object)
+ 
+    ac.delete(object)
+
+  end
+
+  it "should call remove_relationship on subject and object when inverse_of given" do
+    subject = stub("subject", :new_record? => false, :pid => 'subject:a', :internal_uri => 'info:fedora/subject:a')
+    predicate = stub(:klass => mock.class, :options=>{:property=>'predicate', :inverse_of => 'inverse_predicate'}, :class_name=> nil)
+    ActiveFedora::SolrService.stub(:query).and_return([])
+    ac = ActiveFedora::Associations::HasAndBelongsToManyAssociation.new(subject, predicate)
+    object = stub("object", :new_record? => false, :pid => 'object:b', :save => nil)
+  
+    subject.should_receive(:remove_relationship).with('predicate', object)
+    object.should_receive(:remove_relationship).with('inverse_predicate', subject)
+ 
+    ac.delete(object)
+
+  end
+
+end