active-fedora 5.7.1 → 6.0.0.pre1

data/.gitmodules

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

data/Gemfile

@@ -3,8 +3,9 @@ source "http://rubygems.org"
 # Bundler will rely on active-fedora.gemspec for dependency information.
 
 gemspec
+
 group :development, :test do
-  gem 'simplecov', :platform => [:mri_19, :mri_20]
+  gem 'simplecov', :platform => :mri_19
   gem 'simplecov-rcov', :platform => :mri_19
 end
 

data/History.txt

@@ -1,17 +1,3 @@
-5.6.1
-Fixed delegating enumerable methods (join, [], each_with_index, to_a, etc) on an RdfNode::TermProxy
-
-5.6.0
-Upgrade to rubydora 1.3.0, which prevents unnecessary loading of datastream content.
-#35 fix passing :sort argument to ActiveFedora::Base#find
-Better support for ruby 2.0 (delegating inspect within RdfNode::TermProxy)
-
-5.5.2
-#25 When multiple has_many relationships share a predicate, the solr_query should use class_name to distinguish the sets.
-
-5.5.1
-#34 Allow passing RDF::URI to rdf_type
-
 5.5.0
 Added support for complex rdf structures.
 Changed RdfDatastream to_solr so that it uses the dsid as the solr prefix, not the datastream class name

data/Rakefile

