active-fedora 9.13.0 → 10.0.0.beta1

data/lib/active_fedora/core.rb

@@ -151,12 +151,6 @@ module ActiveFedora
           attributes = { id: attributes_or_id }.with_indifferent_access
         when Hash
           attributes = attributes_or_id.with_indifferent_access
-          # TODO: Remove when we decide using 'pid' is no longer supported.
-          if !attributes.key?(:id) && attributes.key?(:pid)
-            Deprecation.warn Core, 'Initializing with :pid is deprecated and will be removed in active-fedora 10.0. Use :id instead'
-            attributes[:id] = attributes.delete(:pid)
-          end
-
         when NilClass
           attributes = {}.with_indifferent_access
         else

data/lib/active_fedora/datastreams.rb

@@ -1,8 +1,6 @@
 module ActiveFedora
   module Datastreams
     extend ActiveSupport::Autoload
-    # extend Deprecation
-
     autoload :NokogiriDatastreams, 'active_fedora/datastreams/nokogiri_datastreams'
   end
 end

data/lib/active_fedora/errors.rb

@@ -22,10 +22,6 @@ module ActiveFedora #:nodoc:
   class ConfigurationError < ActiveFedoraError
   end
 
-  # Raised when ActiveFedora cannot find the predicate mapping configuration file
-  class PredicateMappingsNotFoundError < ConfigurationError
-  end
-
   # Raised when an object assigned to an association has an incorrect type.
   #
   #   class Ticket < ActiveFedora::Base
@@ -57,11 +53,6 @@ module ActiveFedora #:nodoc:
     end
   end
 
-  # Raised when ActiveFedora cannot find the predicate corresponding to the given property
-  # in the predicate registy
-  class UnregisteredPredicateError < ActiveFedoraError
-  end
-
   # Raised by ActiveFedora::Base.save! and ActiveFedora::Base.create! methods when record cannot be
   # saved because record is invalid.
   class RecordNotSaved < ActiveFedoraError

data/lib/active_fedora/file.rb

@@ -6,7 +6,6 @@ module ActiveFedora
     extend ActiveModel::Callbacks
     extend ActiveSupport::Autoload
     extend ActiveTriples::Properties
-    extend Deprecation
     extend Querying
 
     autoload :Streaming
@@ -29,32 +28,20 @@ module ActiveFedora
     define_model_callbacks :update, :save, :create, :destroy
     define_model_callbacks :initialize, only: :after
 
-    # @param parent_or_url_or_hash [ActiveFedora::Base, RDF::URI, String, Hash, NilClass] the parent resource or the URI of this resource
-    # @param [String] path the path partial relative to the resource
-    # @param [Hash] _options
+    # @param [Hash, RDF::URI, String, NilClass] identifier the id (path) or URI of this resource. The hash gets passed when calling Reflection#build_association, but currently we don't do anything with it.
     # @yield [self] Yields self
     # @yieldparam [File] self the newly created file
-    def initialize(parent_or_url_or_hash = nil, path = nil, _options = {}, &_block)
+    def initialize(identifier = nil, &_block)
+      identifier = nil if identifier.is_a? Hash
       run_callbacks(:initialize) do
-        case parent_or_url_or_hash
-        when Hash
-          @ldp_source = build_ldp_resource_via_uri
-        when nil
-          @ldp_source = build_ldp_resource_via_uri nil
-        when String, ::RDF::URI
-          id = ActiveFedora::Associations::IDComposite.new([parent_or_url_or_hash], translate_uri_to_id).first
+        case identifier
+        when nil, ::RDF::URI
+          @ldp_source = build_ldp_resource_via_uri identifier
+        when String
+          id = ActiveFedora::Associations::IDComposite.new([identifier], translate_uri_to_id).first
           @ldp_source = build_ldp_resource id
-        when ActiveFedora::Base
-          Deprecation.warn File, "Initializing a file by passing a container is deprecated. Initialize with a uri instead. This capability will be removed in active-fedora 10.0"
-          uri = if parent_or_url_or_hash.uri.is_a?(::RDF::URI) && parent_or_url_or_hash.uri.value.empty?
-                  nil
-                else
-                  "#{parent_or_url_or_hash.uri}/#{path}"
-                end
-          @ldp_source = build_ldp_resource_via_uri(uri, nil)
-
         else
