active-fedora 6.2.0 → 6.3.0

data/lib/active_fedora/solr_digital_object.rb

@@ -45,5 +45,9 @@ module ActiveFedora
       false
     end
 
+    def uri
+      "solr:#{pid}"
+    end
+
   end
 end

data/lib/active_fedora/solr_service.rb

@@ -58,13 +58,14 @@ module ActiveFedora
     # If the pid_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
     # @param [Array] pid_array the pids that you want included in the query
     def self.construct_query_for_pids(pid_array)
-      query = ""
-      pid_array.each_index do |i|
-        query << "#{SOLR_DOCUMENT_ID}:#{escape_uri_for_query(pid_array[i])}"
-        query << " OR " if i != pid_array.length-1
+
+      q = pid_array.reject { |x| x.empty? }.map do |pid|
+        "_query_:\"{!raw f=#{SOLR_DOCUMENT_ID}}#{pid.gsub('"', '\"')}\""
       end
-      query = "id:NEVER_USE_THIS_ID" if query.empty? || query == "id:"
-      return query
+
+      return "id:NEVER_USE_THIS_ID" if q.empty?
+
+      return q.join(" OR ")
     end
 
     def self.solr_name(*args)
@@ -79,7 +80,7 @@ module ActiveFedora
     # @param [Hash] args key is the predicate, value is the target_uri
     def self.construct_query_for_rel(args)
       clauses = args.map do |predicate, target_uri|
-        "#{solr_name(predicate, :symbol)}:#{escape_uri_for_query(target_uri)}"
+        "_query_:\"{!raw f=#{solr_name(predicate, :symbol)}}#{target_uri.gsub('"', '\"')}\""
       end
       clauses.join(" AND ")
     end
@@ -94,9 +95,11 @@ module ActiveFedora
 
     # Get the count of records that match the query
     # @param [String] query a solr query 
+    # @param [Hash] args arguments to pass through to `args' param of SolrService.query (note that :rows will be overwritten to 0)
     # @return [Integer] number of records matching
-    def self.count(query)
-        SolrService.query(query, :raw=>true, :rows=>0)['response']['numFound'].to_i
+    def self.count(query, args={})
+      args = args.merge(:raw=>true, :rows=>0)
+      SolrService.query(query, args)['response']['numFound'].to_i
     end
 
     def self.add(doc)

data/lib/active_fedora/unsaved_digital_object.rb

@@ -17,6 +17,9 @@ module ActiveFedora
       @pid || PLACEHOLDER
     end
 
+    def uri
+      "unsaved:#{pid}"
+    end
 
     # Set the pid.  This method is only avaialable before the object has been persisted in fedora.
     def pid=pid

data/lib/active_fedora/validations.rb

@@ -69,6 +69,13 @@ module ActiveFedora
       output = super(context)
       errors.empty? && output
     end
+    
+    # Test to see if the given field is required
+    # @param [Symbol] key a field
+    # @return [Boolean] is it required or not
+    def required?(key)
+      self.class.validators_on(key).any?{|v| v.kind_of? ActiveModel::Validations::PresenceValidator}
+    end
 
   protected
 

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.2.0"
+  VERSION = "6.3.0"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -38,7 +38,7 @@ require 'rspec/core/rake_task'
 
   desc "Loads or refreshes the fixtures needed to run the tests"
   task :fixtures => :environment do
-    ENV["pid"] = "hydrangea:fixture_mods_article1"
+    ENV["pid"] = "test:fixture_mods_article1"
     Rake::Task["repo:refresh"].invoke
     ENV["pid"] = nil
 
@@ -46,7 +46,7 @@ require 'rspec/core/rake_task'
     Rake::Task["repo:load"].reenable
     Rake::Task["repo:refresh"].reenable
 
-    ENV["pid"] = "hydrangea:fixture_mods_article2"
+    ENV["pid"] = "test:fixture_mods_article2"
     Rake::Task["repo:refresh"].invoke
     ENV["pid"] = nil
   end
