active-fedora 11.0.0.rc6 → 11.0.0.rc7

data/spec/spec_helper.rb

@@ -24,7 +24,6 @@ ActiveFedora::Base.logger.level = Logger::WARN
 # HttpLogger.log_headers = true
 
 Dir[File.expand_path("../support/**/*.rb", __FILE__)].each { |f| require f }
-require 'samples/samples'
 
 $VERBOSE = nil
 
@@ -37,12 +36,6 @@ restore_spec_configuration
 
 require 'active_fedora/cleaner'
 RSpec.configure do |config|
-  config.before(:suite) do
-    ActiveFedora::RDFDatastream.deprecation_behavior = :silence
-    ActiveFedora::NtriplesRDFDatastream.deprecation_behavior = :silence
-    ActiveFedora::OmDatastream.deprecation_behavior = :silence
-    ActiveFedora::NomDatastream.deprecation_behavior = :silence
-  end
   # Stub out test stuff.
   config.before(:each) do
     begin

data/spec/unit/attached_files_spec.rb

@@ -4,17 +4,20 @@ describe ActiveFedora::AttachedFiles do
   subject(:af_base) { ActiveFedora::Base.new }
   describe "has_subresource" do
     before do
-      class Z < ActiveFedora::File
+      class Sample1 < ActiveFedora::File
+      end
+      class Sample2 < ActiveFedora::File
       end
       class FooHistory < ActiveFedora::Base
-        has_subresource 'dsid', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
-        has_subresource 'complex_ds', autocreate: true, class_name: 'Z'
+        has_subresource 'dsid', class_name: 'Sample2'
+        has_subresource 'complex_ds', autocreate: true, class_name: 'Sample1'
         has_subresource 'thumbnail'
         has_subresource 'child_resource', class_name: 'ActiveFedora::Base'
       end
     end
     after do
-      Object.send(:remove_const, :Z)
+      Object.send(:remove_const, :Sample1)
+      Object.send(:remove_const, :Sample2)
       Object.send(:remove_const, :FooHistory)
     end
 
@@ -26,12 +29,12 @@ describe ActiveFedora::AttachedFiles do
 
     it "lets you override defaults" do
       expect(FooHistory.child_resource_reflections[:complex_ds].options).to include(autocreate: true)
-      expect(FooHistory.child_resource_reflections[:complex_ds].class_name).to eq 'Z'
+      expect(FooHistory.child_resource_reflections[:complex_ds].class_name).to eq 'Sample1'
     end
 
     it "raises an error if you don't give a dsid" do
-      expect { FooHistory.has_subresource nil, type: ActiveFedora::QualifiedDublinCoreDatastream }.to raise_error ArgumentError,
-                                                                                                                  "You must provide a path name (f.k.a. dsid) for the resource"
+      expect { FooHistory.has_subresource nil, type: Sample2 }.to raise_error ArgumentError,
+                                                                              "You must provide a path name (f.k.a. dsid) for the resource"
     end
   end
 

data/spec/unit/base_spec.rb

@@ -100,11 +100,13 @@ describe ActiveFedora::Base do
       class SpecialThing < ActiveFedora::Base
       end
     end
+
     after do
       Object.send(:remove_const, :SpecialThing)
     end
+
     it "records the decendants" do
-      expect(described_class.descendants).to include(ModsArticle, SpecialThing)
+      expect(described_class.descendants).to include(SpecialThing)
     end
   end
 

data/spec/unit/has_many_association_spec.rb

@@ -32,19 +32,34 @@ describe ActiveFedora::Associations::HasManyAssociation do
     end
   end
 
