active-fedora 9.9.1 → 9.10.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0ebc108c6b87dd9fe1a4dc327e64d3fa5e04339
-  data.tar.gz: 7c77a4ebceaea68268ef3b57664816b95768e208
+  metadata.gz: 7df084ee06f2755c8ff2fc057f8b6a8751bd142a
+  data.tar.gz: 622c46cd850334fe1950625b1e9a5b869f0dd2c0
 SHA512:
-  metadata.gz: c0e4a0fb65f9173bbc475a96a0c06cf559cfb95bb93038e7228facb653d6bc5ce03f7c283d706a9a2f527c362ead96e540b662f63e3fdd626128d85b69282d18
-  data.tar.gz: 64c815e6c7aecea3ed9533d3a81b52c268f0982301ef367c9374bfb2764c5dae8ca06fe992158a406958d980882aac02c41da7c999a85add1d0b89fb4691654e
+  metadata.gz: df6c6b7f8af5f3e511434c06b0e667a3234841c4483dac0a7f508cddf89d4e056a087d7ea2186ea0b454133ff8b027e692bd8acf190bd93a4969c7effd874d09
+  data.tar.gz: 17116f1df54b097ad14272537509d976f3eb9dd9f8911dca31c6ea80ce478af5c398255066628b5620938b5ee3a393a15af58577ac2d7ed3c88bf19e91df47ea

data/.rubocop.yml

@@ -1,5 +1,3 @@
-require: rubocop-rspec
-
 AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
@@ -58,6 +56,7 @@ Metrics/PerceivedComplexity:
     - 'lib/active_fedora/associations/has_and_belongs_to_many_association.rb'
     - 'lib/active_fedora/associations/builder/indirectly_contains.rb'
     - 'lib/active_fedora/associations/builder/directly_contains_one.rb'
+    - 'lib/active_fedora/associations/collection_association.rb'
 
 Metrics/ModuleLength:
   Exclude:
@@ -67,6 +66,7 @@ Metrics/ModuleLength:
     - 'lib/active_fedora/attributes.rb'
     - 'lib/active_fedora/autosave_association.rb'
     - 'lib/active_fedora/attached_files.rb'
+    - 'lib/active_fedora/nested_attributes.rb'
 
 Metrics/ClassLength:
   Exclude:
@@ -76,6 +76,8 @@ Metrics/ClassLength:
     - 'lib/active_fedora/qualified_dublin_core_datastream.rb'
     - 'lib/active_fedora/file_configurator.rb'
     - 'lib/active_fedora/file.rb'
+    - 'lib/active_fedora/associations/association.rb'
+    - 'lib/active_fedora/associations/builder/association.rb'
     - 'lib/active_fedora/associations/collection_proxy.rb'
     - 'lib/active_fedora/associations/collection_association.rb'
 

data/.travis.yml

@@ -2,17 +2,13 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2.1
-matrix:
-  include:
-    - rvm: 2.1
-      env: "RAILS_VERSION=4.2.4"
+  - 2.3.0
 
 notifications:
   irc: "irc.freenode.org#projecthydra"
 
 env:
-  - "RAILS_VERSION=4.1.13"
+  - "RAILS_VERSION=4.2.6"
 
 global_env:
   - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/active-fedora.gemspec

@@ -12,27 +12,30 @@ Gem::Specification.new do |s|
   s.summary     = %q{A convenience libary for manipulating documents in the Fedora Repository.}
   s.description = %q{ActiveFedora provides for creating and managing objects in the Fedora Repository Architecture.}
   s.license = "APACHE2"
-  s.required_ruby_version     = '>= 1.9.3'
+  s.required_ruby_version = '~> 2.0'
 
-  s.add_dependency 'rsolr', "~> 1.0.10"
+  s.add_dependency 'rsolr', '~> 1.0', '>= 1.0.10'
+  s.add_dependency 'solrizer', '~> 3.4'
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
-  s.add_dependency "activesupport", '>= 4.1.0'
+  s.add_dependency "activesupport", '>= 4.2', '< 6'
+  s.add_dependency "activemodel", '>= 4.2', '< 6'
   s.add_dependency "active-triples", '~> 0.7.1'
   s.add_dependency "rdf-rdfxml", '~> 1.1'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
