active-fedora 9.3.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9499d1539f4cfe6d15bd6240a7636945f49251
-  data.tar.gz: 62c6f9a13eb35a9eaaf269680de4e6624b25fd5f
+  metadata.gz: 6ac63eb4554f1aae295bbaba4175725bdb50b2c8
+  data.tar.gz: 3a5503efabdbb3b403d6d3f546f1b5aa40e3072a
 SHA512:
-  metadata.gz: 180ae74d2fd67d14b7d205b186cee646915b376257687fe7d9c85731ba5acd6bce8fe4a9990fb065200b2d954c9a10f3006960cec37ca27fbd41b12dc1761ee3
-  data.tar.gz: 99a9bfb6277533275cab73575d3a6c474bed490d6ec51973fcc99ef6e124e23445f85bae8d78f62ca6f316dbe2849026ef6d96d5723e707755ea7c1c4ac23313
+  metadata.gz: dfe295788f5d242148d4b6ac81ad73ac95d6c564cf1c6cafbb5a9430e99453472c8e8af71d5a25f5a0cea1ace59a09191d7f53a5e5b990366bfc146c9c5f5829
+  data.tar.gz: 964c28d8d669bae563794d76d8b4b99a7d9f322f9482252ded396e685a15e37d254f5d179ccd956521db2787f8835da32919cb0a000c08b60c2b9b9f9a7dabb0

data/History.txt

@@ -1,3 +1,17 @@
+v9.4.0
+  2015-09-01: Don't run type validators on destroy. [Trey Terrell] [pgwillia
+
+  2015-08-29: Use Fcrepo 4 and LDP from RDF::Vocab. [Esmé Cowles]
+
+  2015-08-28: Use premis:hasMessageDigest for checksum, falling back to
+  fedora:digest. [Esmé Cowles]
+
+  2015-08-25: Update README to reflect dependency on Solr 4.10 [pgwillia]
+
+  2015-08-19: Enable support for Hash URIs [Trey Terrell]
+
+  2015-08-13: Stop using InboundRelationConnection [Justin Coyne]
+
 v9.3.0
   2015-08-06: Records should be able to be marshaled and loaded [Justin Coyne]
 

data/README.md

