active-fedora 4.1.0 → 4.2.0

data/lib/active_fedora/rdf_datastream.rb

@@ -87,8 +87,8 @@ module ActiveFedora
               config[:predicate_mapping][vocab] = { name => predicate } 
             end
             # stuff data_type and behaviors in there for to_solr support
-            config[:predicate_mapping][vocab]["#{name}type".to_sym] = data_type if indexing
-            config[:predicate_mapping][vocab]["#{name}behaviors".to_sym] = behaviors if indexing
+            config[:predicate_mapping][vocab]["#{name}__type".to_sym] = data_type if indexing
+            config[:predicate_mapping][vocab]["#{name}__behaviors".to_sym] = behaviors if indexing
           else
             config = {
               :default_namespace => vocab,
@@ -97,8 +97,8 @@ module ActiveFedora
               }
             }
             # stuff data_type and behaviors in there for to_solr support
-            config[:predicate_mapping][vocab]["#{name}type".to_sym] = data_type if indexing
-            config[:predicate_mapping][vocab]["#{name}behaviors".to_sym] = behaviors if indexing
+            config[:predicate_mapping][vocab]["#{name}__type".to_sym] = data_type if indexing
+            config[:predicate_mapping][vocab]["#{name}__behaviors".to_sym] = behaviors if indexing
           end
         end
       end
@@ -145,20 +145,40 @@ module ActiveFedora
     end
     
     include ModelMethods
-      
-    def serialize! # :nodoc:
-      if graph.dirty
-        self.content = serialize
+    attr_accessor :loaded
+
+    def ensure_loaded
+      return if loaded 
+      self.loaded = true
+      unless new?
+        deserialize content
       end
     end
 
-    def content= *args
-      @graph = nil
+    def dirty?
+      graph.dirty
+    end
+
+    def save
       super
+      graph.dirty = false
+    end
+
+    def serialize! # :nodoc:
+      return unless dirty?
+      return unless loaded
+      self.content = serialize
+    end
+
+    def content=(content)
+      super
+      @graph = RelationshipGraph.new
+      deserialize(content)
     end
 
     # returns a Hash, e.g.: {field => {:values => [], :type => :something, :behaviors => []}, ...}
     def fields
+      ensure_loaded
       field_map = {}
       graph.relationships.each do |predicate, values|
         vocab_sym, name = predicate.qname
@@ -168,15 +188,16 @@ module ActiveFedora
         config = self.class.config[:predicate_mapping][vocab.to_s]
 
         name, indexed_as = config.select { |k, v| name.to_s == v.to_s && k.to_s.split("__")[0] == self.class.prefix(name).to_s.split("__")[0]}.first
-        next unless name and config.has_key?("#{name}type".to_sym) and config.has_key?("#{name}behaviors".to_sym)
-        type = config["#{name}type".to_sym]
-        behaviors = config["#{name}behaviors".to_sym]
+        next unless name and config.has_key?("#{name}__type".to_sym) and config.has_key?("#{name}__behaviors".to_sym)
+        type = config["#{name}__type".to_sym]
+        behaviors = config["#{name}__behaviors".to_sym]
         field_map[name.to_sym] = {:values => values.map {|v| v.to_s}, :type => type, :behaviors => behaviors}
       end
       field_map
     end
 
     def to_solr(solr_doc = Hash.new) # :nodoc:
+      ensure_loaded
       fields.each do |field_key, field_info|
         values = field_info.fetch(:values, false)
         if values
@@ -199,25 +220,33 @@ module ActiveFedora
       RDF::URI(result.reverse.join)
     end
 
-    def graph
-      @graph ||= begin
-        graph = RelationshipGraph.new
-        unless new?
-          RDF::Reader.for(serialization_format).new(content) do |reader|
-            reader.each_statement do |statement|
+    # Populate a RDFDatastream object based on the "datastream" content 
+    # Assumes that the datastream contains RDF content
+    # @param [String] data the "rdf" node 
+    def deserialize(data)
+      unless data.nil?
+        RDF::Reader.for(serialization_format).new(data) do |reader|
+          reader.each_statement do |statement|
+            begin
               next unless statement.subject == rdf_subject
-              literal = statement.object.kind_of?(RDF::Literal)
-              object = literal ? statement.object.value : statement.object.to_s
-              graph.add(statement.predicate, object, literal)
+            rescue
             end
+            literal = statement.object.kind_of?(RDF::Literal)
+            object = literal ? statement.object.value : statement.object.to_s
+            graph.add(statement.predicate, object, literal)
           end
         end
-        graph
       end
+      graph
+    end
+
+    def graph
+      @graph ||= RelationshipGraph.new
     end
 
     # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
     def get_values(predicate)
+      ensure_loaded
       predicate = find_predicate(predicate) unless predicate.kind_of? RDF::URI
       results = graph[predicate]
       return if results.nil?
@@ -231,6 +260,7 @@ module ActiveFedora
     # if there are any existing statements with this predicate, replace them
     # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
     def set_value(predicate, args)
+      ensure_loaded
       predicate = find_predicate(predicate) unless predicate.kind_of? RDF::URI
       graph.delete(predicate)
       args = [args] unless args.respond_to? :each
