active-fedora 9.13.0 → 10.0.0.beta1

data/lib/active_fedora/version.rb

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

data/lib/active_fedora/versionable.rb

@@ -1,19 +1,11 @@
 module ActiveFedora
   module Versionable
     extend ActiveSupport::Concern
-    extend Deprecation
 
     included do
       class_attribute :versionable
     end
 
-    module ClassMethods
-      def has_many_versions
-        Deprecation.warn Versionable, "has_many_versions is deprecated and will be removed in ActiveFedora 11."
-        # self.versionable = true
-      end
-    end
-
     def model_type
       if respond_to?(:metadata)
         metadata.ldp_source.graph.query(predicate: ::RDF.type).objects

data/spec/config_helper.rb

@@ -5,10 +5,6 @@ def mock_yaml(hash, path)
   allow(Psych).to receive(:load).and_return(hash)
 end
 
-def default_predicate_mapping_file
-  File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "predicate_mappings.yml"))
-end
-
 def stub_rails(opts = {})
   Object.const_set("Rails", Class)
   Rails.send(:undef_method, :env) if Rails.respond_to?(:env)

data/spec/integration/attached_files_spec.rb

@@ -26,113 +26,6 @@ describe ActiveFedora::AttachedFiles do
     end
   end
 
-  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
-      after :each do
-        Object.send(:remove_const, :MockAFBaseRelationship)
-      end
-      describe "a new document" do
-        before do
-          @obj = MockAFBaseRelationship.new
-
-          @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
-
-    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
-
-      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
-        extend Deprecation
-        Deprecation.silence(HasFile) do
-          has_file_datastream "file_ds"
-          has_file_datastream "file_ds2", autocreate: false
-        end
-      end
-    end
-
-    after do
-      has_file.delete
-      Object.send(:remove_const, :HasFile)
-    end
-
-    let(:has_file) { HasFile.create("test:ds_versionable_has_file") }
-
-    it "creates datastreams from the spec on new objects" do
-      has_file.file_ds.content = "blah blah blah"
-      expect(has_file.file_ds).to be_changed
-      expect(has_file.file_ds2).to_not be_changed # no autocreate
-      expect(has_file.file_ds2).to be_new_record
-      has_file.save
-      has_file.reload
-      expect(has_file.file_ds).to_not be_changed
-      expect(has_file.file_ds2).to_not be_changed # no autocreate
-      expect(has_file.file_ds2).to be_new_record
-    end
-  end
-
   describe "Datastreams synched together" do
     before do
       class DSTest < ActiveFedora::Base
@@ -233,7 +126,7 @@ describe ActiveFedora::AttachedFiles do
       let(:obj) { ActiveFedora::Base.create }
       after { obj.destroy }
 
-      let(:ds) { ActiveFedora::File.new(obj.uri + '/DS1').tap { |ds| ds.content = "foo"; ds.save } }
+      let(:ds) { ActiveFedora::File.new(obj.uri + '/DS1') { |ds| ds.content = "foo"; ds.save } }
 
       it "retrieves blobs that match the saved blobs" do
         obj.attach_file(ds, 'DS1')

data/spec/integration/attributes_spec.rb

@@ -2,28 +2,11 @@ require 'spec_helper'
 
 describe "delegating attributes" do
   before :all do
-    class PropertiesDatastream < ActiveFedora::OmDatastream
-      set_terminology do |t|
-        t.root(path: "fields")
-        t.depositor index_as: [:symbol, :stored_searchable]
-        t.wrangler index_as: [:facetable]
-      end
-    end
     class TitledObject < ActiveFedora::Base
-      has_subresource 'foo', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :title, datastream: 'foo', multiple: false
-      end
+      property :title, predicate: ::RDF::Vocab::DC.title
     end
 
     class RdfObject < ActiveFedora::Base
-      has_subresource 'foo', class_name: 'PropertiesDatastream'
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :depositor, datastream: :foo, multiple: false do |index|
-          index.as :stored_searchable
-        end
-        has_attributes :wrangler, datastream: :foo, multiple: true
-      end
       property :resource_type, predicate: ::RDF::Vocab::DC.type do |index|
         index.as :stored_searchable, :facetable
       end
@@ -33,7 +16,6 @@ describe "delegating attributes" do
   after :all do
     Object.send(:remove_const, :TitledObject)
     Object.send(:remove_const, :RdfObject)
-    Object.send(:remove_const, :PropertiesDatastream)
   end
 
   describe "#index_config" do
@@ -41,7 +23,6 @@ describe "delegating attributes" do
       subject { RdfObject.index_config }
       it "has configuration" do
         expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
-        expect(subject[:depositor].behaviors).to eq [:stored_searchable]
       end
     end
 
@@ -59,7 +40,6 @@ describe "delegating attributes" do
 
       it "has configuration" do
         expect(subject[:resource_type].behaviors).to eq [:stored_searchable, :facetable]
