active-fedora 5.0.0.rc3 → 5.0.0.rc4

data/.gitmodules

@@ -1,3 +1,4 @@
 [submodule "jetty"]
 	path = jetty
 	url = git://github.com/projecthydra/hydra-jetty.git
+  ignore = all

data/Gemfile

@@ -5,7 +5,6 @@ source "http://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'rcov', :platform => :mri_18
   gem 'simplecov', :platform => :mri_19
   gem 'simplecov-rcov', :platform => :mri_19
 end

data/active-fedora.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.8.0.rc1')
-  s.add_dependency('solrizer', '~>2.0.0.rc6')
+  s.add_dependency('solrizer', '~>2.0.0.rc7')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')

data/lib/active_fedora.rb

@@ -41,7 +41,6 @@ module ActiveFedora #:nodoc:
     autoload :UnsavedDigitalObject
     autoload :SolrDigitalObject
     autoload :Model
-    autoload :MetadataDatastream
     autoload :MetadataDatastreamHelper
     autoload :NokogiriDatastream
     autoload :NtriplesRDFDatastream

data/lib/active_fedora/base.rb

@@ -11,7 +11,7 @@ module ActiveFedora
   #
   # =The Basics
   #   class Oralhistory < ActiveFedora::Base
-  #     has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream do |m|
+  #     has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
   #       m.field "narrator",  :string
   #       m.field "narrator",  :text
   #     end
@@ -42,16 +42,11 @@ module ActiveFedora
       end
     end
 
-
     # Has this object been saved?
     def new_object?
       inner_object.new?
     end
     
-    def new_object=(bool)
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base.new_object= has been deprecated and nolonger has any effect. Will be removed in 5.0")
-    end
-
     ## Required by associations
     def new_record?
       self.new_object?
@@ -61,7 +56,6 @@ module ActiveFedora
       !new_object?
     end
 
-
     # Constructor.  You may supply a custom +:pid+, or we call the Fedora Rest API for the
     # next available Fedora pid, and mark as new object.
     # Also, if +attrs+ does not contain +:pid+ but does contain +:namespace+ it will pass the
@@ -84,7 +78,7 @@ module ActiveFedora
     # example:
     #
     #   class Post < ActiveFedora::Base
-    #     has_metadata :name => "properties", :type => ActiveFedora::MetadataDatastream
+    #     has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream
     #   end
     #
     #   post = Post.allocate
@@ -248,37 +242,6 @@ module ActiveFedora
       @inner_object.label = new_label
     end
 
