active-fedora 4.0.0.rc16 → 4.0.0.rc17

data/lib/active_fedora/rdf_datastream.rb

@@ -46,7 +46,7 @@ module ActiveFedora
         end
 
         def register_vocabularies(*vocabs)
-          @vocabularies = {}
+          @vocabularies ||= {}
           vocabs.each do |v|
             if v.is_a?(RDF::Vocabulary) or (v.respond_to? :property and v.respond_to? :to_uri)
               @vocabularies[v.to_uri] = v 
@@ -57,6 +57,7 @@ module ActiveFedora
           ActiveFedora::Predicates.vocabularies(@vocabularies)
           @vocabularies
         end
+
         def map_predicates(&block)
           yield self
         end
@@ -144,26 +145,20 @@ module ActiveFedora
     end
     
     include ModelMethods
-    attr_accessor :loaded
-
-    def ensure_loaded
-      return if loaded 
-      self.loaded = true
-      unless new?
-        deserialize content
-      end
-    end
-    
+      
     def serialize! # :nodoc:
       if graph.dirty
-        return unless loaded 
         self.content = serialize
       end
     end
 
+    def content= *args
+      @graph = nil
+      super
+    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
@@ -182,7 +177,6 @@ module ActiveFedora
     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
@@ -206,12 +200,24 @@ module ActiveFedora
     end
 
     def graph
-      @graph ||= RelationshipGraph.new
+      @graph ||= begin
+        graph = RelationshipGraph.new
+        unless new?
+          RDF::Reader.for(serialization_format).new(content) do |reader|
+            reader.each_statement do |statement|
+              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)
+            end
+          end
+        end
+        graph
+      end
     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?
@@ -225,7 +231,6 @@ 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
@@ -239,7 +244,6 @@ 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
@@ -266,22 +270,7 @@ module ActiveFedora
       @subject ||= self.class.rdf_subject.call(self)
     end
     
-    # Populate a RDFDatastream object based on the "datastream" content 
-    # Assumes that the datastream contains RDF XML from a Fedora RELS-EXT datastream 
-    # @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|
-            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)
-          end
-        end
-      end
-      graph
-    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

data/lib/active_fedora/rels_ext_datastream.rb

@@ -80,7 +80,6 @@ module ActiveFedora
     # ====Warning
     #  Solr must be synchronized with RELS-EXT data in Fedora.
     def from_solr(solr_doc)
-      profile_from_solr(solr_doc)
       #cycle through all possible predicates
       model.relationships_loaded = true
       Predicates.predicate_mappings.each_pair do |namespace,predicates|

data/lib/active_fedora/solr_digital_object.rb

@@ -2,26 +2,21 @@ module ActiveFedora
   class SolrDigitalObject
     attr_reader :pid, :label, :state, :ownerId, :profile, :datastreams, :solr_doc
     
-    def initialize(solr_doc, klass=ActiveFedora::Base)
+    def initialize(solr_doc, profile_hash, klass=ActiveFedora::Base)
       @solr_doc = solr_doc
       @pid = solr_doc[SOLR_DOCUMENT_ID]
-      profile_attrs = solr_doc.keys.select { |k| k =~ /^objProfile_/ }
       @profile = {}
-      profile_attrs.each do |key|
-        attr_name = key.split(/_/)[1..-2].join('_')
-        @profile[attr_name] = Array(solr_doc[key]).first.to_s
-      end
+      profile_hash.each_pair { |key,value| @profile[key] = value.to_s if key =~ /^obj/ }
       @profile['objCreateDate'] ||= Time.now.xmlschema
       @profile['objLastModDate'] ||= @profile['objCreateDate']
 
       @datastreams = {}
       
-      dsids = @solr_doc.keys.collect { |k| k.scan(/^(.+)_dsProfile_/).flatten.first }.compact.uniq
+      dsids = profile_hash['datastreams'].keys
       missing = dsids - klass.ds_specs.keys
       missing.each do |dsid|
         #Initialize the datastreams that are in the solr document, but not found in the classes spec.
