active-fedora 9.12.0 → 9.13.0

data/spec/unit/base_active_model_spec.rb

@@ -15,19 +15,22 @@ describe ActiveFedora::Base do
       end
     end
 
-    class BarHistory < ActiveFedora::Base
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-        m.field "fubar", :string
-        m.field "swank", :text
-      end
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "withText" do |m|
-        m.field "fubar", :text
+    class BazStream < ActiveFedora::OmDatastream
+      set_terminology do |t|
+        t.root(path: "first", xmlns: "urn:foobar")
+        t.fubar
       end
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "withText2" do |m|
-        m.field "fubar", :text
+
+      def self.xml_template
+        Nokogiri::XML::Document.parse '<first xmlns="urn:foobar">
+          <fubar></fubar>
+        </first>'
       end
+    end
 
-      has_metadata type: BarStream, name: "xmlish"
+    class BarHistory < ActiveFedora::Base
+      has_subresource 'xmlish', class_name: 'BarStream'
+      has_subresource 'withText', class_name: 'BazStream'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :fubar, datastream: 'withText', multiple: false
         has_attributes :duck, datastream: 'xmlish', multiple: false

data/spec/unit/base_spec.rb

@@ -111,34 +111,12 @@ describe ActiveFedora::Base do
   describe "With a test class" do
     before do
       class FooHistory < ActiveFedora::Base
-        has_metadata 'someData', type: ActiveFedora::SimpleDatastream, autocreate: true do |m|
-          m.field "fubar", :string
-          m.field "swank", :text
-        end
-        has_metadata "withText", type: ActiveFedora::SimpleDatastream, autocreate: true do |m|
-          m.field "fubar", :text
-        end
-        has_metadata "withText2", type: ActiveFedora::SimpleDatastream, autocreate: true do |m|
-          m.field "fubar", :text
-        end
-        Deprecation.silence(ActiveFedora::Attributes) do
-          has_attributes :fubar, datastream: 'withText', multiple: true
-          has_attributes :swank, datastream: 'someData', multiple: true
-        end
-      end
-
-      class FooAdaptation < ActiveFedora::Base
-        has_metadata 'someData', type: ActiveFedora::OmDatastream
-      end
-
-      class FooInherited < FooHistory
+        property :fubar, predicate: ::RDF::URI('http://example.com/fubar')
       end
     end
 
     after do
       Object.send(:remove_const, :FooHistory)
-      Object.send(:remove_const, :FooAdaptation)
-      Object.send(:remove_const, :FooInherited)
     end
 
     def increment_id
@@ -305,7 +283,7 @@ describe ActiveFedora::Base do
         obj = double
         expect(obj).to receive(:save)
         expect(FooHistory).to receive(:new).and_return(obj)
-        @hist = FooHistory.create(fubar: 'ta', swank: 'da')
+        FooHistory.create(fubar: 'ta')
       end
     end
 

data/spec/unit/callback_spec.rb

@@ -3,14 +3,6 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   before :each do
     class CallbackStub < ActiveFedora::Base
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-        m.field "fubar", :string
-        m.field "swank", :text
-      end
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :fubar, :swank, datastream: 'someData', multiple: true
-      end
-
       after_initialize :a_init
       before_save :b_save
       after_save :a_save

data/spec/unit/core_spec.rb

@@ -9,10 +9,8 @@ describe ActiveFedora::Base do
     end
     class Book < ActiveFedora::Base
       belongs_to :library, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.hasConstituent
-      has_metadata "foo", type: ActiveFedora::SimpleDatastream do |m|
-        m.field "title", :string
-      end
-      has_metadata "bar", type: MyDatastream
+      has_subresource "foo", class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
+      has_subresource "bar", class_name: 'MyDatastream'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :title, datastream: 'foo' # Om backed property
         has_attributes :publisher, datastream: 'bar' # RDF backed property
@@ -65,7 +63,7 @@ describe ActiveFedora::Base do
     it "makes the om properties immutable" do
       expect {
         subject.title = "HEY"
-      }.to raise_error RuntimeError, "can't modify frozen ActiveFedora::SimpleDatastream"
+      }.to raise_error RuntimeError, "can't modify frozen ActiveFedora::QualifiedDublinCoreDatastream"
       expect(subject.title).to eq "War and Peace"
     end
 

data/spec/unit/inheritance_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   before do
+    class MyDS < ActiveFedora::OmDatastream
+    end
     class Foo < ActiveFedora::Base
