active-fedora 9.1.2 → 9.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da18bdd03d130d9d80945cd2c2ce0cbbe6056831
-  data.tar.gz: 7709031721c4ccb85bf411d49d61731b097de430
+  metadata.gz: 8342f8e77df84a1256f26396de99577f34010d2a
+  data.tar.gz: 87203d5509bac4250d9a8c02082b31a310de971f
 SHA512:
-  metadata.gz: 3e685a07394f367818b44898dba0c8d059dfec46702534f915840cae1dabda372f50ebe60eb68962295186e588b76dced9624861b545e3611bb83fa89e60737c
-  data.tar.gz: 048eb130c747e5e96be4593b25c4ab51ccf7fee443df5aa8c67c91108f839f50b01dc8455c86a07cef1417a238e54385d4d2f092138abb17e1797a7a292b359c
+  metadata.gz: 407aab67f7584c962bc16c24b0a9f8fc8c25b7d25c7c5d92dd83ee7dbad9cc75b4800fdb7c267790ea4c0879fccc03bcc52da344601e3596b3e4f3214e462dd2
+  data.tar.gz: c23c707171608bc46666cfa2c45b45313cf7fdfedc4e656b3b50458565888b35625fd3e3acc5efc77b80fa6b19aa72226d2c2a62870a6343325b89b2bbb929e5

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.2
+  - 2.2.1
 
 gemfile:
   - gemfiles/rails4.1.gemfile

data/Gemfile

@@ -5,6 +5,7 @@ source "https://rubygems.org"
 gemspec path: File.expand_path('..', __FILE__)
 
 gem 'byebug' unless ENV['TRAVIS']
+gem 'pry-byebug' unless ENV['CI']
 
 group :test do
   gem 'simplecov', require: false

data/History.txt

@@ -1,3 +1,93 @@
+v9.2.0.rc1
+  2015-06-30: Refactor CollectionAssociation#reset [Justin Coyne]
+
+  2015-06-30: make CollectionAssociation#find_target private [Justin Coyne]
+
+  2015-06-25: Implements delete for direct containers. [Hector Correa]
+
+  2015-06-29: The uri() method should return an RDF::URI instead of a string
+  [Justin Coyne]
+
+  2015-06-29: Refactor File#== to avoid an unnecessary API call The new_record?
+  call used to cause an API call to fedora, which we are now able to avoid.
+  [Justin Coyne]
+
+  2015-06-26: Allow File constructor to take a block. Enables removing several
+  TODOs about using `tap` [Justin Coyne]
+
+  2015-06-26: Avoid unnecessary solr query If only one property has been defined
+  for a predicate, there's no reason to run a query to filter the results by
+  class. This avoids a call to solr that is unnecessary in most situations.
+  [Justin Coyne]
+
+  2015-06-26: For an AF record the primary key is always `id` [Justin Coyne]
+
+  2015-06-26: Use the solr terms query when fetching by id This allows the query
+  to be smaller and more understandable [Justin Coyne]
+
+  2015-06-25: RDF::IndexingService indexes objects & properties [Adam Wead]
+  true/false depending on whether something was saved or not. [Hector Correa]
+
+  2015-06-24: Reorganizing ActiveFedora:File code [Adam Wead]
+
+  2015-06-24: Make autosave tests more specific [Adam Wead]
+
+  2015-06-24: Use foreign_key in case user has specified one [Adam Wead]
+
+  2015-06-24: Refactoring ActiveFedora::File to use ActiveFedora::Persistence
+  changed WithMetadata to override create_or_update instead of save so that it
+  gets called when you call save or save! [Carolyn Cole]
+
+  2015-06-24: Removing unneeded line [Carolyn Cole]
+
+  2015-05-02: Add optional prefix to resource URI [Adam Wead]
+
+  2015-06-24: refactoring equals [Carolyn Cole]
+
+  2015-06-24: Removing dead define_destroy_hook method [Adam Wead]
+
+  2015-06-24: Refactoring .find_target for HasAndBelongsToMany [Adam Wead]
+
+  2015-06-18: Implements directly_contains_one association Note: part of this
+  functionality is blocked by #794 [Matt Zumwalt]
+
+  2015-06-24: Return relation for .limit, fixes #352 [Carolyn Cole]
+
+  2015-06-23: Refactoring DelegateAttribute [Adam Wead]
+
+  2015-06-18: Create a blacklist to disallow mutating relations [Justin Coyne]
+
+  2015-06-15: Add documentation to apply_schema. [Trey Terrell]
+
+  2015-06-04: Add apply_schema support to AF. [Trey Terrell]
+
+  2015-06-11: Remove unnecessary dependency on rdf-vocab [Justin Coyne]
+
+  2015-05-18: Direct/Indirect containers should have an include? method [Justin
+  Coyne]
+
+  2015-05-18: A SolrBackedResource should be enumerable [Justin Coyne]
+
+  2015-05-13: Refactor Deleting Indirect Proxies [Trey Terrell]
+
+  2015-04-29: Update ActiveTriples [Trey Terrell]
+
+  2015-05-13: Translation procs should not overwrite one another [Justin Coyne]
+
+  2015-05-13: Fix Deletion of Indirect Container Proxies [Trey Terrell]
+
+  2015-05-11: Update Travis to support YARD [Trey Terrell]
+
+  2015-05-11: Delete proxies. [Trey Terrell]
+
+  2015-05-11: Add spec for deleting indirect items. [Trey Terrell]
+
+  2015-05-08: Request Inbound Relations [Trey Terrell]
+
+  2015-05-07: Added ldp:IndirectContainer [Justin Coyne]
+
+  2015-05-06: Add direct containers [Justin Coyne]
+
 v9.1.2
   2015-06-11: Remove unnecessary dependency on rdf-vocab [Justin Coyne]
 