-        mime_key = ActiveFedora::SolrService.solr_name("#{dsid}_dsProfile_dsMIME",:symbol)
-        mime_type = Array(@solr_doc[mime_key]).first
+        mime_type = profile_hash['datastreams'][dsid]['dsMIME']
         ds_class = mime_type =~ /[\/\+]xml$/ ? NokogiriDatastream : Datastream
         @datastreams[dsid] = ds_class.new(self, dsid)
       end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-    VERSION = "4.0.0.rc16"
+    VERSION = "4.0.0.rc17"
 end

data/lib/tasks/active_fedora.rake

@@ -47,7 +47,7 @@ namespace :repo do
         dir = File.join('spec', 'fixtures')
       end
       filename = ActiveFedora::FixtureExporter.export_to_path(pid, dir)
-      puts "The object has been saved as #{filename}"
+      puts "The object has been saved as #{filename}" if filename
     end
   end
   
@@ -68,6 +68,7 @@ namespace :repo do
     else
       puts "You must specify the foxml path or provide its pid.  Example: rake repo:load foxml=spec/fixtures/demo_12.foxml.xml"
     end
+    puts "Loaded '#{pid}' into #{ActiveFedora::Base.connection_for_pid(pid).client.url}" if pid
   end
 
 

data/spec/integration/base_find_by_fields_spec.rb

@@ -30,6 +30,9 @@ describe ActiveFedora::Base do
                   [:title]=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
     @test_object2.update_indexed_attributes(attributes)
     @test_object2.save
+    slr = @test_object2.to_solr
+    # puts "PID: #{@test_object2.pid}"
+    # puts "ID: #{slr[:id]} #{slr["active_fedora_model_s"]}"
     sleep(1)
     
     @test_object3 = MockAFBaseQuerySolr.new

data/spec/integration/full_featured_model_spec.rb

@@ -45,16 +45,16 @@ describe ActiveFedora::Base do
           # my_oral_history.subjects  OR   my_oral_history.titles  OR EVEN my_oral_history.title whenever possible
           
           # Setting new Types for dates and text content
-          m.field "creation_date", :date, :xml_node => "date"
-          m.field "abstract", :text, :xml_node => "abstract"
-          m.field "rights", :text, :xml_node => "rights"
+          #m.field "creation_date", :date, :xml_node => "date"
+          #m.field "abstract", :text, :xml_node => "abstract"
+          #m.field "rights", :text, :xml_node => "rights"
           
           # Setting up special named fields
-          m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH" 
-          m.field "spatial_coverage", :string, :xml_node => "spatial", :encoding => "TGN"
-          m.field "temporal_coverage", :string, :xml_node => "temporal", :encoding => "Period"
-          m.field "type", :string, :xml_node => "type", :encoding => "DCMITYPE"
-          m.field "alt_title", :string, :xml_node => "alternative"
+          #m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH" 
+          #m.field "spatial_coverage", :string, :xml_node => "spatial", :encoding => "TGN"
+          #m.field "temporal_coverage", :string, :xml_node => "temporal", :encoding => "Period"
+          #m.field "type", :string, :xml_node => "type", :encoding => "DCMITYPE"
+          #m.field "alt_title", :string, :xml_node => "alternative"
         end
         
         has_metadata :name => "significant_passages", :type => ActiveFedora::MetadataDatastream do |m|
@@ -87,10 +87,17 @@ describe ActiveFedora::Base do
                                     :notes => sample_notes, :hard_copy_availability => sample_hard_copy_availability, :hard_copy_location => "Archives", :other_contributor => sample_other_contributor, 
                                     :restrictions => "None", :series => "My Series", :location => sample_location]
 
