active-fedora 7.3.1 → 8.0.0.rc1

data/spec/unit/rdf_resource_datastream_spec.rb

@@ -66,7 +66,7 @@ describe ActiveFedora::RDFDatastream do
     end
 
     it "should set values" do
-      subject.title = "blah"
+      subject.title = ["blah"]
       expect(subject.descMetadata.title).to eq ["blah"]
     end
 
@@ -105,7 +105,7 @@ describe ActiveFedora::RDFDatastream do
         end
 
         it "should be persisted" do
-          expect(subject.descMetadata.resource.persisted?).to be_true
+          expect(subject.descMetadata.resource.persisted?).to be true
         end
 
         context "and it's reloaded" do
@@ -146,7 +146,7 @@ describe ActiveFedora::RDFDatastream do
       context "persisted to parent" do
         before do
           dummy = DummySubnode.new
-          dummy.title = 'subbla'
+          dummy.title = ['subbla']
           subject.descMetadata.license = dummy
         end
 
@@ -163,7 +163,7 @@ describe ActiveFedora::RDFDatastream do
           DummySubnode.configure :repository => :default
           DummySubnode.any_instance.stub(:repository).and_return(RDF::Repository.new)
           dummy = DummySubnode.new(RDF::URI('http://example.org/dummy/blah'))
-          dummy.title = 'subbla'
+          dummy.title = ['subbla']
           # We want to have to manually persist to the repository.
           # Parent objects shouldn't be persisting children they share with other parents
           dummy.persist!
@@ -196,9 +196,9 @@ describe ActiveFedora::RDFDatastream do
   describe "relationships" do
     before do
       @new_object = DummyAsset.new
-      @new_object.title = "subbla"
+      @new_object.title = ["subbla"]
       @new_object.save
-      subject.title = "bla"
+      subject.title = ["bla"]
       subject.descMetadata.creator = @new_object
     end
 
@@ -224,7 +224,7 @@ describe ActiveFedora::RDFDatastream do
     end
 
     it "should allow for deep attributes to be set directly" do
-      subject.descMetadata.creator.first.title = "Bla"
+      subject.descMetadata.creator.first.title = ["Bla"]
       expect(subject.descMetadata.creator.first.title).to eq ["Bla"]
     end
 
@@ -270,12 +270,12 @@ describe ActiveFedora::RDFDatastream do
     context 'when the object has no Rdf::Resource' do
       before do
         class DummyOmAsset < ActiveFedora::Base
-          has_metadata :name => 'descMetadata', :type => OmDatastream
+          has_metadata :name => 'descMetadata', :type => ActiveFedora::OmDatastream
         end
 
         @new_object = DummyOmAsset.new
         @new_object.save
-        subject.title = "bla"
+        subject.title = ["bla"]
         subject.descMetadata.creator = @new_object
         subject.save
         subject.reload
@@ -293,6 +293,56 @@ describe ActiveFedora::RDFDatastream do
         expect{@new_object.resource << RDF::Statement.new(RDF::Node.new, RDF::DC.title, 'title')
 }.to raise_error TypeError
       end
+    end    
+  end
+
+  context 'with custom resource' do
+    before do
+
+      class DummyATResource < ActiveTriples::Resource
+        configure :base_uri => 'http://example.org/at/obj#', :type => RDF::OWL.Thing
+        property :title, :predicate => RDF::DC.alternative
+        property :my_special_property, :predicate => RDF::DC.spatial
+      end
+
+      DummyResource.resource_class DummyATResource
+    end
+
+    after do
+      Object.send(:remove_const, "DummyATResource")
+    end
+
+    it 'lets me specify a resource class' do
+      expect(DummyResource.resource_class < DummyATResource).to be_true
+    end
+
+    it 'creates underlying resource of type resource_class' do
+      expect(subject.resource).to be_a DummyATResource
+    end
+
+    it 'has properties from resource_class' do
+      expect(subject.resource.class.properties).to include :my_special_property.to_s
+    end
+
+    it 'favors property configuration from datastream' do
+      expect(subject.resource.class.properties['title'].predicate).to eq RDF::DC.title
+    end
+
+    it 'exposes resource propreties to parent object via datastream' do
+      subject.resource.title = 'Wizard of Oz'
+      expect(subject.title).to eq subject.resource.title
+    end
+
+    it 'applies base_uri from resource class' do
+      expect(subject.resource.class.base_uri).to eq DummyATResource.base_uri
+    end
+
+    it 'applies rdf type from resource class' do
+      expect(subject.resource.class.type).to eq DummyATResource.type
+    end
+
+    it 'refuses to change resource_class once set' do
+      expect { DummyResource.resource_class(ActiveTriples::Resource) }.to raise_error ArgumentError
     end
   end
 end