@@ -9,7 +9,7 @@ Description
 ActiveFedora is a Ruby gem for creating and
 managing objects in the Fedora Repository Architecture
 ([http://fedora-commons.org](http://fedora-commons.org)). ActiveFedora
-is loosely based on “ActiveRecord” in Rails. Version 9.0+ works with Fedora 4 and prior versions work on Fedora 3.
+is loosely based on “ActiveRecord” in Rails. Version 9.0+ works with Fedora 4 and prior versions work on Fedora 3. Version 9.2+ works with Solr 4.10.
 
 Getting Help
 ------------

data/lib/active_fedora/associations/association.rb

@@ -149,7 +149,6 @@ module ActiveFedora
             message = "#{@reflection.class_name}(##{@reflection.klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
             raise ActiveFedora::AssociationTypeMismatch, message
           end
-          type_validator.validate!(self, record)
         end
 
         def type_validator
@@ -184,6 +183,10 @@ module ActiveFedora
           end
         end
 
+        def run_type_validator(record)
+          type_validator.validate!(self, record)
+        end
+
     end
   end
 end

data/lib/active_fedora/associations/basic_contains_association.rb

@@ -26,6 +26,7 @@ module ActiveFedora
       def replace(record)
         if record
           raise_on_type_mismatch(record)
+          run_type_validator(record)
           @updated = true
         end
 

data/lib/active_fedora/associations/belongs_to_association.rb

@@ -5,6 +5,7 @@ module ActiveFedora
       def replace(record)
         if record
           raise_on_type_mismatch(record)
+          run_type_validator(record)
           # update_counters(record)
           replace_keys(record)
           set_inverse_instance(record)

data/lib/active_fedora/associations/collection_association.rb

@@ -157,6 +157,7 @@ module ActiveFedora
 
         records.flatten.each do |record|
           raise_on_type_mismatch(record)
+          run_type_validator(record)
           add_to_target(record) do |r|
             result &&= insert_record(record) unless owner.new_record?
           end

data/lib/active_fedora/associations/contained_finder.rb

@@ -1,17 +1,20 @@
 module ActiveFedora::Associations
-  ## 
+  ##
   # Finds the objects which associate with a given record and are contained
   # within the given container. Uses #repository to find the objects.
   class ContainedFinder
-    attr_reader :container, :repository
+    attr_reader :container, :repository, :proxy_class
     delegate :contained_ids, to: :container
     # @param [#contained_ids] container a container that records are stored
     #   under.
     # @param [#translate_uri_to_id, #find] repository a repository to build
     #   objects from.
-    def initialize(container:, repository:)
+    # @param [ActiveFedora::Base] proxy_class class that represents an
+    #   ore:Proxy
+    def initialize(container:, repository:, proxy_class:)
       @container = container
       @repository = repository
+      @proxy_class = proxy_class
     end
 
     # @param [ActiveFedora::Base] record a record which you want to find the
@@ -33,8 +36,14 @@ module ActiveFedora::Associations
       relation_subjects(record)
     end
 
+    # This could be done with Prefer InboundReferences, but that is
+    # a slow fedora call
     def relation_subjects(record)
-      record.resource.query(object: record.rdf_subject).subjects.to_a
+      query = ActiveFedora::SolrQueryBuilder.construct_query_for_rel(
+        [[:has_model, proxy_class.to_class_uri], [:proxyFor, record.id]]
+      )
+      results = ActiveFedora::SolrService.query(query, fl: 'id')
+      results.map { |res| ::RDF::URI(ActiveFedora::Base.id_to_uri(res['id'])) }
     end
   end
 

data/lib/active_fedora/associations/directly_contains_one_association.rb

@@ -35,6 +35,7 @@ module ActiveFedora
       def replace(record, *)
         if record
           raise_on_type_mismatch(record)
+          run_type_validator(record)
           remove_existing_target
           add_type_to_record(record, options[:type])
           add_to_container(record)

data/lib/active_fedora/associations/indirectly_contains_association.rb

@@ -64,7 +64,7 @@ module ActiveFedora
         end
 
         def record_proxy_finder
-          ContainedFinder.new(container: container, repository: composite_proxy_repository)
+          ContainedFinder.new(container: container, repository: composite_proxy_repository, proxy_class: proxy_class)
         end
 
         def composite_proxy_repository

data/lib/active_fedora/change_set.rb

@@ -26,6 +26,7 @@ module ActiveFedora
         elsif object.class.properties.keys.include?(key)
           predicate = graph.reflections.reflect_on_property(key).predicate
           result[predicate] = graph.query(subject: object.rdf_subject, predicate: predicate)
+          result[predicate] = child_graphs(result[predicate].objects) << result[predicate]
         elsif key == 'type'.freeze
           # working around https://github.com/ActiveTriples/ActiveTriples/issues/122
           predicate = ::RDF.type
@@ -35,5 +36,35 @@ module ActiveFedora
         end
       end
     end
+
+    private
+    
+    # @return [RDF::Graph] A graph containing child graphs from changed
+    #   attributes.
+    def child_graphs(objects)
+      child_graphs = ::RDF::Graph.new
+      objects.each do |object|
+        graph.query(subject: object).each do |statement|
+          # Have to filter out Fedora triples.
+          unless FedoraStatement.new(statement).internal?
+            child_graphs << statement
+          end
+        end
+      end
+      child_graphs
+    end
+  end
+
+  class FedoraStatement
+    attr_reader :value
+    def initialize(value)
+      @value = value
+    end
+
+    def internal?
+      value.object.to_s.start_with?("http://www.jcp.org") ||
+        value.object.to_s.start_with?("http://fedora.info") ||
+        value.predicate.to_s.start_with?("http://fedora.info")
+    end
   end
 end

data/lib/active_fedora/clean_connection.rb

@@ -13,10 +13,10 @@ module ActiveFedora
 
     def omit_uris
       [
-        RDF::Fcrepo4.ServerManaged,
-        RDF::Ldp.PreferContainment,
-        RDF::Ldp.PreferEmptyContainer,
-        RDF::Ldp.PreferMembership
+        ::RDF::Vocab::Fcrepo4.ServerManaged,
+        ::RDF::Vocab::LDP.PreferContainment,
+        ::RDF::Vocab::LDP.PreferEmptyContainer,
+        ::RDF::Vocab::LDP.PreferMembership
       ]
     end
 

data/lib/active_fedora/fedora.rb

@@ -22,7 +22,11 @@ module ActiveFedora
     end
 
     def connection
-      @connection ||= InboundRelationConnection.new(CachingConnection.new(authorized_connection))
+      # The InboundRelationConnection does provide more data, useful for
+      # things like ldp:IndirectContainers, but it's imposes a significant
+      # performance penalty on every request
+      #   @connection ||= InboundRelationConnection.new(CachingConnection.new(authorized_connection))
+      @connection ||= CachingConnection.new(authorized_connection)
     end
 
     def clean_connection

data/lib/active_fedora/fedora_attributes.rb

@@ -11,8 +11,8 @@ module ActiveFedora
       delegate :rdf_subject, :get_values, :type, to: :resource
 
       property :has_model, predicate: ActiveFedora::RDF::Fcrepo::Model.hasModel
-      property :create_date, predicate: ActiveFedora::RDF::Fcrepo4.created
-      property :modified_date, predicate: ActiveFedora::RDF::Fcrepo4.lastModified
+      property :create_date, predicate: ::RDF::Vocab::Fcrepo4.created
+      property :modified_date, predicate: ::RDF::Vocab::Fcrepo4.lastModified
 
       def create_date
         super.first

data/lib/active_fedora/file/attributes.rb

@@ -15,7 +15,9 @@ module ActiveFedora::File::Attributes
   end
 
   def digest
-    response = metadata.ldp_source.graph.query(predicate: ActiveFedora::RDF::Fcrepo4.digest)
+    response = metadata.ldp_source.graph.query(predicate: RDF::Vocab::PREMIS.hasMessageDigest)
+    # fallback on old predicate for checksum
+    response = metadata.ldp_source.graph.query(predicate: RDF::Vocab::Fcrepo4.digest) if response.empty?
     response.map(&:object)
   end
 

data/lib/active_fedora/fixity_service.rb

@@ -18,7 +18,7 @@ module ActiveFedora
     end
 
     def status
-      fixity_graph.query(predicate: ActiveFedora::RDF::Fcrepo4.status).map(&:object).first.to_s
+      fixity_graph.query(predicate: ::RDF::Vocab::Fcrepo4.status).map(&:object).first.to_s
     end
 
     private

data/lib/active_fedora/inbound_relation_connection.rb

@@ -1,4 +1,6 @@
 module ActiveFedora
+  # Use this connection judiciously, on fedora 4.3, these requests
+  # may be 3-5x slower, and make a graph that takes longer to parse.
   class InboundRelationConnection < SimpleDelegator
     def get(*args)
       result = __getobj__.get(*args) do |req|
@@ -14,7 +16,7 @@ module ActiveFedora
 
     def include_uris
       [
-        RDF::Fcrepo4.InboundReferences
+        ::RDF::Vocab::Fcrepo4.InboundReferences
       ]
     end
   end

data/lib/active_fedora/rdf.rb

@@ -3,8 +3,6 @@ module ActiveFedora
     extend ActiveSupport::Autoload
     autoload :DatastreamIndexing
     autoload :Fcrepo
-    autoload :Fcrepo4
-    autoload :Ldp
     autoload :IndexingService
     autoload :Identifiable
     autoload :Persistence

data/lib/active_fedora/sparql_insert.rb

@@ -20,7 +20,7 @@ module ActiveFedora
       query +=
         changes.map do |_, result|
           result.map do |statement|
-            ::RDF::Query::Pattern.new(subject: subject, predicate: statement.predicate, object: statement.object).to_s
+            ::RDF::Query::Pattern.new(subject: pattern_subject(statement.subject), predicate: statement.predicate, object: statement.object).to_s
           end.join("\n")
         end.join("\n")
 
@@ -30,16 +30,51 @@ module ActiveFedora
 
     private
 
+    def pattern_subject(potential_subject)
+      if MaybeHashUri.new(potential_subject).hash?
+        potential_subject
+      else
+        subject
+      end
+    end
+
     def deletes(subject)
       patterns(subject).map do |pattern|
         "DELETE { #{pattern} }\n  WHERE { #{pattern} } ;\n"
       end
     end
 
+    # Returns query patterns for finding all existing changed properties as well
+    # as well as their embedded hash-uri graphs.
+    # 
+    # @return [Array<::RDF::Query::Pattern>]
     def patterns(subject)
-      changes.map do |key, _|
-        ::RDF::Query::Pattern.new(subject, key, :change).to_s
+      changes.flat_map do |key, result|
+        [
+          ::RDF::Query::Pattern.new(subject, key, :change).to_s,
+          hash_patterns(result)
+        ].flatten
+      end
+    end
+
+    def hash_patterns(graph)
+      graph = graph.select do |statement|
+        MaybeHashUri.new(statement.subject).hash?
       end
+      graph.map do |statement|
+        ::RDF::Query::Pattern.new(statement.subject, statement.predicate, :change).to_s
+      end
+    end
+  end
+
+  class MaybeHashUri
+    attr_reader :uri
+    def initialize(uri)
+      @uri = uri
+    end
+
+    def hash?
+      uri.to_s.include?("#")
     end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.3.0"
+  VERSION = "9.4.0"
 end

data/lib/active_fedora/versions_graph.rb

@@ -26,7 +26,7 @@ module ActiveFedora
     end
 
     def resources
-      query(predicate: ActiveFedora::RDF::Fcrepo4.hasVersion)
+      query(predicate: ::RDF::Vocab::Fcrepo4.hasVersion)
     end
 
     private
@@ -44,11 +44,11 @@ module ActiveFedora
       end
 
       def label_query statement
-        query(subject: statement.object).query(predicate: ActiveFedora::RDF::Fcrepo4.hasVersionLabel).first.object.to_s
+        query(subject: statement.object).query(predicate: ::RDF::Vocab::Fcrepo4.hasVersionLabel).first.object.to_s
       end
 
       def created_query statement
-        query(subject: statement.object).query(predicate: ActiveFedora::RDF::Fcrepo4.created).first.object.to_s
+        query(subject: statement.object).query(predicate: ::RDF::Vocab::Fcrepo4.created).first.object.to_s
       end
 
       def fedora_versions

data/spec/integration/associations_spec.rb

@@ -100,6 +100,12 @@ describe ActiveFedora::Base do
       bar.banana = true
       expect{foo.bars << bar}.not_to raise_error
     end
+    it "should NOT validate on destroy" do
+      bar.banana = true
+      foo.bars << bar
+      bar.banana = false
+      expect{foo.bars.destroy(bar)}.not_to raise_error
+    end
   end
 
   describe "complex example" do

data/spec/integration/indirect_container_spec.rb

@@ -151,16 +151,13 @@ describe "Indirect containers" do
               file2.title = "Derp"
               o.save!
             end
+
             it "has two related_objects" do
               expect(reloaded.related_objects).to eq [file, file2]
             end
-            it "has inbound triples" do
-              statement = file.reload.resource.query(predicate: ::RDF::URI.new('http://www.openarchives.org/ore/terms/proxyFor')).to_a.first
-
-              expect(statement.object).to eq file.resource.rdf_subject
-            end
           end
         end
+
         describe "remove" do
           it "should be able to remove" do
             o.related_objects = []

data/spec/integration/nested_hash_resources_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe "nested hash resources" do
+  before do
+    class NestedResource < ActiveTriples::Resource
+      property :title, predicate: ::RDF::DC.title
+      ## Necessary to get AT to create hash URIs.
+      def initialize(uri, parent)
+        if uri.try(:node?)
+          uri = RDF::URI("#nested_#{uri.to_s.gsub('_:','')}")
+        elsif uri.start_with?("#")
+          uri = RDF::URI(uri)
+        end
+        super
+      end
+
+      def final_parent
+        parent
+      end
+    end
+    class ExampleOwner < ActiveFedora::Base
+      property :relation, predicate: ::RDF::DC.relation, class_name: NestedResource
+      accepts_nested_attributes_for :relation
+    end
+  end
+  after do
+    Object.send(:remove_const, :NestedResource)
+    Object.send(:remove_const, :ExampleOwner)
+  end
+  it "should be able to nest resources" do
+    obj = ExampleOwner.new
+    obj.attributes = {
+      :relation_attributes => [
+        {
+          :title => "Test"
+        }
+      ]
+    }
+    obj.save!
+
+    expect(obj.reload.relation.first.title).to eq ["Test"]
+  end
+end

data/spec/unit/change_set_spec.rb

@@ -46,6 +46,15 @@ describe ActiveFedora::ChangeSet do
         base.title = nil
         expect(subject[RDF::DC.title].to_a).to eq []
       end
+      it "should include hash URIs" do
+        # This is useful as an alternative to blank nodes.
+        hash_uri = RDF::URI(base.uri.to_s + "#test")
+        base.resource << RDF::Statement.new(hash_uri, RDF::DC.title, "good")
+        base.title = [RDF::URI(hash_uri)]
+        expect(subject[RDF::DC.title].to_a).not_to eq []
+        # Include the title reference and the title for the hash URI
+        expect(subject[RDF::DC.title].to_a.length).to eq 2
+      end
     end
 
     it { is_expected.to_not be_empty }

data/spec/unit/file_spec.rb

@@ -230,6 +230,16 @@ describe ActiveFedora::File do
         expect(parent.reload.abcd.digest.first).to be_kind_of RDF::URI
       end
     end
+    context "with pre-4.3.0 predicate" do
+      before do
+        graph = ActiveTriples::Resource.new
+        graph << RDF::Statement.new(file.uri, RDF::Vocab::Fcrepo4.digest, RDF::URI.new("urn:sha1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15"))
+        allow(file).to receive_message_chain(:metadata, :ldp_source, :graph).and_return(graph)
+      end
+      it "falls back on fedora:digest if premis:hasMessageDigest is not present" do
+        expect(file.digest.first).to be_kind_of RDF::URI
+      end
+    end
   end
 
   describe "#save" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.3.0
+  version: 9.4.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-07 00:00:00.000000000 Z
+date: 2015-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -394,11 +394,9 @@ files:
 - lib/active_fedora/rdf.rb
 - lib/active_fedora/rdf/datastream_indexing.rb
 - lib/active_fedora/rdf/fcrepo.rb
-- lib/active_fedora/rdf/fcrepo4.rb
 - lib/active_fedora/rdf/field_map.rb
 - lib/active_fedora/rdf/field_map_entry.rb
 - lib/active_fedora/rdf/indexing_service.rb
-- lib/active_fedora/rdf/ldp.rb
 - lib/active_fedora/rdf/ntriples_rdf_datastream.rb
 - lib/active_fedora/rdf/persistence.rb
 - lib/active_fedora/rdf/project_hydra.rb
@@ -500,6 +498,7 @@ files:
 - spec/integration/marshal_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/nested_attribute_spec.rb
+- spec/integration/nested_hash_resources_spec.rb
 - spec/integration/ntriples_datastream_spec.rb
 - spec/integration/om_datastream_spec.rb
 - spec/integration/persistence_spec.rb
@@ -605,7 +604,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.

data/lib/active_fedora/rdf/fcrepo4.rb

@@ -1,13 +0,0 @@
-require 'rdf'
-module ActiveFedora::RDF
-  class Fcrepo4 < RDF::StrictVocabulary("http://fedora.info/definitions/v4/repository#")
-    property :created
-    property :digest
-    property :hasVersion
-    property :hasVersionLabel
-    property :lastModified
-    property :status
-    property :ServerManaged
-    property :InboundReferences
-  end
-end

data/lib/active_fedora/rdf/ldp.rb

@@ -1,9 +0,0 @@
-require 'rdf'
-class ActiveFedora::RDF::Ldp < RDF::StrictVocabulary("http://www.w3.org/ns/ldp#")
-  # Property definitions
-  property :contains
-  property :member
-  property :PreferContainment
-  property :PreferEmptyContainer
-  property :PreferMembership
-end