-    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => 'Jewish Women\\\'s Archive', :description => "description", :identifier => "jwa:sample_pid", 
-                                    :title => "title", :alt_title => "alt_title", :subject => "subject", :subject_heading => "subject heading", 
-                                    :creation_date => "2008-07-02T05:09:42.015Z", :language => "language", :spatial_coverage => "spatial coverage", 
-                                    :temporal_coverage => "temporal coverage", :abstract => "abstract", :rights => "rights", :type => "type", :extent => "extent", 
+    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => "Jewish Womens's Archive", :description => "description", :identifier => "jwa:sample_pid", 
+                                    :title => "title", 
+                                    #:alt_title => "alt_title", :subject => "subject", 
+                                    #:subject_heading => "subject heading", 
+                                    #:creation_date => "2008-07-02T05:09:42.015Z", 
+                                    :language => "language", 
+                                    #:spatial_coverage => "spatial coverage", 
+                                    #:temporal_coverage => "temporal coverage", 
+                                    #:abstract => "abstract",
+                                    :rights => "rights", :type => "type",
+                                    #:extent => "extent", 
                                     :format => "format", :medium => "medium"]
     @signigicant_passages_sample_values = {}
     @sensitive_passages_sample_values = {}     
@@ -134,7 +141,7 @@ describe ActiveFedora::Base do
     end
     
     @dublin_core_sample_values.each_pair do |field, value|
-      dublin_core_ds.send("#{field.to_s}_values=", [value])
+      dublin_core_ds.send("#{field.to_s}=", [value])
     end
     
     @test_history.save
@@ -145,20 +152,19 @@ describe ActiveFedora::Base do
     end
     
     @dublin_core_sample_values.each_pair do |field, value|
-      dublin_core_ds.send("#{field.to_s}_values").should == [value]
+      next if [:format, :type].include?(field)  #format and type are methods declared on Object
+      dublin_core_ds.send("#{field.to_s}").should == [value]
     end    
   end
   
   it "should have Qualified Dublin core, with custom accessors" do
     
-    #xml = REXML::Document.new(@test_history.to_xml.to_s)
     dublin_core_ds = @test_history.datastreams["dublin_core"]
     
-    dublin_core_ds.subject_heading_values = "My Subject Heading"
-    dc_xml = REXML::Document.new(dublin_core_ds.to_dc_xml)
+    dublin_core_ds.subject = "My Subject Heading"
+    dc_xml = REXML::Document.new(dublin_core_ds.to_xml)
     
     dc_xml.root.elements["dcterms:subject"].text.should == "My Subject Heading"
-    dc_xml.root.elements["dcterms:subject"].attributes["xsi:type"].should == "LCSH"
     
   end
   

data/spec/integration/metadata_datastream_helper_spec.rb

@@ -16,6 +16,7 @@ class MockMetaHelperSolr < ActiveFedora::Base
     m.field "geography", :string, :xml_node => "geography"
     m.field "title", :string, :xml_node => "title"
   end
+
 end
 
 describe ActiveFedora::MetadataDatastreamHelper do
@@ -44,7 +45,7 @@ describe ActiveFedora::MetadataDatastreamHelper do
     it 'should return an object with the appropriate metadata fields filled in' do
       @test_object = MockMetaHelperSolr.new
       attributes = {"holding_id"=>{0=>"Holding 1"},
-                    "language"=>{0=>"Italian"},
+                    "language" =>{0=>"Italian"},
                     "creator"=>{0=>"Linguist, A."},
                     "geography"=>{0=>"Italy"},
                     "title"=>{0=>"Italian and Spanish: A Comparison of Common Phrases"}}
@@ -74,23 +75,23 @@ describe ActiveFedora::MetadataDatastreamHelper do
       test_from_solr_object2 = MockMetaHelperSolr.load_instance_from_solr(@test_object2.pid)
       test_from_solr_object3 = MockMetaHelperSolr.load_instance_from_solr(@test_object3.pid)
       
