active-fedora 9.12.0 → 9.13.0

data/lib/active_fedora/file.rb

@@ -203,7 +203,7 @@ module ActiveFedora
       end
 
       def build_ldp_resource_via_uri(uri = nil, content = '')
-        Ldp::Resource::BinarySource.new(ldp_connection, uri, content, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
+        Ldp::Resource::BinarySource.new(ldp_connection, uri, content, base_path_for_resource)
       end
 
       def uploaded_file?(payload)

data/lib/active_fedora/file/attributes.rb

@@ -1,6 +1,10 @@
 module ActiveFedora::File::Attributes
   attr_writer :mime_type
 
+  def assign_attributes(_)
+    # nop
+  end
+
   def mime_type
     @mime_type ||= fetch_mime_type
   end

data/lib/active_fedora/file_persistence.rb

@@ -8,7 +8,7 @@ module ActiveFedora
 
       def _create_record(_options = {})
         return false if content.nil?
-        ldp_source.content = content
+        @ldp_source = build_ldp_binary_source
         ldp_source.create do |req|
           req.headers.merge!(ldp_headers)
         end
@@ -23,5 +23,13 @@ module ActiveFedora
         end
         refresh
       end
+
+      def build_ldp_binary_source
+        if id
+          build_ldp_resource_via_uri(uri, content)
+        else
+          build_ldp_resource_via_uri(nil, content)
+        end
+      end
   end
 end

data/lib/active_fedora/initializing_connection.rb

@@ -0,0 +1,64 @@
+module ActiveFedora
+  class InitializingConnection < Delegator
+    attr_reader :connection, :root_resource_path
+
+    def initialize(connection, root_resource_path)
+      super(connection)
+      @connection = connection
+      @root_resource_path = root_resource_path
+      @initialized = false
+    end
+
+    def __getobj__
+      @connection
+    end
+
+    def __setobj__(connection)
+      @connection = connection
+    end
+
+    def head(*)
+      init_base_path
+      super
+    end
+
+    def get(*)
+      init_base_path
+      super
+    end
+
+    def delete(*)
+      init_base_path
+      super
+    end
+
+    def post(*)
+      init_base_path
+      super
+    end
+
+    def put(*)
+      init_base_path
+      super
+    end
+
+    def patch(*)
+      init_base_path
+      super
+    end
+
+    private
+
+      # Call this to create a Container Resource to act as the base path for this connection
+      def init_base_path
+        return if @initialized
+
+        connection.head(root_resource_path)
+        ActiveFedora::Base.logger.info "Attempted to init base path `#{root_resource_path}`, but it already exists" if ActiveFedora::Base.logger
+        @initialized = true
+        false
+      rescue Ldp::NotFound
+        @initialized = connection.put(root_resource_path, '').success?
+      end
+  end
+end

data/lib/active_fedora/ldp_cache.rb

@@ -29,9 +29,8 @@ module ActiveFedora
       end
 
       response
-    rescue StandardError => e
+    ensure
       reset_cache_settings
-      raise e
     end
 
     private

data/lib/active_fedora/ldp_resource_service.rb

@@ -10,10 +10,16 @@ module ActiveFedora
       if id
         LdpResource.new(connection, to_uri(klass, id))
       else
-        LdpResource.new(connection, nil, nil, ActiveFedora.fedora.host + ActiveFedora.fedora.base_path)
+        parent_uri = ActiveFedora.fedora.host + ActiveFedora.fedora.base_path
+        LdpResource.new(connection, nil, nil, parent_uri)
       end
     end
 
+    def build_resource_under_path(graph, parent_uri)
+      parent_uri ||= ActiveFedora.fedora.host + ActiveFedora.fedora.base_path
+      LdpResource.new(connection, nil, graph, parent_uri)
+    end
+
     def update(change_set, klass, id)
       SparqlInsert.new(change_set.changes).execute(to_uri(klass, id))
     end

data/lib/active_fedora/persistence.rb

@@ -5,6 +5,8 @@ module ActiveFedora
 
     def new_record?
       @ldp_source.new?
+    rescue Ldp::Gone
+      false
     end
 
     def persisted?
@@ -85,6 +87,11 @@ module ActiveFedora
       self.class.eradicate(id)
     end
 
+    # Used when setting containment
+    def base_path_for_resource=(path)
+      @base_path = path
+    end
+
     module ClassMethods
       # Creates an object (or multiple objects) and saves it to the repository, if validations pass.
       # The resulting object is returned whether the object was saved successfully to the repository or not.
@@ -199,11 +206,15 @@ module ActiveFedora
         @ldp_source = if !id && new_id = assign_id
                         LdpResource.new(ActiveFedora.fedora.connection, self.class.id_to_uri(new_id), @resource)
                       else
-                        LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, ActiveFedora.fedora.host + base_path_for_resource)
+                        LdpResource.new(ActiveFedora.fedora.connection, @ldp_source.subject, @resource, base_path_for_resource)
                       end
       end
 
       def base_path_for_resource
