active-fedora 7.0.0.rc2 → 7.0.0.rc3

data/spec/unit/query_spec.rb

@@ -119,7 +119,6 @@ describe ActiveFedora::Base do
         }.and_return('response'=>{'docs'=>mock_docs})
         SpecModel::Basic.find({:foo=>'bar', :baz=>['quix','quack']}, :sort=>'title_t desc').should == ["Fake Object1", "Fake Object2"]
       end
-
     end
   end
 
@@ -203,7 +202,7 @@ describe ActiveFedora::Base do
 
     it "should count without a class specified" do
       mock_result = {'response'=>{'numFound'=>7}}
-      ActiveFedora::SolrService.should_receive(:query).with("foo:bar", :rows=>0, :raw=>true).and_return(mock_result)
+      ActiveFedora::SolrService.should_receive(:query).with("(foo:bar)", :rows=>0, :raw=>true).and_return(mock_result)
       ActiveFedora::Base.count(:conditions=>'foo:bar').should == 7 
     end
   end
@@ -283,9 +282,9 @@ describe ActiveFedora::Base do
       ActiveFedora::SolrService.should_receive(:query).with('baz:quack', {:sort => [@sort_query]}).and_return(mock_result)
       ActiveFedora::Base.find_with_conditions(:baz=>'quack').should == mock_result
     end
-    it "should use the query string if it's provided" do
+    it "should use the query string if it's provided and wrap it in parentheses" do
       mock_result = double('Result')
-      ActiveFedora::SolrService.should_receive(:query).with('chunky:monkey', {:sort => [@sort_query]}).and_return(mock_result)
+      ActiveFedora::SolrService.should_receive(:query).with('(chunky:monkey)', {:sort => [@sort_query]}).and_return(mock_result)
       ActiveFedora::Base.find_with_conditions('chunky:monkey').should == mock_result
     end
   end

data/spec/unit/rdf_configurable_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+describe ActiveFedora::Rdf::Configurable do
+  before do
+    class DummyConfigurable
+      extend ActiveFedora::Rdf::Configurable
+    end
+  end
+  after do
+    Object.send(:remove_const, "DummyConfigurable")
+  end
+
+  describe '#configure' do
+    before do
+      DummyConfigurable.configure :base_uri => "http://example.org/base", :type => RDF.Class, :rdf_label => RDF::DC.title
+    end
+
+    it 'should set a base uri' do
+      expect(DummyConfigurable.base_uri).to eq "http://example.org/base"
+    end
+
+    it 'should set an rdf_label' do
+      expect(DummyConfigurable.rdf_label).to eq RDF::DC.title
+    end
+
+    it 'should set a type' do
+      expect(DummyConfigurable.type).to eq RDF.Class
+    end
+  end
+
+  describe '#rdf_type' do
+    it "should set the type the old way" do
+      DummyConfigurable.should_receive(:configure).with(:type => RDF.Class).and_call_original
+      DummyConfigurable.rdf_type(RDF.Class)
+      expect(DummyConfigurable.type).to eq RDF.Class
+    end
+  end
+end

data/spec/unit/rdf_datastream_spec.rb

@@ -7,12 +7,10 @@ describe ActiveFedora::RDFDatastream do
     its(:content_changed?) { should be_false}
   end
   describe "an instance that exists in the datastore, but hasn't been loaded" do
-    before do 
+    before do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.title(in: RDF::DC)
-          map.description(in: RDF::DC, multivalue: false)
-        end
+        property :title, :predicate => RDF::DC.title
+        property :description, :predicate => RDF::DC.description, :multivalue => false
       end
       class MyObj < ActiveFedora::Base
         has_metadata 'descMetadata', type: MyDatastream
@@ -26,7 +24,7 @@ describe ActiveFedora::RDFDatastream do
       Object.send(:remove_const, :MyDatastream)
       Object.send(:remove_const, :MyObj)
     end
-    subject { @obj.reload.descMetadata } 
+    subject { @obj.reload.descMetadata }
     it "should not load the descMetadata datastream when calling content_changed?" do
       @obj.inner_object.repository.should_not_receive(:datastream_dissemination).with(hash_including(:dsid=>'descMetadata'))
       subject.should_not be_content_changed
@@ -60,7 +58,7 @@ describe ActiveFedora::RDFDatastream do
       # see https://github.com/ruby-rdf/rdf/issues/142
       ds = ActiveFedora::NtriplesRDFDatastream.new
       data = "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n\xE2\x80\x99 \" .\n".force_encoding('ASCII-8BIT')
-      
+
       result = ds.deserialize(data)
       result.dump(:ntriples).should == "<info:fedora/scholarsphere:qv33rx50r> <http://purl.org/dc/terms/description> \"\\n’ \" .\n"
     end

