active-fedora 10.3.0 → 11.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f4e8471f5df940e6d52c76f150fd1532aff2e7d
-  data.tar.gz: 79be63a9635f81dfe7a0017fe8890900e4ff598c
+  metadata.gz: e30d9865f03aa8fde7431fa449c1fd1b0fa8a3c5
+  data.tar.gz: ad33f54129ac32831e5917b980d2607e2fd6bc1d
 SHA512:
-  metadata.gz: c2ff90b7a1a95255a21f55d72c55a488087087147629b29615380a041ba8da465a61274e850b52299955951f7a85bf398e4d0709db552cfb418d4ad2693b524f
-  data.tar.gz: 193eac22abf48bb8b3817d92d36fb25f977155648ee8f7c2493d271be6d01c4b2f0d4b587c501b2fe668a0f82d0e7cd0a4eba16af506d84da7136c5664ca0ff6
+  metadata.gz: edf50b69bdd72334819f4470868936646752c79da2091413721ea35410ce45ec00e14445f8853df15f36fa18fff89dfe443b3171985395b910237f7de54531e7
+  data.tar.gz: 09720448439264991177243424a6f9bf1d133c62ad916b00d9075d22ab04625b6548d6a166883ae229c1509e7cf5c4fd85ee1466b7b2d05bbc45ba8a76a3ccb4

data/.rubocop.yml

@@ -1,3 +1,6 @@
+inherit_from:
+- .rubocop_todo.yml
+
 AllCops:
   TargetRubyVersion: 2.2
   DisplayCopNames: true
@@ -89,6 +92,7 @@ Metrics/ClassLength:
     - 'lib/active_fedora/reflection.rb'
     - 'lib/active_fedora/orders/ordered_list.rb'
     - 'lib/active_fedora/solr_service.rb'
+    - 'lib/active_fedora/associations/orders_association.rb'
 
 Metrics/MethodLength:
   Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,24 @@
+require: rubocop-rspec
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-29 08:55:51 -0500 using RuboCop version 0.42.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 133
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Enabled: false
+
+# Offense count: 58
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Enabled: false
+
+# Offense count: 2
+Style/MethodMissing:
+  Exclude:
+    - 'lib/active_fedora/nom_datastream.rb'
+    - 'lib/active_fedora/relation/delegation.rb'

data/README.md

@@ -75,9 +75,11 @@ rake active_fedora:ci
 If you want to run the tests manually, follow these instructions:
 
 ```bash
-solr_wrapper
+solr_wrapper -d solr/config/ --collection_name hydra-test
 ```
 