-  s.add_dependency "ldp", '~> 0.4.0'
+  s.add_dependency "ldp", '~> 0.5.0'
 
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"
-  s.add_development_dependency "rake"
+  # Pin rake to 10.0 due to https://github.com/lsegal/yard/issues/947
+  s.add_development_dependency "rake", '~> 10.0'
   s.add_development_dependency "solr_wrapper", "~> 0.4"
   s.add_development_dependency 'fcrepo_wrapper', '~> 0.2'
   s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
-  s.add_development_dependency "simplecov", '~> 0.7.1'
+  s.add_development_dependency "simplecov", '~> 0.8'
   s.add_development_dependency "rubocop", '~> 0.37'
   s.add_development_dependency "rubocop-rspec", '~> 1.4'
 

data/lib/active_fedora.rb

@@ -9,9 +9,6 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/except'
 require 'active_triples'
 
-SOLR_DOCUMENT_ID = Solrizer.default_field_mapper.id_field unless defined?(SOLR_DOCUMENT_ID)
-ENABLE_SOLR_UPDATES = true unless defined?(ENABLE_SOLR_UPDATES)
-
 # Monkey patching RDF::Literal::DateTime to support fractional seconds.
 # See https://github.com/projecthydra/active_fedora/issues/497
 # Also monkey patches in a fix for timezones to be stored properly.
@@ -68,6 +65,7 @@ module ActiveFedora #:nodoc:
       autoload :OmAttribute
       autoload :RdfDatastreamAttribute
     end
+    autoload :DefaultModelMapper
     autoload :Fedora
     autoload :FedoraAttributes
     autoload :File
@@ -87,6 +85,7 @@ module ActiveFedora #:nodoc:
     autoload :LdpResourceService
     autoload :LoadableFromJson
     autoload :Model
+    autoload :ModelClassifier
     autoload :NestedAttributes
     autoload :NomDatastream
     autoload :NullRelation
@@ -121,11 +120,13 @@ module ActiveFedora #:nodoc:
     autoload :Serialization
     autoload :SimpleDatastream
     autoload :SchemaIndexingStrategy
+    autoload :SolrHit
     autoload :SolrInstanceLoader
     autoload :SolrQueryBuilder
     autoload :SolrService
     autoload :SparqlInsert
     autoload :Predicates
+    autoload :Type
     autoload :Validations
     autoload :Versionable
     autoload :VersionsGraph
@@ -245,18 +246,33 @@ module ActiveFedora #:nodoc:
     # @example Search within ActiveFedora::RdfNode for a class called "TermProxy"
     #   ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode)
     #   => ActiveFedora::RdfNode::TermProxy
-    def class_from_string(full_class_name, container_class = Kernel)
-      container_class = container_class.name if container_class.is_a? Module
-      container_parts = container_class.split('::')
-      (container_parts + full_class_name.split('::')).flatten.inject(Kernel) do |mod, class_name|
-        if mod == Kernel
-          Object.const_get(class_name)
-        elsif mod.const_defined? class_name.to_sym
-          mod.const_get(class_name)
-        else
-          container_parts.pop
-          class_from_string(class_name, container_parts.join('::'))
-        end
+    def class_from_string(*args)
+      ActiveFedora::ModelClassifier.class_from_string(*args)
+    end
+
+    def model_mapper
+      ActiveFedora::DefaultModelMapper.new
+    end
+
+    def index_field_mapper
+      Solrizer.default_field_mapper
+    end
+
+    def id_field
+      if defined?(SOLR_DOCUMENT_ID) && !SOLR_DOCUMENT_ID.nil?
+        SOLR_DOCUMENT_ID
+      elsif defined?(Solrizer)
+        Solrizer.default_field_mapper.id_field
+      else
+        'id'.freeze
+      end
+    end
+
+    def enable_solr_updates?
+      if defined?(ENABLE_SOLR_UPDATES)
+        ENABLE_SOLR_UPDATES
+      else
+        true
       end
     end
   end

