active-fedora 9.13.0 → 10.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de64ddd51b632d51f1f4dc511ff09f362ef0f780
-  data.tar.gz: d92cd808d81b5f883bfe354ec500ddb0b876cf45
+  metadata.gz: 52036e2b5df62b1f60a9de0775f437b25c3a7007
+  data.tar.gz: 3dfb407e63e75f71b5a4ee179ae3bb269fb9d507
 SHA512:
-  metadata.gz: 74614aefd969cdbc977b7c793a8c2f09f434200ae28407d75af925112fcd85b3da3f14fc112fa3d704573762909c25d03111c509b172452574183ccc3836b749
-  data.tar.gz: 60a60f1c17d835d44423bb1a4fa24bcec477ff9854bfb0b33791220de4edfd2b273942a9fbce8b486aa6ba4f5fec397efc87b38687ff8e6058a46778f2938788
+  metadata.gz: e8f1330cc76aae3d76639026d5538c559e3b156093138f11ff736a0d0220e5bba0732b4997dc68e43f52fba756c1ebd5c77fa3d406db6ee4d9761837f3ce4cda
+  data.tar.gz: 108479da9acacf1fef63de9d734eaa3c2aa866660b75b5363474ef1283ce04938beb0f71f04eb19cee890a5bfa46cca95f866c47ce454bee36685cc94db0045c

data/README.md

