active-fedora 11.0.0.rc6 → 11.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26d41f24c20c93a9161b7930e013a3201ecab4e1
-  data.tar.gz: d1fb36e1bf445e44e211cff333c65b6cc6357e19
+  metadata.gz: cc7a3946a47ca155b5b2e9fa9f62514e4be440c8
+  data.tar.gz: c64e65c2107219cc400cbd66f586388fd0a3e6cc
 SHA512:
-  metadata.gz: accce0bdf13ec9932e10482464883b8fe25cfe3f1a129cd2646bccd1cdce952cad633ef07f6e38a5e2d2168ece295156dc44e6334225e7ee8fdeaf39a5c58fcb
-  data.tar.gz: 88b3d9cb64352cd5e3ccaaf2c4c1eec3a43c59e437a9deaecfe653fdb248db00a5d5658ba05abe202c27dfb9f3ac03f8d4eed440a9dfc00406ac144c211b6cf5
+  metadata.gz: cd127fc65d51bcc2421d4be1693a5332ff4d14cdbea316fab935fb425b5527371fade8a5ee9c7d079119e613040dec9e35a71bfc29fdf7fac4a09287c1f49df3
+  data.tar.gz: 7781a22aa37f934c60bef92898d8c02cbd7cff702272e8f855b9f03b65179a602d2186ee43b4f58bc63fa3b750df40b5b6e6fb1bc781a941bc5b4029624e7330

data/active-fedora.gemspec

@@ -16,12 +16,9 @@ Gem::Specification.new do |s|
 
   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.2.4', '< 6'
   s.add_dependency "activemodel", '>= 4.2', '< 6'
   s.add_dependency "active-triples", '~> 0.10.0'
-  s.add_dependency "rdf-rdfxml"
   s.add_dependency "deprecation"
   s.add_dependency "ldp", '~> 0.6.0'
 

data/lib/active_fedora.rb

@@ -59,7 +59,6 @@ module ActiveFedora #:nodoc:
       autoload :DirectContainer
       autoload :IndirectContainer
     end
-    autoload :Datastreams
     autoload :DelegatedAttribute
     autoload_under 'attributes' do
       autoload :ActiveTripleAttribute
@@ -89,23 +88,14 @@ module ActiveFedora #:nodoc:
     autoload :LoadableFromJson
     autoload :ModelClassifier
     autoload :NestedAttributes
-    autoload :NomDatastream
     autoload :NullRelation
-    autoload :OmDatastream
     autoload :Orders
     autoload :Pathing
     autoload :Persistence
     autoload :Property
-    autoload :QualifiedDublinCoreDatastream
     autoload :Querying
     autoload :QueryResultBuilder
     autoload :RDF
-    autoload_under 'rdf' do
-      autoload :RDFDatastream
-      autoload :RDFXMLDatastream
-      autoload :NtriplesRDFDatastream
-      autoload :FedoraRdfResource
-    end
     autoload :Reflection
     autoload :Relation
 

data/lib/active_fedora/associations/has_many_association.rb

@@ -83,7 +83,7 @@ module ActiveFedora
       protected
 
         def find_polymorphic_inverse(record)
-          record.reflections.values.find { |r| !r.has_many? && r.options[:property] == reflection.options[:property] }
+          record.reflections.values.find { |r| !r.has_many? && r.predicate == reflection.predicate }
         end
 
         # Deletes the records according to the <tt>:dependent</tt> option.

data/lib/active_fedora/attributes.rb

@@ -144,7 +144,7 @@ module ActiveFedora
 
           # @param [Symbol] field the field to find or create
           # @param [Class] klass the class to use to delegate the attribute (e.g.
-          #                ActiveTripleAttribute, OmAttribute, or RdfDatastreamAttribute)
+          #                ActiveTripleAttribute)
           # @param [Hash] args
           # @option args [String] :delegate_target the path to the delegate
           # @option args [Class] :klass the class to create

data/lib/active_fedora/base.rb

@@ -10,16 +10,12 @@ module ActiveFedora
   #
   # =The Basics
   #   class Oralhistory < ActiveFedora::Base
-  #     has_metadata "properties", type: ActiveFedora::SimpleDatastream do |m|
-  #       m.field "narrator",  :string
-  #       m.field "narrator",  :text
-  #     end
+  #     property :creator, predicate: RDF::Vocab::DC.creator
   #   end
   #