-  describe "Finding a polymorphic inverse relation" do
-    before do
-      # :books must come first, so that we can test that is being passed over in favor of :contents
-      Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-      Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
-    end
+  describe "#find_polymorphic_inverse" do
     let(:book_reflection) { ActiveFedora::Reflection.create(:has_many, 'pages', nil, { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
     let(:association) { described_class.new(book, book_reflection) }
 
     subject(:af_page) { association.send(:find_polymorphic_inverse, page) }
 
-    it "finds the HABTM reflection" do
-      expect(af_page.name).to eq :contents
+    context "when a has_many is present" do
+      before do
+        # :books must come first, so that we can test that is being passed over in favor of :contents
+        Page.has_many :books, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+        Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      end
+
+      it "finds the HABTM reflection" do
+        expect(af_page.name).to eq :contents
+      end
+    end
+
+    context "when multiple belongs_to are present" do
+      before do
+        # :foo must come first, so that we can test that is being passed over in favor of :bar
+        Page.belongs_to :foo, predicate: ::RDF::Vocab::DC.isPartOf, class_name: 'ActiveFedora::Base'
+        Page.belongs_to :bar, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
+      end
+
+      it "finds the belongs_to reflection" do
+        expect(af_page.name).to eq :bar
+      end
     end
   end
 

data/spec/unit/inheritance_spec.rb

@@ -2,28 +2,32 @@ require 'spec_helper'
 
 describe ActiveFedora::Base do
   before do
-    class MyDS < ActiveFedora::OmDatastream
+    class MyDS < ActiveFedora::File
     end
+
+    class MySample < ActiveFedora::File
+    end
+
     class Foo < ActiveFedora::Base
       has_subresource 'foostream', class_name: 'MyDS'
-      has_subresource 'dcstream', class_name: 'ActiveFedora::QualifiedDublinCoreDatastream'
+      has_subresource 'dcstream', class_name: 'MySample'
     end
+
     class Bar < ActiveFedora::Base
       has_subresource 'barstream', class_name: 'MyDS'
     end
   end
+  let(:f) { Foo.new }
+  subject(:attached_files) { f.attached_files }
 
   it "doesn't overwrite stream specs" 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 "MyDS"
-    expect(streams.pop).to eq "ActiveFedora::QualifiedDublinCoreDatastream"
+    expect(attached_files.values).to match_array [MyDS, MySample]
   end
 
   after do
     Object.send(:remove_const, :Bar)
     Object.send(:remove_const, :Foo)
     Object.send(:remove_const, :MyDS)
+    Object.send(:remove_const, :MySample)
   end
 end

data/spec/unit/model_classifier_spec.rb

@@ -15,7 +15,7 @@ describe ActiveFedora::ModelClassifier do
 
   describe ".class_from_string" do
     it "returns class constants based on strings" do
-      expect(described_class.class_from_string("Om")).to eq Om
+      expect(described_class.class_from_string("String")).to eq String
       expect(described_class.class_from_string("ActiveFedora::RDF::IndexingService")).to eq ActiveFedora::RDF::IndexingService
       expect(described_class.class_from_string("IndexingService", ActiveFedora::RDF)).to eq ActiveFedora::RDF::IndexingService
     end

data/spec/unit/rdf/indexing_service_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe ActiveFedora::RDF::IndexingService do
   before do
-    class MyDatastream < ActiveFedora::NtriplesRDFDatastream
+    class MyObj < ActiveFedora::Base
       property :created, predicate: ::RDF::Vocab::DC.created
       property :title, predicate: ::RDF::Vocab::DC.title
       property :publisher, predicate: ::RDF::Vocab::DC.publisher
@@ -13,17 +13,17 @@ describe ActiveFedora::RDF::IndexingService do
   end
 
   after do
-    Object.send(:remove_const, :MyDatastream)
+    Object.send(:remove_const, :MyObj)
   end
 
   let(:f2) do
-    MyDatastream.new.tap do |obj|
-      obj.created = Date.parse("2012-03-04")
-      obj.title = "Of Mice and Men, The Sequel"
-      obj.publisher = "Bob's Blogtastic Publishing"
+    MyObj.new.tap do |obj|
+      obj.created = [Date.parse("2012-03-04")]
+      obj.title = ["Of Mice and Men, The Sequel"]
+      obj.publisher = ["Bob's Blogtastic Publishing"]
       obj.based_near = ["Tacoma, WA", "Renton, WA"]
-      obj.related_url = "http://example.org/blogtastic/"
-      obj.rights = "Totally open, y'all"
+      obj.related_url = ["http://example.org/blogtastic/"]
+      obj.rights = ["Totally open, y'all"]
     end
   end
 
@@ -51,7 +51,7 @@ describe ActiveFedora::RDF::IndexingService do
   end
 
   before do
-    allow(MyDatastream).to receive(:index_config).and_return(index_config)
+    allow(MyObj).to receive(:index_config).and_return(index_config)
   end
 
   let(:indexer) { described_class.new(f2) }

data/spec/unit/solr_config_options_spec.rb

@@ -8,9 +8,7 @@ describe ActiveFedora do
     end
   end
 
-  before(:each) do
-    @test_object = ActiveFedora::Base.new
-  end
+  subject(:test_object) { ActiveFedora::Base.new }
 
   describe ".id_field" do
     let(:field) { "MY_SAMPLE_ID".freeze }
@@ -19,9 +17,9 @@ describe ActiveFedora do
     end
 
     it "is used by ActiveFedora::Base.to_solr" do
-      allow(@test_object).to receive(:id).and_return('changeme:123')
-      expect(@test_object.to_solr[field.to_sym]).to eq 'changeme:123'
-      expect(@test_object.to_solr[:id]).to be_nil
+      allow(test_object).to receive(:id).and_return('changeme:123')
+      expect(test_object.to_solr[field.to_sym]).to eq 'changeme:123'
+      expect(test_object.to_solr[:id]).to be_nil
     end
 
     it "is used by ActiveFedora::Base#search_with_conditions" do
@@ -43,17 +41,16 @@ describe ActiveFedora do
       end
 
       it "prevents Base.save from calling update_index if false" do
-        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
-        expect(@test_object).to receive(:refresh)
-        @test_object.save
+        allow(test_object).to receive(:new_record?).and_return(false)
+        expect(test_object).to receive(:update_index).never
+        expect(test_object).to receive(:refresh)
+        test_object.save
       end
+
       it "prevents Base.delete from deleting the corresponding Solr document if false" do
-        expect(ActiveFedora::SolrService.instance.conn).to receive(:delete).with(@test_object.id).never
-        expect(@test_object).to receive(:delete)
-        @test_object.delete
+        expect(ActiveFedora::SolrService.instance.conn).to receive(:delete).with(test_object.id).never
+        expect(test_object).to receive(:delete)
+        test_object.delete
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc6
+  version: 11.0.0.rc7
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-12 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -46,34 +46,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: om
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: nom-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -445,8 +403,6 @@ files:
 - lib/active_fedora/core.rb
 - lib/active_fedora/core/fedora_id_translator.rb
 - lib/active_fedora/core/fedora_uri_translator.rb
-- lib/active_fedora/datastreams.rb
-- lib/active_fedora/datastreams/nokogiri_datastreams.rb
 - lib/active_fedora/default_model_mapper.rb
 - lib/active_fedora/delegated_attribute.rb
 - lib/active_fedora/errors.rb
@@ -480,9 +436,7 @@ files:
 - lib/active_fedora/log_subscriber.rb
 - lib/active_fedora/model_classifier.rb
 - lib/active_fedora/nested_attributes.rb
-- lib/active_fedora/nom_datastream.rb
 - lib/active_fedora/null_relation.rb
-- lib/active_fedora/om_datastream.rb
 - lib/active_fedora/orders.rb
 - lib/active_fedora/orders/collection_proxy.rb
 - lib/active_fedora/orders/list_node.rb
@@ -491,22 +445,17 @@ files:
 - lib/active_fedora/pathing.rb
 - lib/active_fedora/persistence.rb
 - lib/active_fedora/property.rb
-- lib/active_fedora/qualified_dublin_core_datastream.rb
 - lib/active_fedora/query_result_builder.rb
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
 - lib/active_fedora/rake_support.rb
 - lib/active_fedora/rdf.rb
-- lib/active_fedora/rdf/datastream_indexing.rb
 - lib/active_fedora/rdf/fcrepo.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/ntriples_rdf_datastream.rb
 - lib/active_fedora/rdf/persistence.rb
 - lib/active_fedora/rdf/project_hydra.rb
-- lib/active_fedora/rdf/rdf_datastream.rb
-- lib/active_fedora/rdf/rdfxml_datastream.rb
 - lib/active_fedora/reflection.rb
 - lib/active_fedora/relation.rb
 - lib/active_fedora/relation/calculations.rb
@@ -606,8 +555,6 @@ files:
 - 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/datastream_rdf_nested_attributes_spec.rb
 - spec/integration/date_time_properties_spec.rb
 - spec/integration/delete_all_spec.rb
 - spec/integration/direct_container_spec.rb
@@ -628,8 +575,6 @@ files:
 - spec/integration/marshal_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
 - spec/integration/query_result_builder_spec.rb
 - spec/integration/rdf_nested_attributes_spec.rb
@@ -641,11 +586,8 @@ files:
 - spec/integration/versionable_spec.rb
 - spec/integration/with_metadata_spec.rb
 - spec/rcov.opts
-- spec/samples/hydra-mods_article_datastream.rb
-- spec/samples/models/mods_article.rb
 - spec/samples/oral_history_sample.xml
 - spec/samples/oral_history_xml.xml
-- spec/samples/samples.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/an_active_model.rb
@@ -690,9 +632,6 @@ files:
 - spec/unit/loadable_from_json_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/model_classifier_spec.rb
-- spec/unit/nom_datastream_spec.rb
-- spec/unit/ntriples_datastream_spec.rb
-- spec/unit/om_datastream_spec.rb
 - spec/unit/ordered_spec.rb
 - spec/unit/orders/list_node_spec.rb
 - spec/unit/orders/ordered_list_spec.rb
@@ -701,15 +640,11 @@ files:
 - spec/unit/persistence_spec.rb
 - spec/unit/property_predicate_spec.rb
 - spec/unit/property_spec.rb
-- spec/unit/qualified_dublin_core_datastream_spec.rb
 - spec/unit/query_result_builder_spec.rb
 - spec/unit/query_spec.rb
 - spec/unit/querying_spec.rb
 - spec/unit/rdf/indexing_service_spec.rb
-- spec/unit/rdf_datastream_spec.rb
-- spec/unit/rdf_resource_datastream_spec.rb
 - spec/unit/rdf_vocab_spec.rb
-- spec/unit/rdfxml_datastream_spec.rb
 - spec/unit/readonly_spec.rb
 - spec/unit/reflection_spec.rb
 - spec/unit/rspec_matchers/belong_to_associated_active_fedora_object_matcher_spec.rb

data/lib/active_fedora/datastreams.rb

@@ -1,6 +0,0 @@
-module ActiveFedora
-  module Datastreams
-    extend ActiveSupport::Autoload
-    autoload :NokogiriDatastreams, 'active_fedora/datastreams/nokogiri_datastreams'
-  end
-end

data/lib/active_fedora/datastreams/nokogiri_datastreams.rb

@@ -1,119 +0,0 @@
-module ActiveFedora
-  module Datastreams
-    module NokogiriDatastreams
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def xml_template
-          Nokogiri::XML::Document.parse("<xml/>")
-        end
-
-        def decorate_ng_xml(xml)
-          xml
-        end
-      end
-
-      def ng_xml
-        @ng_xml ||= begin
-          xml = if new_record?
-                  ## Load up the template
-                  self.class.xml_template
-                else
-                  Nokogiri::XML::Document.parse(remote_content)
-                end
-          self.class.decorate_ng_xml xml
-        end
-      end
-
-      def ng_xml=(new_xml)
-        # before we set ng_xml, we load the datastream so we know if the new value differs.
-        # TODO reinstate this
-        # local_or_remote_content(true)
-
-        case new_xml
-        when Nokogiri::XML::Document
-          self.content = new_xml.to_xml
-        when Nokogiri::XML::Node
-          ## Cast a fragment to a document
-          self.content = new_xml.to_s
-        when String
-          self.content = new_xml
-        else
-          raise TypeError, "You passed a #{new_xml.class} into the ng_xml of the #{dsid} datastream. OmDatastream.ng_xml= only accepts Nokogiri::XML::Document, Nokogiri::XML::Element, Nokogiri::XML::Node, or raw XML (String) as inputs."
-        end
-      end
-
-      def refresh_attributes
-        changed_attributes.clear
-        @ng_xml = nil
-      end
-
-      # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods
-      def ng_xml_will_change!
-        changed_attributes['ng_xml'] = nil
-      end
-
-      def ng_xml_doesnt_change!
-        changed_attributes.delete('ng_xml')
-      end
-
-      # don't want content eagerly loaded by proxy, so implementing methods that would be implemented by define_attribute_methods
-      def ng_xml_changed?
-        changed_attributes.key? 'ng_xml'
-      end
-
-      def remote_content
-        @ds_content ||= Nokogiri::XML(super).to_xml(&:no_declaration).strip
-      end
-
-      def content=(new_content)
-        if remote_content != new_content.to_s
-          ng_xml_will_change!
-          @ng_xml = Nokogiri::XML::Document.parse(new_content)
-          super(@ng_xml.to_s.strip)
-        end
-        self.class.decorate_ng_xml @ng_xml
-      end
-
-      def content_changed?
-        return true if autocreate? && new_record?
-        return false unless xml_loaded
-        ng_xml_changed?
-      end
-
-      def to_xml(xml = nil)
-        xml = ng_xml if xml.nil?
-        ng_xml = self.ng_xml
-        if ng_xml.respond_to?(:root) && ng_xml.root.nil? && self.class.respond_to?(:root_property_ref) && !self.class.root_property_ref.nil?
-          ng_xml = self.class.generate(self.class.root_property_ref, "")
-          xml = ng_xml if xml.root.nil?
-        end
-
-        unless xml == ng_xml || ng_xml.root.nil?
-          if xml.is_a?(Nokogiri::XML::Document)
-            xml.root.add_child(ng_xml.root)
-          elsif xml.is_a?(Nokogiri::XML::Node)
-            xml.add_child(ng_xml.root)
-          else
-            raise "You can only pass instances of Nokogiri::XML::Node into this method.  You passed in #{xml}"
-          end
-        end
-
-        xml.to_xml.strip
-      end
-
-      def content
-        @content = to_xml if ng_xml_changed? || autocreate?
-        super
-      end
-
-      def autocreate?
-        changed_attributes.key? :profile
-      end
-
-      def xml_loaded
-        instance_variable_defined? :@ng_xml
-      end
-    end
-  end
-end