-          raise "The first argument to #{self} must be a String or an ActiveFedora::Base. You provided a #{parent_or_url_or_hash.class}"
+          raise "The first argument to #{self} must be a Hash, String or RDF::URI. You provided a #{uri.class}"
         end
 
         @attributes = {}.with_indifferent_access

data/lib/active_fedora/file_configurator.rb

@@ -4,10 +4,7 @@ require 'yaml'
 
 module ActiveFedora
   class FileConfigurator
-    extend Deprecation
     # Initializes ActiveFedora's connection to Fedora and Solr based on the info in fedora.yml and solr.yml
-    # NOTE: this deprecates the use of a solr url in the fedora.yml
-    #
     #
     # If Rails.env is set, it will use that environment.  Defaults to "development".
     # @param [Hash] options (optional) a list of options for the configuration of active_fedora
@@ -49,7 +46,7 @@ module ActiveFedora
     #
 
     attr_accessor :config_env
-    attr_reader :config_options, :fedora_config_path, :solr_config_path, :predicate_mappings_config_path
+    attr_reader :config_options, :fedora_config_path, :solr_config_path
 
     # The configuration hash that gets used by RSolr.connect
     def initialize
@@ -84,7 +81,6 @@ module ActiveFedora
       @fedora_config = {}
       @solr_config = {}
       @config_options = {}
-      @predicate_config_path = nil
     end
 
     def config_loaded?
@@ -161,11 +157,6 @@ module ActiveFedora
       end
     end
 
-    def get_config_path(config_type)
-      Deprecation.warn(FileConfigurator, "get_config_path is deprecated and will be removed in ActiveFedora 10.  Use config_path instead.")
-      config_path(config_type)
-    end
-
     # Determine the fedora config file to use. Order of preference is:
     # 1. Use the config_options[:config_path] if it exists
     # 2. Look in +Rails.root+/config/fedora.yml
@@ -210,27 +201,5 @@ module ActiveFedora
       return unless ::File.file? path
       path
     end
-
-    def predicate_config
-      @predicate_config_path ||= build_predicate_config_path
-      YAML.load(::File.open(@predicate_config_path)) if ::File.exist?(@predicate_config_path)
-    end
-
-    protected
-
-      def build_predicate_config_path
-        testfile = ::File.expand_path(config_path(:predicate_mappings))
-        if ::File.exist?(testfile) && valid_predicate_mapping?(testfile)
-          return testfile
-        end
-        raise PredicateMappingsNotFoundError
-      end
-
-      def valid_predicate_mapping?(testfile)
-        mapping = YAML.load(::File.open(testfile))
-        return false unless mapping.key?(:default_namespace) && mapping[:default_namespace].is_a?(String)
-        return false unless mapping.key?(:predicate_mapping) && mapping[:predicate_mapping].is_a?(Hash)
-        true
-      end
   end
 end

data/lib/active_fedora/identifiable.rb

@@ -45,12 +45,6 @@ module ActiveFedora
       @ldp_source = build_ldp_resource(id.to_s)
     end
 
-    # TODO: Remove after we no longer support #pid.
-    def pid
-      Deprecation.warn FedoraAttributes, "#{self.class}#pid is deprecated and will be removed in active-fedora 10.0. Use #{self.class}#id instead."
-      id
-    end
-
     # @return [RDF::URI] the uri for this resource
     def uri
       @ldp_source.subject_uri

data/lib/active_fedora/ldp_resource.rb

@@ -12,18 +12,6 @@ module ActiveFedora
       self.class.graph_class
     end
 
-    ##
-    # @param [RDF::Graph] original_graph The graph returned by the LDP server
-    # @return [RDF::Graph] A graph striped of any inlined resources present in the original
-    def build_graph(original_graph)
-      Deprecation.warn(ActiveFedora::LdpResource, '#build_graph is deprecated and will be removed in active-fedora 10.0')
-      inlined_resources = get.graph.query(predicate: Ldp.contains).map(&:object)
-
-      # ActiveFedora always wants to copy the resources to a new graph because it
-      # forces a cast to FedoraRdfResource
-      graph_without_inlined_resources(original_graph, inlined_resources)
-    end
-
     # Don't dump @client, it has a proc and thus can't be serialized.
     def marshal_dump
       (instance_variables - [:@client]).map { |name| [name, instance_variable_get(name)] }

data/lib/active_fedora/qualified_dublin_core_datastream.rb

@@ -81,7 +81,7 @@ module ActiveFedora
 
     # Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
     # when this method returns. Each term is marked as a multivalue string.