data/spec/unit/rdf_list_nested_attributes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedora::RdfList do
+describe ActiveFedora::Rdf::List do
   before :each do
     class MADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
       property :MADSScheme
@@ -14,39 +14,27 @@ describe ActiveFedora::RdfList do
       property :hasExactExternalAuthority
     end
 
-    class TopicElement
-      include ActiveFedora::RdfObject
-      rdf_type MADS.TopicElement
-      map_predicates do |map|
-        map.elementValue(:in=> MADS)
-      end
+    class TopicElement < ActiveFedora::Rdf::Resource
+      configure :type => MADS.TopicElement
+      property :elementValue, :predicate => MADS.elementValue
     end
-    class TemporalElement
-      include ActiveFedora::RdfObject
-      rdf_type MADS.TemporalElement
-      map_predicates do |map|
-        map.elementValue(:in=> MADS)
-      end
+    class TemporalElement < ActiveFedora::Rdf::Resource
+      configure :type => MADS.TemporalElement
+      property :elementValue, :predicate => MADS.elementValue
     end
-    class ElementList
-      include ActiveFedora::RdfList
-      
-      map_predicates do |map|
-        map.topicElement(:in=> MADS, :to =>"TopicElement", :class_name => "TopicElement")
-        map.temporalElement(:in=> MADS, :to =>"TemporalElement", :class_name => "TemporalElement")
-      end
+    class ElementList < ActiveFedora::Rdf::List
+      property :topicElement, :predicate => MADS.TopicElement, :class_name => 'TopicElement'
+      property :temporalElement, :predicate => MADS.TemporalElement, :class_name => 'TemporalElement'
       accepts_nested_attributes_for :topicElement, :temporalElement
     end
 
-    class Topic
-      include ActiveFedora::RdfObject
-      rdf_type MADS.Topic
-      rdf_subject { |ds| RDF::URI.new(Rails.configuration.id_namespace + ds.pid)}
-      map_predicates do |map|
-        map.name(:in => MADS, :to => 'authoritativeLabel')
-        map.elementList(:in => MADS, :class_name=>'ElementList')
-        map.externalAuthority(:in => MADS, :to => 'hasExactExternalAuthority')
-      end
+    class Topic < ActiveFedora::Rdf::Resource
+      configure :type => MADS.Topic
+      configure :base_uri => "http://example.org/id_namespace#"
+      property :name, :predicate => MADS.authoritativeLabel
+      property :elementList, :predicate => MADS.elementList, :class_name => 'ElementList'
+      property :externalAuthority, :predicate => MADS.hasExactExternalAuthority
+
       accepts_nested_attributes_for :elementList
     end
   end
@@ -57,7 +45,7 @@ describe ActiveFedora::RdfList do
     Object.send(:remove_const, :TemporalElement)
     Object.send(:remove_const, :MADS)
   end
-  
+
   describe "nested_attributes" do
     it "should insert new nodes into RdfLists (rather than calling .build)" do
       params = {
@@ -70,9 +58,8 @@ describe ActiveFedora::RdfList do
         }
       }
 
-      topic = Topic.new(RDF::Graph.new)
+      topic = Topic.new
       topic.attributes = params[:topic]
-      # puts topic.graph.dump(:ntriples)
       topic.elementList.first.size.should == 2
       topic.elementList.first[0].should be_kind_of(TopicElement)
       topic.elementList.first[0].elementValue.should == ["Baseball"]
@@ -80,10 +67,10 @@ describe ActiveFedora::RdfList do
       topic.elementList.first[1].elementValue.should == ["Football"]
 
       # only one rdf:rest rdf:nil
-      topic.graph.query([nil, RDF.rest, RDF.nil]).size.should == 1 
+      topic.query([nil, RDF.rest, RDF.nil]).size.should == 1
     end
     it "should insert new nodes of varying types into RdfLists (rather than calling .build)" do
-      # It's Not clear what the syntax should be when an RDF list contains multiple types of sub-nodes.  
+      # It's Not clear what the syntax should be when an RDF list contains multiple types of sub-nodes.
       # This is a guess, which currently works.
       params = {
         topic: {
@@ -96,9 +83,8 @@ describe ActiveFedora::RdfList do
         }
       }
 
-      topic = Topic.new(RDF::Graph.new)
+      topic = Topic.new
       topic.attributes = params[:topic]
-      # puts topic.graph.dump(:ntriples)
       topic.elementList.first.size.should == 4
       topic.elementList.first[0].should be_kind_of(TopicElement)
       topic.elementList.first[0].elementValue.should == ["Baseball"]

data/spec/unit/rdf_list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ActiveFedora::RdfList do
+describe ActiveFedora::Rdf::List do
   before :each do
     class MADS < RDF::Vocabulary("http://www.loc.gov/mads/rdf/v1#")
       property :complexSubject