-      test_from_solr_object.fields[:language][:values].should == ["Italian"]
-      test_from_solr_object.fields[:creator][:values].should == ["Linguist, A."]
-      #test_from_solr_object.fields[:geography][:values].should == ["Italy"]
-      test_from_solr_object.fields[:title][:values].should == ["Italian and Spanish: A Comparison of Common Phrases"]
+      test_from_solr_object.descMetadata.language.should == ["Italian"]
+      test_from_solr_object.descMetadata.creator.should == ["Linguist, A."]
+      test_from_solr_object.descMetadata.geography.should == ["Italy"]
+      test_from_solr_object.descMetadata.title.should == ["Italian and Spanish: A Comparison of Common Phrases"]
       #test_from_solr_object.fields[:holding_id][:values].should == ["Holding 1"]
       
-      test_from_solr_object2.fields[:language][:values].should == ["Spanish;Latin"]
-      test_from_solr_object2.fields[:creator][:values].should == ["Linguist, A."]
-      #test_from_solr_object2.fields[:geography][:values].should == ["Spain"]
-      test_from_solr_object2.fields[:title][:values].should == ["A study of the evolution of Spanish from Latin"]
+      test_from_solr_object2.descMetadata.language.should == ["Spanish;Latin"]
+      test_from_solr_object2.descMetadata.creator.should == ["Linguist, A."]
+      test_from_solr_object2.descMetadata.geography.should == ["Spain"]
+      test_from_solr_object2.descMetadata.title.should == ["A study of the evolution of Spanish from Latin"]
       #test_from_solr_object2.fields[:holding_id][:values].should == ["Holding 2"]
       
-      test_from_solr_object3.fields[:language][:values].should == ["Spanish;Latin"]
-      test_from_solr_object3.fields[:creator][:values].should == ["Linguist, A."]
-      #test_from_solr_object3.fields[:geography][:values].should == ["Spain"]
-      test_from_solr_object3.fields[:title][:values].should == ["An obscure look into early nomadic tribes of Spain"]
-      #test_from_solr_object3.fields[:holding_id][:values].should == ["Holding 3"]
+      test_from_solr_object3.descMetadata.language.should == ["Spanish;Latin"]
+      test_from_solr_object3.descMetadata.creator.should == ["Linguist, A."]
+      test_from_solr_object3.descMetadata.geography.should == ["Spain"]
+      test_from_solr_object3.descMetadata.title.should == ["An obscure look into early nomadic tribes of Spain"]
+      #test_from_solr_object3.properties.holding_id.should == ["Holding 3"]
       
       
     end

data/spec/integration/model_spec.rb

@@ -1,12 +1,7 @@
 require 'spec_helper'
-#require 'spec/samples/models/hydrangea_article'
-
-include ActiveFedora::Model
-include Mocha::API
 
 describe ActiveFedora::Model do
   
-  
   before(:each) do 
     module ModelIntegrationSpec
       

data/spec/integration/solr_service_spec.rb

@@ -13,14 +13,7 @@ describe ActiveFedora::SolrService do
           m.field "holding_id", :string
         end
   
-        has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-          m.field "created", :date, :xml_node => "created"
-          m.field "language", :string, :xml_node => "language"
-          m.field "creator", :string, :xml_node => "creator"
-          # Created remaining fields
-          m.field "geography", :string, :xml_node => "geography"
-          m.field "title", :string, :xml_node => "title"
-        end
+        has_metadata :name => "descMetadata", :type => ActiveFedora::QualifiedDublinCoreDatastream
       end
       @test_object = ActiveFedora::Base.new
       @test_object.label = 'test_object'

data/spec/samples/oral_history_sample_model.rb

@@ -17,17 +17,8 @@ class OralHistorySampleModel < ActiveFedora::Base
       m.field "location", :string
     end
     
-    has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
-      m.field "creation_date", :date, :xml_node => "date"
-      m.field "abstract", :text, :xml_node => "abstract"
-      m.field "rights", :text, :xml_node => "rights"
-      m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH" 
-      m.field "spatial_coverage", :string, :xml_node => "spatial", :encoding => "TGN"
-      m.field "temporal_coverage", :string, :xml_node => "temporal", :encoding => "Period"
-      m.field "type", :string, :xml_node => "type", :encoding => "DCMITYPE"
-      m.field "alt_title", :string, :xml_node => "alternative"
-    end
-    
+    has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream
+
     has_metadata :name => "significant_passages", :type => ActiveFedora::MetadataDatastream do |m|
       m.field "significant_passage", :text
     end