-    #Return a hash of all available metadata fields for all 
-    #ActiveFedora::MetadataDatastream datastreams, as well as 
-    #system_create_date, system_modified_date, active_fedora_model_field, 
-    #and the object id.
-    def fields
-    # TODO this can likely be removed once find_by_fields_by_solr is removed
-      fields = {:id => {:values => [pid]}, :system_create_date => {:values => [self.create_date], :type=>:date}, :system_modified_date => {:values => [self.modified_date], :type=>:date}, :active_fedora_model => {:values => [self.class.inspect], :type=>:symbol}}
-      datastreams.values.each do |ds|        
-        fields.merge!(ds.fields) if [ActiveFedora::MetadataDatastream, ActiveFedora::SimpleDatastream, ActiveFedora::QualifiedDublinCoreDatastream].include?(ds.class)
-      end
-      return fields
-    end
-    
-    #Returns the xml version of this object as a string.
-    def to_xml(xml=Nokogiri::XML::Document.parse("<xml><fields/><content/></xml>"))
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base#to_xml has been deprecated and will be removed in version 5.0")
-      fields_xml = xml.xpath('//fields').first
-      builder = Nokogiri::XML::Builder.with(fields_xml) do |fields_xml|
-        fields_xml.id_ pid
-        fields_xml.system_create_date self.create_date
-        fields_xml.system_modified_date self.modified_date
-        fields_xml.active_fedora_model self.class.inspect
-      end
-      
-      datastreams.each_value do |ds|  
-        ds.to_xml(fields_xml) if ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper)
-        ds.to_rels_ext if ds.kind_of?(ActiveFedora::RelsExtDatastream)
-      end
-      return xml.to_s
-    end
-
     def ==(comparison_object)
          comparison_object.equal?(self) ||
            (comparison_object.instance_of?(self.class) &&
@@ -449,7 +412,6 @@ module ActiveFedora
     include Associations
     include NestedAttributes
     include Reflection
-    include NamedRelationships ##TODO don't include by default
   end
 
 end

data/lib/active_fedora/datastreams.rb

@@ -22,7 +22,7 @@ module ActiveFedora
     def serialize_datastreams
       datastreams.each {|k, ds| ds.serialize! }
       self.metadata_is_dirty = datastreams.any? do |k,ds| 
-        ds.changed? && (ds.class.included_modules.include?(ActiveFedora::MetadataDatastreamHelper) || ds.instance_of?(ActiveFedora::RelsExtDatastream) || ds.kind_of?(ActiveFedora::RDFDatastream))
+        ds.changed? && (ds.kind_of?(ActiveFedora::NokogiriDatastream) || ds.instance_of?(ActiveFedora::RelsExtDatastream) || ds.kind_of?(ActiveFedora::RDFDatastream))
       end
      true
     end
@@ -60,11 +60,6 @@ module ActiveFedora
       @datastreams ||= DatastreamHash.new(self)
     end
   
-    def datastreams_in_memory
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base.datastreams_in_memory has been deprecated.  Use #datastreams instead")
-      datastreams
-    end
-
     def configure_datastream(ds, ds_spec=nil)
       ds_spec ||= self.class.ds_specs[ds.instance_variable_get(:@dsid)]
       if ds_spec
@@ -107,39 +102,17 @@ module ActiveFedora
       return datastream.dsid
     end
 
-    def add(datastream) # :nodoc:
-      ActiveSupport::Deprecation.warn "Warning: ActiveFedora::Base.add has been deprecatedand will be removed in 5.0.  Use add_datastream"
-      add_datastream(datastream)
-    end
-    
-    #return all datastreams of type ActiveFedora::MetadataDatastream
+    #return all datastreams of type ActiveFedora::RDFDatastream or ActiveFedora::NokogiriDatastream
     def metadata_streams
       results = []
       datastreams.each_value do |ds|
-        if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
+        if ds.kind_of?(ActiveFedora::RDFDatastream) || ds.kind_of?(ActiveFedora::NokogiriDatastream)
           results << ds
         end
       end
       return results
     end
     
-    #return all datastreams not of type ActiveFedora::MetadataDatastream 
-    #(that aren't Dublin Core or RELS-EXT streams either)
-    #@deprecated
-    def file_streams
-      ActiveSupport::Deprecation.warn("ActiveFedora::Base#file_streams has been deprecated and will be removed in 5.0")
-      results = []
-      datastreams.each_value do |ds|
-        if !ds.kind_of?(ActiveFedora::MetadataDatastream) && !ds.kind_of?(ActiveFedora::NokogiriDatastream)
-          dsid = ds.dsid
-          if dsid != "DC" && dsid != "RELS-EXT"
-            results << ds
-          end
-        end
-      end
-      return results
-    end
-    
     # return a valid dsid that is not currently in use.  Uses a prefix (default "DS") and an auto-incrementing integer
     # Example: if there are already datastreams with IDs DS1 and DS2, this method will return DS3.  If you specify FOO as the prefix, it will return FOO1.
     def generate_dsid(prefix="DS")
@@ -156,8 +129,7 @@ module ActiveFedora
     # Return the Dublin Core (DC) Datastream. You can also get at this via 
     # the +datastreams["DC"]+.
     def dc
-      #dc = REXML::Document.new(datastreams["DC"].content)
-      return  datastreams["DC"] 
+      return datastreams["DC"] 
     end
 
     # Returns the RELS-EXT Datastream

data/lib/active_fedora/delegating.rb

@@ -58,7 +58,7 @@ module ActiveFedora
       def create_delegate_accessor(field, args)
         define_method field do
           ds = self.send(args[:to])
-          val = if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::RDFDatastream)
+          val = if ds.kind_of?(ActiveFedora::RDFDatastream)
                   ds.send(:get_values, field)
                 else
                   terminology = args[:at] || [field]
@@ -71,7 +71,7 @@ module ActiveFedora
       def create_delegate_setter(field, args)
         define_method "#{field}=".to_sym do |v|
           ds = self.send(args[:to])
-          if ds.kind_of?(ActiveFedora::MetadataDatastream) || ds.kind_of?(ActiveFedora::RDFDatastream)
+          if ds.kind_of?(ActiveFedora::RDFDatastream)
             ds.send(:set_value, field, v)
           else
             terminology = args[:at] || [field]

data/lib/active_fedora/file_management.rb

@@ -1,7 +1,9 @@
 module ActiveFedora
   module FileManagement
     extend ActiveSupport::Concern
-
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 6.0'
+ 
     included do
       include ActiveFedora::Relationships
       has_relationship "collection_members", :has_collection_member
@@ -69,6 +71,9 @@ module ActiveFedora
       # will rely on SemanticNode.remove_relationship once it is implemented
     end
 
+    deprecation_deprecate :file_objects, :file_objects_append, :collection_members_append, :collection_members_remove
+    
+ 
   end
 end
 

data/lib/active_fedora/metadata_datastream_helper.rb

@@ -1,6 +1,5 @@
 require 'solrizer/field_name_mapper'
 