data/active-fedora.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'om', '~> 3.1'
   s.add_dependency 'nom-xml', '>= 0.5.1'
   s.add_dependency "activesupport", '>= 4.1.0'
-  s.add_dependency "active-triples", '~> 0.6.0'
+  s.add_dependency "active-triples", '~> 0.7.1'
   s.add_dependency "rdf-rdfxml", '~> 1.1.0'
   s.add_dependency "linkeddata"
   s.add_dependency "deprecation"
-  s.add_dependency "ldp", '~> 0.3.0'
+  s.add_dependency "ldp", '~> 0.3.1'
 
   s.add_development_dependency "rdoc"
   s.add_development_dependency "yard"

data/lib/active_fedora.rb

@@ -51,23 +51,34 @@ module ActiveFedora #:nodoc:
     autoload :CleanConnection
     autoload :Config
     autoload :Core
-    autoload_under 'core' do
-      autoload :FedoraIdTranslator
-      autoload :FedoraUriTranslator
+    autoload_under 'containers' do
+      autoload :Container
+      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 :Fedora
     autoload :FedoraAttributes
     autoload :File
     autoload :FileConfigurator
     autoload :FilePathBuilder
+    autoload :FileRelation
     autoload :FilesHash
     autoload :FixityService
+    autoload :Identifiable
+    autoload :Indexers
     autoload :Indexing
     autoload :IndexingService
     autoload :InheritableAccessors
+    autoload :InboundRelationConnection
     autoload :LdpCache
     autoload :LdpResource
     autoload :LdpResourceService
@@ -77,6 +88,7 @@ module ActiveFedora #:nodoc:
     autoload :NomDatastream
     autoload :NullRelation
     autoload :OmDatastream
+    autoload :Pathing
     autoload :Persistence
     autoload :ProfileIndexingService
     autoload :Property
@@ -101,9 +113,11 @@ module ActiveFedora #:nodoc:
       autoload :FinderMethods
     end
 
+    autoload :Schema
     autoload :Scoping
     autoload :Serialization
     autoload :SimpleDatastream
+    autoload :SchemaIndexingStrategy
     autoload :SolrInstanceLoader
     autoload :SolrQueryBuilder
     autoload :SolrService

data/lib/active_fedora/associations.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/enumerable'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 
@@ -19,11 +20,20 @@ module ActiveFedora
     autoload :SingularRDF,           'active_fedora/associations/singular_rdf'
     autoload :CollectionAssociation, 'active_fedora/associations/collection_association'
     autoload :CollectionProxy,       'active_fedora/associations/collection_proxy'
+    autoload :ContainerProxy,        'active_fedora/associations/container_proxy'
 
     autoload :HasManyAssociation,             'active_fedora/associations/has_many_association'
     autoload :BelongsToAssociation,           'active_fedora/associations/belongs_to_association'
     autoload :HasAndBelongsToManyAssociation, 'active_fedora/associations/has_and_belongs_to_many_association'
+    autoload :BasicContainsAssociation,       'active_fedora/associations/basic_contains_association'
+    autoload :DirectlyContainsAssociation,    'active_fedora/associations/directly_contains_association'
+    autoload :DirectlyContainsOneAssociation, 'active_fedora/associations/directly_contains_one_association'
+    autoload :IndirectlyContainsAssociation,  'active_fedora/associations/indirectly_contains_association'
     autoload :ContainsAssociation,            'active_fedora/associations/contains_association'
+    autoload :DeleteProxy,            'active_fedora/associations/delete_proxy'
+    autoload :ContainedFinder,      'active_fedora/associations/contained_finder'
+    autoload :RecordComposite,         'active_fedora/associations/record_composite'
+    autoload :IDComposite,         'active_fedora/associations/id_composite'
 
     module Builder
       autoload :Association,             'active_fedora/associations/builder/association'