-      has_metadata "foostream", type: ActiveFedora::SimpleDatastream do |m|
-        m.field "foostream", :string
-      end
-      has_metadata 'dcstream', type: ActiveFedora::QualifiedDublinCoreDatastream
+      extend Deprecation
+      has_subresource 'foostream', class_name: 'MyDS'
+      has_subresource 'dcstream', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
     end
     class Bar < ActiveFedora::Base
-      has_metadata 'barstream', type: ActiveFedora::SimpleDatastream do |m|
-        m.field "barfield", :string
-      end
+      extend Deprecation
+      has_subresource 'barstream', class_name: 'MyDS'
     end
   end
 
@@ -19,17 +19,23 @@ describe ActiveFedora::Base do
     f = Foo.new
     expect(f.attached_files.size).to eq 2
     streams = f.attached_files.values.map { |x| x.class.to_s }.sort
-    expect(streams.pop).to eq "ActiveFedora::SimpleDatastream"
+    expect(streams.pop).to eq "MyDS"
     expect(streams.pop).to eq "ActiveFedora::QualifiedDublinCoreDatastream"
   end
 
   it "works for multiple types" do
     b = Foo.new
     f = Bar.new
-    expect(b.class.ds_specs).to_not eq f.class.ds_specs
+    Deprecation.silence(Foo) do
+      Deprecation.silence(Bar) do
+        expect(b.class.ds_specs).to_not eq f.class.ds_specs
+      end
+    end
   end
+
   after do
     Object.send(:remove_const, :Bar)
     Object.send(:remove_const, :Foo)
+    Object.send(:remove_const, :MyDS)
   end
 end

data/spec/unit/ntriples_datastream_spec.rb

@@ -196,7 +196,7 @@ EOF
     describe "with an actual object" do
       before(:each) do
         class Foo < ActiveFedora::Base
-          has_metadata "descMetadata", type: MyDatastream
+          has_subresource "descMetadata", class_name: 'MyDatastream'
           Deprecation.silence(ActiveFedora::Attributes) do
             has_attributes :created, :title, :publisher, :based_near, :related_url, :rights, datastream: :descMetadata, multiple: true
           end

data/spec/unit/om_datastream_spec.rb

@@ -306,7 +306,7 @@ describe ActiveFedora::OmDatastream do
   describe "an instance that exists in the datastore, but hasn't been loaded" do
     before do
       class MyObj < ActiveFedora::Base
-        has_metadata 'descMetadata', type: Hydra::ModsArticleDatastream
+        has_subresource 'descMetadata', class_name: 'Hydra::ModsArticleDatastream'
       end
       @obj = MyObj.new
       @obj.descMetadata.title = 'Foobar'

data/spec/unit/persistence_spec.rb

@@ -1,6 +1,19 @@
 require 'spec_helper'
 
 describe ActiveFedora::Persistence do
+  describe '#new_record?' do
+    context 'with an new object' do
+      subject { ActiveFedora::Base.new }
+      it { is_expected.to be_new_record }
+    end
+
+    context 'with an destroyed object' do
+      subject { ActiveFedora::Base.create }
+      before { subject.delete }
+      it { is_expected.not_to be_new_record }
+    end
+  end
+
   describe '.delete' do
     context 'with an unsaved object' do
       subject { ActiveFedora::Base.new }
@@ -22,6 +35,14 @@ describe ActiveFedora::Persistence do
         expect { |b| ActiveFedora::Base.create(&b) }.to yield_with_args(an_instance_of(ActiveFedora::Base))
       end
     end
+
+    context "when trying to create it again" do
+      let(:object) { ActiveFedora::Base.create! }
+
+      it "raises an error" do
+        expect { ActiveFedora::Base.create(id: object.id) }.to raise_error(ActiveFedora::IllegalOperation, "Attempting to recreate existing ldp_source: `#{object.uri}'")
+      end
+    end
   end
 
   describe '.destroy' do

data/spec/unit/query_spec.rb

@@ -67,6 +67,14 @@ describe ActiveFedora::Base do
         SpecModel::Basic.find(id: "_ID_")
       end
     end
+
+    context "with a blank string" do
+      it 'raises ActiveFedora::ObjectNotFoundError' do
+        expect {
+          SpecModel::Basic.find('')
+        }.to raise_error(ActiveFedora::ObjectNotFoundError)
+      end
+    end
   end
 
   describe "#where" do

data/spec/unit/rdf_datastream_spec.rb

@@ -15,7 +15,7 @@ describe ActiveFedora::RDFDatastream do
         property :description, predicate: ::RDF::Vocab::DC.description
       end
       class MyObj < ActiveFedora::Base