-#this class represents a MetadataDatastream, a special case of ActiveFedora::Datastream
 module ActiveFedora::MetadataDatastreamHelper 
   
   attr_accessor :fields, :xml_loaded

data/lib/active_fedora/named_relationships.rb

@@ -1,6 +1,9 @@
 module ActiveFedora
   module NamedRelationships
     extend ActiveSupport::Concern
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 6.0'
+
     included do
       class_attribute :class_named_relationships_desc
       self.class_named_relationships_desc = {}
@@ -91,5 +94,6 @@ module ActiveFedora
       end
 
     
+      deprecation_deprecate :named_predicate_exists_with_different_name?, :named_relationships_desc, :register_named_subject, :register_named_relationship, :create_named_relationship_methods, :create_bidirectional_named_relationship_methods
   end
 end

data/lib/active_fedora/nokogiri_datastream.rb

@@ -2,7 +2,7 @@ require "nokogiri"
 require  "om"
 require "solrizer/xml"
 
-#this class represents a MetadataDatastream, a special case of ActiveFedora::Datastream
+#this class represents a xml metadata datastream
 module ActiveFedora
   class NokogiriDatastream < Datastream
       
@@ -10,8 +10,6 @@ module ActiveFedora
     include OM::XML::Document
     include Solrizer::XML::TerminologyBasedSolrizer # this adds support for calling .to_solr
     
-    # extend(OM::XML::Container::ClassMethods)
-
     alias_method(:om_term_values, :term_values) unless method_defined?(:om_term_values)
     alias_method(:om_update_values, :update_values) unless method_defined?(:om_update_values)
     
@@ -23,7 +21,7 @@ module ActiveFedora
 
     # Create an instance of this class based on xml content
     # @param [String, File, Nokogiri::XML::Node] xml the xml content to build from
-    # @param [ActiveFedora::MetadataDatastream] tmpl the Datastream object that you are building @default a new instance of this class
+    # @param [ActiveFedora::NokogiriDatastream] tmpl the Datastream object that you are building @default a new instance of this class
     # Careful! If you call this from a constructor, be sure to provide something 'ie. self' as the @tmpl. Otherwise, you will get an infinite loop!
     def self.from_xml(xml, tmpl=nil)
       tmpl = self.new(nil, nil) if tmpl.nil?  ## This path is used only for unit testing (e.g. MarpaDCDatastream.from_xml(fixture("data.xml")) )

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -9,7 +9,6 @@ module ActiveFedora
 
     class_attribute :class_fields
     self.class_fields = []
-    attr_accessor :fields # TODO this can be removed when Model.find_by_fields_by_solr has been removed.
     
     
      set_terminology do |t|
@@ -56,7 +55,6 @@ module ActiveFedora
     #   :encoding=>foo, or encodings_scheme  - causes an xsi:type attribute to be set to 'foo'
     #   :multiple=>true -  mark this field as a multivalue field (on by default)
     #
-    #At some point, these modifiers will be ported up to work for any +ActiveFedora::MetadataDatastream+.
     #
     #There is quite a good example of this class in use in spec/examples/oral_history.rb
     #

data/lib/active_fedora/relationships.rb

@@ -1,11 +1,15 @@
 module ActiveFedora
   module Relationships
     extend ActiveSupport::Concern
-
+    extend Deprecation
+    self.deprecation_horizon = 'active-fedora 6.0'
+    
 
     # Return array of objects for a given relationship name
     # @param [String] Name of relationship to find
     # @return [Array] Returns array of objects linked via the relationship name given
+    #
+    # @deprecated find_relationship_by_name will be removed in active-fedora 6.0
     def find_relationship_by_name(name)
       rels = nil
       if inbound_relationship_names.include?(name)
@@ -129,7 +133,6 @@ module ActiveFedora
     
 
 
-
     # Returns a Class symbol for the given string for the class name
     # @param [String] the class name as a string
     # @return [Class] the class as a Class object
@@ -262,6 +265,7 @@ module ActiveFedora
       end
     end
 
+    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
       # Tests if the relationship name passed is in bidirectional
@@ -487,7 +491,10 @@ module ActiveFedora
       #  similar_audio_query: Return solr query that can be used to retrieve related objects as solr documents
       #  similar_audio_append: Add an AudioRecord object to the similar_audio relationship
       #  similar_audio_remove: Remove an AudioRecord from the similar_audio relationship
+      #
+      # @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.")
         opts = {:singular => nil, :inbound => false}.merge(opts)
         if opts[:inbound] == true
           register_relationship_desc(:inbound, name, predicate, opts)
@@ -512,6 +519,8 @@ module ActiveFedora
       #
       #   Methods audio_records_append and audio_records_remove are created.
       #   Boths methods take an object that is kind_of? ActiveFedora::Base as a parameter
