active-fedora 5.1.0 → 5.2.0

data/active-fedora.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>0.8.0')
+  s.add_dependency("rubydora", '~>1.0')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
   s.add_dependency("deprecation")
@@ -32,7 +32,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("jettywrapper", ">=1.2.0")
   s.add_development_dependency("rspec", ">= 2.9.0")
   s.add_development_dependency("equivalent-xml")
-  s.add_development_dependency("mocha", "0.10.5")
   
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/active_fedora/datastreams.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   module Datastreams
     extend ActiveSupport::Concern
+    extend Deprecation
 
     included do
       class_attribute :ds_specs
@@ -19,13 +20,17 @@ module ActiveFedora
       before_save :serialize_datastreams
     end
 
+    def ds_specs
+      self.class.ds_specs
+    end
+
     def serialize_datastreams
       datastreams.each {|k, ds| ds.serialize! }
     end
 
     # Adds the disseminator location to the datastream after the pid has been established
     def add_disseminator_location_to_datastreams
-      self.class.ds_specs.each do |name,ds_config|
+      self.ds_specs.each do |name,ds_config|
         ds = datastreams[name]
         if ds && ds.controlGroup == 'E' && ds_config[:disseminator].present?
           ds.dsLocation= "#{ActiveFedora.config_for_environment[:url]}/objects/#{pid}/methods/#{ds_config[:disseminator]}"
@@ -57,7 +62,7 @@ module ActiveFedora
     end
   
     def configure_datastream(ds, ds_spec=nil)
-      ds_spec ||= self.class.ds_specs[ds.instance_variable_get(:@dsid)]
+      ds_spec ||= self.ds_specs[ds.dsid]
       if ds_spec
         ds.model = self if ds_spec[:type] == RelsExtDatastream
         # If you called has_metadata with a block, pass the block into the Datastream class
@@ -72,13 +77,13 @@ module ActiveFedora
     end
 
     def load_datastreams
-      ds_specs = self.class.ds_specs.dup
+      local_ds_specs = self.ds_specs.dup
       inner_object.datastreams.each do |dsid, ds|
         self.add_datastream(ds)
         configure_datastream(datastreams[dsid])
-        ds_specs.delete(dsid)
+        local_ds_specs.delete(dsid)
       end
-      ds_specs.each do |name,ds_spec|
+      local_ds_specs.each do |name,ds_spec|
         ds = datastream_from_spec(ds_spec, name)
         self.add_datastream(ds)
         configure_datastream(ds, ds_spec)
@@ -100,13 +105,7 @@ module ActiveFedora
 
     #return all datastreams of type ActiveFedora::RDFDatastream or ActiveFedora::NokogiriDatastream
     def metadata_streams
-      results = []
-      datastreams.each_value do |ds|
-        if ds.metadata? && !ds.kind_of?(ActiveFedora::RelsExtDatastream)
-          results << ds
-        end
-      end
-      return results
+      datastreams.select { |k, ds| ds.metadata? }.reject { |k, ds| ds.kind_of?(ActiveFedora::RelsExtDatastream) }.values
     end
     
     # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
@@ -167,9 +166,9 @@ module ActiveFedora
     
     
     def create_datastream(type, dsid, opts={})
-      dsid = generate_dsid(opts[:prefix] || "DS") if dsid == nil
+      dsid ||= generate_dsid(opts[:prefix] || "DS")
       klass = type.kind_of?(Class) ? type : type.constantize
-      raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String) || dsid.kind_of?(NilClass)
+      raise ArgumentError, "Argument dsid must be of type string" unless dsid.kind_of?(String)
       ds = klass.new(inner_object, dsid)
       [:mimeType, :controlGroup, :dsLabel, :dsLocation, :checksumType, :versionable].each do |key|
         ds.send("#{key}=".to_sym, opts[key]) unless opts[key].nil?
@@ -202,6 +201,7 @@ module ActiveFedora
         ds.dsLocation= ds_config[:url]
       end
     end
+    deprecation_deprecate :additional_attributes_for_external_and_redirect_control_groups
 
 
     module ClassMethods

data/lib/active_fedora/file_management.rb

@@ -6,9 +6,11 @@ module ActiveFedora
  
     included do
       include ActiveFedora::Relationships