+You can switch `hydra-test` to `hydra-dev` if you want to create a collection for development.
+
 To start FCRepo, open another shell and run:
 
 ```bash

data/active-fedora.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 4.2.4', '< 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 "active-triples", '~> 0.10.0'
+  s.add_dependency "rdf-rdfxml"
+  s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.5.0'
 
@@ -36,8 +37,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "simplecov", '~> 0.8'
-  # Pin to rubocop 0.38.0 due to https://github.com/nevir/rubocop-rspec/issues/78
-  s.add_development_dependency "rubocop", '~> 0.38.0'
+  s.add_development_dependency "rubocop", '~> 0.42.0'
   s.add_development_dependency "rubocop-rspec", '~> 1.4'
 
   s.files         = `git ls-files`.split("\n")

data/lib/active_fedora.rb

@@ -95,7 +95,6 @@ module ActiveFedora #:nodoc:
     autoload :Orders
     autoload :Pathing
     autoload :Persistence
-    autoload :ProfileIndexingService
     autoload :Property
     autoload :QualifiedDublinCoreDatastream
     autoload :Querying
@@ -124,7 +123,6 @@ module ActiveFedora #:nodoc:
     autoload :Serialization
     autoload :SchemaIndexingStrategy
     autoload :SolrHit
-    autoload :SolrInstanceLoader
     autoload :SolrQueryBuilder
     autoload :SolrService
     autoload :SparqlInsert

data/lib/active_fedora/aggregation/list_source.rb

@@ -73,6 +73,8 @@ module ActiveFedora
           # Assert head and tail
           self.head = ordered_self.head.next.rdf_subject
           self.tail = ordered_self.tail.prev.rdf_subject
+          head_will_change!
+          tail_will_change!
           graph = ordered_self.to_graph
           resource << graph
           # Set node subjects to a term in AF JUST so that AF will persist the

data/lib/active_fedora/associations/association_scope.rb

@@ -31,7 +31,7 @@ module ActiveFedora
               scope = scope.where(ActiveFedora::SolrQueryBuilder.construct_query_for_rel(association.send(:find_reflection) => owner.id))
             end
 
-            is_first_chain = i == 0
+            is_first_chain = i.zero?
             is_first_chain ? klass : reflection.klass
           end
 

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

@@ -19,7 +19,7 @@ module ActiveFedora::Associations::Builder
     private_class_method :indirect_options
 
     def self.has_member_relation(options)
-      options[:has_member_relation] || ::RDF::DC.hasPart
+      options[:has_member_relation] || ::RDF::Vocab::DC.hasPart
     end
     private_class_method :has_member_relation
 

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

@@ -36,7 +36,7 @@ module ActiveFedora::Associations::Builder
     def self.build_scope(scope, extension)
       new_scope = scope
 
-      new_scope = proc { instance_exec(&scope) } if scope && scope.arity == 0
+      new_scope = proc { instance_exec(&scope) } if scope && scope.arity.zero?
 
       new_scope = wrap_scope new_scope, extension if extension
 

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

@@ -14,6 +14,9 @@ module ActiveFedora::Associations::Builder
       mixin.redefine_method(target_accessor(name)) do
         association(name).target_reader
       end
+      mixin.redefine_method("#{target_accessor(name, pluralize: false)}_ids") do
+        association(name).target_ids_reader
+      end
       mixin.redefine_method("#{target_accessor(name)}=") do |nodes|
         association(name).target_writer(nodes)
       end
@@ -27,7 +30,7 @@ module ActiveFedora::Associations::Builder
       model.send(:define_method, :apply_first_and_last) do
         source = send(options[:through])
         source.save
-        return if head.map(&:rdf_subject) == source.head_id && tail.map(&:rdf_subject) == source.tail_id
+        return if head_ids == source.head_id && tail_ids == source.tail_id
         self.head = source.head_id
         self.tail = source.tail_id
         save! if changed?
@@ -50,8 +53,13 @@ module ActiveFedora::Associations::Builder
       end
     end
 
-    def self.target_accessor(name)
-      name.to_s.gsub("_proxies", "").pluralize
+    def self.target_accessor(name, pluralize: true)
+      name = name.to_s.gsub("_proxies", "")
+      if pluralize
+        name.pluralize
+      else
+        name
+      end
     end
     private_class_method :target_accessor
 

data/lib/active_fedora/associations/collection_association.rb

@@ -94,7 +94,7 @@ module ActiveFedora
         if loaded?
           size.zero?
         else
-          @target.blank? && count_records == 0
+          @target.blank? && count_records.zero?
         end
       end
 
@@ -250,7 +250,7 @@ module ActiveFedora
         finder_query = construct_query
         return [] if finder_query.empty?
         rows = opts.delete(:rows) { count }
-        return [] if rows == 0
+        return [] if rows.zero?
         SolrService.query(finder_query, { rows: rows }.merge(opts))
       end
 

data/lib/active_fedora/associations/has_many_association.rb

@@ -19,7 +19,7 @@ module ActiveFedora
         # If there's nothing in the database and @target has no new records
         # we are certain the current target is an empty array. This is a
         # documented side-effect of the method that may avoid an extra SELECT.
-        @target ||= [] and loaded! if count == 0
+        @target ||= [] and loaded! if count.zero?
 
         count
       end
@@ -83,7 +83,7 @@ module ActiveFedora
       protected
 
         def find_polymorphic_inverse(record)
-          record.reflections.values.find { |r| !r.has_many? && r.predicate == reflection.predicate }
+          record.reflections.values.find { |r| !r.has_many? && r.options[:property] == reflection.options[:property] }
         end
 
         # Deletes the records according to the <tt>:dependent</tt> option.

data/lib/active_fedora/associations/has_subresource_association.rb

@@ -25,12 +25,12 @@ module ActiveFedora
 
         def find_or_initialize_target(&block)
           if reflection.klass < ActiveFedora::File
-            reflection.build_association(id: target_uri, &block)
+            reflection.build_association(target_uri, &block)
           else
             reflection.klass.find(target_uri)
           end
         rescue ActiveFedora::ObjectNotFoundError
-          reflection.build_association(id: target_uri, &block)
+          reflection.build_association(target_uri, &block)
         end
 
         def replace(record)

data/lib/active_fedora/associations/orders_association.rb

@@ -27,6 +27,10 @@ module ActiveFedora::Associations
       @target_proxy ||= ActiveFedora::Orders::TargetProxy.new(self)
     end
 
+    def target_ids_reader
+      target_reader.ids
+    end
+
     def find_reflection
       reflection
     end

data/lib/active_fedora/associations/rdf.rb

@@ -10,6 +10,7 @@ module ActiveFedora
         additions = incoming_objects - current_objects
         deletions.each { |object| owner.resource.delete([owner.rdf_subject, reflection.predicate, object]) }
         additions.each { |object| owner.resource.insert([owner.rdf_subject, reflection.predicate, object]) }
+        owner.resource.persist!
         owner.send(:attribute_will_change!, reflection.name)
       end
 
@@ -21,6 +22,7 @@ module ActiveFedora
         filtered_results.each do |candidate|
           owner.resource.delete([owner.rdf_subject, reflection.predicate, candidate])
         end
+        owner.resource.persist!
       end
 
       private

data/lib/active_fedora/attribute_methods/dirty.rb

@@ -6,7 +6,7 @@ module ActiveFedora
       def set_value(*val)
         attribute = val.first
         unless [:has_model, :modified_date].include? attribute
-          attribute_will_change!(attribute) unless self[val.first] == val.last
+          attribute_will_change!(attribute) unless Array(self[val.first]).to_set == Array(val.last).to_set
         end
         super
       end

data/lib/active_fedora/base.rb

@@ -40,11 +40,11 @@ module ActiveFedora
     include Associations
     include AutosaveAssociation
     include NestedAttributes
-    include Reflection
     include Serialization
 
     include AttachedFiles
     include FedoraAttributes
+    include Reflection
     include AttributeMethods
     include Attributes
     include Versionable

data/lib/active_fedora/containers/container.rb

@@ -22,7 +22,7 @@ module ActiveFedora
     def self.find_or_initialize(id)
       find(id)
     rescue ActiveFedora::ObjectNotFoundError
-      new(id: id)
+      new(id)
     end
 
     private

data/lib/active_fedora/core.rb

@@ -2,7 +2,6 @@ module ActiveFedora
   module Core
     extend ActiveSupport::Autoload
     extend ActiveSupport::Concern
-    extend Deprecation
     include ActiveFedora::Common
 
     autoload :FedoraIdTranslator
@@ -26,7 +25,7 @@ module ActiveFedora
     def initialize(attributes_or_id = nil, &_block)
       init_internals
       attributes = initialize_attributes(attributes_or_id)
-      @ldp_source = build_ldp_resource(attributes.delete('id'.freeze))
+      @ldp_source = build_ldp_resource(attributes.delete(:id))
       raise IllegalOperation, "Attempting to recreate existing ldp_source: `#{ldp_source.subject}'" unless ldp_source.new?
       assert_content_model
       load_attached_files