-  # The above example creates a Fedora object with a metadata datastream named "properties", which is composed of a
-  # narrator and bio field.
+  # The above example creates a Fedora object with a property named "creator"
   #
-  # Attached files defined with +contains+ are accessed via the +attached_files+ member hash.
+  # Attached files defined with +has_subresource+ and iis accessed via the +attached_files+ member hash.
   #
   class Base
     extend ActiveModel::Naming

data/lib/active_fedora/querying.rb

@@ -1,7 +1,7 @@
 module ActiveFedora
   module Querying
     delegate :find, :first, :exists?, :where, :limit, :offset, :order, :delete_all,
-             :destroy_all, :count, :last, :find_with_conditions, :find_in_batches, :search_with_conditions, :search_in_batches, :search_by_id, :find_each, to: :all
+             :destroy_all, :count, :last, :search_with_conditions, :search_in_batches, :search_by_id, :find_each, to: :all
 
     def self.extended(base)
       base.class_attribute :solr_query_handler

data/lib/active_fedora/rdf.rb

@@ -1,7 +1,6 @@
 module ActiveFedora
   module RDF
     extend ActiveSupport::Autoload
-    autoload :DatastreamIndexing
     autoload :Fcrepo
     autoload :IndexingService
     autoload :Persistence

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "11.0.0.rc6".freeze
+  VERSION = "11.0.0.rc7".freeze
 end

data/spec/integration/attached_files_spec.rb

@@ -79,16 +79,26 @@ describe ActiveFedora::AttachedFiles do
     end
 
     describe ".metadata_streams" do
-      let(:mds1) { ActiveFedora::QualifiedDublinCoreDatastream.new }
-      let(:mds2) { ActiveFedora::QualifiedDublinCoreDatastream.new }
-      let(:fds) { ActiveFedora::File.new }
       before do
-        fds = ActiveFedora::File.new
+        class Metadata < ActiveFedora::File
+          def metadata?
+            true
+          end
+        end
+
         obj.attach_file(mds1, 'md1')
         obj.attach_file(mds2, 'qdc')
         obj.attach_file(fds, 'fds')
       end
 
+      let(:mds1) { Metadata.new }
+      let(:mds2) { Metadata.new }
+      let(:fds) { ActiveFedora::File.new }
+
+      after do
+        Object.send(:remove_const, :Metadata)
+      end
+
       it "returns all of the datastreams from the object that are kinds of OmDatastream" do
         expect(obj.metadata_streams).to match_array [mds1, mds2]
       end

data/spec/integration/file_spec.rb

@@ -54,53 +54,52 @@ describe ActiveFedora::File do
   context "with a sub-resource that autocreates" do
     before do
       class MockAFBase < ActiveFedora::Base
-        has_subresource "descMetadata", class_name: 'ActiveFedora::QualifiedDublinCoreDatastream', autocreate: true
+        has_subresource "descMetadata", class_name: 'SampleResource', autocreate: true
+      end
+
+      class SampleResource < ActiveFedora::File
+        def content
+          'something to save'
+        end
       end
     end
 
     after do
+      Object.send(:remove_const, :SampleResource)
       Object.send(:remove_const, :MockAFBase)
     end
 
     let(:test_object) { MockAFBase.create }
     let(:descMetadata) { test_object.descMetadata }
 
-    describe "#content" do
-      subject { descMetadata.content }
-      it { should_not be_nil }
-    end
-
-    describe "#described_by" do
-      subject { descMetadata.described_by }
-      it { should eq descMetadata.uri + '/fcr:metadata' }
+    describe "changed attributes are set" do
+      it "marks profile as changed" do
+        expect_any_instance_of(SampleResource).to receive(:attribute_will_change!).with(:profile)
+        test_object
+      end
     end
 
-    context "an XML file" do
-      let(:xml_content) { Nokogiri::XML::Document.parse(descMetadata.content) }
-      let(:title) { Nokogiri::XML::Element.new "title", xml_content }
+    describe "content_changed? is called" do
       before do