-    def initialize(digital_object = nil, dsid = nil, options = {})
+    def initialize(string_or_url = nil)
       super
       self.fields = {}
       DCTERMS.each do |el|

data/lib/active_fedora/query_result_builder.rb

@@ -12,23 +12,6 @@ module ActiveFedora
       lazy_reify_solr_results(solr_results, opts).to_a
     end
 
-    def self.reify_solr_result(hit, _opts = {})
-      Deprecation.warn(ActiveFedora::Base, 'ActiveFedora::QueryResultBuilder.reify_solr_result is deprecated and will be removed in ActiveFedora 10.0; call #reify on the SolrHit instead.')
-      ActiveFedora::SolrHit.for(hit).reify
-    end
-
-    # Returns all possible classes for the solr object
-    def self.classes_from_solr_document(hit, _opts = {})
-      Deprecation.warn(ActiveFedora::Base, 'ActiveFedora::QueryResultBuilder.classes_from_solr_document is deprecated and will be removed in ActiveFedora 10.0; call #models on the SolrHit instead.')
-      ActiveFedora::SolrHit.for(hit).models
-    end
-
-    # Returns the best singular class for the solr object
-    def self.class_from_solr_document(hit, opts = {})
-      Deprecation.warn(ActiveFedora::Base, 'ActiveFedora::QueryResultBuilder.class_from_solr_document is deprecated and will be removed in ActiveFedora 10.0; call #model on the SolrHit instead.')
-      ActiveFedora::SolrHit.for(hit).model(opts)
-    end
-
     HAS_MODEL_SOLR_FIELD = ActiveFedora.index_field_mapper.solr_name("has_model", :symbol).freeze
   end
 end

data/lib/active_fedora/rdf/datastream_indexing.rb

@@ -8,17 +8,6 @@ module ActiveFedora::RDF
       end
     end
 
-    # Gives the primary solr name for a column. If there is more than one indexer on the field definition, it gives the first
-    def primary_solr_name(field, file_path)
-      config = self.class.config_for_term_or_uri(field)
-      return nil unless config && config.behaviors # punt on index names for deep nodes!
-      config.behaviors.each do |behavior|
-        result = ActiveFedora.index_field_mapper.solr_name(apply_prefix(field, file_path), behavior, type: config.type)
-        return result if Solrizer::DefaultDescriptors.send(behavior).evaluate_suffix(:text).stored?
-      end
-      raise RuntimeError "no stored fields were found"
-    end
-
     module ClassMethods
       def indexer
         ActiveFedora::RDF::IndexingService

data/lib/active_fedora/rdf/indexing_service.rb

@@ -8,7 +8,7 @@ module ActiveFedora::RDF
     include Solrizer::Common
     attr_reader :object
 
-    # @param obj [#resource, #rdf_subject] the object to build an solr document for. Its class must respond to 'properties'
+    # @param [#resource, #rdf_subject] obj the object to build an solr document for. Its class must respond to 'properties' and 'index_config'
     def initialize(obj)
       @object = obj
     end

data/lib/active_fedora/rdf/rdf_datastream.rb

@@ -14,16 +14,6 @@ module ActiveFedora
         @subject_block ||= ->(ds) { parent_uri(ds) }
       end
 
-      def property(name, *args, &block)
-        super
-        add_attribute_indexing_config(name, &block) if block_given?
-      end
-
-      def add_attribute_indexing_config(name, &block)
-        Deprecation.warn(RDFDatastream, "Adding indexing to datastreams is deprecated")
-        index_config[name] ||= ActiveFedora::Indexing::Map::IndexObject.new(name, &block)
-      end
-
       # Trim the last segment off the URI to get the parents uri
       def parent_uri(ds)
         m = /^(.*)\/[^\/]*$/.match(ds.uri)

data/lib/active_fedora/relation/finder_methods.rb

@@ -48,15 +48,8 @@ module ActiveFedora
         options[:order] ||= sort if sort.present?
       end
 
-      if options.present?
-        options = args.first unless args.empty?
-        Deprecation.warn(ActiveFedora::Base, "Calling .find with a hash has been deprecated and will not be allowed in active-fedora 10.0. Use .where instead")
-        options = { conditions: options }
-        apply_finder_options(options)
-      else
-        raise ArgumentError, "#{self}.find() expects an id. You provided `#{args.inspect}'" unless args.is_a? Array
-        find_with_ids(args, cast)
-      end
+      raise ArgumentError, "#{self}.find() expects an id. You provided `#{args.inspect}'" unless args.is_a? Array
+      find_with_ids(args, cast)
     end
 
     # Gives a record (or N records if a parameter is supplied) without any implied