@@ -93,25 +93,6 @@ is installed, run:
 rake spec
 ```
 
-Predicate Mappings
-------------------
-
-ActiveFedora versions 2.2.1 and higher provides specialized control over
-the predicate mappings used by SemanticNode. In order to provide your
-own mappings,
-you must supply a `predicate_mappings.yml` in the same format as the
-`config/predicate_mappings.yml` file shipped with the ActiveFedora gem.
-Place the file in the same directory
-as your `fedora.yml` file and use the current method of initializing
-ActiveFedora:
-
-```ruby
-ActiveFedora.init("/path/to/my/config/fedora.yml")
-```
-
-If no `predicate_mappings.yml` file is found, ActiveFedora will use the
-default mappings.
-
 Acknowledgements
 ----------------
 

data/lib/active_fedora.rb

@@ -59,14 +59,10 @@ module ActiveFedora #:nodoc:
       autoload :DirectContainer
       autoload :IndirectContainer
     end
-    autoload :Datastream
     autoload :Datastreams
     autoload :DelegatedAttribute
     autoload_under 'attributes' do
-      autoload :StreamAttribute
       autoload :ActiveTripleAttribute
-      autoload :OmAttribute
-      autoload :RdfDatastreamAttribute
     end
     autoload :DefaultModelMapper
     autoload :Fedora
@@ -91,7 +87,6 @@ module ActiveFedora #:nodoc:
     autoload :LdpResource
     autoload :LdpResourceService
     autoload :LoadableFromJson
-    autoload :Model
     autoload :ModelClassifier
     autoload :NestedAttributes
     autoload :NomDatastream
@@ -127,14 +122,12 @@ module ActiveFedora #:nodoc:
     autoload :Schema
     autoload :Scoping
     autoload :Serialization
-    autoload :SimpleDatastream
     autoload :SchemaIndexingStrategy
     autoload :SolrHit
     autoload :SolrInstanceLoader
     autoload :SolrQueryBuilder
     autoload :SolrService
     autoload :SparqlInsert
-    autoload :Predicates
     autoload :Type
     autoload :Validations
     autoload :Versionable
@@ -172,8 +165,6 @@ module ActiveFedora #:nodoc:
     end
   end
 
-  extend Deprecation
-
   class << self
     attr_reader :fedora_config, :solr_config, :config_options
     attr_accessor :configurator
@@ -198,7 +189,6 @@ module ActiveFedora #:nodoc:
       end
       @fedora_config = nil
       SolrService.reset!
-      Predicates.predicate_config = nil
       configurator.init(options)
     end
 
@@ -234,17 +224,10 @@ module ActiveFedora #:nodoc:
       ActiveFedora::SolrService.instance
     end
 
-    def reset_fedora!
-      Deprecation.warn(ActiveFedora, 'ActiveFedora.reset_fedora! is deprecated; use ActiveFedora::Fedora.reset! instead. This will be removed in active-fedora 10.0')
-      ActiveFedora::Fedora.reset!
-    end
-
     def fedora
       ActiveFedora::Fedora.instance
     end
 
-    delegate :predicate_config, to: :configurator
-
     def root
       ::File.expand_path('../..', __FILE__)
     end

data/lib/active_fedora/associations.rb

@@ -183,22 +183,6 @@ module ActiveFedora
           Builder::HasMany.build(self, name, options)
         end
 
-        # This method is used to specify the details of a contained resource.
-        # Pass the name as the first argument and a hash of options as the second argument
-        # Note that this method doesn't actually execute the block, but stores it, to be executed
-        # by any the implementation of the resource(specified as :class_name)
-        #
-        # @param [String] name the handle to refer to this child as
-        # @param [Hash] options
-        # @option options [Class] :class_name The class that will represent this child, should extend ``ActiveFedora::File'' or ``ActiveFedora::Base''
-        # @option options [String] :url
-        # @option options [Boolean] :autocreate Always create this resource on new objects
-        # @yield block executed by some types of child resources
-        def contains(name, options = {}, &block)
-          Deprecation.warn(Associations, "contains is deprecated. Use has_subresource instead. This will be removed in ActiveFedora 10")
-          has_subresource(name, options, &block)
-        end
-
         # This method is used to specify the details of a contained resource.
         # Pass the name as the first argument and a hash of options as the second argument
         # Note that this method doesn't actually execute the block, but stores it, to be executed

data/lib/active_fedora/associations/builder/association.rb

@@ -10,9 +10,9 @@ module ActiveFedora::Associations::Builder
     # configure_dependency
     def self.build(model, name, options, &block)
       if model.dangerous_attribute_method?(name)
-        Deprecation.warn(ActiveFedora::Base, "You tried to define an association named #{name} on the model #{model.name}, but " \
+        raise ArgumentError, "You tried to define an association named #{name} on the model #{model.name}, but " \
                              "this will conflict with a method #{name} already defined by ActiveFedora. " \
-                             "Please choose a different association name.")
+                             "Please choose a different association name."
       end
 
       extension = define_extensions model, name, &block
@@ -24,12 +24,8 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.create_reflection(model, name, scope, options, extension = nil)
-      unless name.is_a?(Symbol)
-        name = name.to_sym
-        Deprecation.warn(ActiveFedora::Base, "association names must be a Symbol")
-      end
+      raise ArgumentError, "association names must be a Symbol. You provided #{name.inspect}" unless name.is_a?(Symbol)
       validate_options(options)
-      translate_property_to_predicate(options)
 
       scope = build_scope(scope, extension)
       name = better_name(name)
@@ -67,18 +63,6 @@ module ActiveFedora::Associations::Builder
       name
     end
 
-    def self.translate_property_to_predicate(options)
-      return unless options[:property]
-      Deprecation.warn Association, "the :property option to `#{model}.#{macro} :#{name}' is deprecated and will be removed in active-fedora 10.0. Use :predicate instead", caller(5)
-      options[:predicate] = predicate(options.delete(:property))
-    end
-
-    # Returns the RDF predicate as defined by the :property attribute
-    def self.predicate(property)
-      return property if property.is_a? RDF::URI
-      ActiveFedora::Predicates.find_graph_predicate(property)
-    end
-
     def self.define_extensions(_model, _name)
     end
 

data/lib/active_fedora/associations/builder/has_and_belongs_to_many.rb

@@ -1,6 +1,5 @@
 module ActiveFedora::Associations::Builder
   class HasAndBelongsToMany < CollectionAssociation #:nodoc:
-    extend Deprecation
     def self.macro
       :has_and_belongs_to_many
     end
@@ -11,8 +10,7 @@ module ActiveFedora::Associations::Builder
 
     def self.validate_options(options)
       super
-      Deprecation.warn HasAndBelongsToMany, ":solr_page_size doesn't do anything anymore and will be removed in ActiveFedora 10" if options.key?(:solr_page_size)
-      raise "You must specify a predicate for #{name}" unless options[:predicate]
+      raise ArgumentError, "You must specify a predicate for #{name}" unless options[:predicate]
       raise ArgumentError, "Predicate must be a kind of RDF::URI" unless options[:predicate].is_a?(RDF::URI)
     end
   end