data/lib/active_fedora/associations.rb

@@ -69,7 +69,7 @@ module ActiveFedora
       association = association_instance_get(name)
 
       if association.nil?
-        reflection  = self.class.reflect_on_association(name)
+        reflection  = self.class._reflect_on_association(name)
         association = reflection.association_class.new(self, reflection) if reflection
         association_instance_set(name, association) if association
       end

data/lib/active_fedora/associations/association.rb

@@ -18,7 +18,7 @@ module ActiveFedora
         @owner = owner
         @reflection = reflection
         reset
-        # construct_scope
+        reset_scope
       end
 
       # Resets the \loaded flag to +false+ and sets the \target to +nil+.
@@ -32,7 +32,7 @@ module ActiveFedora
       # Reloads the \target and returns +self+ on success.
       def reload
         reset
-        # construct_scope
+        reset_scope
         load_target
         self unless @target.nil?
       end
@@ -79,6 +79,10 @@ module ActiveFedora
         @association_scope ||= AssociationScope.new(self).scope if klass
       end
 
+      def reset_scope
+        @association_scope = nil
+      end
+
       # Set the inverse association, if possible
       def set_inverse_instance(record)
         return unless record && invertible_for?(record)

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -36,16 +36,6 @@ module ActiveFedora
           owner[reflection.foreign_key] = nil
         end
 
-        # Constructs a query that checks solr for the correct id & class_name combination
-        def construct_query(ids)
-          # Some descendants of ActiveFedora::Base are anonymous classes. They don't have names. Filter them out.
-          candidate_classes = klass.descendants.select(&:name)
-          candidate_classes += [klass] unless klass == ActiveFedora::Base
-          model_pairs = candidate_classes.each_with_object([]) { |klass, arr| arr << [:has_model, klass.to_class_uri] }
-          '(' + ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids) + ') AND (' +
-            ActiveFedora::SolrQueryBuilder.construct_query_for_rel(model_pairs, 'OR') + ')'
-        end
-
         def foreign_key_present?
           owner[reflection.foreign_key]
         end

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

@@ -1,21 +1,53 @@
 module ActiveFedora::Associations::Builder
   class Association #:nodoc:
-    class_attribute :valid_options
-    self.valid_options = [:class_name, :predicate, :type_validator]
+    class << self
+      attr_accessor :extensions
+    end
+    self.extensions = []
+
+    VALID_OPTIONS = [:class_name, :predicate, :type_validator].freeze
+
+    def self.macro
+      raise NotImplementedError
+    end
 
-    # Set by subclasses
-    class_attribute :macro
+    def self.valid_options(_options)
+      VALID_OPTIONS + Association.extensions.flat_map(&:valid_options)
+    end
+
+    def self.validate_options(options)
+      options.assert_valid_keys(valid_options(options))
+    end
 
     attr_reader :model, :name, :options, :mixin
 
     # configure_dependency
-    def self.build(model, name, options)
-      reflection = new(model, name, options).build
+    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 " \
+                             "this will conflict with a method #{name} already defined by ActiveFedora. " \
+                             "Please choose a different association name.")
+      end
+
+      extension = define_extensions model, name, &block
+      reflection = create_reflection model, name, nil, options, extension
       define_accessors(model, reflection)
       define_callbacks(model, reflection)
+      define_validations model, reflection
       reflection
     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
+
+      validate_options(options)
+
+      new(model, name, options).build
+    end
+
     def initialize(model, name, options)
       @model = model
       @name = name
@@ -36,7 +68,7 @@ module ActiveFedora::Associations::Builder
     end
 
     def validate_options
-      options.assert_valid_keys(self.class.valid_options)
+      self.class.validate_options(options)
     end
 
     # Returns the RDF predicate as defined by the :property attribute
@@ -45,13 +77,26 @@ module ActiveFedora::Associations::Builder
       ActiveFedora::Predicates.find_graph_predicate(property)
     end
 