@@ -125,12 +118,6 @@ module ActiveFedora
       result.first
     end
 
-    # @deprecated
-    def find_with_conditions(*args)
-      Deprecation.warn(ActiveFedora::Base, '.find_with_conditions is deprecated and will be removed in active-fedora 10.0; use .search_with_conditions instead')
-      search_with_conditions(*args)
-    end
-
     # Yields the found ActiveFedora::Base object to the passed block
     #
     # @param [Hash] conditions the conditions for the solr search to match
@@ -182,12 +169,6 @@ module ActiveFedora
       end
     end
 
-    # @deprecated
-    def find_in_batches(*args, &block)
-      Deprecation.warn(ActiveFedora::Base, '.find_in_batches is deprecated and will be removed in active-fedora 10.0; use .search_in_batches instead')
-      search_in_batches(*args, &block)
-    end
-
     # Retrieve the Fedora object with the given id, explore the returned object
     # Raises a ObjectNotFoundError if the object is not found.
     # @param [String] id of the object to load

data/lib/active_fedora/solr_query_builder.rb

@@ -1,7 +1,5 @@
 module ActiveFedora
   module SolrQueryBuilder
-    extend Deprecation
-
     class << self
       # Construct a solr query for a list of ids
       # This is used to get a solr response based on the list of ids in an object's RELS-EXT relationhsips
@@ -13,20 +11,6 @@ module ActiveFedora
         "{!terms f=#{ActiveFedora.id_field}}#{ids.join(',')}"
       end
 
-      # Create a raw query clause suitable for sending to solr as an fq element
-      # @param [String] key
-      # @param [String] value
-      def raw_query(key, value)
-        Deprecation.warn(ActiveFedora::SolrQueryBuilder, 'ActiveFedora::SolrQueryBuilder.raw_query is deprecated and will be removed in ActiveFedora 10.0. Use .construct_query instead.')
-        "_query_:\"{!raw f=#{key}}#{value.gsub('"', '\"')}\""
-      end
-
-      # @deprecated
-      def solr_name(*args)
-        Deprecation.warn(ActiveFedora::SolrQueryBuilder, 'ActiveFedora::SolrQueryBuilder.solr_name is deprecated and will be removed in ActiveFedora 10.0. Use ActiveFedora.index_field_mapper.solr_name instead.')
-        ActiveFedora.index_field_mapper.solr_name(*args)
-      end
-
       # Create a query with a clause for each key, value
       # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
       # @param [String] join_with ('AND') the value we're joining the clauses with

data/lib/active_fedora/solr_service.rb

@@ -1,10 +1,7 @@
 require 'rsolr'
-require 'deprecation'
 
 module ActiveFedora
   class SolrService
-    extend Deprecation
-
     attr_writer :conn
 
     def initialize(options = {})
@@ -16,18 +13,8 @@ module ActiveFedora
     end
 
     class << self
-      def register(*args)
-        options = args.extract_options!
-
-        if args.length == 1
-          Deprecation.warn(SolrService, "SolrService.register with a host argument is deprecated. Use `SolrService.register(url: host)` instead. This will be removed in active-fedora 10.0")
-
-          host = args.first
-          options[:url] = host if host
-        elsif args.length > 1
-          raise ArgumentError, "wrong number of arguments (#{args.length} for 0..2)"
-        end
-
+      # @param [Hash] options
+      def register(options = {})
         ActiveFedora::RuntimeRegistry.solr_service = new(options)
       end
 
@@ -49,87 +36,13 @@ module ActiveFedora
         ActiveFedora::RuntimeRegistry.solr_service
       end
 