data/lib/active_fedora/attached_files.rb

@@ -1,15 +1,6 @@
-require 'deprecation'
-
 module ActiveFedora
   module AttachedFiles
     extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = "active-fedora 10.0"
-
-    def ds_specs
-      self.class.child_resource_reflections
-    end
-    deprecation_deprecate :ds_specs
 
     def serialize_attached_files
       declared_attached_files.each_value(&:serialize!)
@@ -34,20 +25,10 @@ module ActiveFedora
       @attached_files ||= FilesHash.new(self)
     end
 
-    def datastreams
-      attached_files
-    end
-    deprecation_deprecate :datastreams
-
     def clear_attached_files
       @attached_files = nil
     end
 
-    def clear_datastreams
-      clear_attached_files
-    end
-    deprecation_deprecate :clear_datastreams
-
     def contains_assertions
       resource.query(subject: resource, predicate: ::RDF::Vocab::LDP.contains).objects.map(&:to_s)
     end
@@ -71,11 +52,6 @@ module ActiveFedora
       file_path
     end
 
-    def add_datastream(datastream, opts = {})
-      attach_file(datastream, opts)
-    end
-    deprecation_deprecate :add_datastream
-
     # @return [Array] all attached files that return true for `metadata?` and are not Rels-ext
     def metadata_streams
       attached_files.select { |_k, ds| ds.metadata? }.values
@@ -85,11 +61,6 @@ module ActiveFedora
     # File Management
     #
 
-    def add_file_datastream(file, opts = {})
-      Deprecation.warn AttachedFiles, "add_file_datastream is deprecated and will be removed in active-fedora 10.0. Use add_file instead"
-      add_file(file, opts)
-    end
-
     # Attach the given stream/string to object
     #
     # @param [IO, String] file the file to add
@@ -98,27 +69,10 @@ module ActiveFedora
     # @option opts [String] :prefix The path prefix (for auto-generated path)
     # @option opts [String] :mime_type The Mime-Type of the file
     # @option opts [String] :original_name The original name of the file (used for Content-Disposition)
-    def add_file(file, *args)
-      opts = if args.size == 1
-               args.first
-             else
-               Deprecation.warn AttachedFiles, "The second option to add_file should be a hash. Passing the file path is deprecated and will be removed in active-fedora 10.0.", caller
-               { path: args[0], original_name: args[1], mime_type: args[2] }
-             end
-
-      if opts[:dsid]
-        Deprecation.warn AttachedFiles, "The :dsid option to add_file is deprecated and will be removed in active-fedora 10.0. Use :path instead", caller
-        opts[:path] = opts[:dsid]
-      end
-
+    def add_file(file, opts)
       find_or_create_child_resource(opts[:path], opts[:prefix]).tap do |node|
         node.content = file
-        node.mime_type = if opts[:mimeType]
-                           Deprecation.warn AttachedFiles, "The :mimeType option to add_file is deprecated and will be removed in active-fedora 10.0. Use :mime_type instead", caller
-                           opts[:mimeType]
-                         else
-                           opts[:mime_type]
-                         end
+        node.mime_type = opts[:mime_type]
         node.original_name = opts[:original_name]
       end
     end
@@ -154,65 +108,5 @@ module ActiveFedora
       def accessor_name(file_path)
         file_path.tr('-', '_')
       end