@@ -34,6 +44,9 @@ module ActiveFedora
       autoload :HasMany,             'active_fedora/associations/builder/has_many'
       autoload :HasAndBelongsToMany, 'active_fedora/associations/builder/has_and_belongs_to_many'
       autoload :Contains,            'active_fedora/associations/builder/contains'
+      autoload :DirectlyContains,    'active_fedora/associations/builder/directly_contains'
+      autoload :DirectlyContainsOne, 'active_fedora/associations/builder/directly_contains_one'
+      autoload :IndirectlyContains,  'active_fedora/associations/builder/indirectly_contains'
 
       autoload :Property,         'active_fedora/associations/builder/property'
       autoload :SingularProperty, 'active_fedora/associations/builder/singular_property'
@@ -61,6 +74,14 @@ module ActiveFedora
       association
     end
 
+    def delete(*)
+      reflections.each_pair do |name, reflection|
+        if reflection.macro == :has_many
+          association(name.to_sym).delete_all
+        end
+      end
+      super
+    end
 
     private
 
@@ -77,6 +98,62 @@ module ActiveFedora
 
     module ClassMethods
 
+      # This method is used to declare an ldp:DirectContainer on a resource
+      # you must specify an is_member_of_relation or a has_member_relation
+      #
+      # @param [String] name the handle to refer to this child as
+      # @param [Hash] options
+      # @option options [String] :class_name ('ActiveFedora::File') The name of the class that will represent the contained resources
+      # @option options [RDF::URI] :has_member_relation the rdf predicate to use for the ldp:hasMemberRelation
+      # @option options [RDF::URI] :is_member_of_relation the rdf predicate to use for the ldp:isMemberOfRelation
+      #
+      # example:
+      #   class FooHistory < ActiveFedora::Base
+      #     directly_contains :files, has_member_relation:
+      #         ::RDF::URI.new("http://example.com/hasFiles"), class_name: 'Thing'
+      #     directly_contains :other_stuff, is_member_of_relation:
+      #         ::RDF::URI.new("http://example.com/isContainedBy"), class_name: 'Thing'
+      #   end
+      #
+      def directly_contains(name, options={})
+        Builder::DirectlyContains.build(self, name, { class_name: 'ActiveFedora::File' }.merge(options))
+      end
+
+      def directly_contains_one(name, options={})
+        Builder::DirectlyContainsOne.build(self, name, { class_name: 'ActiveFedora::File' }.merge(options))
+      end
+
+      # This method is used to declare an ldp:IndirectContainer on a resource
+      # you must specify an is_member_of_relation or a has_member_relation
+      #
+      # @param [String] name the handle to refer to this child as
+      # @param [Hash] options
+      # @option options [String] :class_name ('ActiveFedora::File') The name of the class that will represent the contained resources
+      # @option options [RDF::URI] :has_member_relation the rdf predicate to use for the ldp:hasMemberRelation
+      # @option options [RDF::URI] :is_member_of_relation the rdf predicate to use for the ldp:isMemberOfRelation
+      # @option options [RDF::URI] :inserted_content_relation the rdf predicate to use for the ldp:insertedContentRelation
+      # @option options [String] :through name of a class to represent the interstitial node
+      # @option options [Symbol] :foreign_key property that points at the remote resource
+      #
+      # example:
+      #   class Proxy < ActiveFedora::Base
+      #     belongs_to :proxy_for, predicate: ::RDF::URI.new('http://www.openarchives.org/ore/terms/proxyFor'), class_name: 'ActiveFedora::Base'
+      #   end
+      #
+      #   class FooHistory < ActiveFedora::Base
+      #     indirectly_contains :files, has_member_relation: RDF::Vocab::ORE.aggregates,
+      #       inserted_content_relation: RDF::Vocab::ORE.proxyFor, class_name: 'Thing',
+      #       through: 'Proxy', foreign_key: :proxy_for
+      #
+      #     indirectly_contains :other_stuff, is_member_of_relation:
+      #         ::RDF::URI.new("http://example.com/isContainedBy"), class_name: 'Thing',
+      #         through: 'Proxy', foreign_key: :proxy_for
+      #   end
+      #
+      def indirectly_contains(name, options={})
+        Builder::IndirectlyContains.build(self, name, options)
+      end
+
       def has_many(name, options={})
         Builder::HasMany.build(self, name, options)
       end

data/lib/active_fedora/associations/association.rb

@@ -24,6 +24,7 @@ module ActiveFedora
       def reset
         @loaded = false
         @target = nil
+        @stale_state = nil
         @inversed = false
       end
 