-      def lazy_reify_solr_results(solr_results, opts = {})
-        Deprecation.warn SolrService, "SolrService.lazy_reify_solr_results is deprecated. Use QueryResultBuilder.lazy_reify_solr_results instead. This will be removed in active-fedora 10.0"
-        QueryResultBuilder.lazy_reify_solr_results(solr_results, opts)
-      end
-
-      def reify_solr_results(solr_results, opts = {})
-        Deprecation.warn SolrService, "SolrService.reify_solr_results is deprecated. Use QueryResultBuilder.reify_solr_results instead. This will be removed in active-fedora 10.0"
-        QueryResultBuilder.reify_solr_results(solr_results, opts)
-      end
-
-      def reify_solr_result(hit, opts = {})
-        Deprecation.warn SolrService, "SolrService.reify_solr_result is deprecated. Use SolrHit#reify instead. This will be removed in active-fedora 10.0"
-        QueryResultBuilder.reify_solr_result(hit, opts)
-      end
-
-      # Returns all possible classes for the solr object
-      def classes_from_solr_document(hit, opts = {})
-        Deprecation.warn SolrService, "SolrService.classes_from_solr_document is deprecated. Use SolrHit#models instead. This will be removed in active-fedora 10.0"
-        QueryResultBuilder.classes_from_solr_document(hit, opts)
-      end
-
-      # Returns the best singular class for the solr object
-      def class_from_solr_document(hit, opts = {})
-        Deprecation.warn SolrService, "SolrService.class_from_solr_document is deprecated. Use SolrHit#model instead. This will be removed in active-fedora 10.0"
-        QueryResultBuilder.class_from_solr_document(hit, opts)
-      end
-
-      # Construct a solr query for a list of ids
-      # This is used to get a solr response based on the list of ids in an object's RELS-EXT relationhsips
-      # If the id_array is empty, defaults to a query of "id:NEVER_USE_THIS_ID", which will return an empty solr response
-      # @param [Array] id_array the ids that you want included in the query
-      def construct_query_for_ids(id_array)
-        Deprecation.warn SolrService, "SolrService.construct_query_for_ids is deprecated. Use SolrQueryBuilder.construct_query_for_ids instead. This will be removed in active-fedora 10.0"
-        SolrQueryBuilder.construct_query_for_ids(id_array)
-      end
-
-      def construct_query_for_pids(id_array)
-        Deprecation.warn SolrService, "SolrService.construct_query_for_pids is deprecated. Use SolrQueryBuilder.construct_query_for_ids instead. This will be removed in active-fedora 10.0"
-        SolrQueryBuilder.construct_query_for_ids(id_array)
-      end
-
-      # Create a raw query clause suitable for sending to solr as an fq element
-      # @param [String] key
-      # @param [String] value
-      def raw_query(key, value)
-        Deprecation.warn SolrService, "SolrService.raw_query is deprecated. Use SolrQueryBuilder.construct_query instead. This will be removed in active-fedora 10.0"
-        SolrQueryBuilder.construct_query(key, value)
-      end
-
-      def solr_name(*args)
-        Deprecation.warn SolrService, "SolrService.solr_name is deprecated. Use SolrQueryBuilder.solr_name instead. This will be removed in active-fedora 10.0"
-        SolrQueryBuilder.solr_name(*args)
-      end
-
-      # Create a query with a clause for each key, value
-      # @param [Hash, Array<Array<String>>] field_pairs key is the predicate, value is the target_uri
-      # @param [String] join_with ('AND') the value we're joining the clauses with
-      # @example
-      #   construct_query_for_rel [[:has_model, "info:fedora/afmodel:ComplexCollection"], [:has_model, "info:fedora/afmodel:ActiveFedora_Base"]], 'OR'
-      #   # => _query_:"{!field f=has_model_ssim}info:fedora/afmodel:ComplexCollection" OR _query_:"{!field f=has_model_ssim}info:fedora/afmodel:ActiveFedora_Base"
-      #
-      #   construct_query_for_rel [[Book._reflect_on_association(:library), "foo/bar/baz"]]
-      def construct_query_for_rel(field_pairs, join_with = 'AND')
-        Deprecation.warn SolrService, "SolrService.construct_query_for_rel is deprecated. Use SolrQueryBuilder.construct_query_for_rel instead. This will be removed in active-fedora 10.0"
-        SolrQueryBuilder.construct_query_for_rel(field_pairs, join_with)
-      end
-
       def get(query, args = {})
         args = args.merge(q: query, qt: 'standard')
         SolrService.instance.conn.get(select_path, params: args)
       end
 
       def query(query, args = {})
-        raw = args.delete(:raw)
         result = get(query, args)
-
-        if raw
-          Deprecation.warn SolrService, "SolrService.query with raw: true is deprecated. Use SolrService.get instead. This will be removed in active-fedora 10.0"
-          return result
-        end
-
         result['response']['docs'].map do |doc|
           ActiveFedora::SolrHit.new(doc)
         end