active-fedora 7.0.0.rc2 → 7.0.0.rc3

data/spec/spec_helper.rb

@@ -4,9 +4,6 @@ require "bundler/setup"
 
 begin
   require 'simplecov'
-  require 'simplecov-rcov'
-
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
   SimpleCov.start
 rescue LoadError
   #It's nbd if we don't have simplecov

data/spec/support/an_active_model.rb

@@ -1,17 +1,10 @@
 shared_examples_for "An ActiveModel" do
-  begin
-    require 'minitest/unit'
-    include Minitest::Assertions
-  rescue NameError
-    puts "Unable to load minitest, here's hoping these methods are adequate"
-
-    def assert(test, *args)
-      expect(test).to eq(true)
-    end
+  def assert(test, *args)
+    expect(test).to eq(true)
+  end
 
-    def assert_kind_of(klass, inspected_object)
-      expect(inspected_object).to be_kind_of(klass)
-    end
+  def assert_kind_of(klass, inspected_object)
+    expect(inspected_object).to be_kind_of(klass)
   end
   include ActiveModel::Lint::Tests
 

data/spec/unit/active_fedora_spec.rb

@@ -112,8 +112,8 @@ describe ActiveFedora do
     end
     it "should return class constants based on strings" do
       ActiveFedora.class_from_string("Om").should == Om
-      ActiveFedora.class_from_string("ActiveFedora::RdfNode::TermProxy").should == ActiveFedora::RdfNode::TermProxy
-      ActiveFedora.class_from_string("TermProxy", ActiveFedora::RdfNode).should == ActiveFedora::RdfNode::TermProxy
+      ActiveFedora.class_from_string("ActiveFedora::Rdf::ObjectResource").should == ActiveFedora::Rdf::ObjectResource
+      ActiveFedora.class_from_string("ObjectResource", ActiveFedora::Rdf).should == ActiveFedora::Rdf::ObjectResource
     end
 
     it "should find sibling classes" do

data/spec/unit/attributes_spec.rb

@@ -211,10 +211,8 @@ describe ActiveFedora::Base do
   describe "with a RDF datastream" do
     before :all do
       class BarRdfDatastream < 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 BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', :type=>BarRdfDatastream
@@ -287,10 +285,8 @@ describe ActiveFedora::Base do
   describe "when a datastream is specified as a symbol" do
     before :all do
       class BarRdfDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.title(in: RDF::DC)
-          map.description(in: RDF::DC)
-        end
+        property :title, :predicate => RDF::DC.title
+        property :description, :predicate => RDF::DC.description
       end
       class BarHistory4 < ActiveFedora::Base
         has_metadata 'rdfish', :type=>BarRdfDatastream

data/spec/unit/base_datastream_management_spec.rb

@@ -6,26 +6,6 @@ describe ActiveFedora::Base do
     @test_object = ActiveFedora::Base.new
   end
   
-  describe '.generate_dsid' do
-    it "should return a dsid that is not currently in use" do
-      dsids = Hash["DS1"=>1, "DS2"=>1]
-      @test_object.should_receive(:datastreams).and_return(dsids)
-      generated_id = @test_object.generate_dsid
-      generated_id.should_not be_nil
-      generated_id.should == "DS3"
-    end
-    it "should accept a prefix argument, default to using DS as prefix" do
-      @test_object.generate_dsid("FOO").should == "FOO1"  
-    end
-
-    it "if delete a datastream it should still use next index for a prefix" do
-      dsids = Hash["DS2"=>1]
-      @test_object.should_receive(:datastreams).and_return(dsids)
-      generated_id = @test_object.generate_dsid
-      generated_id.should_not be_nil
-      generated_id.should == "DS3"
-    end
-  end
   describe '.add_datastream' do
     it "should not call Datastream.save" do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, 'ds_to_add')
@@ -40,18 +20,14 @@ describe ActiveFedora::Base do
     end
     it "should auto-assign dsids using auto-incremented integers if dsid is nil or an empty string" do 
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, nil)
-      ds.dsid.should == nil
+      ds.dsid.should == 'DS1'
+      @test_object.add_datastream(ds).should == 'DS1'
       ds_emptystringid = ActiveFedora::Datastream.new(@test_object.inner_object, '')