+      #
+      # @deprecated create_relationship_name_methods will be removed in active-fedora 6.0
       def create_relationship_name_methods(name)
         append_method_name = "#{name.to_s.downcase}_append"
         remove_method_name = "#{name.to_s.downcase}_remove"
@@ -535,7 +544,10 @@ module ActiveFedora
       # create_inbound_relationship_finders and create_outbound_relationship_finders
       # The third method combines the results of both and handles generating appropriate 
       # solr queries where necessary.
+      #
+      # @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.")
         create_bidirectional_relationship_finders(name, outbound_predicate, inbound_predicate, opts)
       end
       
@@ -582,7 +594,9 @@ module ActiveFedora
       # @param [Symbol] outbound_predicate Predicate used in outbound relationships
       # @param [Symbol] inbound_predicate Predicate used in inbound relationships
       # @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.")
         inbound_method_name = name.to_s+"_inbound"
         outbound_method_name = name.to_s+"_outbound"
         has_relationship(outbound_method_name, outbound_predicate, opts)
@@ -617,7 +631,10 @@ module ActiveFedora
       #    Method members_outbound_append and members_outbound_remove added
       #    This method will create members_append which does same thing as members_outbound_append
       #    and will create members_remove which does same thing as members_outbound_remove
+      #
+      # @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.")
         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)}

data/lib/active_fedora/rels_ext_datastream.rb

@@ -30,7 +30,7 @@ module ActiveFedora
       
     # Populate a RelsExtDatastream object based on the "datastream" content 
     # Assumes that the datastream contains RDF XML from a Fedora RELS-EXT datastream 
-    # @param [ActiveFedora::MetadataDatastream] tmpl the Datastream object that you are populating
+    # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are populating
     # @param [String] the "rdf" node 
     def self.from_xml(xml, tmpl) 
       if (xml.nil?)

data/lib/active_fedora/simple_datastream.rb

@@ -4,7 +4,6 @@ module ActiveFedora
 
     class_attribute :class_fields
     self.class_fields = []
-    attr_accessor :fields # TODO this can be removed when Model.find_by_fields_by_solr has been removed.
     
     
      set_terminology do |t|
@@ -29,13 +28,12 @@ module ActiveFedora
     # opts is an options hash, which  will affect the generation of the xml representation of this datastream.
     #
     # Currently supported modifiers: 
-    # For +QualifiedDublinCorDatastreams+:
+    # For +SimpleDatastream+:
     #   :element_attrs =>{:foo=>:bar} -  hash of xml element attributes
     #   :xml_node => :nodename  - The xml node to be used to represent this object (in dcterms namespace)
     #   :encoding=>foo, or encodings_scheme  - causes an xsi:type attribute to be set to 'foo'
     #   :multiple=>true -  mark this field as a multivalue field (on by default)
     #
-    #At some point, these modifiers will be ported up to work for any +ActiveFedora::MetadataDatastream+.
     #
     #There is quite a good example of this class in use in spec/examples/oral_history.rb
     #

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "5.0.0.rc3"
+  VERSION = "5.0.0.rc4"
 end

data/spec/integration/base_spec.rb

@@ -32,7 +32,7 @@ describe "A base object with metadata" do
     describe "and has been changed" do
       before do
         @release.foo.person = 'frank'
-        @release.save
+        @release.save!
       end
       it "should save the datastream." do
         MockAFBaseRelationship.find(@release.pid).foo.person.should == ['frank']
@@ -273,31 +273,6 @@ describe ActiveFedora::Base do
     end
   end
   
-  describe ".file_streams" do
-    it "should return all of the datastreams from the object that are kinds of NokogiriDatastream" do
-      fds1 = ActiveFedora::Datastream.new(@test_object.inner_object, "fds1")
-      fds2 = ActiveFedora::Datastream.new(@test_object.inner_object, "fds2")
-      mds = ActiveFedora::SimpleDatastream.new(@test_object.inner_object, "mds")
-      @test_object.add_datastream(fds1)  
-      @test_object.add_datastream(fds2)
-      @test_object.add_datastream(mds)    
-      
-      result = @test_object.file_streams
-      result.length.should == 2
-      result.should include(fds1)
-      result.should include(fds2)
-    end
-    it "should skip DC and RELS-EXT datastreams" do
-      fds1 = ActiveFedora::Datastream.new(@test_object.inner_object,"fds1")
-      dc = ActiveFedora::Datastream.new(@test_object.inner_object, "DC")
-      rels_ext = ActiveFedora::RelsExtDatastream.new(@test_object.inner_object, 'RELS-EXT')
-      @test_object.add_datastream(fds1)  
-      @test_object.add_datastream(dc)
-      @test_object.add_datastream(rels_ext)    
-      @test_object.file_streams.should  == [fds1]
-    end
-  end
-  
   describe ".dc" do
     it "should expose the DC datastream" do
       dc = @test_object.dc