-        title.content = "Test Title"
-        xml_content.root.add_child title
-        allow(descMetadata).to receive(:before_save)
-        descMetadata.content = xml_content.to_s
-        descMetadata.save
+        allow_any_instance_of(SampleResource).to receive(:content_changed?).and_return(true)
       end
-
-      let(:found) { Nokogiri::XML::Document.parse(test_object.reload.descMetadata.content) }
-
-      subject { found.xpath('//dc/title/text()').first.inner_text }
-      it { should eq title.content }
+      subject { descMetadata.described_by }
+      it { should eq descMetadata.uri + '/fcr:metadata' }
     end
   end
 
   context "with a sub-resource" do
     before do
       class MockAFBase < ActiveFedora::Base
-        has_subresource "descMetadata", class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
+        has_subresource "descMetadata", class_name: 'SampleResource'
+      end
+
+      class SampleResource < ActiveFedora::File
       end
     end
 
     after do
+      Object.send(:remove_const, :SampleResource)
       Object.send(:remove_const, :MockAFBase)
     end
 

data/spec/integration/versionable_spec.rb

@@ -126,260 +126,6 @@ describe ActiveFedora::Versionable do
     end
   end
 
-  describe ActiveFedora::NtriplesRDFDatastream do
-    before(:all) do
-      class VersionableDatastream < ActiveFedora::NtriplesRDFDatastream
-        property :title, predicate: ::RDF::Vocab::DC.title
-      end
-
-      class MockAFBase < ActiveFedora::Base
-        has_subresource "descMetadata", class_name: 'VersionableDatastream', autocreate: true
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :MockAFBase)
-      Object.send(:remove_const, :VersionableDatastream)
-    end
-
-    it "creates the object" do
-      MockAFBase.create
-    end
-
-    subject(:desc_metadata) { test_object.descMetadata }
-
-    let(:current_year) { DateTime.now.year.to_s }
-
-    context "that exists in the repository" do
-      let(:test_object) { MockAFBase.create }
-
-      context "before creating the file" do
-        it "does not have versions" do
-          expect(desc_metadata.versions).to be_empty
-        end
-        it "does not have a title" do
-          expect(desc_metadata.title).to be_empty
-        end
-      end
-
-      context "after creating the file" do
-        before do
-          desc_metadata.title = "Greetings Earthlings"
-          desc_metadata.save
-          desc_metadata.create_version
-          @original_size = desc_metadata.size
-        end
-
-        it "links to versions endpoint" do
-          expect(desc_metadata.metadata.ldp_source.graph.query(predicate: ::RDF::Vocab::Fcrepo4.hasVersions).objects).to_not be_empty
-        end
-
-        it "has one version" do
-          expect(desc_metadata.versions.first.label).to eql "version1"
-        end
-
-        it "has a title" do
-          expect(desc_metadata.title).to eq(["Greetings Earthlings"])
-        end
-
-        it "has a size" do
-          expect(desc_metadata.size).to_not be_nil
-        end
-
-        context "two times" do
-          before do
-            desc_metadata.title = "Surrender and prepare to be boarded"
-            desc_metadata.save
-            desc_metadata.create_version
-          end
-
-          it "has two versions" do
-            expect(desc_metadata.versions.all.size).to eq 2
-            desc_metadata.versions.all.each_index do |index|
-              expect(desc_metadata.versions.all[index].label).to end_with "version" + (index + 1).to_s
-              expect(desc_metadata.versions.all[index].created).to start_with current_year
-            end
-          end
-
-          it "has the new title" do
-            expect(desc_metadata.title).to eq(["Surrender and prepare to be boarded"])
-          end
-
-          it "has a new size" do
-            expect(desc_metadata.size).to_not be_nil
-            expect(desc_metadata.size).to_not eq(@original_size)
-          end
-
-          context "then restoring" do
-            let(:first_version) { "version1" }
-            before do
-              desc_metadata.restore_version(first_version)
-            end
-
-            it "has two unique versions" do
-              expect(desc_metadata.versions.all.size).to eq 2
-            end
-
-            it "loads the restored file's content" do
-              expect(desc_metadata.title).to eq(["Greetings Earthlings"])
-            end
-
-            it "is the same size as the original file" do
-              expect(desc_metadata.size).to eq @original_size
-            end
-
-            context "and creating additional versions" do
-              before do
-                desc_metadata.title = "Now, surrender and prepare to be boarded"
-                desc_metadata.save
-                desc_metadata.create_version
-              end
-
-              it "has three unique versions" do
-                expect(desc_metadata.versions.all.size).to eq 3
-              end
-
-              it "has a new title" do
-                expect(desc_metadata.title).to eq(["Now, surrender and prepare to be boarded"])
-              end
-
-              it "has a new size" do
-                expect(desc_metadata.size).to_not eq @original_size
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  describe ActiveFedora::OmDatastream do
-    before(:all) do
-      class VersionableDatastream < ActiveFedora::OmDatastream
-        set_terminology do |t|
-          t.root(path: "foo")
-          t.title
-        end
-      end
-
-      class MockAFBase < ActiveFedora::Base
-        has_subresource "descMetadata", class_name: 'VersionableDatastream', autocreate: true
-      end
-    end
-
-    after(:all) do
-      Object.send(:remove_const, :MockAFBase)
-      Object.send(:remove_const, :VersionableDatastream)
-    end
-
-    subject(:desc_metadata) { test_object.descMetadata }
-
-    let(:current_year) { DateTime.now.year.to_s }
-
-    context "that exists in the repository" do
-      let(:test_object) { MockAFBase.create }
-
-      context "before creating the file" do
-        it "does not have versions" do
-          expect(desc_metadata.versions).to be_empty
-        end
-        it "does not have a title" do
-          expect(desc_metadata.title).to be_empty
-        end
-      end
-
-      context "after creating the file" do
-        before do
-          desc_metadata.title = "Greetings Earthlings"
-          desc_metadata.save
-          desc_metadata.create_version
-          @original_size = desc_metadata.size
-        end
-
-        it "links to versions endpoint" do
-          expect(desc_metadata.metadata.ldp_source.graph.query(predicate: ::RDF::Vocab::Fcrepo4.hasVersions).objects).to_not be_empty
-        end
-
-        it "has one version" do
-          expect(desc_metadata.versions.first.label).to eql "version1"
-          expect(desc_metadata.versions.first.created).to start_with current_year
-        end
-
-        it "has a title" do
-          expect(desc_metadata.title).to eql(["Greetings Earthlings"])
-        end
-
-        it "has a size" do
-          expect(desc_metadata.size).to_not be_nil
-        end
-
-        context "two times" do
-          before do
-            desc_metadata.title = "Surrender and prepare to be boarded"
-            desc_metadata.save
-            desc_metadata.create_version
-          end
-
-          it "has two unique versions" do
-            expect(desc_metadata.versions.all.size).to eq 2
-            desc_metadata.versions.all.each_index do |index|
-              expect(desc_metadata.versions.all[index].label).to end_with "version" + (index + 1).to_s
-              expect(desc_metadata.versions.all[index].created).to start_with current_year
-            end
-          end
-
-          it "has the new title" do
-            expect(desc_metadata.title).to eql(["Surrender and prepare to be boarded"])
-          end
-
-          it "has a new size" do
-            expect(desc_metadata.size).to_not be_nil
-            expect(desc_metadata.size).to_not eq(@original_size)
-          end
-
-          context "then restoring" do
-            let(:first_version) { "version1" }
-            before do
-              desc_metadata.restore_version(first_version)
-            end
-
-            it "stills have two unique versions" do
-              expect(desc_metadata.versions.all.size).to eq 2
-            end
-
-            it "loads the restored file's content" do
-              expect(desc_metadata.title).to eql(["Greetings Earthlings"])
-            end
-
-            it "is the same size as the original file" do
-              expect(desc_metadata.size).to eq @original_size
-            end
-
-            context "and creating additional versions" do
-              before do
-                desc_metadata.title = "Now, surrender and prepare to be boarded"
-                desc_metadata.save
-                desc_metadata.create_version
-              end
-
-              it "has three unique versions" do
-                expect(desc_metadata.versions.all.size).to eq 3
-              end
-
-              it "has a new title" do
-                expect(desc_metadata.title).to eql(["Now, surrender and prepare to be boarded"])
-              end
-
-              it "has a new size" do
-                expect(desc_metadata.size).to_not eq @original_size
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
   describe ActiveFedora::File do
     before(:all) do
       class BinaryDatastream < ActiveFedora::File