@@ -65,7 +65,6 @@ task :ci do
   ENV['environment'] = "test"
   Rake::Task["active_fedora:configure_jetty"].invoke
   jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 60
   error = Jettywrapper.wrap(jetty_params) do
     Rake::Task['active_fedora:coverage'].invoke
   end
@@ -84,13 +83,5 @@ task :coverage do
   Rake::Task["active_fedora:rspec"].invoke
 end
 
-# Provides an :environment task for use while working within a working copy of active-fedora
-# You should never load this rake file into any other application
-desc 'Set up ActiveFedora environment.  !! Only for use while working within a working copy of active-fedora'
-task :environment do
-  puts "Initializing ActiveFedora Rake environment.  This should only be called when working within a workign copy of the active-fedora code."
-  require "#{APP_ROOT}/spec/samples/models/hydrangea_article"
-end
-
 end
 

data/spec/fixtures/{hydrangea_fixture_mods_article1.foxml.xml → test_fixture_mods_article1.foxml.xml}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrangea:fixture_mods_article1"
+<foxml:digitalObject VERSION="1.1" PID="test:fixture_mods_article1"
 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">
@@ -62,7 +62,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2010-06-17T19:56:19.301Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="360">
 <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>hydrangea:fixture_mods_article1</dc:identifier>
+  <dc:identifier>test:fixture_mods_article1</dc:identifier>
 </oai_dc:dc>
 </foxml:xmlContent>
 </foxml:datastreamVersion>
@@ -175,8 +175,8 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 <foxml:datastreamVersion ID="RELS-EXT.0" LABEL="" CREATED="2010-06-17T19:56:22.353Z" MIMETYPE="text/xml" SIZE="306">
 <foxml:xmlContent>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about="info:fedora/hydrangea:fixture_mods_article1">
-    <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:HydrangeaArticle"></hasModel>
+  <rdf:Description rdf:about="info:fedora/test:fixture_mods_article1">
+    <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:ModsArticle"></hasModel>
   </rdf:Description>
 </rdf:RDF>
 </foxml:xmlContent>
@@ -231,4 +231,4 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 </foxml:xmlContent>
 </foxml:datastreamVersion>
 </foxml:datastream>
-</foxml:digitalObject>
+</foxml:digitalObject>

data/spec/fixtures/{hydrangea_fixture_mods_article2.foxml.xml → test_fixture_mods_article2.foxml.xml}

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<foxml:digitalObject VERSION="1.1" PID="hydrangea:fixture_mods_article2"
+<foxml:digitalObject VERSION="1.1" PID="test:fixture_mods_article2"
 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">
@@ -62,7 +62,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 <foxml:datastreamVersion ID="DC1.0" LABEL="Dublin Core Record for this object" CREATED="2010-06-17T19:56:19.301Z" MIMETYPE="text/xml" FORMAT_URI="http://www.openarchives.org/OAI/2.0/oai_dc/" SIZE="360">
 <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>hydrangea:fixture_mods_article2</dc:identifier>
+  <dc:identifier>test:fixture_mods_article2</dc:identifier>
 </oai_dc:dc>
 </foxml:xmlContent>
 </foxml:datastreamVersion>
@@ -175,8 +175,8 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 <foxml:datastreamVersion ID="RELS-EXT.0" LABEL="" CREATED="2010-06-17T19:56:22.353Z" MIMETYPE="text/xml" SIZE="306">
 <foxml:xmlContent>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <rdf:Description rdf:about="info:fedora/hydrangea:fixture_mods_article2">
-    <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:HydrangeaArticle"></hasModel>
+  <rdf:Description rdf:about="info:fedora/test:fixture_mods_article2">
+    <hasModel xmlns="info:fedora/fedora-system:def/relations-external#" rdf:resource="info:fedora/afmodel:ModsArticle"></hasModel>
   </rdf:Description>
 </rdf:RDF>
 </foxml:xmlContent>
@@ -231,4 +231,4 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
 </foxml:xmlContent>
 </foxml:datastreamVersion>
 </foxml:datastream>
-</foxml:digitalObject>
+</foxml:digitalObject>

data/spec/integration/associations_spec.rb