+        @base_path ||= ActiveFedora.fedora.host + default_base_path_for_resource
+      end
+
+      def default_base_path_for_resource
         init_root_path if has_uri_prefix?
         root_resource_path
       end

data/lib/active_fedora/reflection.rb

@@ -20,14 +20,16 @@ module ActiveFedora
                   BelongsToReflection
                 when :has_and_belongs_to_many
                   HasAndBelongsToManyReflection
-                when :contains
-                  ContainsReflection
+                when :has_subresource
+                  HasSubresourceReflection
                 when :directly_contains
                   DirectlyContainsReflection
                 when :directly_contains_one
                   DirectlyContainsOneReflection
                 when :indirectly_contains
                   IndirectlyContainsReflection
+                when :is_a_container
+                  BasicContainsReflection
                 when :rdf
                   RDFPropertyReflection
                 when :singular_rdf
@@ -107,11 +109,11 @@ module ActiveFedora
       end
 
       def child_resource_reflections
-        reflect_on_all_associations(:contains).select { |_, reflection| reflection.klass <= ActiveFedora::File }
+        reflect_on_all_associations(:has_subresource).select { |_, reflection| reflection.klass <= ActiveFedora::File }
       end
 
       def contained_rdf_source_reflections
-        reflect_on_all_associations(:contains).select { |_, reflection| !(reflection.klass <= ActiveFedora::File) }
+        reflect_on_all_associations(:has_subresource).select { |_, reflection| !(reflection.klass <= ActiveFedora::File) }
       end
 
       # Returns the AssociationReflection object for the +association+ (use the symbol).
@@ -503,9 +505,23 @@ module ActiveFedora
       end
     end
 
-    class ContainsReflection < AssociationReflection # :nodoc:
+    class HasSubresourceReflection < AssociationReflection # :nodoc:
       def macro
-        :contains
+        :has_subresource
+      end
+
+      def association_class
+        Associations::HasSubresourceAssociation
+      end
+    end
+
+    class BasicContainsReflection < AssociationReflection # :nodoc:
+      def macro
+        :is_a_container
+      end
+
+      def collection?
+        true
       end
 
       def association_class

data/lib/active_fedora/simple_datastream.rb

@@ -1,6 +1,7 @@
 module ActiveFedora
   # This class represents a simple xml datastream.
   class SimpleDatastream < OmDatastream
+    extend Deprecation
     class_attribute :class_fields
     attr_accessor :fields
     self.class_fields = []
@@ -18,6 +19,7 @@ module ActiveFedora
     # Constructor. this class will call self.field for each DCTERM. In short, all DCTERMS fields will already exist
     # when this method returns. Each term is marked as a multivalue string.
     def initialize(digital_object = nil, dsid = nil, options = {}, &block)
+      Deprecation.warn(SimpleDatastream, "ActiveFedora::SimpleDatastream is deprecated and will be removed in ActiveFedora 10.0")
       self.fields = {}
       super
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.12.0".freeze
+  VERSION = "9.13.0".freeze
 end

data/lib/generators/active_fedora/config/fedora/fedora_generator.rb

@@ -10,6 +10,7 @@ module ActiveFedora
 
     def fcrepo_wrapper_config
       copy_file '.fcrepo_wrapper', '.fcrepo_wrapper'
+      copy_file 'fcrepo_wrapper_test.yml', 'config/fcrepo_wrapper_test.yml'
     end
   end
 end

data/lib/generators/active_fedora/config/fedora/templates/.fcrepo_wrapper

@@ -1,3 +1,4 @@
 # Place any default configuration for solr_wrapper here
 port: 8984
 enable_jms: false
+fcrepo_home_dir: tmp/fcrepo4-development-data

data/lib/generators/active_fedora/config/fedora/templates/fcrepo_wrapper_test.yml

@@ -0,0 +1,4 @@
+#config/fcrepo_wrapper_test.yml.sample
+port: 8986
+enable_jms: false
+fcrepo_home_dir: tmp/fcrepo4-test-data

data/lib/generators/active_fedora/config/solr/solr_generator.rb

@@ -12,6 +12,7 @@ module ActiveFedora
 
     def solr_wrapper_config
       copy_file '.solr_wrapper', '.solr_wrapper'
+      copy_file 'solr_wrapper_test.yml', 'config/solr_wrapper_test.yml'
     end
   end
 end

data/lib/generators/active_fedora/config/solr/templates/.solr_wrapper

@@ -1,5 +1,8 @@
 # Place any default configuration for solr_wrapper here
+# version: 6.0.0
 # port: 8983
+instance_dir: tmp/solr-development
 collection:
+  persist: true
   dir: solr/config/
   name: hydra-development

data/lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml

@@ -0,0 +1,8 @@
+#config/solr_wrapper_test.yml
+# version: 6.0.0
+port: 8985
+instance_dir: tmp/solr-test
+collection:
+    persist: false
+    dir: solr/config
+    name: hydra-test

data/spec/integration/attached_files_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe ActiveFedora::AttachedFiles do
-  describe "#contains" do
+  describe "#has_subresource" do
     before do
       class FooHistory < ActiveFedora::Base