@@ -11,29 +11,18 @@ describe ActiveFedora::RdfList do
       property :TemporalElement
     end
     class DemoList < ActiveFedora::RdfxmlRDFDatastream
-      map_predicates do |map|
-        map.elementList(:in => MADS, :to => 'elementList', :class_name=>'List')
-      end 
-      class List 
-        include ActiveFedora::RdfList
-        map_predicates do |map|
-          map.topicElement(:in=> MADS, :to =>"TopicElement", :class_name => "TopicElement")
-          map.temporalElement(:in=> MADS, :to =>"TemporalElement", :class_name => "TemporalElement")
+      property :elementList, :predicate => MADS.elementList, :class_name => 'DemoList::List'
+      class List < ActiveFedora::Rdf::List
+        property :topicElement, :predicate => MADS.TopicElement, :class_name => 'DemoList::List::TopicElement'
+        property :temporalElement, :predicate => MADS.TemporalElement, :class_name => 'DemoList::List::TemporalElement'
+
+        class TopicElement < ActiveFedora::Rdf::Resource
+          configure :type => MADS.TopicElement
+          property :elementValue, :predicate => MADS.elementValue
         end
-          
-        class TopicElement
-          include ActiveFedora::RdfObject
-          rdf_type MADS.TopicElement
-          map_predicates do |map|   
-            map.elementValue(:in=> MADS)
-          end
-        end
-        class TemporalElement
-          include ActiveFedora::RdfObject
-          rdf_type MADS.TemporalElement
-          map_predicates do |map|   
-            map.elementValue(:in=> MADS)
-          end
+        class TemporalElement < ActiveFedora::Rdf::Resource
+          configure :type => MADS.TemporalElement
+          property :elementValue, :predicate => MADS.elementValue
         end
       end
     end
@@ -50,24 +39,24 @@ describe ActiveFedora::RdfList do
     it "should insert at the end" do
       subject.should be_kind_of DemoList::List
       subject.size.should == 0
-      subject[1] = DemoList::List::TopicElement.new(subject.graph)
+      subject[1] = DemoList::List::TopicElement.new
       subject.size.should == 2
     end
 
     it "should insert at the head" do
       subject.should be_kind_of DemoList::List
       subject.size.should == 0
-      subject[0] = DemoList::List::TopicElement.new(subject.graph)
+      subject[0] = DemoList::List::TopicElement.new
       subject.size.should == 1
     end
 
     describe "that has 4 elements" do
       before do
-        subject[3] = DemoList::List::TopicElement.new(subject.graph)
+        subject[3] = DemoList::List::TopicElement.new
         subject.size.should == 4
       end
       it "should insert in the middle" do
-        subject[1] = DemoList::List::TopicElement.new(subject.graph)
+        subject[1] = DemoList::List::TopicElement.new
         subject.size.should == 4
       end
     end
@@ -75,11 +64,12 @@ describe ActiveFedora::RdfList do
     describe "return updated xml" do
       it "should be built" do
         subject[0] = RDF::URI.new "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
-        subject[1] = DemoList::List::TopicElement.new(ds.graph)
+        subject[1] = DemoList::List::TopicElement.new
         subject[1].elementValue = "Relations with Mexican Americans"
         subject[2] = RDF::URI.new "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
-        subject[3] = DemoList::List::TemporalElement.new(ds.graph)
+        subject[3] = DemoList::List::TemporalElement.new
         subject[3].elementValue = "20th century"
+        ds.elementList = subject
         doc = Nokogiri::XML(ds.content)
         ns = {rdf: "http://www.w3.org/1999/02/22-rdf-syntax-ns#", mads: "http://www.loc.gov/mads/rdf/v1#"}
         expect(doc.xpath('/rdf:RDF/rdf:Description/@rdf:about', ns).map(&:value)).to eq ["info:fedora/foo"]
@@ -90,22 +80,20 @@ describe ActiveFedora::RdfList do
         expect(doc.xpath('//rdf:Description/mads:elementList/*[position() = 4]/mads:elementValue', ns).map(&:text)).to eq ["20th century"]
       end
     end
-
-
   end
 
   describe "an empty list" do
-    subject { DemoList.new(double('inner object', :pid=>'foo', :new_record? =>true)).elementList.build } 
+    subject { DemoList.new(double('inner object', :pid=>'foo', :new_record? =>true), 'descMd').elementList.build } 
     it "should have to_ary" do
       subject.to_ary.should == []
     end
   end
 
   describe "a list that has a constructed element" do