@@ -160,16 +160,20 @@ describe ActiveFedora::Base do
 
     describe "of has_many_and_belongs_to" do
       before do
-        @topic1 = Topic.new
-        @topic1.save
-        @topic2 = Topic.new
-        @topic2.save
+        @topic1 = Topic.create
+        @topic2 = Topic.create
+        @book = Book.create
       end
-      it "habtm should set relationships bidirectionally" do
-        @book = Book.new
+      it "habtm should set and remove relationships bidirectionally" do
         @book.topics << @topic1
-        @book.topics.map(&:pid).should == [@topic1.pid]
-        Topic.find(@topic1.pid).books.should == [] #Can't have saved it because @book isn't saved yet.
+        @book.topics.should == [@topic1]
+        @topic1.books.should == [@book]
+        @topic1.reload.books.should == [@book]
+
+        @book.topics.delete(@topic1)
+        #@topic1.books.delete(@book)
+        @book.topics.should == []
+        @topic1.books.should == []
       end
       after do
         @topic1.delete
@@ -353,55 +357,134 @@ describe ActiveFedora::Base do
 
   describe "single direction habtm" do
     before :all do
-      class LibraryBook < ActiveFedora::Base
-        has_and_belongs_to_many :pages, :property=>:is_part_of
+      class Course < ActiveFedora::Base
+        has_and_belongs_to_many :textbooks, :property=>:is_part_of
       end
-      class Page < ActiveFedora::Base
-        has_many :library_books, :property=>:is_part_of
+      class Textbook < ActiveFedora::Base
+        has_many :courses, :property=>:is_part_of
       end
         
     end
     after :all do
-      Object.send(:remove_const, :LibraryBook)
-      Object.send(:remove_const, :Page)
+      Object.send(:remove_const, :Course)
+      Object.send(:remove_const, :Textbook)
     end
 
     describe "with a parent that has two children" do
       before do
-        @book = LibraryBook.create
-        @p1 = Page.create()
-        @p2 = Page.create()
-        @book.pages = [@p1, @p2]
-        @book.save
+        @course = Course.create
+        @t1 = Textbook.create()
+        @t2 = Textbook.create()
+        @course.textbooks = [@t1, @t2]
+        @course.save
       end
 
       it "should load the association stored in the parent" do
-        @reloaded_book = LibraryBook.find(@book.pid)
-        @reloaded_book.pages.should == [@p1, @p2]
+        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course.textbooks.should == [@t1, @t2]
       end
 
       it "should allow a parent to be deleted from the has_many association" do
-        @reloaded_book = LibraryBook.find(@book.pid)
-        @p1.library_books.delete(@reloaded_book)
-        @reloaded_book.save
+        @reloaded_course = Course.find(@course.pid)
+        @t1.courses.delete(@reloaded_course)
+        @reloaded_course.save
 
-        @reloaded_book = LibraryBook.find(@book.pid)
-        @reloaded_book.pages.should == [@p2]
+        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course.textbooks.should == [@t2]
+      end
+
+      it "should allow replacing the children" do
+        @t3 = Textbook.create()
+        @t4 = Textbook.create()
+        @course.textbooks = [@t3, @t4]
+        @course.save
+
+        @course.reload.textbooks.should == [@t3, @t4]
       end
 
       it "should allow a child to be deleted from the has_and_belongs_to_many association" do
-        pending "This isn't working and we ought to fix it"
-        @reloaded_book = LibraryBook.find(@book.pid)
-        @reloaded_book.pages.delete(@p1)
-        @reloaded_book.save
-        @p1.save
+        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course.textbooks.delete(@t1)
+        @reloaded_course.save
+        @t1.save
 
-        @reloaded_book = LibraryBook.find(@book.pid)
-        @reloaded_book.pages.should == [@p2]
+        @reloaded_course = Course.find(@course.pid)
+        @reloaded_course.textbooks.should == [@t2]
       end
     end
   end
 