@@ -149,16 +148,15 @@ module ActiveFedora
       def initialize_attributes(attributes_or_id)
         case attributes_or_id
         when String
-          Deprecation.warn(Core, "calling #{self.class}.new with a string is deprecated. Pass a hash with id instead.")
-          { 'id': attributes_or_id }
+          attributes = { id: attributes_or_id }.with_indifferent_access
+        when Hash
+          attributes = attributes_or_id.with_indifferent_access
         when NilClass
-          {}
+          attributes = {}.with_indifferent_access
         else
-          unless attributes_or_id.respond_to?(:stringify_keys)
-            raise ArgumentError, "#{attributes_or_id.class} is not acceptable"
-          end
-          attributes_or_id.stringify_keys
+          raise ArgumentError, "#{attributes_or_id.class} is not acceptable"
         end
+        attributes
       end
   end
 end

data/lib/active_fedora/fedora.rb

@@ -23,15 +23,11 @@ module ActiveFedora
     end
 
     def host
-      @config[:url].sub(/\/$/, BLANK)
+      @config[:url]
     end
 
     def base_path
-      @config[:base_path] || SLASH
-    end
-
-    def base_uri
-      host + base_path.sub(/\/$/, BLANK)
+      @config[:base_path] || '/'
     end
 
     def user

data/lib/active_fedora/fedora_attributes.rb

@@ -43,7 +43,7 @@ module ActiveFedora
       # Appending the graph at the end is necessary because adding it as the
       # parent leaves behind triples not related to the ldp_source's rdf
       # subject.
-      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, @ldp_source.graph) << @ldp_source.graph
+      @resource ||= self.class.resource_class.new(@ldp_source.graph.rdf_subject, data: @ldp_source.graph.send(:graph).data)
     end
 
     # You can set the URI to use for the rdf_label on ClassMethods.rdf_label, then on

data/lib/active_fedora/file.rb

@@ -30,7 +30,7 @@ module ActiveFedora
     # @yield [self] Yields self
     # @yieldparam [File] self the newly created file
     def initialize(identifier = nil, &_block)
-      identifier = identifier.delete(:id) if identifier.is_a? Hash
+      identifier = nil if identifier.is_a? Hash
       run_callbacks(:initialize) do
         case identifier
         when nil, ::RDF::URI