-      has_relationship "collection_members", :has_collection_member
-      has_relationship "part_of", :is_part_of
-      has_bidirectional_relationship "parts", :has_part, :is_part_of
+      Deprecation.silence(ActiveFedora::Relationships::ClassMethods) do
+        has_relationship "collection_members", :has_collection_member
+        has_relationship "part_of", :is_part_of
+        has_bidirectional_relationship "parts", :has_part, :is_part_of
+      end
     end
 
     # List the objects that assert isPartOf pointing at this object _plus_ all objects that this object asserts hasPart for

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -1,7 +1,9 @@
 require 'solrizer/field_name_mapper'
 
 module ActiveFedora::MetadataDatastreamHelper 
-  
+  extend Deprecation
+  self.deprecation_horizon = 'active-fedora 6.0'  
+
   attr_accessor :fields, :xml_loaded
   
   module ClassMethods
@@ -28,6 +30,7 @@ module ActiveFedora::MetadataDatastreamHelper
       self.class.from_xml content, self
     end
   end
+  deprecation_deprecate :ensure_xml_loaded
   
   def serialize! # :nodoc:
     if changed?
@@ -35,5 +38,6 @@ module ActiveFedora::MetadataDatastreamHelper
       self.content = self.to_xml 
     end
   end
+  deprecation_deprecate :serialize!
 
 end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -47,6 +47,12 @@ module ActiveFedora
       Nokogiri::XML::Document.parse("<xml/>")
     end
 
+    def save
+      @content = to_xml
+      super
+    end
+
+
     def ng_xml 
       @ng_xml ||= begin
       self.xml_loaded = true
@@ -76,7 +82,7 @@ module ActiveFedora
 
       new_xml_string = nokogiri_document.to_xml {|config| config.no_declaration}
 
-      ng_xml_will_change! unless (xml_loaded && (new_xml_string.to_s.strip == datastream_content.strip))
+      ng_xml_will_change! unless (xml_loaded && (new_xml_string.to_s.strip == (datastream_content || '').strip))
       self.xml_loaded=true
 
       @ng_xml = nokogiri_document
@@ -94,12 +100,19 @@ module ActiveFedora
     
     # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods 
     def ng_xml_changed?
-      changed_attributes.has_key? 'ng_xml' ||
-       (xml_loaded && (to_xml != datastream_content) )
+      return true if changed_attributes.has_key?('ng_xml')
+
+      return false unless xml_loaded
+
+      if new?
+        !to_xml.empty?
+      else
+       (to_xml.strip != (datastream_content || '').strip)
+     end
     end
 
     def changed?
-     ng_xml_changed? || super
+      ng_xml_changed? || super
     end
 
     def content_changed?

data/lib/active_fedora/rdf_datastream.rb

@@ -1,5 +1,11 @@
 module ActiveFedora
   class RDFDatastream < Datastream
+
+    before_save do
+      return unless graph_changed?
+      content_will_change!
+    end  
+
     # this enables a cleaner API for solr integration
     class IndexObject
       attr_accessor :data_type, :behaviors
@@ -145,46 +151,26 @@ module ActiveFedora
     include ModelMethods
     attr_accessor :loaded
 
-    def ensure_loaded
-      return if loaded 
-      self.loaded = true
-      unless new?
-        deserialize content
-      end
-    end
-
-    def changed?
-      super || dirty?
-    end
-
-    def dirty?
-      graph.dirty
-    end
-
     def metadata?
       true
     end
 
     def save
-      super
-      graph.dirty = false
-    end
+      @content = serialize
+
 
-    def serialize! # :nodoc:
-      return unless dirty?
-      return unless loaded
-      self.content = serialize
+      super
     end
 
     def content=(content)
-      super
-      @graph = RelationshipGraph.new
-      deserialize(content)
+      content_will_change!
+      self.loaded = true
+      @graph = 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
@@ -203,7 +189,7 @@ 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
@@ -229,8 +215,12 @@ module ActiveFedora
     # 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?
+    def deserialize(data = nil)
+      graph = RelationshipGraph.new
+      return graph if new? and data.nil?
+
+      data ||= datastream_content
+
         RDF::Reader.for(serialization_format).new(data) do |reader|
           reader.each_statement do |statement|
             begin
@@ -242,17 +232,51 @@ module ActiveFedora
             graph.add(statement.predicate, object, literal)
           end
         end
-      end
+
       graph
     end
 
     def graph
-      @graph ||= RelationshipGraph.new
+      @graph ||= begin
+        self.loaded = true
+        deserialize
+      end
+    end
+
+    # alias the original datastream content
+    alias :datastream_content :content
+
+    def content
+      # return the RDF graph content if it's available (or all we have)
+      return serialize if loaded or new?
+
+      # otherwise, grab the data from the datastore
+      super
+    end
+    
+    def graph_will_change!
+      changed_attributes['graph'] = nil
+    end
+
+    def graph_changed?
+      return true if changed_attributes.has_key?('graph')
+      return false unless loaded
+
+      if new?
+        !serialize.empty?
+      else
+        serialize.strip != (datastream_content || '').strip
+      end
+
+    end
+
+    def changed?
+       graph_changed? || super
     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?