+  describe "association hooks" do
+    describe "for habtm" do
+      before :all do
+        class LibraryBook < ActiveFedora::Base
+          has_and_belongs_to_many :pages, :property=>:is_part_of, after_remove: :after_hook, before_remove: :before_hook
+
+          def before_hook(m)
+            say_hi(m)
+            m.reload.library_books.count.should == 1
+          end
+
+          def after_hook(m)
+            say_hi(m)
+            m.reload.library_books.count.should == 0
+          end
+
+
+        end
+        class Page < ActiveFedora::Base
+          has_many :library_books, :property=>:is_part_of
+        end
+          
+      end
+      after :all do
+        Object.send(:remove_const, :LibraryBook)
+        Object.send(:remove_const, :Page)
+      end
+
+      describe "removing association" do
+        subject {LibraryBook.create}
+        before do
+          @p1 = Page.create
+          @p2 = Page.create
+          subject.pages << @p1 << @p2
+          subject.save!
+        end
+        it "should save between the before and after hooks" do
+          subject.should_receive(:say_hi).with(@p2).twice
+          subject.pages.delete(@p2)
+        end
+      end
+    end
+    describe "for has_many" do
+      before :all do
+        class LibraryBook < ActiveFedora::Base
+          has_many :pages, :property=>:is_part_of, after_remove: :say_hi
+
+        end
+        class Page < ActiveFedora::Base
+          belongs_to :library_book, :property=>:is_part_of
+        end
+          
+      end
+      after :all do
+        Object.send(:remove_const, :LibraryBook)
+        Object.send(:remove_const, :Page)
+      end
+
+      describe "removing association" do
+        subject {LibraryBook.new}
+        before do
+          @p1 = subject.pages.build
+          @p2 = subject.pages.build
+        end
+        it "should run the hooks" do
+          subject.should_receive(:say_hi).with(@p2)
+          subject.pages.delete(@p2)
+        end
+      end
+    end
+  end
 
 
   describe "when a object is deleted" do

data/spec/integration/base_spec.rb

@@ -21,14 +21,13 @@ describe "A base object with metadata" do
       obj.foo.should_not be_new
       obj.foo.person.should == ['bob']
       person_field = ActiveFedora::SolrService.solr_name('person', type: :string)
-      ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@obj.pid, person_field =>['bob']}
+      ActiveFedora::SolrService.query("{!raw f=id}#{@obj.pid}", :fl=>"id #{person_field}").first.should == {"id"=>@obj.pid, person_field =>['bob']}
     end
   end
 
   describe "setting object state" do
     it "should store it" do
       obj = MockAFBaseRelationship.create
-      obj.state.should == 'A'
       obj.state='D'
       obj.save!
       obj.reload
@@ -39,8 +38,8 @@ describe "A base object with metadata" do
   describe "that already exists in the repo" do
     before do
       @release = MockAFBaseRelationship.create()
-      @release.add_relationship(:is_governed_by, 'info:fedora/narmdemo:catalog-fixture')
-      @release.add_relationship(:is_part_of, 'info:fedora/narmdemo:777')
+      @release.add_relationship(:is_governed_by, 'info:fedora/test:catalog-fixture')
+      @release.add_relationship(:is_part_of, 'info:fedora/test:777')
       @release.foo.person = "test foo content"
       @release.save
     end
@@ -58,21 +57,21 @@ describe "A base object with metadata" do
     describe "clone_into a new object" do
       before do
         begin
-          new_object = MockAFBaseRelationship.find('narm:999')
+          new_object = MockAFBaseRelationship.find('test:999')
           new_object.delete
         rescue ActiveFedora::ObjectNotFoundError
         end
         
-        new_object = MockAFBaseRelationship.create(:pid => 'narm:999')
+        new_object = MockAFBaseRelationship.create(:pid => 'test:999')
         @release.clone_into(new_object)
-        @new_object = MockAFBaseRelationship.find('narm:999')
+        @new_object = MockAFBaseRelationship.find('test:999')
       end
       it "should have all the assertions" do
         @new_object.rels_ext.content.should be_equivalent_to '<rdf:RDF xmlns:ns1="info:fedora/fedora-system:def/model#" xmlns:ns2="info:fedora/fedora-system:def/relations-external#" xmlns:ns0="http://projecthydra.org/ns/relations#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-         <rdf:Description rdf:about="info:fedora/narm:999">