@@ -11,9 +11,8 @@ load "lib/tasks/active_fedora_dev.rake" if defined?(Rake)
 
 CLEAN.include %w[**/.DS_Store tmp *.log *.orig *.tmp **/*~]
 
-task :ci => ['jetty:clean', 'active_fedora:ci']
 task :spec => ['active_fedora:rspec']
 task :rcov => ['active_fedora:rcov']
 
 
-task :default => [:ci]
+task :default => [:spec]

data/active-fedora.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.add_dependency('rsolr')
   s.add_dependency('om', '~> 1.8.0')
   s.add_dependency('nom-xml', '>=0.5.1')
-  s.add_dependency('solrizer', '~>2.1')
+  s.add_dependency('solrizer', '~>3.0.0.pre1')
   s.add_dependency("activeresource", '>= 3.0.0')
   s.add_dependency("activesupport", '>= 3.0.0')
   s.add_dependency("builder", '~> 3.0.0')
   s.add_dependency("mediashelf-loggable")
-  s.add_dependency("rubydora", '~>1.6')
+  s.add_dependency("rubydora", '~>1.2')
   s.add_dependency("rdf")
   s.add_dependency("rdf-rdfxml", '~>0.3.8')
   s.add_dependency("deprecation")

data/lib/active_fedora.rb

@@ -8,7 +8,7 @@ require 'active_support/core_ext/object'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'rdf'
 
-SOLR_DOCUMENT_ID = ActiveFedora::FileConfigurator.id_field unless defined?(SOLR_DOCUMENT_ID)
+SOLR_DOCUMENT_ID = Solrizer.default_field_mapper.id_field unless defined?(SOLR_DOCUMENT_ID)
 ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
 
 module ActiveFedora #:nodoc:
@@ -32,8 +32,6 @@ module ActiveFedora #:nodoc:
     autoload :Config
     autoload :FileConfigurator
     autoload :Reflection
-    autoload :Relationships
-    autoload :FileManagement
     autoload :RelationshipGraph
     autoload :Datastream
     autoload :DatastreamHash
@@ -43,7 +41,6 @@ module ActiveFedora #:nodoc:
     autoload :UnsavedDigitalObject
     autoload :SolrDigitalObject
     autoload :Model
-    autoload :MetadataDatastreamHelper
     autoload :NokogiriDatastream
     autoload :NomDatastream
     autoload :NtriplesRDFDatastream
@@ -66,7 +63,6 @@ module ActiveFedora #:nodoc:
     autoload :FixtureLoader
     autoload :FixtureExporter
     autoload :DatastreamCollections
-    autoload :NamedRelationships
     autoload :Predicates
     autoload :Validations
   end
@@ -129,21 +125,10 @@ module ActiveFedora #:nodoc:
     end
   end
   
-  def self.config_for_environment
-    ActiveSupport::Deprecation.warn("config_for_environment has been deprecated use `config' instead")
-    config
-  end
-
   def self.solr
     ActiveFedora::SolrService.instance
   end
   
-  def self.fedora
-    ActiveSupport::Deprecation.warn("ActiveFedora.fedora() is deprecated and will be removed in the next release use ActiveFedora::Base.connection_for_pid(pid) instead")
-    
-    ActiveFedora::Base.connection_for_pid('0')
-  end
-
   def self.predicate_config
     configurator.predicate_config
   end

data/lib/active_fedora/associations.rb

@@ -12,27 +12,24 @@ module ActiveFedora
 
     autoload :AssociationCollection, 'active_fedora/associations/association_collection'
     autoload :AssociationProxy, 'active_fedora/associations/association_proxy'
-
-    # Clears out the association cache.
-    def clear_association_cache #:nodoc:
-      @association_cache.clear if persisted?
-    end
-
-    # :nodoc:
-    attr_reader :association_cache
-    
     private 
 
       # Returns the specified association instance if it responds to :loaded?, nil otherwise.
       def association_instance_get(name)
-        @association_cache[name.to_sym]
+        ivar = "@#{name}"
+        if instance_variable_defined?(ivar)
+          association = instance_variable_get(ivar)
+          association if association.respond_to?(:loaded?)
+        end
       end
 
       # Set the specified association instance.
       def association_instance_set(name, association)
-        @association_cache[name] = association
+        instance_variable_set("@#{name}", association)
       end
 
+    
+
     module ClassMethods
 
       def has_many(association_id, options={})

data/lib/active_fedora/associations/association_collection.rb

@@ -74,7 +74,7 @@ module ActiveFedora
         flatten_deeper(records).each do |record|
           raise_on_type_mismatch(record)
           add_record_to_target_with_callbacks(record) do |r|
-            result &&= insert_record(record)
+            result &&= insert_record(record) unless @owner.new_record?
           end
         end
 
@@ -180,9 +180,7 @@ module ActiveFedora
         end
 
         def construct_query
-          clauses = {@reflection.options[:property] => @owner.internal_uri}
-          clauses[:has_model] = @reflection.class_name.constantize.to_class_uri if @reflection.class_name && @reflection.class_name != 'ActiveFedora::Base'
-          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(clauses)
+          @counter_query = @finder_query = ActiveFedora::SolrService.construct_query_for_rel(@reflection.options[:property], @owner.internal_uri)
         end
 
 

data/lib/active_fedora/associations/has_and_belongs_to_many_association.rb

@@ -31,25 +31,16 @@ module ActiveFedora
 
           ### TODO save relationship
           @owner.add_relationship(@reflection.options[:property], record)
-
-          if @owner.new_record? and @reflection.options[:inverse_of]
-            logger.warn("has_and_belongs_to_many #{@reflection.inspect} is cowardly refusing to insert the inverse relationship into #{record}, because #{@owner} is not persisted yet.")
-          elsif @reflection.options[:inverse_of]
+          if (@reflection.options[:inverse_of])
             record.add_relationship(@reflection.options[:inverse_of], @owner)
-            record.save
           end
-
+          record.save
           return true
         end
 
         def delete_records(records)
           records.each do |r| 
-            @owner.remove_relationship(@reflection.options[:property], r)
-            
-            if (@reflection.options[:inverse_of])
-              r.remove_relationship(@reflection.options[:inverse_of], @owner)
-              r.save
-            end
+            r.remove_relationship(@reflection.options[:property], @owner)
           end
         end
     end

data/lib/active_fedora/associations/has_many_association.rb

@@ -31,10 +31,6 @@ module ActiveFedora
       end
 
       def insert_record(record, force = false, validate = true)
-        if @owner.new_record?
-          logger.warn("has_many #{@reflection.inspect} is cowardly refusing to insert a relationship into #{record}, because #{@owner} is not persisted yet.")
-          return true 
-        end
         set_belongs_to_association_for(record)
         #force ? record.save! : record.save(:validate => validate)
         record.save

data/lib/active_fedora/base.rb

@@ -27,7 +27,7 @@ module ActiveFedora
 
     class_attribute :fedora_connection, :profile_solr_name
     self.fedora_connection = {}
-    self.profile_solr_name = ActiveFedora::SolrService.solr_name("object_profile", :string, :displayable)
+    self.profile_solr_name = ActiveFedora::SolrService.solr_name("object_profile", :displayable)
 
 
     def method_missing(name, *args)
@@ -68,7 +68,6 @@ module ActiveFedora
     # the given namespace.
     def initialize(attrs = nil)
       attrs = {} if attrs.nil?
-      @association_cache = {}
       attributes = attrs.dup
       @inner_object = UnsavedDigitalObject.new(self.class, attributes.delete(:namespace), attributes.delete(:pid))
       self.relationships_loaded = true
@@ -81,7 +80,6 @@ module ActiveFedora
 
     # Reloads the object from Fedora.
     def reload
-      clear_association_cache
       init_with(self.class.find(self.pid).inner_object)
     end
 
@@ -96,7 +94,6 @@ module ActiveFedora
     #   post.init_with(DigitalObject.find(pid))
     #   post.properties.title # => 'hello world'
     def init_with(inner_obj)
-      @association_cache = {}
       @inner_object = inner_obj
       unless @inner_object.is_a? SolrDigitalObject
         @inner_object.original_class = self.class
@@ -307,7 +304,7 @@ module ActiveFedora
         c_time = Time.parse(c_time) unless c_time.is_a?(Time)
         m_time = modified_date
         m_time = Time.parse(m_time) unless m_time.is_a?(Time)
-        solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, :date) => c_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:system_modified, :date) => m_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect)
+        solr_doc.merge!(SOLR_DOCUMENT_ID.to_sym => pid, ActiveFedora::SolrService.solr_name(:system_create, type: :date) => c_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:system_modified, type: :date) => m_time.utc.xmlschema, ActiveFedora::SolrService.solr_name(:active_fedora_model, :symbol) => self.class.inspect)
         solrize_profile(solr_doc)
       end
       datastreams.each_value do |ds|
@@ -317,6 +314,10 @@ module ActiveFedora
       solr_doc
     end
 
+    def solr_name(*args)
+      ActiveFedora::SolrService.solr_name(*args)
+    end
+
     def solrize_profile(solr_doc = Hash.new) # :nodoc:
       profile_hash = { 'datastreams' => {} }
       if inner_object.respond_to? :profile
@@ -443,7 +444,6 @@ module ActiveFedora
     include Attributes
     include ActiveFedora::Persistence
     include Model
-    include Solrizer::FieldNameMapper
     include Loggable
     include ActiveModel::Conversion
     include Validations

data/lib/active_fedora/config.rb

@@ -21,13 +21,6 @@ module ActiveFedora
 
     def init_single(vals)
         @credentials = vals.symbolize_keys
-        if @credentials[:url] && !@credentials[:user]
-          ActiveSupport::Deprecation.warn("Configuring fedora with \":url\" without :user and :password is no longer supported.")
-          u = URI.parse @credentials[:url]
-          @credentials[:user] = u.user
-          @credentials[:password] = u.password
-          @credentials[:url] = "#{u.scheme}://#{u.host}:#{u.port}#{u.path}"
-        end
         unless @credentials.has_key?(:user) && @credentials.has_key?(:password) && @credentials.has_key?(:url)
           raise ActiveFedora::ConfigurationError, "Fedora configuration must provide :user, :password and :url."
         end

data/lib/active_fedora/datastream.rb

@@ -2,7 +2,6 @@ module ActiveFedora
 
   #This class represents a Fedora datastream
   class Datastream < Rubydora::Datastream
-    extend Deprecation
     attr_writer :digital_object
     attr_accessor :last_modified
 
@@ -22,40 +21,12 @@ module ActiveFedora
       dsid.gsub(/\./, '%2e')
     end
     
-    # Test whether this datastream been modified since it was last saved
-    # Deprecated
-    def dirty?
-      changed?
-    end
-    deprecation_deprecate :dirty?
-    
     # @abstract Override this in your concrete datastream class. 
     # @return [boolean] does this datastream contain metadata (not file data)
     def metadata?
       false
     end
     
-    # Deprecated
-    def dirty
-      changed?
-    end
-    deprecation_deprecate :dirty
-    
-    # Deprecated
-    def dirty=(value)
-      if value
-        content_will_change! # an innocent hack to pretend something has changed
-      else
-        changed_attributes.clear
-      end
-    end
-    deprecation_deprecate :dirty=
-
-    def new_object?
-      new?
-    end
-    deprecation_deprecate :new_object?
-
     def validate_content_present
       has_content?
     end
@@ -73,14 +44,6 @@ module ActiveFedora
     # serializes any changed data into the content field
     def serialize!
     end
-    # Populate a Datastream object based on the "datastream" node from a FOXML file
-    # @param [ActiveFedora::Datastream] tmpl the Datastream object that you are building
-    # @param [Nokogiri::XML::Node] node the "foxml:datastream" node from a FOXML file
-    def self.from_xml(tmpl, node)
-      Deprecation.deprecated_method_warning(self, :from_xml)
-      tmpl.controlGroup= node['CONTROL_GROUP']
-      tmpl
-    end
     
     def solrize_profile # :nodoc:
       profile_hash = {}

data/lib/active_fedora/datastream_collections.rb

@@ -323,15 +323,5 @@ module ActiveFedora
         @named_datastreams_desc ||= self.class.class_named_datastreams_desc
       end
       
-      # ** EXPERIMENTAL **
-      #
-      # Get class variable hash that stores has_datastream arguments.
-      # It is used to initialize the value returned by public named_datastreams_desc method
-      # Deprecated
-      def named_datastreams_desc_from_class
-        logger.warn "named_datastreams_desc_from_class is deprecated and will be removed in the next version"
-        self.class.class_named_datastreams_desc
-      end
-
   end
 end

data/lib/active_fedora/datastreams.rb

@@ -1,7 +1,6 @@
 module ActiveFedora
   module Datastreams
     extend ActiveSupport::Concern
-    extend Deprecation
 
     included do
       class_attribute :ds_specs
@@ -188,22 +187,6 @@ module ActiveFedora
       ds
     end
 
-    # This method provides validation of proper options for control_group 'E' and 'R' and builds an attribute hash to be merged back into ds.attributes prior to saving
-    #
-    # @param [Object] ds The datastream
-    # @param [Object] ds_config hash of options which may contain :disseminator and :url
-    def additional_attributes_for_external_and_redirect_control_groups(ds,ds_config)
-      if ds.controlGroup=='E'
-        if !ds_config[:disseminator].present? && ds_config[:url].present?
-          ds.dsLocation= ds_config[:url]
-        end
-      elsif ds.controlGroup=='R'
-        ds.dsLocation= ds_config[:url]
-      end
-    end
-    deprecation_deprecate :additional_attributes_for_external_and_redirect_control_groups
-
-
     module ClassMethods
       #This method is used to specify the details of a datastream. 
       # You can pass the name as the first argument and a hash of options as the second argument

data/lib/active_fedora/digital_object.rb

@@ -35,7 +35,7 @@ module ActiveFedora
       obj = Deprecation.silence(Rubydora::DigitalObject) do
         begin
           super(pid, conn)
-        rescue Rubydora::FedoraInvalidRequest, (Rubydora::RecordNotFound rescue nil)
+        rescue Rubydora::FedoraInvalidRequest => e
           # PID is nil
           raise ActiveFedora::ObjectNotFoundError, "Unable to find '#{pid}' in fedora. See logger for details."
         end

data/lib/active_fedora/file_configurator.rb

@@ -46,7 +46,6 @@ module ActiveFedora
     #     url: http://127.0.0.1:8983/fedora2
     #
 
-    include Solrizer::FieldNameMapper
     attr_accessor :config_env
     attr_reader :config_options, :fedora_config_path, :solr_config_path
 
@@ -73,12 +72,6 @@ module ActiveFedora
       @solr_config
     end
 
-    def config_reload!
-      ActiveSupport::Deprecation.warn("config_reload! is not supported")
-      reset!
-      load_configs
-    end
-
     def path
       get_config_path(:fedora)
     end
@@ -101,7 +94,6 @@ module ActiveFedora
       
       load_fedora_config
       load_solr_config
-      load_solrizer_config
       @config_loaded = true
     end
 
@@ -150,20 +142,6 @@ module ActiveFedora
       @solr_config = {:url=> get_solr_url(config[ActiveFedora.environment.to_sym].symbolize_keys)}
     end
 
-    def load_solrizer_config
-      if solrizer_config_path
-        logger.warn "loading_solrizer_config at #{solrizer_config_path}, this overwrites the default field mapper class."
-        ActiveFedora::SolrService.load_mappings 
-      end
-    end
-
-    def solrizer_config_path
-      begin
-        get_config_path('solr_mappings')
-      rescue ActiveFedora::ConfigurationError
-      end
-    end
-
     # Given the solr_config that's been loaded for this environment, 
     # determine which solr url to use
     def get_solr_url(solr_config)