-        has_metadata 'descMetadata', type: MyDatastream
+        has_subresource 'descMetadata', class_name: 'MyDatastream'
       end
       @obj = MyObj.new
       @obj.descMetadata.title = 'Foobar'

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -25,7 +25,7 @@ describe ActiveFedora::RDFDatastream do
     end
 
     class DummyAsset < ActiveFedora::Base
-      has_metadata 'descMetadata', type: DummyResource
+      has_subresource 'descMetadata', class_name: 'DummyResource'
       Deprecation.silence(ActiveFedora::Attributes) do
         has_attributes :title, :license, datastream: 'descMetadata', multiple: true
         has_attributes :relation, datastream: 'descMetadata', at: [:license, :relation], multiple: false

data/spec/unit/simple_datastream_spec.rb

@@ -4,6 +4,8 @@ describe ActiveFedora::SimpleDatastream do
   let(:sample_xml) { "<fields><coverage>coverage1</coverage><coverage>coverage2</coverage><creation_date>2012-01-15</creation_date><mydate>fake-date</mydate><publisher>publisher1</publisher></fields>" }
 
   before do
+    @original_behavior = Deprecation.default_deprecation_behavior
+    Deprecation.default_deprecation_behavior = :silence
     @test_ds = described_class.new
     allow(@test_ds).to receive(:retrieve_content).and_return('') # DS grabs the old content to compare against the new
     @test_ds.content = sample_xml
@@ -70,8 +72,11 @@ describe ActiveFedora::SimpleDatastream do
 
     before do
       class FooHistory < ActiveFedora::Base
-        has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-          m.field "fubar", :string
+        extend Deprecation
+        Deprecation.silence(FooHistory) do
+          has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
+            m.field "fubar", :string
+          end
         end
         Deprecation.silence(ActiveFedora::Attributes) do
           has_attributes :fubar, datastream: 'someData', multiple: false
@@ -87,6 +92,7 @@ describe ActiveFedora::SimpleDatastream do
 
     after do
       Object.send(:remove_const, :FooHistory)
+      Deprecation.default_deprecation_behavior = @original_behavior
     end
 
     subject { FooHistory.find(foo.id) }

data/spec/unit/solr_config_options_spec.rb

@@ -43,7 +43,7 @@ describe ActiveFedora do
       end
 
       it "prevents Base.save from calling update_index if false" do
-        dirty_ds = ActiveFedora::SimpleDatastream.new
+        dirty_ds = ActiveFedora::QualifiedDublinCoreDatastream.new
         @test_object.attached_files['ds1'] = dirty_ds
         allow(@test_object).to receive(:datastreams).and_return(ds1: dirty_ds)
         expect(@test_object).to receive(:update_index).never

data/spec/unit/validations_spec.rb

@@ -3,14 +3,8 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   before :all do
     class ValidationStub < ActiveFedora::Base
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-        m.field "fubar", :string
-        m.field "swank", :text
-      end
-      Deprecation.silence(ActiveFedora::Attributes) do
-        has_attributes :fubar, datastream: 'someData', multiple: true
-        has_attributes :swank, datastream: 'someData', multiple: false
-      end
+      property :fubar, predicate: ::RDF::URI('http://example.com/fubar')
+      property :swank, predicate: ::RDF::URI('http://example.com/swank'), multiple: false
 
       validates_presence_of :fubar
       validates_length_of :swank, minimum: 5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.12.0
+  version: 9.13.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -184,6 +184,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -382,14 +396,15 @@ files:
 - lib/active_fedora/associations/belongs_to_association.rb
 - lib/active_fedora/associations/builder/aggregation.rb
 - lib/active_fedora/associations/builder/association.rb
+- lib/active_fedora/associations/builder/basic_contains.rb
 - lib/active_fedora/associations/builder/belongs_to.rb
 - lib/active_fedora/associations/builder/collection_association.rb
-- lib/active_fedora/associations/builder/contains.rb
 - lib/active_fedora/associations/builder/directly_contains.rb
 - lib/active_fedora/associations/builder/directly_contains_one.rb
 - lib/active_fedora/associations/builder/filter.rb
 - lib/active_fedora/associations/builder/has_and_belongs_to_many.rb
 - lib/active_fedora/associations/builder/has_many.rb
+- lib/active_fedora/associations/builder/has_subresource.rb
 - lib/active_fedora/associations/builder/indirectly_contains.rb
 - lib/active_fedora/associations/builder/orders.rb
 - lib/active_fedora/associations/builder/property.rb
@@ -406,6 +421,7 @@ files:
 - lib/active_fedora/associations/filter_association.rb
 - lib/active_fedora/associations/has_and_belongs_to_many_association.rb
 - lib/active_fedora/associations/has_many_association.rb