@@ -173,8 +174,7 @@ module ActiveFedora
         end
 
         def build_record(attributes)
-          # TODO make initalize take a block and get rid of the tap
-          reflection.build_association(attributes).tap do |record|
+          reflection.build_association(attributes) do |record|
             initialize_attributes(record)
           end
         end

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -0,0 +1,52 @@
+module ActiveFedora
+  module Associations
+    class BasicContainsAssociation < SingularAssociation #:nodoc:
+      # Implements the reader method, e.g. foo.bar for Foo.has_one :bar
+      def reader(force_reload = false)
+        super || build
+      end
+
+      def find_target
+        reflection.build_association(target_uri) do |record|
+          configure_datastream(record) if reflection.options[:block]
+        end
+      end
+
+      def target_uri
+        "#{owner.uri}/#{reflection.name}"
+      end
+
+      private
+
+      def raise_on_type_mismatch(record)
+        return if record.is_a? LoadableFromJson::SolrBackedMetadataFile
+        super
+      end
+
+      def replace(record)
+        if record
+          raise_on_type_mismatch(record)
+          @updated = true
+        end
+
+        self.target = record
+      end
+
+      def new_record(method, attributes)
+        record = super
+        configure_datastream(record)
+        record
+      end
+
+      def configure_datastream(record)
+        # If you called has_metadata with a block, pass the block into the File class
+        if reflection.options[:block].class == Proc
+          reflection.options[:block].call(record)
+        end
+        if record.new_record? && reflection.options[:autocreate]
+          record.datastream_will_change!
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+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 build
+      reflection = super
+      configure_dependency
+      reflection
+    end
+
+    def validate_options
+      super
+      if !options[:has_member_relation] && !options[:is_member_of_relation]
+        raise ArgumentError, "You must specify a :has_member_relation or :is_member_of_relation predicate for #{name}"
+      elsif !options[:has_member_relation].kind_of?(RDF::URI) && !options[:is_member_of_relation].kind_of?(RDF::URI)
+        raise ArgumentError, "Predicate must be a kind of RDF::URI"
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,44 @@
+module ActiveFedora::Associations::Builder
+  class DirectlyContainsOne < SingularAssociation #:nodoc:
+    self.macro = :directly_contains_one
+    self.valid_options += [:has_member_relation, :is_member_of_relation, :type, :through]
+    self.valid_options -= [:predicate]
+
+    def validate_options
+      raise ArgumentError, "you must specify a :through option on #{name}.  #{name} will use the container from that directly_contains association." if !options[:through]
+      if options[:through]
+        inherit_options_from_association(options[:through])
+      end
+      super
+
+      if options[:class_name] == "ActiveFedora::File"
+        raise ArgumentError, "You cannot set :class_name of #{name} to ActiveFedora::File because directly_contains_one needs to assert and read RDF.type assertions, which is not supported by ActiveFedora::File.  To make Files support RDF.type assertions, define a subclass of ActiveFedora::File and make it `include ActiveFedora::WithMetadata`. Otherwise, all subclasses of ActiveFedora::Base support RDF.type assertions."
+      elsif !options[:has_member_relation] && !options[:is_member_of_relation]
+        raise ArgumentError, "You must specify a :has_member_relation or :is_member_of_relation predicate for #{name}"
+      elsif !options[:has_member_relation].kind_of?(RDF::URI) && !options[:is_member_of_relation].kind_of?(RDF::URI)
+        raise ArgumentError, "Predicate must be a kind of RDF::URI"
+      end
+
+      if !options[:type].kind_of?(RDF::URI)
+        raise ArgumentError, "You must specify a Type and it must be a kind of RDF::URI"
+      end
+    end
+
+    private
+
+    # Inherits :has_member_relation from the association corresponding to association_name
+    # @param [Symbol] association_name of the association to inherit from
+    def inherit_options_from_association(association_name)
+      associated_through_reflection = lookup_reflection(association_name)
+      raise ArgumentError, "You specified `:through => #{@reflection.options[:through]}` on the #{name} associaiton but #{model} does not actually have a #{@reflection.options[:through]}` association" if associated_through_reflection.nil? || !associated_through_reflection.name
+      raise ArgumentError, "You must specify a directly_contains association as the :through option on #{name}.  You provided a #{associated_through_reflection.macro}" unless associated_through_reflection.macro == :directly_contains
+      options[:has_member_relation] = associated_through_reflection.options[:has_member_relation] unless options[:has_member_relation]
+      options[:class_name] = associated_through_reflection.options[:class_name] unless (options[:class_name] && options[:class_name] != "ActiveFedora::File")
+    end
+
+    def lookup_reflection(association_name)
+      model.reflect_on_association(association_name)
+    end
+
+  end
+end