-        contains 'child'
+        has_subresource 'child'
       end
     end
     after do
@@ -25,32 +25,91 @@ describe ActiveFedora::AttachedFiles do
       end
     end
   end
-  describe "serializing datastreams" do
-    before do
-      class TestingMetadataSerializing < ActiveFedora::Base
-        has_metadata "nokogiri_autocreate_on", autocreate: true, type: ActiveFedora::OmDatastream
-        has_metadata "nokogiri_autocreate_off", autocreate: false, type: ActiveFedora::OmDatastream
+
+  describe "#has_metadata" do
+    describe "autosave" do
+      before :each do
+        class MockAFBaseRelationship < ActiveFedora::Base
+          extend Deprecation
+          Deprecation.silence(MockAFBaseRelationship) do
+            has_metadata 'foo', type: Hydra::ModsArticleDatastream
+          end
+        end
       end
-    end
+      after :each do
+        Object.send(:remove_const, :MockAFBaseRelationship)
+      end
+      describe "a new document" do
+        before do
+          @obj = MockAFBaseRelationship.new
 
-    after do
-      Object.send(:remove_const, :TestingMetadataSerializing)
+          @obj.foo.person = "bob"
+          @obj.save
+        end
+
+        it "saves the datastream." do
+          obj = MockAFBaseRelationship.find(@obj.id)
+          expect(obj.foo).to_not be_new_record
+          expect(obj.foo.person).to eq ['bob']
+          person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
+          solr_result = ActiveFedora::SolrService.query("{!field f=id}#{@obj.id}", fl: "id #{person_field}").first
+          expect(solr_result).to eq("id" => @obj.id, person_field => ['bob'])
+        end
+      end
+
+      describe "that already exists in the repo" do
+        before do
+          @release = MockAFBaseRelationship.create
+          @release.foo.person = "test foo content"
+          @release.save
+        end
+        describe "and has been changed" do
+          before do
+            @release.foo.person = 'frank'
+            @release.save!
+          end
+          it "saves the datastream." do
+            expect(MockAFBaseRelationship.find(@release.id).foo.person).to eq ['frank']
+            person_field = ActiveFedora.index_field_mapper.solr_name('foo__person', type: :string)
+            expect(ActiveFedora::SolrService.query("id:\"#{@release.id}\"", fl: "id #{person_field}").first).to eq("id" => @release.id, person_field => ['frank'])
+          end
+        end
+      end
     end
 
-    subject { TestingMetadataSerializing.new }
+    describe "serializing datastreams" do
+      before do
+        class TestingMetadataSerializing < ActiveFedora::Base
+          extend Deprecation
+          Deprecation.silence(TestingMetadataSerializing) do
+            has_metadata "nokogiri_autocreate_on", autocreate: true, type: ActiveFedora::OmDatastream
+            has_metadata "nokogiri_autocreate_off", autocreate: false, type: ActiveFedora::OmDatastream
+          end
+        end
+      end
 
-    it "works" do
-      subject.save(validate: false)
-      expect(subject.nokogiri_autocreate_on).to_not be_new_record
-      expect(subject.nokogiri_autocreate_off).to be_new_record
+      after do
+        Object.send(:remove_const, :TestingMetadataSerializing)
+      end
+
+      subject { TestingMetadataSerializing.new }
+
+      it "works" do
+        subject.save(validate: false)
+        expect(subject.nokogiri_autocreate_on).to_not be_new_record
+        expect(subject.nokogiri_autocreate_off).to be_new_record
+      end
     end
   end
 
   describe "#has_file_datastream" do
     before do
       class HasFile < ActiveFedora::Base
-        has_file_datastream "file_ds"
-        has_file_datastream "file_ds2", autocreate: false
+        extend Deprecation
+        Deprecation.silence(HasFile) do
+          has_file_datastream "file_ds"
+          has_file_datastream "file_ds2", autocreate: false
+        end
       end
     end
 
@@ -127,7 +186,7 @@ describe ActiveFedora::AttachedFiles do
     end
 
     describe ".metadata_streams" do
-      let(:mds1) { ActiveFedora::SimpleDatastream.new }
+      let(:mds1) { ActiveFedora::QualifiedDublinCoreDatastream.new }
       let(:mds2) { ActiveFedora::QualifiedDublinCoreDatastream.new }
       let(:fds) { ActiveFedora::File.new }
       before do

data/spec/integration/attributes_spec.rb

@@ -10,15 +10,14 @@ describe "delegating attributes" do
       end
     end
     class TitledObject < ActiveFedora::Base
-      has_metadata 'foo', type: ActiveFedora::SimpleDatastream do |m|
-        m.field "title", :string
-      end
+      has_subresource 'foo', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :title, datastream: 'foo', multiple: false
       end
     end
+
     class RdfObject < ActiveFedora::Base
-      contains 'foo', class_name: 'PropertiesDatastream'
+      has_subresource 'foo', class_name: 'PropertiesDatastream'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :depositor, datastream: :foo, multiple: false do |index|
           index.as :stored_searchable