active-fedora 9.0.6 → 9.0.8

data/spec/integration/versionable_spec.rb

@@ -18,6 +18,43 @@ describe "a versionable class" do
 
   it { is_expected.to be_versionable }
 
+  describe 'sorting versions' do
+    before do
+      allow(subject).to receive(:fedora_versions) { versions }
+    end
+
+    let(:version1) { double('version1', uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e711aa993d-e1d2-4a65-93ee-3a12fc9541ab', label: 'version1', created: '2015-04-02T19:54:45.962Z') }
+    let(:version2) { double('version2', uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e790373a67-c9ee-447d-b740-4faa882b1a1f', label: 'version2', created: '2015-04-02T19:54:45.96Z') }
+    let(:versions) { [version1, version2] }
+
+    subject { ActiveFedora::VersionsGraph.new }
+
+    it 'sorts by DateTime' do
+      expect(subject.first).to eq version2
+    end
+
+    context 'with an unparseable created date' do
+      let(:version2) { double('version2', uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e790373a67-c9ee-447d-b740-4faa882b1a1f', label: 'version2', created: '') }
+
+      it 'raises an exception' do
+        expect { subject.first }.to raise_error(ActiveFedora::VersionLacksCreateDate)
+      end
+    end
+
+    context 'with a missing created date' do
+      before do
+        # Because mocks raise RSpec::Mocks::MockExpectationError instead
+        allow(version2).to receive(:created) { raise NoMethodError }
+      end
+
+      let(:version2) { double('version2', uri: 'http://localhost:8983/fedora/rest/test/84/61/63/98/84616398-f63a-4572-ba01-0689339e4fcb/fcr:versions/87a0a8c317f1e790373a67-c9ee-447d-b740-4faa882b1a1f', label: 'version2') }
+
+      it 'raises an exception' do
+        expect { subject.first }.to raise_error(ActiveFedora::VersionLacksCreateDate)
+      end
+    end
+  end
+
   context "after saving" do
     before do
       subject.title = ["Greetings Earthlings"]
@@ -175,7 +212,7 @@ describe "a versionable rdf datastream" do
           end
 
           it "should have two unique versions" do
-            expect(subject.versions.all.size).to eq 2      
+            expect(subject.versions.all.size).to eq 2
           end
 
           it "should load the restored datastream's content" do

data/spec/samples/samples.rb

@@ -1,3 +1,2 @@
 # require all of the files in the samples directory
 require 'samples/models/mods_article'
-require 'samples/special_thing'

data/spec/unit/base_spec.rb

@@ -51,7 +51,58 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe ".rdf_label" do
+    context "on a concrete class" do
+      before do
+        class FooHistory < ActiveFedora::Base
+          rdf_label ::RDF::DC.title
+          property :title, predicate: ::RDF::DC.title
+        end
+      end
+      after do
+        Object.send(:remove_const, :FooHistory)
+      end
+
+      let(:instance) { FooHistory.new(title: ['A label']) }
+      subject { instance.rdf_label }
+
+      it { is_expected.to eq ['A label'] }
+    end
+
+    context "on an inherited class" do
+      before do
+        class Agent < ActiveFedora::Base
+          rdf_label ::RDF::FOAF.name
+          property :foaf_name, predicate: ::RDF::FOAF.name
+        end
+        class Person < Agent
+          rdf_label ::RDF::URI('http://example.com/foo')
+          property :job, predicate: ::RDF::URI('http://example.com/foo')
+        end
+        class Creator < Person
+        end
+      end
+      after do
+        Object.send(:remove_const, :Person)
+        Object.send(:remove_const, :Agent)
+        Object.send(:remove_const, :Creator)
+      end
+
+      let(:instance) { Creator.new(foaf_name: ['Carolyn'], job: ['Developer']) }
+      subject { instance.rdf_label }
+
+      it { is_expected.to eq ['Developer'] }
+    end
+  end
+
   describe 'descendants' do
+    before do
+      class SpecialThing < ActiveFedora::Base
+      end
+    end
+    after do
+      Object.send(:remove_const, :SpecialThing)
+    end
     it "should record the decendants" do
       expect(ActiveFedora::Base.descendants).to include(ModsArticle, SpecialThing)
     end

data/spec/unit/core/fedora_id_translator_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Core::FedoraIdTranslator do
+  describe ".call" do
+    let(:result) { described_class.call(id) }
+    context "when given an id" do
+      let(:good_uri) { ActiveFedora.fedora.host+ActiveFedora.fedora.base_path+"/banana" }
+      let(:id) { "banana" }
+      it "should return a fedora URI" do
+        expect(result).to eq good_uri
+      end
+      context "when given an id with a leading slash" do
+        let(:id) { "/banana" }
+        it "should return a good fedora URI" do
+          expect(result).to eq good_uri
+        end
+      end
+    end
+  end
+end

data/spec/unit/core/fedora_uri_translator_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+RSpec.describe ActiveFedora::Core::FedoraUriTranslator do
+  describe ".call" do
+    let(:result) { described_class.call(uri) }
+    context "when given a Fedora URI" do
+      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path+"/6" }
+      it "should return the id" do
+        expect(result).to eq '6'
+      end
+    end
+    context "when given a URI missing a slash" do
+      let(:uri) { ActiveFedora.fedora.host + ActiveFedora.fedora.base_path+"602-a" }
+      it "should return the id" do
+        expect(result).to eq "602-a"
+      end
+    end
+  end
+end

data/spec/unit/core_spec.rb

@@ -88,12 +88,54 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "#translate_id_to_uri" do
+    subject { ActiveFedora::Base.translate_id_to_uri }
+    context "when it's not set" do
+      it "should be a FedoraIdTranslator" do
+        expect(subject).to eq ActiveFedora::Core::FedoraIdTranslator
+      end
+    end
+    context "when it's set to nil" do
+      before do
+        ActiveFedora::Base.translate_id_to_uri = nil
+      end
+      it "should be a FedoraIdTranslator" do
+        expect(subject).to eq ActiveFedora::Core::FedoraIdTranslator
+      end
+    end
+  end
+
+  describe "#translate_uri_to_id" do
+    subject { ActiveFedora::Base.translate_uri_to_id }
+    context "when it's not set" do
+      it "should be a FedoraUriTranslator" do
+        expect(subject).to eq ActiveFedora::Core::FedoraUriTranslator
+      end
+    end
+    context "when it's set to nil" do
+      before do
+        ActiveFedora::Base.translate_uri_to_id = nil
+      end
+      it "should be a FedoraIdTranslator" do
+        expect(subject).to eq ActiveFedora::Core::FedoraUriTranslator
+      end
+    end
+  end
+
   describe "id_to_uri" do
     let(:id) { '123456w' }
     subject { ActiveFedora::Base.id_to_uri(id) }
 
     context "with no custom proc is set" do
       it { should eq "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/123456w" }
+      it "should just call #translate_id_to_uri" do
+        allow(ActiveFedora::Base).to receive(:translate_id_to_uri).and_call_original
+        allow(ActiveFedora::Core::FedoraIdTranslator).to receive(:call).and_call_original
+
+        subject
+
+        expect(ActiveFedora::Core::FedoraIdTranslator).to have_received(:call).with(id)
+      end
     end
 
     context "when custom proc is set" do
@@ -126,6 +168,14 @@ describe ActiveFedora::Base do
 
     context "with no custom proc is set" do
       it { should eq 'foo/123456w' }
+      it "should just call #translate_uri_to_id" do
+        allow(ActiveFedora::Base).to receive(:translate_uri_to_id).and_call_original
+        allow(ActiveFedora::Core::FedoraUriTranslator).to receive(:call).and_call_original
+
+        subject
+
+        expect(ActiveFedora::Core::FedoraUriTranslator).to have_received(:call).with(uri)
+      end
     end
 
     context "when custom proc is set" do

data/spec/unit/has_many_association_spec.rb

@@ -23,7 +23,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
     end
 
     let(:reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
-    let(:association) { ActiveFedora::Associations::HasManyAssociation.new(book, reflection) }
+    let(:association) { described_class.new(book, reflection) }
 
     it "should set the book_id attribute" do
       expect(association).to receive(:callback).twice
@@ -40,7 +40,7 @@ describe ActiveFedora::Associations::HasManyAssociation do
       Page.has_and_belongs_to_many :contents, predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, class_name: 'ActiveFedora::Base'
     end
     let(:book_reflection) { Book.create_reflection(:has_many, 'pages', { predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf }, Book) }
-    let(:association) { ActiveFedora::Associations::HasManyAssociation.new(book, book_reflection) }
+    let(:association) { described_class.new(book, book_reflection) }
 
     subject { association.send(:find_polymorphic_inverse, page) }
 
@@ -48,4 +48,29 @@ describe ActiveFedora::Associations::HasManyAssociation do
       expect(subject.name).to eq :contents
     end
   end
+
+
+  context "when inverse doesn't have a predictable name" do
+    before do
+      class TimeSpan < ActiveFedora::Base
+        has_many :images, inverse_of: :created # predicate: ::RDF::DC.created
+      end
+
+      class Image < ActiveFedora::Base
+         has_and_belongs_to_many :created, predicate: ::RDF::DC.created, class_name: 'TimeSpan'
+      end
+    end
+
+    after do
+      Object.send(:remove_const, :TimeSpan)
+      Object.send(:remove_const, :Image)
+    end
+
+    let(:owner) { TimeSpan.new }
+    let(:reflection) { TimeSpan.reflect_on_association(:images) }
+
+    it "finds the predicate" do
+      expect { described_class.new(owner, reflection) }.not_to raise_error
+    end
+  end
 end

data/spec/unit/qualified_dublin_core_datastream_spec.rb

@@ -3,12 +3,6 @@ require 'spec_helper'
 describe ActiveFedora::QualifiedDublinCoreDatastream do
   DC_ELEMENTS = [:contributor, :coverage, :creator, :date, :description, :identifier, :language, :publisher, :relation, :rights, :source]
 
-  before(:all) do
-    # Load Sample OralHistory Model
-    require File.join( File.dirname(__FILE__), "..", "samples","oral_history_sample_model" )
-    @dc_terms = []
-  end
-
   let(:sample_xml) do "<dc xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:dcterms='http://purl.org/dc/terms/'>
           <dcterms:type xsi:type='DCMITYPE'>sound</dcterms:type>
           <dcterms:medium>medium</dcterms:medium>

data/spec/unit/reflection_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe ActiveFedora::Reflection::AssociationReflection do
+  describe "#derive_foreign_key" do
+    let(:name) { 'dummy' }
+    let(:options) { { inverse_of: :default_permissions } }
+    let(:active_fedora) { double }
+    let(:instance) { described_class.new(macro, name, options, active_fedora) }
+    subject { instance.send :derive_foreign_key }
+
+    context "when a has_many" do
+      let(:macro) { :has_many }
+
+      context "and the inverse is a collection association" do
+        let(:inverse) { double(collection?: true) }
+        before { allow(instance).to receive(:inverse_of).and_return(inverse) }
+        it { is_expected.to eq 'default_permission_ids' }
+      end
+    end
+  end
+
+  describe "#automatic_inverse_of" do
+    before do
+      class Dummy < ActiveFedora::Base
+        belongs_to :foothing, predicate: ::RDF::DC.extent
+      end
+    end
+
+    after { Object.send(:remove_const, :Dummy) }
+    let(:name) { 'dummy' }
+    let(:options) { { as: 'foothing' } }
+    let(:active_fedora) { double }
+    let(:instance) { described_class.new(macro, name, options, active_fedora) }
+    subject { instance.send :automatic_inverse_of }
+
+    context "when a has_many" do
+      let(:macro) { :has_many }
+
+      context "and the inverse is a collection association" do
+        it { is_expected.to eq :foothing }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.6
+  version: 9.0.8
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -338,6 +338,8 @@ files:
 - lib/active_fedora/cleaner.rb
 - lib/active_fedora/config.rb
 - lib/active_fedora/core.rb
+- lib/active_fedora/core/fedora_id_translator.rb
+- lib/active_fedora/core/fedora_uri_translator.rb
 - lib/active_fedora/datastream.rb
 - lib/active_fedora/datastreams.rb
 - lib/active_fedora/datastreams/nokogiri_datastreams.rb
@@ -352,6 +354,7 @@ files:
 - lib/active_fedora/fixity_service.rb
 - lib/active_fedora/indexing.rb
 - lib/active_fedora/indexing_service.rb
+- lib/active_fedora/inheritable_accessors.rb
 - lib/active_fedora/ldp_cache.rb
 - lib/active_fedora/ldp_resource.rb
 - lib/active_fedora/ldp_resource_service.rb
@@ -484,18 +487,10 @@ files:
 - spec/rcov.opts
 - spec/samples/hydra-mods_article_datastream.rb
 - spec/samples/hydra-rights_metadata_datastream.rb
-- spec/samples/marpa-dc_datastream.rb
-- spec/samples/models/audio_record.rb
-- spec/samples/models/image.rb
 - spec/samples/models/mods_article.rb
-- spec/samples/models/oral_history.rb
-- spec/samples/models/seminar.rb
-- spec/samples/models/seminar_audio_file.rb
 - spec/samples/oral_history_sample.xml
-- spec/samples/oral_history_sample_model.rb
 - spec/samples/oral_history_xml.xml
 - spec/samples/samples.rb
-- spec/samples/special_thing.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/an_active_model.rb
@@ -513,6 +508,8 @@ files:
 - spec/unit/change_set_spec.rb
 - spec/unit/code_configurator_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/core/fedora_id_translator_spec.rb
+- spec/unit/core/fedora_uri_translator_spec.rb
 - spec/unit/core_spec.rb
 - spec/unit/file_configurator_spec.rb
 - spec/unit/file_path_builder_spec.rb
@@ -544,6 +541,7 @@ files:
 - 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
 - spec/unit/rspec_matchers/have_many_associated_active_fedora_objects_matcher_spec.rb
 - spec/unit/rspec_matchers/have_predicate_matcher_spec.rb
@@ -573,10 +571,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
-has_rdoc: 

data/spec/samples/marpa-dc_datastream.rb

@@ -1,102 +0,0 @@
-require "active-fedora"
-module Marpa
-
-  # This is an example of a OmDatastream that defines a terminology for Dublin Core xml
-  #
-  # Some things to observe about this Class:
-  # * Defines a couple of custom terms, tibetan_title and english_title, that map to dc:title with varying @language attributes
-  # * Indicates which terms should be indexed as facets using :index_as=>[:facetable]
-  # * Defines an xml template that is an empty dublin core xml document with three namespaces set
-  # * Sets the namespace using :xmlns argument on the root term
-  # * Does not override or extend to_solr, so the default solrization approach will be used (Solrizer::XML::TerminologyBasedSolrizer)
-  #
-  class DcDatastream < ActiveFedora::OmDatastream
-  
-    set_terminology do |t|
-      t.root(:path=>"dc", :xmlns=>'http://purl.org/dc/terms/')
-      t.tibetan_title(:path=>"title", :attributes=>{:language=>"tibetan"})
-      t.english_title(:path=>"title", :attributes=>{:language=>:none})
-      t.contributor(:index_as=>[:facetable])
-      t.coverage
-      t.creator
-      t.description
-      t.format
-      t.identifier
-      t.language(:index_as=>[:facetable])
-      t.publisher
-      t.relation
-      t.source
-      t.title
-      t.abstract
-      t.accessRights
-      t.accrualMethod
-      t.accrualPeriodicity
-      t.accrualPolicy
-      t.alternative
-      t.audience
-      t.available
-      t.bibliographicCitation
-      t.conformsTo
-      t.contributor
-      t.coverage
-      t.created
-      t.creator
-      t.date(:index_as=>[:facetable])
-      t.dateAccepted
-      t.dateCopyrighted
-      t.dateSubmitted
-      t.description
-      t.educationLevel
-      t.extent
-      t.format
-      t.hasFormat
-      t.hasPart
-      t.hasVersion
-      t.identifier
-      t.instructionalMethod
-      t.isFormatOf
-      t.isPartOf
-      t.isReferencedBy
-      t.isReplacedBy
-      t.isRequiredBy
-      t.issued
-      t.isVersionOf
-      t.language(:index_as=>[:facetable])
-      t.license
-      t.mediator
-      t.medium
-      t.modified
-      t.provenance
-      t.publisher
-      t.references
-      t.relation
-      t.replaces
-      t.requires
-      t.rights
-      t.rightsHolder
-      t.source
-      t.spatial(:index_as=>[:facetable])
-      t.subject(:index_as=>[:facetable])
-      t.tableOfContents
-      t.temporal
-      t.type
-      t.valid
-    end
-  
-    def self.xml_template
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.dc("xmlns"=>'http://purl.org/dc/terms/',
-          "xmlns:dcterms"=>'http://purl.org/dc/terms/', 
-          "xmlns:xsi"=>'http://www.w3.org/2001/XMLSchema-instance') {
-        }
-      end
-      return builder.doc
-    end
-
-    def prefix
-      "#{dsid.underscore}__"
-    end
-
-  
-  end
-end