+- lib/active_fedora/associations/has_subresource_association.rb
 - lib/active_fedora/associations/id_composite.rb
 - lib/active_fedora/associations/indirectly_contains_association.rb
 - lib/active_fedora/associations/null_validator.rb
@@ -472,6 +488,7 @@ files:
 - lib/active_fedora/indexing_service.rb
 - lib/active_fedora/inheritable_accessors.rb
 - lib/active_fedora/inheritance.rb
+- lib/active_fedora/initializing_connection.rb
 - lib/active_fedora/ldp_cache.rb
 - lib/active_fedora/ldp_resource.rb
 - lib/active_fedora/ldp_resource_service.rb
@@ -549,6 +566,7 @@ files:
 - lib/generators/active_fedora/config/config_generator.rb
 - lib/generators/active_fedora/config/fedora/fedora_generator.rb
 - lib/generators/active_fedora/config/fedora/templates/.fcrepo_wrapper
+- lib/generators/active_fedora/config/fedora/templates/fcrepo_wrapper_test.yml
 - lib/generators/active_fedora/config/fedora/templates/fedora.yml
 - lib/generators/active_fedora/config/solr/solr_generator.rb
 - lib/generators/active_fedora/config/solr/templates/.solr_wrapper
@@ -569,6 +587,7 @@ files:
 - lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_atom.xsl
 - lib/generators/active_fedora/config/solr/templates/solr/config/xslt/example_rss.xsl
 - lib/generators/active_fedora/config/solr/templates/solr/config/xslt/luke.xsl
+- lib/generators/active_fedora/config/solr/templates/solr_wrapper_test.yml
 - lib/generators/active_fedora/model/USAGE
 - lib/generators/active_fedora/model/model_generator.rb
 - lib/generators/active_fedora/model/templates/datastream.rb.erb
@@ -617,13 +636,12 @@ files:
 - spec/integration/attributes_spec.rb
 - spec/integration/autosave_association_spec.rb
 - spec/integration/base_spec.rb
+- spec/integration/basic_contains_association_spec.rb
 - spec/integration/belongs_to_association_spec.rb
-- spec/integration/bug_spec.rb
 - spec/integration/caching_spec.rb
 - spec/integration/clean_connection_spec.rb
 - spec/integration/collection_association_spec.rb
 - spec/integration/complex_rdf_datastream_spec.rb
-- spec/integration/contains_association_spec.rb
 - spec/integration/datastream_rdf_nested_attributes_spec.rb
 - spec/integration/date_time_properties_spec.rb
 - spec/integration/delete_all_spec.rb
@@ -634,10 +652,12 @@ files:
 - spec/integration/field_to_solr_name_spec.rb
 - spec/integration/file_fixity_spec.rb
 - spec/integration/file_spec.rb
-- spec/integration/full_featured_model_spec.rb
+- spec/integration/generators/fedora_generator_spec.rb
+- spec/integration/generators/solr_generator_spec.rb
 - spec/integration/gone_spec.rb
 - spec/integration/has_and_belongs_to_many_associations_spec.rb
 - spec/integration/has_many_associations_spec.rb
+- spec/integration/has_subresource_spec.rb
 - spec/integration/indexing_spec.rb
 - spec/integration/indirect_container_spec.rb
 - spec/integration/json_serialization_spec.rb
@@ -770,3 +790,4 @@ signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
+has_rdoc: 

data/spec/integration/bug_spec.rb

@@ -1,40 +0,0 @@
-require 'spec_helper'
-
-require 'active_fedora'
-require 'active_fedora/model'
-require "rexml/document"
-
-describe 'bugs' do
-  before do
-    class FooHistory < ActiveFedora::Base
-      has_metadata type: ActiveFedora::SimpleDatastream, name: "someData" do |m|
-        m.field "fubar", :string
-      end
-    end
-    @test_object = FooHistory.new
-    @test_object.save
-  end
-  after do
-    @test_object.delete
-    Object.send(:remove_const, :FooHistory)
-  end
-
-  it 'raises ActiveFedora::ObjectNotFoundError when find("")' do
-    expect {
-      FooHistory.find('')
-    }.to raise_error(ActiveFedora::ObjectNotFoundError)
-  end
-
-  it "does not clobber everything when setting a value" do
-    @test_object.someData.fubar = ['initial']
-    @test_object.save!
-
-    x = FooHistory.find(@test_object.id)
-    x.someData.fubar = ["replacement"] # set a new value
-    x.save!
-
-    x = FooHistory.find(@test_object.id)
-    expect(x.someData.fubar).to eq ["replacement"] # recall the value
-    x.save
-  end
-end