-        expect(subject[:depositor].behaviors).to eq [:stored_searchable]
       end
 
       context "when the inherited config is modifed" do
@@ -75,83 +55,23 @@ describe "delegating attributes" do
     end
   end
 
-  context "with a simple datastream" do
-    describe "save" do
-      subject do
-        obj = TitledObject.create
-        obj.title = "Hydra for Dummies"
-        obj.save
-        obj
-      end
-      it "keeps a list of changes after a successful save" do
-        expect(subject.previous_changes).to_not be_empty
-        expect(subject.previous_changes.keys).to include("title")
-      end
-      it "cleans out changes" do
-        expect(subject).to_not be_title_changed
-        expect(subject.changes).to be_empty
-      end
+  describe "previous_changes" do
+    subject do
+      TitledObject.create(title: ["Hydra for Dummies"])
     end
-  end
-
-  context "with multiple datastreams" do
-    subject { RdfObject.create }
-
-    describe "getting attributes" do
-      before do
-        subject.depositor = "foo"
-        subject.resource_type = ["bar"]
-        subject.save
-      end
-
-      specify "using strings for keys" do
-        expect(subject["depositor"]).to eql("foo")
-        expect(subject["resource_type"]).to eql(["bar"])
-      end
-      specify "using symbols for keys" do
-        expect(subject[:depositor]).to eql("foo")
-        expect(subject[:resource_type]).to eql(["bar"])
-      end
-    end
-
-    describe "setting attributes" do
-      specify "using strings for keys" do
-        subject["depositor"] = "foo"
-        subject["resource_type"] = ["bar"]
-        subject.save
-        expect(subject.depositor).to eql("foo")
-        expect(subject.resource_type).to eql(["bar"])
-      end
-
-      specify "using symbols for keys" do
-        subject[:depositor] = "foo"
-        subject[:resource_type] = ["bar"]
-        subject.save
-        expect(subject.depositor).to eql("foo")
-        expect(subject.resource_type).to eql(["bar"])
-      end
-
-      # TODO: bug logged in issue #540
-      describe "using shift", pending: "has_changed? not returning true" do
-        specify "with rdf properties" do
-          subject.resource_type << "bar"
-          subject.save
-          expect(subject.resource_type).to eql(["bar"])
-        end
-        specify "with om terms" do
-          subject.wrangler << "bar"
-          subject.save
-          expect(subject.wrangler).to eql(["bar"])
-        end
-      end
+    it "keeps a list of changes after a successful save" do
+      expect(subject.previous_changes).to_not be_empty
+      expect(subject.previous_changes.keys).to include("title")
     end
   end
 
-  describe 'dangerous attributes' do
-    it 'raises an exception if a dangerous attribute is defined' do
-      Deprecation.silence(ActiveFedora::Attributes) do
-        expect { TitledObject.has_attributes :save, datastream: 'foo', multiple: false }.to raise_error ActiveFedora::DangerousAttributeError
-      end
+  describe "#changes" do
+    subject do
+      TitledObject.create(title: ["Hydra for Dummies"])
+    end
+    it "cleans out changes" do
+      expect(subject).to_not be_title_changed
+      expect(subject.changes).to be_empty
     end
   end
 end

data/spec/integration/direct_container_spec.rb

@@ -226,7 +226,7 @@ describe "Direct containers" do
       end
 
       context "and it doesn't contain the file" do
-        let!(:file2) { ActiveFedora::File.new.tap { |f| f.content = 'hmm'; f.save } }
+        let!(:file2) { ActiveFedora::File.new { |f| f.content = 'hmm'; f.save } }
         subject { foo.reload.files.include? file2 }
         it { is_expected.to be false }
       end
@@ -241,7 +241,7 @@ describe "Direct containers" do
       end
 
       context "and it doesn't contain the file" do
-        let!(:file2) { ActiveFedora::File.new.tap { |f| f.content = 'hmm'; f.save } }
+        let!(:file2) { ActiveFedora::File.new { |f| f.content = 'hmm'; f.save } }
         subject { foo.files.include? file2 }
         it { is_expected.to be false }
       end

data/spec/integration/file_spec.rb

@@ -50,13 +50,10 @@ describe ActiveFedora::File do
     end
   end
 
-  context "when autocreate is true" do
+  context "with a sub-resource that autocreates" do
     before do
       class MockAFBase < ActiveFedora::Base
-        extend Deprecation
-        Deprecation.silence(MockAFBase) do
-          has_metadata "descMetadata", type: ActiveFedora::QualifiedDublinCoreDatastream, autocreate: true
-        end
+        has_subresource "descMetadata", class_name: 'ActiveFedora::QualifiedDublinCoreDatastream', autocreate: true
       end
     end
 
@@ -65,13 +62,7 @@ describe ActiveFedora::File do
     end
 
     let(:test_object) { MockAFBase.create }