-           <ns0:isGovernedBy rdf:resource="info:fedora/narmdemo:catalog-fixture"/>
+         <rdf:Description rdf:about="info:fedora/test:999">
+           <ns0:isGovernedBy rdf:resource="info:fedora/test:catalog-fixture"/>
            <ns1:hasModel rdf:resource="info:fedora/afmodel:MockAFBaseRelationship"/>
-           <ns2:isPartOf rdf:resource="info:fedora/narmdemo:777"/>
+           <ns2:isPartOf rdf:resource="info:fedora/test:777"/>
 
          </rdf:Description>
        </rdf:RDF>'
@@ -89,9 +88,9 @@ describe "A base object with metadata" do
       it "should have all the assertions" do
         @new_object.rels_ext.content.should be_equivalent_to '<rdf:RDF xmlns:ns1="info:fedora/fedora-system:def/model#" xmlns:ns2="info:fedora/fedora-system:def/relations-external#" xmlns:ns0="http://projecthydra.org/ns/relations#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
          <rdf:Description rdf:about="info:fedora/'+ @new_object.pid+'">
-           <ns0:isGovernedBy rdf:resource="info:fedora/narmdemo:catalog-fixture"/>
+           <ns0:isGovernedBy rdf:resource="info:fedora/test:catalog-fixture"/>
            <ns1:hasModel rdf:resource="info:fedora/afmodel:MockAFBaseRelationship"/>
-           <ns2:isPartOf rdf:resource="info:fedora/narmdemo:777"/>
+           <ns2:isPartOf rdf:resource="info:fedora/test:777"/>
 
          </rdf:Description>
        </rdf:RDF>'
@@ -219,16 +218,6 @@ describe ActiveFedora::Base do
       @test_object.pid.should_not be_nil
     end
   end
-
-  describe '.assign_pid' do
-    it "should get nextid" do
-      one = ActiveFedora::Base.assign_pid(ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'changeme'))
-      two = ActiveFedora::Base.assign_pid(ActiveFedora::UnsavedDigitalObject.new(ActiveFedora::Base, 'changeme'))
-      one = one.gsub('changeme:', '').to_i
-      two = two.gsub('changeme:', '').to_i
-      two.should == one + 1
-    end
-  end
   
   describe "#save" do
     before(:each) do
@@ -257,7 +246,6 @@ describe ActiveFedora::Base do
       inner_object = @test_object2.inner_object
       inner_object.pid.should == @test_object2.pid
       inner_object.should respond_to(:lastModifiedDate)
-      inner_object.ownerId.should == "fedoraAdmin"
     end
   end
   
@@ -296,16 +284,6 @@ describe ActiveFedora::Base do
     end
   end
   
-  describe ".dc" do
-    it "should expose the DC datastream" do
-      dc = @test_object.dc
-      dc.should be_a_kind_of(ActiveFedora::Datastream)
-      rexml = REXML::Document.new(dc.content)
-      rexml.root.elements["dc:identifier"].get_text.should_not be_nil
-    end
-  end
-
-  
   describe '.rels_ext' do
     it "should retrieve RelsExtDatastream object via rels_ext method" do
       @test_object.rels_ext.should be_instance_of(ActiveFedora::RelsExtDatastream)
@@ -437,10 +415,10 @@ describe ActiveFedora::Base do
   
   describe "#exists?" do
     it "should return true for objects that exist" do
-      ActiveFedora::Base.exists?('hydrangea:fixture_mods_article1').should be_true
+      ActiveFedora::Base.exists?('test:fixture_mods_article1').should be_true
     end
     it "should return false for objects that don't exist" do
-      ActiveFedora::Base.exists?('nil:object').should be_false
+      ActiveFedora::Base.exists?('test:missing_object').should be_false
     end
     it "should return false for nil" do
       ActiveFedora::Base.exists?(nil).should be_false