@@ -266,7 +290,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
@@ -281,7 +305,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
@@ -316,7 +340,6 @@ module ActiveFedora
           writer << statement
         end
       end
-      graph.dirty = false
       out
     end
   end

data/lib/active_fedora/relationships.rb

@@ -93,7 +93,9 @@ module ActiveFedora
     # @param [Boolean] if false it will include inbound relationships (defaults to true)
     # @return [Hash] Returns a hash of subject name (:self or :inbound) mapped to nested hashs of each relationship name mapped to an Array of objects linked via the relationship
     def relationships_by_name(outbound_only=true)
-      @relationships_by_name = relationships_by_name_from_class()
+      Deprecation.silence(ActiveFedora::Relationships) do
+        @relationships_by_name = relationships_by_name_from_class()
+      end
       outbound_only ? @relationships_by_name : @relationships_by_name.merge(:inbound=>inbound_relationships_by_name)      
     end
 
@@ -152,11 +154,13 @@ module ActiveFedora
     # @param [String] Name of relationship
     # @param [Boolean] If false checks inbound relationships as well (defaults to true)
     def is_relationship_name?(name, outbound_only=true)
+      Deprecation.silence(ActiveFedora::Relationships) do
       if outbound_only
         outbound_relationship_names.include?(name)
       else
         (outbound_relationship_names.include?(name)||inbound_relationship_names.include?(name))
       end
+      end
     end
     
 
@@ -240,6 +244,7 @@ module ActiveFedora
     # @param [ActiveFedora::Base] object to add to the relationship (expects ActvieFedora::Base to be an ancestor)
     # @return [Boolean] returns true if add operation successful
     def add_relationship_by_name(name, object)
+      Deprecation.silence(ActiveFedora::Relationships) do
       if is_relationship_name?(name,true)
         if relationships_desc[:self][name].has_key?(:type)
           klass = class_from_name(relationships_desc[:self][name][:type])
@@ -251,6 +256,7 @@ module ActiveFedora
       else
         false
       end
+      end
     end
     
     # Remove an object for the given relationship name
@@ -268,6 +274,7 @@ module ActiveFedora
     deprecation_deprecate :find_relationship_by_name, :inbound_relationship_names, :inbound_relationships_by_name, :relationship_query, :relationships_by_name, :relationships_by_name_from_class, :assert_conforms_to, :class_from_name, :outbound_relationship_names, :is_relationship_name?, :load_inbound_relationship, :load_bidirectional, :load_outbound_relationship, :relationship_has_solr_filter_query?, :add_relationship_by_name, :remove_relationship_by_name
 
     module ClassMethods
+      extend Deprecation
       # Tests if the relationship name passed is in bidirectional
       # @param [String] relationship name to test
       # @return [Boolean]
@@ -494,7 +501,6 @@ module ActiveFedora
       #
       # @deprecated use ActiveFedora::Base.has_many or ActiveFedora::Base.belongs_to. has_relationship will be removed in active-fedora 6.0
       def has_relationship(name, predicate, opts = {})
-        ActiveSupport::Deprecation.warn("ActiveFedora::Relationships#has_relationship has been deprecated use ActiveFedora::Base.has_many or ActiveFedora::Base.belongs_to. has_relationship will be removed in active-fedora 6.0.", caller(1))
         opts = {:singular => nil, :inbound => false}.merge(opts)
         if opts[:inbound] == true
           register_relationship_desc(:inbound, name, predicate, opts)
@@ -508,6 +514,7 @@ module ActiveFedora
           create_outbound_relationship_finders(name, predicate, opts)
         end
       end
+      deprecation_deprecate :has_relationship
 
       # Used in has_relationship call to create dynamic helper methods to 
       # append and remove objects to and from a relationship
@@ -524,8 +531,9 @@ module ActiveFedora
       def create_relationship_name_methods(name)
         append_method_name = "#{name.to_s.downcase}_append"
         remove_method_name = "#{name.to_s.downcase}_remove"