-
-      module ClassMethods
-        def ds_specs
-          Deprecation.warn(self, "ds_specs is deprecated and will be removed in ActiveFedora 10.0")
-          child_resource_reflections
-        end
-
-        # 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
-        # or you can pass the :name as a value in the args hash. Either way, name is required.
-        # Note that this method doesn't actually execute the block, but stores it, to be executed
-        # by any the implementation of the datastream(specified as :type)
-        #
-        # @param [Hash] args
-        # @option args [Class] :type The class that will represent this datastream, should extend ``ActiveFedora::File''
-        # @option args [String] :name the handle to refer to this datastream as
-        # @option args [String] :url
-        # @option args [Boolean] :autocreate Always create this datastream on new objects
-        # @yield block executed by some kinds of datastreams
-        def has_metadata(*args, &block)
-          Deprecation.warn(self, "has_metadata is deprecated and will be removed in ActiveFedora 10.0. Use has_subresource instead.")
-          if args.first.is_a? String
-            name = args.first
-            args = args[1] || {}
-            args[:name] = name
-          else
-            args = args.first || {}
-          end
-          name = args.delete(:name)
-          raise ArgumentError, "You must provide a :type property for the datastream '#{name}'" unless args[:type]
-          args[:class_name] = args.delete(:type).to_s
-          has_subresource(name, args, &block)
-        end
-
-        # @overload has_file_datastream(name, args)
-        #   Declares a file datastream exists for objects of this type
-        #   @param [String] name
-        #   @param [Hash] args
-        #     @option args :type (ActiveFedora::File) The class the datastream should have
-        #     @option args [Boolean] :autocreate Always create this datastream on new objects
-        # @overload has_file_datastream(args)
-        #   Declares a file datastream exists for objects of this type
-        #   @param [Hash] args
-        #     @option args :name ("content") The dsid of the datastream
-        #     @option args :type (ActiveFedora::File) The class the datastream should have
-        #     @option args [Boolean] :autocreate Always create this datastream on new objects
-        def has_file_datastream(*args)
-          Deprecation.warn(self, "has_file_datastream is deprecated and will be removed in ActiveFedora 10.0. Use has_subresource instead.")
-          if args.first.is_a? String
-            name = args.first
-            args = args[1] || {}
-            args[:name] = name
-          else
-            args = args.first || {}
-          end
-          name = args.delete(:name)
-          args[:class_name] = args.delete(:type).to_s
-          has_subresource(name, args)
-        end
-      end
   end
 end

data/lib/active_fedora/attributes.rb

@@ -1,10 +1,7 @@
 require 'active_model/forbidden_attributes_protection'
-require 'deprecation'
 module ActiveFedora
   module Attributes
     extend ActiveSupport::Concern
-    extend Deprecation
-    self.deprecation_horizon = 'ActiveFedora 10.0'
     include ActiveModel::Dirty
     include ActiveModel::ForbiddenAttributesProtection
 
@@ -35,8 +32,7 @@ module ActiveFedora
         # Use the generated method so that single value assetions are single
         send(key)
       else
-        # The attribute is a delegate to a datastream
-        array_reader(key)
+        raise ArgumentError, "Unknown attribute #{key}"
       end
     end
 
@@ -49,21 +45,10 @@ module ActiveFedora
         # The attribute is stored in the RDF graph for this object
         send(key.to_s + "=", value)
       else
-        # The attribute is a delegate to a datastream
-        array_setter(key, value)
+        raise ArgumentError, "Unknown attribute #{key}"
       end
     end
 
-    # @return [Boolean] true if there is an reader method and it returns a
-    # value different from the new_value.
-    def value_has_changed?(field, new_value)
-      new_value != array_reader(field)
-    end
-
-    def mark_as_changed(field)
-      send("#{field}_will_change!")
-    end
-
     def local_attributes
       self.class.local_attributes
     end
@@ -77,27 +62,6 @@ module ActiveFedora
         respond_to_without_attributes?(:attributes) && self.class.delegated_attributes.include?(attr_name)
       end
 
-    private
-
-      def array_reader(field, *args)
-        raise UnknownAttributeError.new(self, field) unless self.class.delegated_attributes.key?(field)
-
-        val = self.class.delegated_attributes[field].reader(self, *args)
-        self.class.multiple?(field) ? val : val.first
-      end
-
-      def array_setter(field, args)
-        raise UnknownAttributeError.new(self, field) unless self.class.delegated_attributes.key?(field)
-        if self.class.multiple?(field)
-          if args.present? && !args.respond_to?(:each)
-            raise ArgumentError, "You attempted to set the attribute `#{field}' on `#{self.class}' to a scalar value. However, this attribute is declared as being multivalued."
-          end
-        elsif args.respond_to?(:each) # singular
-          raise ArgumentError, "You attempted to set the attribute `#{field}' on `#{self.class}' to an enumerable value. However, this attribute is declared as being singular."
-        end
-        self.class.delegated_attributes[field].writer(self, args)
-      end
-
       module ClassMethods
         def attribute_names
           @attribute_names ||= delegated_attributes.keys + association_attributes - system_attributes