@@ -244,6 +274,7 @@ module ActiveFedora
     # append a value 
     # @param [Symbol, RDF::URI] predicate  the predicate to insert into the graph
     def append(predicate, args)
+      ensure_loaded
       predicate = find_predicate(predicate) unless predicate.kind_of? RDF::URI
       graph.add(predicate, args, true)
       graph.dirty = true
@@ -268,9 +299,7 @@ module ActiveFedora
     # Get the subject for this rdf/xml datastream
     def rdf_subject
       @subject ||= self.class.rdf_subject.call(self)
-    end
-    
-   
+    end   
 
     # Creates a RDF datastream for insertion into a Fedora Object
     # Note: This method is implemented on SemanticNode instead of RelsExtDatastream because SemanticNode contains the relationships array
@@ -280,6 +309,7 @@ module ActiveFedora
           writer << statement
         end
       end
+      graph.dirty = false
       out
     end
   end

data/lib/active_fedora/semantic_node.rb

@@ -33,6 +33,15 @@ module ActiveFedora
       rels_ext.dirty = true
     end
 
+    # Clears all relationships with the specified predicate
+    # @param predicate
+    def clear_relationship(predicate)
+      relationships(predicate).each do |target|
+        object_relations.delete(predicate, target) 
+      end
+      rels_ext.dirty = true
+    end
+
     # Checks that this object is matches the model class passed in.
     # It requires two steps to pass to return true
     #   1. It has a hasModel relationship of the same model

data/lib/active_fedora/unsaved_digital_object.rb

@@ -14,6 +14,12 @@ module ActiveFedora
       @pid || '__DO_NOT_USE__'
     end
 
+
+    # Set the pid.  This method is only avaialable before the object has been persisted in fedora.
+    def pid=pid
+      @pid = pid
+    end
+
     def new?
       true
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.1.0"
+    VERSION = "4.2.0"
 end

data/lib/tasks/active_fedora_dev.rake

@@ -69,14 +69,23 @@ task :hudson do
   jetty_params = Jettywrapper.load_config
   jetty_params[:startup_wait]= 30
   error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task["active_fedora:load_fixtures"].invoke
-    Rake::Task["active_fedora:rspec"].invoke
+    Rake::Task['active_fedora:coverage'].invoke
   end
   raise "test failures: #{error}" if error
   # Only create documentation if the tests have passed
   Rake::Task["active_fedora:doc"].invoke
 end
 
+desc "Execute specs with coverage"
+task :coverage do 
+  # Put spec opts in a file named .rspec in root
+  ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
+  ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
+
+  Rake::Task["active_fedora:load_fixtures"].invoke
+  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'

data/spec/integration/associations_spec.rb

@@ -190,6 +190,23 @@ describe ActiveFedora::Base do
         Book.find(@book.id).author.send(:find_target).should be_kind_of Person
       end
 
+      describe "when changing the belonger" do
+        before do
+          @book.library = @library
+          @book.save
+          @library2 = Library.create
+        end
+        it "should replace an existing instance" do
+          @book.library_id.should == @library.id
+          @book.library = @library2
+          @book.save
+          Book.find(@book.id).library_id.should == @library2.id
+        end
+        after do
+          @library2.delete
+        end
+      end
+
       after do
         @library.delete
         @book.delete

data/spec/integration/base_spec.rb

@@ -1,31 +1,6 @@
 require 'spec_helper'
 
-
-describe "Datastreams synched together" do
-  before do
-    class DSTest < ActiveFedora::Base
-      def load_datastreams
-        super
-        unless self.datastreams.keys.include? 'test_ds'
-         add_file_datastream("XXX",:dsid=>'test_ds', :mimeType=>'text/html')
-        end
-      end
-    end
-  end
-  it "Should update datastream" do
-    @nc = DSTest.new
-    @nc.save
-    @nc.test_ds.content.should == 'XXX'
-    ds  = @nc.datastreams['test_ds']
-    ds.content = "Foobar"
-    @nc.save
-    DSTest.find(@nc.pid).datastreams['test_ds'].content.should == 'Foobar'
-    DSTest.find(@nc.pid).test_ds.content.should == 'Foobar'
-  end
-
-end
-
-describe "has_metadata" do
+describe "A base object with metadata" do
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base
       has_metadata :name=>'foo', :type=>Hydra::ModsArticleDatastream 
@@ -46,24 +21,100 @@ describe "has_metadata" do
     end
   end
 
-
-  describe "a changed document" do
+  describe "that already exists in the repo" do
     before do
-      @obj = MockAFBaseRelationship.new
-      @obj.foo.person = "bob"
-      @obj.save
-      @obj.foo.person = "frank"
-      @obj.save
+      @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.foo.person = "test foo content"
+      @release.save
+    end
+    describe "and has been changed" do
+      before do
+        @release.foo.person = 'frank'
+        @release.save
+      end
+      it "should save the datastream." do
+        MockAFBaseRelationship.find(@release.pid).foo.person.should == ['frank']
+        ActiveFedora::SolrService.query("id:#{@release.pid.gsub(":", "\\:")}", :fl=>'id person_t').first.should == {"id"=>@release.pid, 'person_t'=>['frank']}
+      end
     end