-
-    let(:descMetadata) { test_object.attached_files["descMetadata"] }
-
-    describe "the metadata file" do
-      subject { descMetadata }
-      it { should be_a_kind_of(described_class) }
-    end
+    let(:descMetadata) { test_object.descMetadata }
 
     describe "#content" do
       subject { descMetadata.content }
@@ -89,7 +80,6 @@ describe ActiveFedora::File 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
@@ -100,6 +90,26 @@ describe ActiveFedora::File do
       subject { found.xpath('//dc/title/text()').first.inner_text }
       it { should eq title.content }
     end
+  end
+
+  context "with a sub-resource" do
+    before do
+      class MockAFBase < ActiveFedora::Base
+        has_subresource "descMetadata", class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :MockAFBase)
+    end
+
+    let(:test_object) { MockAFBase.create }
+    let(:descMetadata) { test_object.descMetadata }
+
+    describe "the metadata file" do
+      subject { descMetadata }
+      it { should be_a_kind_of(described_class) }
+    end
 
     context "a binary file" do
       let(:path) { "ds#{Time.now.to_i}" }

data/spec/integration/indexing_spec.rb

@@ -31,15 +31,15 @@ describe ActiveFedora::Base do
 
     context 'when some of the decendants are not RDFSources' do
       let(:ids) { ['foo', 'foo/bar'] }
-      let(:datastream) { ActiveFedora::Datastream.new(described_class.id_to_uri('foo/bar/bax')) }
+      let(:file) { ActiveFedora::File.new(described_class.id_to_uri('foo/bar/bax')) }
 
       before do
-        datastream.content = "Hello!!!"
-        datastream.save
+        file.content = "Hello!!!"
+        file.save
       end
 
       it "does not put the datastream in the decendants list" do
-        expect(described_class.descendant_uris(root_uri(ids))).not_to include datastream.uri
+        expect(described_class.descendant_uris(root_uri(ids))).not_to include file.uri
       end
     end
 

data/spec/integration/json_serialization_spec.rb

@@ -5,32 +5,19 @@ describe "Objects should be serialized to JSON" do
     expect(ActiveFedora::Base.new.to_json).to eq "{\"id\":null}"
   end
 
-  context "with properties and datastream attributes" do
+  context "with properties" do
     before do
-      class MyDS < ActiveFedora::OmDatastream
-        set_terminology do |t|
-          t.root(path: "durh")
-          t.foo
-          t.bar
-        end
-      end
-
       class Foo < ActiveFedora::Base
-        has_subresource 'descMetadata', class_name: 'MyDS'
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :foo, datastream: 'descMetadata', multiple: true
-          has_attributes :bar, datastream: 'descMetadata', multiple: false
-        end
         property :title, predicate: ::RDF::Vocab::DC.title
+        property :description, predicate: ::RDF::Vocab::DC.description, multiple: false
       end
     end
 
     after do
       Object.send(:remove_const, :Foo)
-      Object.send(:remove_const, :MyDS)
     end
 
-    let(:obj) { Foo.new(foo: ["baz"], bar: 'quix', title: ['My Title']) }
+    let(:obj) { Foo.new(title: ['My Title'], description: 'Wonderful stuff') }
 
     before { allow(obj).to receive(:id).and_return('test-123') }
 
@@ -38,48 +25,8 @@ describe "Objects should be serialized to JSON" do
 
     it "has to_json" do
       expect(subject['id']).to eq "test-123"
-      expect(subject['foo']).to eq ["baz"]
-      expect(subject['bar']).to eq "quix"
       expect(subject['title']).to eq ["My Title"]
+      expect(subject['description']).to eq "Wonderful stuff"
     end
   end
-
-  context "with nested nodes" do
-    before do
-      class DummySubnode < ActiveTriples::Resource
-        property :relation, predicate: ::RDF::Vocab::DC[:relation]
-      end
-
-      class DummyResource < ActiveFedora::RDFDatastream
-        Deprecation.silence(ActiveFedora::RDFDatastream) do
-          property :license, predicate: ::RDF::Vocab::DC[:license], class_name: DummySubnode do |index|
-            index.as :searchable, :displayable
-          end
-        end
-        def serialization_format
-          :ntriples
-        end
-      end
-
-      class DummyAsset < ActiveFedora::Base
-        has_subresource 'descMetadata', class_name: 'DummyResource'
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false
-        end
-      end
-    end
-
-    after do
-      Object.send(:remove_const, "DummyAsset")
-      Object.send(:remove_const, "DummyResource")
-      Object.send(:remove_const, "DummySubnode")
-    end
-
-    let(:obj) { DummyAsset.new { |a| a.relation = 'Great Grandchild' } }
-    before { allow(obj).to receive(:id).and_return('test-123') }
-
-    subject { JSON.parse(obj.to_json) }
-
-    it { should eq("id" => "test-123", "relation" => "Great Grandchild") }
-  end
 end