+    def self.define_extensions(_model, _name)
+    end
+
     def self.define_callbacks(model, reflection)
       if dependent = reflection.options[:dependent]
         check_dependent_options(dependent)
         add_destroy_callbacks(model, reflection)
       end
+
+      Association.extensions.each do |extension|
+        extension.build model, reflection
+      end
     end
 
+    # Defines the setter and getter methods for the association
+    # class Post < ActiveRecord::Base
+    #   has_many :comments
+    # end
+    #
+    # Post.first.comments and Post.first.comments= methods are defined by this method...
     def self.define_accessors(model, reflection)
       mixin = model.generated_association_methods
       name = reflection.name
@@ -60,19 +105,47 @@ module ActiveFedora::Associations::Builder
     end
 
     def self.define_readers(mixin, name)
-      mixin.send(:define_method, name) do |*params|
-        association(name).reader(*params)
-      end
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}(*args)
+          association(:#{name}).reader(*args)
+        end
+      CODE
     end
 
     def self.define_writers(mixin, name)
-      mixin.send(:define_method, "#{name}=") do |value|
-        association(name).writer(value)
+      mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1
+        def #{name}=(value)
+          association(:#{name}).writer(value)
+        end
+      CODE
+    end
+
+    def self.define_validations(_model, _reflection)
+      # noop
+    end
+
+    def self.add_destroy_callbacks(model, reflection)
+      name = reflection.name
+      model.before_destroy lambda do |o|
+        a = o.association(name)
+        a.handle_dependency if a.respond_to? :handle_dependency
+      end
+    end
+
+    def self.valid_dependent_options
+      raise NotImplementedError
+    end
+
+    def self.check_dependent_options(dependent)
+      unless valid_dependent_options.include? dependent
+        raise ArgumentError, "The :dependent option must be one of #{valid_dependent_options}, but is :#{dependent}"
       end
     end
 
     def configure_dependency
       return unless options[:dependent]
+      return if model.association(name).respond_to? :handle_dependency
+
       unless [:destroy, :delete].include?(options[:dependent])
         raise ArgumentError, "The :dependent option expects either :destroy or :delete (#{options[:dependent].inspect})"
       end

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

@@ -1,6 +1,8 @@
 module ActiveFedora::Associations::Builder
   class BelongsTo < SingularAssociation #:nodoc:
-    self.macro = :belongs_to
+    def self.macro
+      :belongs_to
+    end
 
     def validate_options
       super

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

@@ -3,13 +3,14 @@ module ActiveFedora::Associations::Builder
   class CollectionAssociation < Association #:nodoc:
     CALLBACKS = [:before_add, :after_add, :before_remove, :after_remove].freeze
 
-    self.valid_options += [
-      :before_add, :after_add, :before_remove, :after_remove
-    ]
+    def self.valid_options(options)
+      super + CALLBACKS
+    end
 
     def self.define_callbacks(model, reflection)
       name = reflection.name
       options = reflection.options
+      super
       CALLBACKS.each { |callback_name| define_callback(model, callback_name, name, options) }
     end
 

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

@@ -1,7 +1,12 @@
 module ActiveFedora::Associations::Builder
   class Contains < SingularAssociation #:nodoc:
-    self.macro = :contains
-    self.valid_options += [:autocreate, :block]
+    def self.macro
+      :contains
+    end
+
+    def self.valid_options(options)
+      super + [:autocreate, :block]
+    end
 
     def initialize(model, name, options)
       super

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

@@ -1,8 +1,12 @@
 module ActiveFedora::Associations::Builder
   class DirectlyContains < CollectionAssociation #:nodoc:
-    self.macro = :directly_contains
-    self.valid_options += [:has_member_relation, :is_member_of_relation]
-    self.valid_options -= [:predicate]
+    def self.macro
+      :directly_contains
+    end
+
+    def self.valid_options(options)
+      super + [:has_member_relation, :is_member_of_relation] - [:predicate]
+    end
 
     def build
       reflection = super