data/lib/active_fedora/file/streaming.rb

@@ -23,7 +23,7 @@ module ActiveFedora::File::Streaming
     end
 
     def each(no_of_requests_limit = 3, &block)
-      raise ArgumentError, 'HTTP redirect too deep' if no_of_requests_limit == 0
+      raise ArgumentError, 'HTTP redirect too deep' if no_of_requests_limit.zero?
       Net::HTTP.start(uri.host, uri.port, use_ssl: (uri.scheme == 'https')) do |http|
         request = Net::HTTP::Get.new uri, headers
         http.request request do |response|

data/lib/active_fedora/indexing.rb

@@ -10,7 +10,6 @@ module ActiveFedora
   module Indexing
     extend ActiveSupport::Concern
     extend ActiveSupport::Autoload
-    extend Deprecation
 
     eager_autoload do
       autoload :Map
@@ -84,7 +83,7 @@ module ActiveFedora
         end
 
         def reindex_everything
-          descendants = descendant_uris(ActiveFedora.fedora.base_uri)
+          descendants = descendant_uris(ActiveFedora::Base.id_to_uri(''))
           descendants.shift # Discard the root uri
           descendants.each do |uri|
             logger.debug "Re-index everything ... #{uri}"
@@ -92,22 +91,6 @@ module ActiveFedora
           end
         end
 
-        # This method can be used instead of ActiveFedora::Model::ClassMethods.find.
-        # It works similarly except it populates an object from Solr instead of Fedora.
-        # It is most useful for objects used in read-only displays in order to speed up loading time.  If only
-        # a id is passed in it will query solr for a corresponding solr document and then use it
-        # to populate this object.
-        #
-        # If a value is passed in for optional parameter solr_doc it will not query solr again and just use the
-        # one passed to populate the object.
-        #
-        # It will anything stored within solr such as metadata and relationships.  Non-metadata attached files will not
-        # be loaded and if needed you should use find instead.
-        def load_instance_from_solr(id, solr_doc = nil)
-          SolrInstanceLoader.new(self, id, solr_doc).object
-        end
-        deprecation_deprecate :load_instance_from_solr
-
         def descendant_uris(uri)
           resource = Ldp::Resource::RdfSource.new(ActiveFedora.fedora.connection, uri)
           # GET could be slow if it's a big resource, we're using HEAD to avoid this problem,

data/lib/active_fedora/indexing_service.rb

@@ -40,7 +40,6 @@ module ActiveFedora
       Solrizer.set_field(solr_doc, 'system_modified', m_time, :stored_sortable)
       solr_doc[QueryResultBuilder::HAS_MODEL_SOLR_FIELD] = object.has_model
       solr_doc[ActiveFedora.id_field.to_sym] = object.id
-      solr_doc[self.class.profile_solr_name] = profile_service.new(object).export
       object.declared_attached_files.each do |name, file|
         solr_doc.merge! file.to_solr(solr_doc, name: name.to_s)
       end
@@ -51,10 +50,6 @@ module ActiveFedora
 
     protected
 
-      def profile_service
-        ProfileIndexingService
-      end
-
       def c_time
         c_time = object.create_date.present? ? object.create_date : DateTime.now
         c_time = DateTime.parse(c_time) unless c_time.is_a?(DateTime)

data/lib/active_fedora/loadable_from_json.rb

@@ -50,6 +50,10 @@ module ActiveFedora
         @hash[k]
       end
 
+      def persist!(*)
+        true
+      end
+
       # FakeQuery exists to adapt the hash to the RDF interface used by RDF associations in ActiveFedora
       class FakeQuery
         include ::Enumerable
@@ -153,7 +157,7 @@ module ActiveFedora
       # @param attribute_name [String] the name of the attribute to adapt
       # @return [Object] the adapted value
       def adapt_attribute_value(attrs, attribute_name)
-        reflection = self.class.reflect_on_property(attribute_name)
+        reflection = property_reflection(attribute_name)
         # if this isn't a property, copy value verbatim
         return attrs[attribute_name] unless reflection
         multiple = reflection.multiple?
@@ -169,6 +173,13 @@ module ActiveFedora
         end
       end
 
+      def property_reflection(attribute_name)
+        self.class.reflect_on_property(attribute_name)
+      rescue ActiveTriples::UndefinedPropertyError
+        ActiveFedora::Base.logger.info "Undefined property #{attribute_name} reflected."
+        nil
+      end
+
       def date_attribute?(attribute_name)
         reflection = self.class.reflect_on_property(attribute_name)
         return false unless reflection