data/spec/unit/rdf_vocab_spec.rb

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe ActiveFedora::RDF do
+  describe ActiveFedora::RDF::Fcrepo do
+    it "should register the vocabularies" do
+      namespaces = [
+        "info:fedora/fedora-system:def/model#",
+        "info:fedora/fedora-system:def/view#",
+        "info:fedora/fedora-system:def/relations-external#",
+        "info:fedora/fedora-system:"
+      ]
+      namespaces.each do |namespace|
+        vocab = RDF::Vocabulary.find(namespace)
+        expect(vocab.superclass).to be(RDF::StrictVocabulary)
+      end
+    end
+  end
+  describe ActiveFedora::RDF::ProjectHydra do
+    it "should register the vocabularies" do
+      namespaces = [
+        "http://projecthydra.org/ns/relations#"
+      ]
+      namespaces.each do |namespace|
+        vocab = RDF::Vocabulary.find(namespace)
+        expect(vocab.superclass).to be(RDF::StrictVocabulary)
+      end
+    end
+  end
+end

data/spec/unit/solr_digital_object_spec.rb

@@ -47,10 +47,10 @@ describe ActiveFedora::SolrDigitalObject do
       expect(subject.fetch('author')).to be_empty
     end
     it "should grab values" do
-      expect(subject.fetch('title')).to eq 'foo'
+      expect(subject.fetch('title')).to eq ['foo']
     end
     it "should grab values" do
-      expect(subject.fetch('title')).to eq 'foo'
+      expect(subject.fetch('title')).to eq ['foo']
     end
 
     it "should raise an error if the field isn't indexed" do

data/spec/unit/solr_service_spec.rb

@@ -109,12 +109,6 @@ describe ActiveFedora::SolrService do
     end
   end
   
-  describe '#escape_uri_for_query' do
-    it "should escape : with a backslash" do
-      ActiveFedora::SolrService.escape_uri_for_query("my:pid").should == 'my\:pid'
-    end
-  end
-
   describe ".query" do
     it "should call solr" do 
       mock_conn = double("Connection")

data/spec/unit/validations_spec.rb

@@ -24,14 +24,14 @@ describe ActiveFedora::Base do
 
   describe "a valid object" do
     before do
-      subject.attributes={ fubar:'here', swank:'long enough'}
+      subject.attributes = { fubar: ['here'], swank: 'long enough' }
     end
     
     it { should be_valid}
   end
   describe "an invalid object" do
     before do
-      subject.attributes={ swank:'smal'}
+      subject.attributes = { swank: 'smal' }
     end
     it "should have errors" do
       subject.should_not be_valid
@@ -42,8 +42,8 @@ describe ActiveFedora::Base do
 
   describe "required terms" do
     it "should be required" do
-       subject.required?(:fubar).should be_true
-       subject.required?(:swank).should be_false
+       subject.required?(:fubar).should be true
+       subject.required?(:swank).should be false
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 8.0.0.rc1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,28 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.10
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.10
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
@@ -78,50 +72,44 @@ dependencies:
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.8.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: active-triples
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -210,16 +198,16 @@ dependencies:
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -306,6 +294,9 @@ files:
 - config/solr.yml
 - config/solr_mappings_af_0.1.yml
 - config/solr_mappings_bl_2.4.yml
+- gemfiles/rails3.gemfile
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.gemfile
 - lib/active-fedora.rb
 - lib/active_fedora.rb
 - lib/active_fedora/association_relation.rb
@@ -358,10 +349,12 @@ files:
 - lib/active_fedora/querying.rb
 - lib/active_fedora/railtie.rb
 - lib/active_fedora/rdf.rb
+- lib/active_fedora/rdf/fcrepo.rb
 - lib/active_fedora/rdf/identifiable.rb
 - lib/active_fedora/rdf/indexing.rb
 - lib/active_fedora/rdf/ntriples_rdf_datastream.rb
-- lib/active_fedora/rdf/object_resource.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_rdf_datastream.rb
 - lib/active_fedora/rdf_xml_writer.rb
@@ -521,6 +514,7 @@ files:
 - spec/unit/query_spec.rb
 - spec/unit/rdf_datastream_spec.rb
 - spec/unit/rdf_resource_datastream_spec.rb
+- spec/unit/rdf_vocab_spec.rb
 - spec/unit/rdf_xml_writer_spec.rb
 - spec/unit/rdfxml_rdf_datastream_spec.rb
 - spec/unit/relationship_graph_spec.rb
@@ -555,13 +549,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
+has_rdoc: 

data/lib/active_fedora/rdf/object_resource.rb

@@ -1,20 +0,0 @@
-module ActiveFedora::Rdf
-  ##
-  # A class of RdfResources to act as the primary/root resource associated
-  # with a Datastream and ActiveFedora::Base object.
-  #
-  # @see ActiveFedora::RDFDatastream
-  class ObjectResource < ActiveTriples::Resource
-    configure :base_uri => 'info:fedora/'
-    attr_accessor :datastream
-
-    def persist!
-      return false unless datastream and datastream.respond_to? :digital_object
-      @persisted ||= datastream.digital_object.save
-    end
-
-    def persisted?
-      @persisted ||= (not datastream.new?)
-    end
-  end
-end