-    it "should save the datastream." do
-      ActiveFedora::Base.find(@obj.pid, :cast=>true).foo.person.should == ['frank']
-      ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>'id person_t').first.should == {"id"=>@obj.pid, 'person_t'=>['frank']}
+    describe "clone_into a new object" do
+      before do
+        begin
+          new_object = MockAFBaseRelationship.find('narm:999')
+          new_object.delete
+        rescue ActiveFedora::ObjectNotFoundError
+        end
+        
+        new_object = MockAFBaseRelationship.create(:pid => 'narm:999')
+        @release.clone_into(new_object)
+        @new_object = MockAFBaseRelationship.find('narm: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"/>
+           <ns1:hasModel rdf:resource="info:fedora/afmodel:MockAFBaseRelationship"/>
+           <ns2:isPartOf rdf:resource="info:fedora/narmdemo:777"/>
+
+         </rdf:Description>
+       </rdf:RDF>'
+      end
+      it "should have the other datastreams too" do
+        @new_object.datastreams.keys.should include "foo"
+        @new_object.foo.content.should be_equivalent_to @release.foo.content
+      end
+    end
+    describe "clone" do
+      before do
+        @new_object = @release.clone
+      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/'+ @new_object.pid+'">
+           <ns0:isGovernedBy rdf:resource="info:fedora/narmdemo:catalog-fixture"/>
+           <ns1:hasModel rdf:resource="info:fedora/afmodel:MockAFBaseRelationship"/>
+           <ns2:isPartOf rdf:resource="info:fedora/narmdemo:777"/>
+
+         </rdf:Description>
+       </rdf:RDF>'
+      end
+      it "should have the other datastreams too" do
+        @new_object.datastreams.keys.should include "foo"
+        @new_object.foo.content.should be_equivalent_to @release.foo.content
+      end
     end
   end
+end
+
+describe "Datastreams synched together" do
+  before do
+    class DSTest < ActiveFedora::Base
+      def load_datastreams
+        super
+        unless self.datastreams.keys.include? 'test_ds'
+         add_file_datastream("XXX",:dsid=>'test_ds', :mimeType=>'text/html')
+        end
+      end
+    end
+  end
+  it "Should update datastream" do
+    @nc = DSTest.new
+    @nc.save
+    @nc.test_ds.content.should == 'XXX'
+    ds  = @nc.datastreams['test_ds']
+    ds.content = "Foobar"
+    @nc.save
+    DSTest.find(@nc.pid).datastreams['test_ds'].content.should == 'Foobar'
+    DSTest.find(@nc.pid).test_ds.content.should == 'Foobar'
+  end
 
 end
 
 
+
+
 describe ActiveFedora::Base do
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base

data/spec/integration/datastream_spec.rb

@@ -55,4 +55,33 @@ describe ActiveFedora::Datastream do
     
   end
   
+  it "should be able to set the versionable attribute" do
+    dsid = "ds#{Time.now.to_i}"
+    v1 = "<version1>data</version1>"
+    v2 = "<version2>data</version2>"
+    ds = ActiveFedora::Datastream.new(@test_object.inner_object, dsid)
+    ds.content = v1
+    ds.versionable = false
+    @test_object.add_datastream(ds).should be_true
+    @test_object.save
+    to = ActiveFedora::Base.find(@test_object.pid)
+    ds = to.datastreams[dsid]
+    ds.versionable.should be_false
+    ds.versionable = true
+    to.save
+    ds.content = v2
+    to.save
+    versions = ds.versions
+    versions.length.should == 2
+    # order of versions not guaranteed
+    if versions[0].content == v2
+      versions[1].content.should == v1
+      versions[0].asOfDateTime.should be >= versions[1].asOfDateTime
+    else
+      versions[0].content.should == v1
+      versions[1].content.should == v2   
+      versions[1].asOfDateTime.should be >= versions[0].asOfDateTime
+    end
+    ds.content.should == v2
+  end
 end

data/spec/integration/ntriples_datastream_spec.rb

@@ -64,6 +64,13 @@ describe ActiveFedora::NtriplesRDFDatastream do
     @subject.part << "thing 2"
     @subject.part.should == ["thing 1", "thing 2"]
   end
+  it "should delete a value" do
+    @subject.title = "Hamlet"
+    @subject.save
+    @subject.title = ""
+    @subject.save
+    @subject.title.should be_nil
+  end
   it "should delete values" do
     @subject.title = "Hamlet"
     @subject.related_url = "http://psu.edu/"

data/spec/spec_helper.rb

@@ -1,5 +1,14 @@
 ENV["environment"] ||= 'test'
 require "bundler/setup"
+
+if ENV['COVERAGE'] and RUBY_VERSION =~ /^1.9/
+  require 'simplecov'
+  require 'simplecov-rcov'
+
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
+end
+
 require 'active-fedora'
 require 'rspec'
 require 'equivalent-xml/rspec_matchers'