@@ -123,11 +87,6 @@ module ActiveFedora
           outgoing_reflections.values.map { |reflection| reflection.foreign_key.to_s }
         end
 
-        def defined_attributes
-          Deprecation.warn Attributes, "defined_attributes has been renamed to delegated_attributes. defined_attributes will be removed in ActiveFedora 9"
-          delegated_attributes
-        end
-
         def delegated_attributes
           @delegated_attributes ||= {}.with_indifferent_access
           return @delegated_attributes unless superclass.respond_to?(:delegated_attributes) && value = superclass.delegated_attributes
@@ -139,15 +98,6 @@ module ActiveFedora
           @delegated_attributes = val
         end
 
-        def has_attributes(*fields, &block)
-          options = fields.pop
-          delegate_target = options.delete(:datastream)
-          raise ArgumentError, "You must provide a datastream to has_attributes" if delegate_target.blank?
-
-          Deprecation.warn Attributes, "has_attributes is deprecated and will be removed in ActiveFedora 10.0. Consider using the Form pattern to save all related models or directly delegate the properties and save the target separately"
-          define_delegated_accessor(fields, delegate_target, options, &block)
-        end
-
         # Reveal if the attribute has been declared unique
         # @param [Symbol] field the field to query
         # @return [Boolean]
@@ -164,14 +114,8 @@ module ActiveFedora
         end
 
         def property(name, properties = {}, &block)
-          if properties.key?(:predicate)
-            define_active_triple_accessor(name, properties, &block)
-          elsif properties.key?(:delegate_to)
-            Deprecation.warn Attributes, "delegated properties are deprecated and will be removed in ActiveFedora 10.0. Consider using the Form pattern to save all related models or directly delegate the properties and save the target separately"
-            define_delegated_accessor([name], properties.delete(:delegate_to), properties.reverse_merge(multiple: true), &block)
-          else
-            raise "You must provide `:delegate_to' or `:predicate' options to property"
-          end
+          raise ArgumentError, "You must provide a `:predicate' option to property" unless properties.key?(:predicate)
+          define_active_triple_accessor(name, properties, &block)
         end
 
         private
@@ -187,19 +131,6 @@ module ActiveFedora
             add_attribute_indexing_config(name, &block) if block_given?
           end
 
-          def define_delegated_accessor(fields, delegate_target, options, &block)
-            define_attribute_methods fields
-            fields.each do |f|
-              klass = datastream_class_for_name(delegate_target)
-              attribute_properties = options.merge(delegate_target: delegate_target, klass: klass)
-              find_or_create_defined_attribute f, attribute_class(klass), attribute_properties
-
-              create_attribute_reader(f, delegate_target, options)
-              create_attribute_setter(f, delegate_target, options)
-              add_attribute_indexing_config(f, &block) if block_given?
-            end
-          end
-
           def add_attribute_indexing_config(name, &block)
             index_config[name] ||= ActiveFedora::Indexing::Map::IndexObject.new(name, &block)
           end
@@ -223,33 +154,6 @@ module ActiveFedora
           def find_or_create_defined_attribute(field, klass, args)
             delegated_attributes[field] ||= klass.new(field, args)
           end
-
-          # @param [String] dsid the datastream id
-          # @return [Class] the class of the datastream
-          def datastream_class_for_name(dsid)
-            reflection = _reflect_on_association(dsid.to_sym)
-            reflection ? reflection.klass : ActiveFedora::File
-          end
-
-          def create_attribute_reader(field, _dsid, _args)
-            define_method field do |*opts|
-              array_reader(field, *opts)
-            end
-          end
-
-          def create_attribute_setter(field, _dsid, _args)
-            define_method "#{field}=".to_sym do |v|
-              self[field] = v
-            end
-          end
-
-          def attribute_class(klass)
-            if klass < ActiveFedora::RDFDatastream
-              RdfDatastreamAttribute
-            else
-              OmAttribute
-            end
-          end
       end
   end
 end