-    let(:ds) { DemoList.new(double('inner object', :pid=>'foo', :new_record? =>true)) }
+    let(:ds) { DemoList.new(double('inner object', :pid=>'foo', :new_record? =>true), 'descMd') }
     let(:list) { ds.elementList.build } 
     let!(:topic) { list.topicElement.build }
-    
+
     it "should have to_ary" do
       list.to_ary.size.should == 1
       list.to_ary.first.class.should == DemoList::List::TopicElement
@@ -127,7 +115,7 @@ describe ActiveFedora::RdfList do
       subject.content =<<END
   <rdf:RDF
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:mads="http://www.loc.gov/mads/rdf/v1#">
-      
+
         <mads:ComplexSubject rdf:about="info:fedora/foo">
           <mads:elementList rdf:parseType="Collection">
             <rdf:Description rdf:about="http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"/>
@@ -152,10 +140,10 @@ END
     let (:list) { subject.elementList.first }
 
     it "should have fields" do
-      list.first.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
+      list.first.rdf_subject.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX6"
       list[1].should be_kind_of DemoList::List::TopicElement
       list[1].elementValue.should == ["Relations with Mexican Americans"]
-      list[2].should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
+      list[2].rdf_subject.should == "http://library.ucsd.edu/ark:/20775/bbXXXXXXX4"
       list[3].should be_kind_of DemoList::List::TemporalElement
       list[3].elementValue.should == ["20th century"]
     end
@@ -163,7 +151,7 @@ END
     it "should have each" do
       foo = []
       list.each { |n| foo << n.class }
-      foo.should == [RDF::URI, DemoList::List::TopicElement, RDF::URI, DemoList::List::TemporalElement]
+      foo.should == [ActiveFedora::Rdf::Resource, DemoList::List::TopicElement, ActiveFedora::Rdf::Resource, DemoList::List::TemporalElement]
     end
 
     it "should have to_ary" do

data/spec/unit/rdf_properties_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper"
+describe ActiveFedora::Rdf::Properties do
+  before do
+    class DummyProperties
+      extend ActiveFedora::Rdf::Properties
+    end
+  end
+
+  after do
+    Object.send(:remove_const, "DummyProperties")
+  end
+
+  describe '#map_predicates' do
+    before do
+      DummyProperties.map_predicates do |map|
+        map.title(:in => RDF::DC, :class_name => RDF::Literal) do |index|
+          index.as :facetable, :searchable
+        end
+      end
+    end
+
+    it 'should set a property' do
+      expect(DummyProperties.properties).to include :title
+    end
+
+    it "should set index behaviors" do
+      expect(DummyProperties.properties[:title][:behaviors]).to eq [:facetable, :searchable]
+    end
+
+    it "should set a class name" do
+      expect(DummyProperties.properties[:title][:class_name]).to eq RDF::Literal
+    end
+  end
+
+  describe '#property' do
+    it 'should set a property' do
+      DummyProperties.property :title, :predicate => RDF::DC.title
+      expect(DummyProperties.properties).to include :title
+    end
+
+    it 'should set index behaviors' do
+      DummyProperties.property :title, :predicate => RDF::DC.title do |index|
+        index.as :facetable, :searchable
+      end
+      expect(DummyProperties.properties[:title][:behaviors]).to eq [:facetable, :searchable]
+    end
+
+    it 'should set class name' do
+      DummyProperties.property :title, :predicate => RDF::DC.title, :class_name => RDF::Literal
+      expect(DummyProperties.properties[:title][:class_name]).to eq RDF::Literal
+    end
+  end
+
+  context "when using a subclass" do
+    before do
+      DummyProperties.property :title, :predicate => RDF::DC.title
+      class DummySubClass < DummyProperties
+        property :source, :predicate => RDF::DC11[:source]
+      end
+    end
+
+    after do
+      Object.send(:remove_const, "DummySubClass")
+    end
+
+    it 'should carry properties from superclass' do
+      expect(DummySubClass.properties.keys).to eq ["title", "source"]
+    end
+  end
+end

data/spec/unit/rdf_repositories_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+describe ActiveFedora::Rdf::Repositories do
+  subject {ActiveFedora::Rdf::Repositories}
+
+  after(:each) do
+    subject.clear_repositories!
+    subject.add_repository :default, RDF::Repository.new
+    subject.add_repository :vocabs, RDF::Repository.new
+  end
+
+  describe '#add_repositories' do
+    it 'should accept a new repository' do
+      subject.add_repository :name, RDF::Repository.new
+      expect(subject.repositories).to include :name
+    end
+    it 'should throw an error if passed something that is not a repository' do
+      expect{subject.add_repository :name, :not_a_repo}.to raise_error
+    end
+  end
+
+  describe '#clear_repositories!' do
+    it 'should empty the repositories list' do
+      subject.clear_repositories!
+      expect(subject.repositories).to be_empty
+    end
+  end
+
+end