-      @test_object.stub(:generate_dsid => 'foo')
-     # ds.should_receive(:dsid=).with("foo")
-      @test_object.add_datastream(ds).should == 'foo'
-      @test_object.add_datastream(ds_emptystringid).should == 'foo'
+      @test_object.add_datastream(ds_emptystringid).should == 'DS2'
     end
     it "should accept a prefix option and apply it to automatically assigned dsids" do
-      ds = ActiveFedora::Datastream.new(@test_object.inner_object, nil)
-      ds.dsid.should == nil
-      @test_object.stub(:generate_dsid => "FOO")
-      @test_object.add_datastream(ds, :prefix => "FOO").should == 'FOO'
+      ds = ActiveFedora::Datastream.new(@test_object.inner_object, nil, :prefix=> "FOO")
+      ds.dsid.should == 'FOO1'
     end
   end
 end

data/spec/unit/base_spec.rb

@@ -21,6 +21,7 @@ describe ActiveFedora::Base do
         ActiveFedora.config.stub(:sharded?).and_return(false)
         ActiveFedora::Base.fedora_connection = {}
         ActiveFedora.config.stub(:credentials).and_return(:url=>'myfedora')
+        Rubydora::Fc3Service.any_instance.stub(:repository_profile)
       end
       it { should be_kind_of Rubydora::Repository}
       it "should be the standard connection" do
@@ -66,6 +67,9 @@ describe ActiveFedora::Base do
         end
       end
       describe "the repository" do
+        before do
+          Rubydora::Fc3Service.any_instance.stub(:repository_profile)
+        end
         describe "for test:bar" do
           subject {ActiveFedora::Base.connection_for_pid('test:bar')}
           it "should be shard1" do

data/spec/unit/code_configurator_spec.rb

@@ -38,7 +38,7 @@ describe ActiveFedora::FileConfigurator do
   end
 
   it "should initialize from code" do
-    YAMLAdaptor.should_receive(:load).never
+    Psych.should_receive(:load).never
     File.should_receive(:exists?).never
     File.should_receive(:read).never
     File.should_receive(:open).never
@@ -48,4 +48,4 @@ describe ActiveFedora::FileConfigurator do
     ActiveFedora::Predicates.predicate_mappings['info:fedora/fedora-system:def/relations-external#'].length.should == 1
   end
   
-end
+end

data/spec/unit/config_spec.rb

@@ -2,13 +2,13 @@ require 'spec_helper'
 
 describe ActiveFedora::Config do
   describe "with a single fedora instance" do