data/spec/samples/special_thing.rb

@@ -1,4 +1,4 @@
-require "spec/samples/marpa-dc_datastream.rb"
+require "samples/marpa-dc_datastream.rb"
 
 # This is an example of an ActiveFedora Model
 #

data/spec/unit/base_extra_spec.rb

@@ -88,16 +88,13 @@ describe ActiveFedora::Base do
         ds.stubs(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
         ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
       end
-      mock1.expects(:solrize_profile)
-      mock2.expects(:solrize_profile)
-      mock3.expects(:solrize_profile)
+      mock1.expects(:solrize_profile).returns({})
+      mock2.expects(:solrize_profile).returns({})
+      mock3.expects(:solrize_profile).returns({})
       mock1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
       mock3.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
-      #mock3.expects(:kind_of?).with(ActiveFedora::RelsExtDatastream).returns(true)
-
-      @test_object.expects(:datastreams).returns(mock_datastreams)
-      @test_object.expects(:solrize_profile)
+      @test_object.expects(:datastreams).twice.returns(mock_datastreams)
       @test_object.expects(:solrize_relationships)
       @test_object.update_index
     end
@@ -113,16 +110,13 @@ describe ActiveFedora::Base do
         ds.stubs(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(false)
         ds.stubs(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(false)
       end
-      mock1.expects(:solrize_profile)
-      mock2.expects(:solrize_profile)
-      mock3.expects(:solrize_profile)
+      mock1.expects(:solrize_profile).returns({})
+      mock2.expects(:solrize_profile).returns({})
+      mock3.expects(:solrize_profile).returns({})
       mock1.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
       mock2.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
       mock3.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
-      #mock3.expects(:kind_of?).with(ActiveFedora::RelsExtDatastream).returns(true)
-
-      @test_object.expects(:datastreams).returns(mock_datastreams)
-      @test_object.expects(:solrize_profile)
+      @test_object.expects(:datastreams).twice.returns(mock_datastreams)
       @test_object.expects(:solrize_relationships)
       @test_object.update_index
     end

data/spec/unit/base_spec.rb

@@ -211,10 +211,8 @@ describe ActiveFedora::Base do
       end
       
       it "should call .fields on all MetadataDatastreams and return the resulting document" do
-        mock1 = mock("ds1", :fields => {})
-        mock2 = mock("ds2", :fields => {})
-        mock1.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
-        mock2.expects(:kind_of?).with(ActiveFedora::MetadataDatastream).returns(true)
+        mock1 = mock("ds1", :fields => {}, :class=>ActiveFedora::MetadataDatastream)
+        mock2 = mock("ds2", :fields => {}, :class=>ActiveFedora::MetadataDatastream)
 
         @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2})
         @test_object.fields
@@ -615,8 +613,7 @@ describe ActiveFedora::Base do
         ngds.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(false)
         ngds.expects(:kind_of?).with(ActiveFedora::NokogiriDatastream).returns(true)
         
-        @test_object.expects(:datastreams).returns({:ds1 => mock1, :ds2 => mock2, :ngds => ngds})
-        @test_object.expects(:solrize_profile)
+        @test_object.expects(:datastreams).twice.returns({:ds1 => mock1, :ds2 => mock2, :ngds => ngds})
         @test_object.expects(:solrize_relationships)
         @test_object.to_solr
       end
@@ -625,8 +622,7 @@ describe ActiveFedora::Base do
         mock.expects(:solrize_profile)
         mock.expects(:kind_of?).with(ActiveFedora::RDFDatastream).returns(true)
         
-        @test_object.expects(:datastreams).returns({:ds1 => mock})
-        @test_object.expects(:solrize_profile)
+        @test_object.expects(:datastreams).twice.returns({:ds1 => mock})
         @test_object.expects(:solrize_relationships)
         @test_object.to_solr
       end