-        self.send(:define_method,:"#{append_method_name}") {|object| add_relationship_by_name(name,object)}
-        self.send(:define_method,:"#{remove_method_name}") {|object| remove_relationship_by_name(name,object)}
+
+        self.send(:define_method,:"#{append_method_name}") {|object| Deprecation.silence(ActiveFedora::Relationships) { add_relationship_by_name(name,object) } }
+        self.send(:define_method,:"#{remove_method_name}") {|object| Deprecation.silence(ActiveFedora::Relationships) {remove_relationship_by_name(name,object) } }        
       end 
 
       
@@ -547,14 +555,16 @@ module ActiveFedora
       #
       # @deprecated use ActiveFedora::Base.has_and_belongs_to_many. has_bidirectional_relationship will be removed in active-fedora 6.0
       def has_bidirectional_relationship(name, outbound_predicate, inbound_predicate, opts={})
-        ActiveSupport::Deprecation.warn("ActiveFedora::Relationships#has_bidirectional_relationship has been deprecated, reference ActiveFedora::Base.has_and_belongs_to_many. has_bidirectional_relationship will be removed in active-fedora 6.0.", caller(1))
         create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts)
       end
-      
+      deprecation_deprecate :has_bidirectional_relationship
+
       def create_inbound_relationship_finders(name, predicate, opts = {})
         class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
-          load_inbound_relationship('#{name}', '#{predicate}', opts)
+          Deprecation.silence(ActiveFedora::Relationships) do
+            load_inbound_relationship('#{name}', '#{predicate}', opts)
+          end
         end
         def #{name}_ids
           #{name}(:response_format => :id_array)
@@ -571,7 +581,9 @@ module ActiveFedora
       def create_outbound_relationship_finders(name, predicate, opts = {})
         class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
-          load_outbound_relationship(#{name.inspect}, #{predicate.inspect}, opts)
+          Deprecation.silence(ActiveFedora::Relationships) do
+            load_outbound_relationship(#{name.inspect}, #{predicate.inspect}, opts)
+          end
         end
         def #{name}_ids
           #{name}(:response_format => :id_array)
@@ -596,18 +608,22 @@ module ActiveFedora
       # @param [Hash] opts (optional)
       # @deprecated create_bidirectional_relationship_finders will be removed in active-fedora 6.0
       def create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts={})
-        ActiveSupport::Deprecation.warn("ActiveFedora::Relationships#create_bidirectional_relationship_finders has been deprecated and will be removed in active-fedora 6.0.", caller(1))
         inbound_method_name = name.to_s+"_inbound"
         outbound_method_name = name.to_s+"_outbound"
+        Deprecation.silence(ActiveFedora::Relationships::ClassMethods) do
         has_relationship(outbound_method_name, outbound_predicate, opts)
         has_relationship(inbound_method_name, inbound_predicate, opts.merge!(:inbound=>true))
 
         #create methods that mirror the outbound append and remove with our bidirectional name, assume just add and remove locally        
         create_bidirectional_relationship_name_methods(name,outbound_method_name)
 
+        end
+        
         class_eval <<-END, __FILE__, __LINE__
         def #{name}(opts={})
-          load_bidirectional("#{name}", :#{inbound_method_name}, :#{outbound_method_name}, opts)
+          Deprecation.silence(ActiveFedora::Relationships) do
+            load_bidirectional("#{name}", :#{inbound_method_name}, :#{outbound_method_name}, opts)
+          end
         end
         def #{name}_ids
           #{name}(:response_format => :id_array)
@@ -620,6 +636,7 @@ module ActiveFedora
         end
         END
       end
+      deprecation_deprecate :create_bidirectional_relationship_finders
 
       #  Similar to +create_relationship_name_methods+ except it is used when an ActiveFedora::Base model class
       #  declares has_bidirectional_relationship.  we are merely creating an alias for outbound portion of bidirectional
@@ -634,12 +651,12 @@ module ActiveFedora
       #
       # @deprecated create_bidirectional_relationship_name_methods will be removed in active-fedora 6.0
       def create_bidirectional_relationship_name_methods(name,outbound_name)
-        ActiveSupport::Deprecation.warn("ActiveFedora::Relationships#create_bidirectional_relationship_name_methods has been deprecated and will be removed in active-fedora 6.0.", caller(1))
         append_method_name = "#{name.to_s.downcase}_append"
         remove_method_name = "#{name.to_s.downcase}_remove"
         self.send(:define_method,:"#{append_method_name}") {|object| add_relationship_by_name(outbound_name,object)}
         self.send(:define_method,:"#{remove_method_name}") {|object| remove_relationship_by_name(outbound_name,object)}
       end
+      deprecation_deprecate :create_bidirectional_relationship_name_methods
 
     end
   end