-    conf = YAMLAdaptor.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
+    conf = Psych.load(File.read('spec/fixtures/rails_root/config/fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == {:url => 'http://testhost.com:8983/fedora', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'}}
     it { should_not be_sharded }
   end
   describe "with several fedora shards" do
-    conf = YAMLAdaptor.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
+    conf = Psych.load(File.read('spec/fixtures/sharded_fedora.yml'))['test']
     subject { ActiveFedora::Config.new(conf) }
     its(:credentials) { should == [{:url => 'http://127.0.0.1:8983/fedora1', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},
                               {:url => 'http://127.0.0.1:8983/fedora2', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},

data/spec/unit/core_spec.rb

@@ -3,9 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   before do
     class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-      map_predicates do |map|
-        map.publisher(:in => RDF::DC)
-      end
+      property :publisher, :predicate => RDF::DC.publisher
     end
     class Library < ActiveFedora::Base
     end
@@ -58,7 +56,7 @@ describe ActiveFedora::Base do
     it "should make the RDF properties immutable" do
       expect {
         subject.publisher = "HEY"
-      }.to raise_error RuntimeError, "can't modify frozen MyDatastream"
+      }.to raise_error TypeError
       expect(subject.publisher).to eq "Random House"
     end
 

data/spec/unit/datastream_spec.rb

@@ -28,6 +28,21 @@ describe ActiveFedora::Datastream do
     ds2.mimeType.should == "text/bar"
   end
 
+  describe "#generate_dsid" do
+    subject {ActiveFedora::Datastream.new(@test_object.inner_object) }
+    let(:digital_object) { double(datastreams: {})}
+    it "should create an autoincrementing dsid" do
+      subject.send(:generate_dsid, digital_object, 'FOO').should == 'FOO1'
+    end
+
+    describe "when some datastreams exist" do
+      let(:digital_object) { double(datastreams: {'FOO56' => double})}
+      it "should start from the highest existing dsid" do
+        subject.send(:generate_dsid, digital_object, 'FOO').should == 'FOO57'
+      end
+    end
+  end
+
   describe ".size" do
     it "should lazily load the datastream size attribute from the fedora repository" do
       ds_profile = <<-EOS

data/spec/unit/datastreams_spec.rb

@@ -149,7 +149,7 @@ describe ActiveFedora::Datastreams do
     end
 
     it "should mint a dsid" do
-      ds = ActiveFedora::Datastream.new
+      ds = ActiveFedora::Datastream.new(subject.inner_object)
       subject.add_datastream(ds).should == 'DS1'
     end
   end
@@ -168,17 +168,6 @@ describe ActiveFedora::Datastreams do
     end
   end
 
-  describe "#generate_dsid" do
-    it "should create an autoincrementing dsid" do
-      subject.generate_dsid('FOO').should == 'FOO1'
-    end
-
-    it "should start from the highest existin dsid" do
-      subject.stub(:datastreams => {'FOO56' => double()})
-      subject.generate_dsid('FOO').should == 'FOO57'
-    end
-  end
-
   describe "#relsext" do
     it "should be the RELS-EXT datastream" do
       m = double

data/spec/unit/file_configurator_spec.rb

@@ -343,7 +343,7 @@ describe ActiveFedora::FileConfigurator do
       subject.instance_variable_set :@config_loaded, nil
     end
     it "should return the default mapping if it has not been initialized" do
-      subject.predicate_config().should == YAMLAdaptor.load(File.read(default_predicate_mapping_file))
+      subject.predicate_config().should == Psych.load(File.read(default_predicate_mapping_file))
     end
   end
 

data/spec/unit/ntriples_datastream_spec.rb

@@ -2,19 +2,17 @@ require 'spec_helper'
 
 describe ActiveFedora::NtriplesRDFDatastream do
   describe "an instance with content" do
-    before do 
+    before do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.created(:in => RDF::DC)
-          map.title(:in => RDF::DC)
-          map.publisher(:in => RDF::DC)
-          map.creator(:in => RDF::DC)
-          map.educationLevel(:in => RDF::DC)
-          map.based_near(:in => RDF::FOAF)
-          map.related_url(:to => "seeAlso", :in => RDF::RDFS)
-        end
+        property :created, predicate: RDF::DC.created
+        property :title, predicate: RDF::DC.title
+        property :publisher, predicate: RDF::DC.publisher
+        property :creator, predicate: RDF::DC.creator
+        property :educationLevel, predicate: RDF::DC.educationLevel
+        property :based_near, predicate: RDF::FOAF.based_near
+        property :related_url, predicate: RDF::RDFS.seeAlso
       end
-      @subject = MyDatastream.new(double('inner object', :pid=>'test:1', :new_record? =>true), 'descMetadata')
+      @subject = MyDatastream.new(double('inner object', pid: 'test:1', :new_record? => true), 'descMetadata')
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
     after do
@@ -33,18 +31,19 @@ describe ActiveFedora::NtriplesRDFDatastream do
       @subject.dsid.should == 'descMetadata'
     end
     it "should have fields" do
-      @subject.created.should == ["2010-12-31"]
+      @subject.created.should == [Date.parse('2010-12-31')]
       @subject.title.should == ["Title of work"]
       @subject.publisher.should == ["Penn State"]
       @subject.based_near.should == ["New York, NY, US"]
-      @subject.related_url.should == ["http://google.com/"]
+      @subject.related_url.length.should == 1
+      @subject.related_url.first.rdf_subject.should == "http://google.com/"
     end
 
     it "should be able to call enumerable methods on the fields" do
       @subject.title.join(', ').should == "Title of work"
-      @subject.title.count.should == 1 
-      @subject.title.size.should == 1 
-      @subject.title[0].should == "Title of work" 
+      @subject.title.count.should == 1
+      @subject.title.size.should == 1
+      @subject.title[0].should == "Title of work"
       @subject.title.to_a.should == ["Title of work"]
       val = []
       @subject.title.each_with_index {|v, i| val << "#{i}. #{v}"}
@@ -88,19 +87,18 @@ describe ActiveFedora::NtriplesRDFDatastream do
   end
 
   describe "an instance with a custom subject" do
-    before do 
+    before do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
         rdf_subject { |ds| "info:fedora/#{ds.pid}/content" }
-        map_predicates do |map|
-          map.created(:in => RDF::DC)
-          map.title(:in => RDF::DC)
-          map.publisher(:in => RDF::DC)
-          map.based_near(:in => RDF::FOAF)
-          map.related_url(:to => "seeAlso", :in => RDF::RDFS)
-        end
+        property :created, predicate: RDF::DC.created
+        property :title, predicate: RDF::DC.title
+        property :publisher, predicate: RDF::DC.publisher
+        property :based_near, predicate: RDF::FOAF.based_near
+        property :related_url, predicate: RDF::RDFS.seeAlso
       end
+      @inner_object = double('inner object', pid: 'test:1', :new_record? => true)
       @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stub(:pid => 'test:1')
+      @subject.stub(pid: 'test:1')
       @subject.stub(:new_record? => false)
       @subject.content = File.new('spec/fixtures/mixed_rdf_descMetadata.nt').read
     end
@@ -121,12 +119,10 @@ describe ActiveFedora::NtriplesRDFDatastream do
   describe "a new instance" do
     before(:each) do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.publisher(:in => RDF::DC)
-        end
+        property :publisher, predicate: RDF::DC.publisher
       end
       @subject = MyDatastream.new(@inner_object, 'mixed_rdf')
-      @subject.stub(:pid => 'test:1', :repository => ActiveFedora::Base.connection_for_pid(0))
+      @subject.stub(pid: 'test:1', repository: ActiveFedora::Base.connection_for_pid(0))
     end
     after(:each) do
       Object.send(:remove_const, :MyDatastream)
@@ -143,27 +139,25 @@ describe ActiveFedora::NtriplesRDFDatastream do
   describe "solr integration" do
     before(:all) do
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
-        map_predicates do |map|
-          map.created(:in => RDF::DC) do |index| 
-            index.as :sortable, :displayable
-            index.type :date
-          end
-          map.title(:in => RDF::DC) do |index|
-            index.as :stored_searchable, :sortable
-            index.type :text 
-          end
-          map.publisher(:in => RDF::DC) do |index| 
-            index.as :facetable, :sortable, :stored_searchable
-          end
-          map.based_near(:in => RDF::FOAF) do |index|
-            index.as :facetable, :stored_searchable 
-            index.type :text
-          end
-          map.related_url(:to => "seeAlso", :in => RDF::RDFS) do |index|
-            index.as :stored_searchable
-          end
-          map.rights(:in => RDF::DC)
+        property :created, predicate: RDF::DC.created do |index|
+          index.as :sortable, :displayable
+          index.type :date
         end
+        property :title, predicate: RDF::DC.title do |index|
+          index.as :stored_searchable, :sortable
+          index.type :text
+        end
+        property :publisher, predicate: RDF::DC.publisher do |index|
+          index.as :facetable, :sortable, :stored_searchable
+        end
+        property :based_near, predicate: RDF::FOAF.based_near do |index|
+          index.as :facetable, :stored_searchable
+          index.type :text
+        end
+        property :related_url, predicate: RDF::RDFS.seeAlso do |index|
+          index.as :stored_searchable
+        end
+        property :rights, predicate: RDF::DC.rights
       end
       @subject = MyDatastream.new(@inner_object, 'solr_rdf')
       @subject.content = File.new('spec/fixtures/solr_rdf_descMetadata.nt').read
@@ -171,8 +165,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
     after(:all) do
       Object.send(:remove_const, :MyDatastream)
     end
-    before(:each) do  
-      @subject.stub(:pid => 'test:1')
+    before(:each) do
+      @subject.stub(pid: 'test:1')
+      @subject.serialize
     end
     it "should provide .to_solr and return a SolrDocument" do
       @subject.should respond_to(:to_solr)
@@ -180,7 +175,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     end
 
     it "should have a solr_name method" do
-      expect(MyDatastream.new(nil, 'descMetadata').primary_solr_name(:based_near)).to eq 'desc_metadata__based_near_sim'
+      expect(MyDatastream.new(nil, 'descMetadata').primary_solr_name(:based_near)).to eq 'desc_metadata__based_near_tesim'
       expect(MyDatastream.new(nil, 'props').primary_solr_name(:title)).to eq 'props__title_tesim'
     end
 
@@ -205,15 +200,15 @@ describe ActiveFedora::NtriplesRDFDatastream do
     describe "with an actual object" do
       before(:each) do
         class Foo < ActiveFedora::Base
-          has_metadata :name => "descMetadata", :type => MyDatastream
+          has_metadata "descMetadata", type: MyDatastream
           has_attributes :created, :title, :publisher, :based_near, :related_url, :rights, datastream: :descMetadata, multiple: true
         end
         @obj = MyDatastream.new(@inner_object, 'solr_rdf')
         repository = double()
-          @obj.stub(:repository => repository, :pid => 'test:1')
+          @obj.stub(repository: repository, pid: 'test:1')
           repository.stub(:modify_datastream)
           repository.stub(:add_datastream)
-        @obj.created = "2012-03-04"
+        @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"]
@@ -245,9 +240,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
           @obj.to_solr.keys.should include(ActiveFedora::SolrService.solr_name("solr_rdf__related_url", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__publisher", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :sortable),
-                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable), 
+                ActiveFedora::SolrService.solr_name("solr_rdf__publisher", :facetable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__created", :sortable, type: :date),
-                ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable), 
+                ActiveFedora::SolrService.solr_name("solr_rdf__created", :displayable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__title", type: :string),
                 ActiveFedora::SolrService.solr_name("solr_rdf__title", :sortable),
                 ActiveFedora::SolrService.solr_name("solr_rdf__based_near", type: :string),

data/spec/unit/om_datastream_spec.rb

@@ -47,7 +47,7 @@ describe ActiveFedora::OmDatastream do
     it 'should load xml from blob if provided' do
       test_ds1 = ActiveFedora::OmDatastream.new(nil, 'ds1')
       test_ds1.content="<xml><foo/></xml>"
-      test_ds1.ng_xml.to_xml.should == "<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n"
+      test_ds1.ng_xml.to_xml.should be_equivalent_to("<?xml version=\"1.0\"?>\n<xml>\n  <foo/>\n</xml>\n")
     end
     it "should initialize from #xml_template if no xml is provided" do
       ActiveFedora::OmDatastream.should_receive(:xml_template).and_return("<fake template/>")
@@ -65,7 +65,7 @@ describe ActiveFedora::OmDatastream do
   
   describe '#xml_template' do
     it "should return an empty xml document" do
-      ActiveFedora::OmDatastream.xml_template.to_xml.should == "<?xml version=\"1.0\"?>\n<xml/>\n"
+      ActiveFedora::OmDatastream.xml_template.to_xml.should be_equivalent_to("<?xml version=\"1.0\"?>\n<xml/>\n")
     end
   end
 
@@ -292,7 +292,7 @@ describe ActiveFedora::OmDatastream do
 
   describe '.get_values_from_solr' do
     before(:each) do
-      @mods_ds = ActiveFedora::OmDatastream.new
+      @mods_ds = ActiveFedora::OmDatastream.new(nil, 'test_ds')
       @mods_ds.content=fixture(File.join("mods_articles","mods_article1.xml")).read
     end