active-fedora 7.3.1 → 8.0.0.rc1

data/spec/integration/ntriples_datastream_spec.rb

@@ -15,7 +15,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
         index.type :date
         index.as :stored_searchable, :sortable
       end
-      property :size, predicate: FileVocabulary.size do |index|
+      property :filesize, predicate: FileVocabulary.size do |index|
         index.type :integer
         index.as :stored_sortable
       end
@@ -26,7 +26,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     class RdfTest < ActiveFedora::Base 
       has_metadata 'rdf', type: MyDatastream
       has_attributes :based_near, :related_url, :part, :date_uploaded, datastream: 'rdf', multiple: true
-      has_attributes :title, :size, datastream: 'rdf', multiple: false
+      has_attributes :title, :filesize, datastream: 'rdf', multiple: false
     end
     @subject = RdfTest.new
   end
@@ -74,16 +74,16 @@ describe ActiveFedora::NtriplesRDFDatastream do
 
   describe "serializing" do
     it "should handle dates" do
-      subject.date_uploaded = Date.parse('2012-11-02')
+      subject.date_uploaded = [Date.parse('2012-11-02')]
       subject.date_uploaded.first.should be_kind_of Date
       solr_document = subject.to_solr
       solr_document[ActiveFedora::SolrService.solr_name('rdf__date_uploaded', type: :date)].should == ['2012-11-02T00:00:00Z']
     end
     it "should handle integers" do
-      subject.size = 12345 
-      subject.size.should be_kind_of Fixnum
+      subject.filesize = 12345 
+      subject.filesize.should be_kind_of Fixnum
       solr_document = subject.to_solr
-      solr_document[ActiveFedora::SolrService.solr_name('rdf__size', :stored_sortable, type: :integer)].should == '12345'
+      solr_document[ActiveFedora::SolrService.solr_name('rdf__filesize', :stored_sortable, type: :integer)].should == '12345'
     end
   end
 
@@ -97,9 +97,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
   it "should set and recall values" do
     @subject.title = 'War and Peace'
     @subject.rdf.should be_changed
-    @subject.based_near = "Moscow, Russia"
-    @subject.related_url = "http://en.wikipedia.org/wiki/War_and_Peace"
-    @subject.part = "this is a part"
+    @subject.based_near = ["Moscow, Russia"]
+    @subject.related_url = ["http://en.wikipedia.org/wiki/War_and_Peace"]
+    @subject.part = ["this is a part"]
     @subject.save
     @subject.title.should == 'War and Peace'
     @subject.based_near.should == ["Moscow, Russia"]
@@ -108,9 +108,9 @@ describe ActiveFedora::NtriplesRDFDatastream do
   end
   it "should set, persist, and recall values" do
     @subject.title = 'War and Peace'
-    @subject.based_near = "Moscow, Russia"
-    @subject.related_url = "http://en.wikipedia.org/wiki/War_and_Peace"
-    @subject.part = "this is a part"
+    @subject.based_near = ["Moscow, Russia"]
+    @subject.related_url = ["http://en.wikipedia.org/wiki/War_and_Peace"]
+    @subject.part = ["this is a part"]
     @subject.save
 
     loaded = RdfTest.find(@subject.pid)
@@ -127,7 +127,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     loaded.part.should == ['part 1', 'part 2']
   end
   it "should append values" do
-    @subject.part = "thing 1"
+    @subject.part = ["thing 1"]
     @subject.save
 
     @subject.part << "thing 2"
@@ -152,7 +152,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
       # reopening existing class
       class MyDatastream < ActiveFedora::NtriplesRDFDatastream
         rdf_subject { |ds| RDF::URI.new("http://oregondigital.org/ns/#{ds.pid.split(':')[1]}") }
-        property :type, predicate: RDF::DC.type
+        property :dctype, predicate: RDF::DC.type
         property :spatial, predicate: RDF::DC.spatial
       end
     end
@@ -162,11 +162,11 @@ describe ActiveFedora::NtriplesRDFDatastream do
 
     it "should write rdf with proper subjects" do
       @subject.inner_object.pid = 'test:99'
-      @subject.rdf.type = "Frog"
+      @subject.rdf.dctype = "Frog"
       @subject.save!
       @subject.reload
       @subject.rdf.graph.dump(:ntriples).should == "<http://oregondigital.org/ns/99> <http://purl.org/dc/terms/type> \"Frog\" .\n"
-      @subject.rdf.type == ['Frog']
+      @subject.rdf.dctype == ['Frog']
 
     end
 
@@ -175,7 +175,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
 
   it "should delete values" do
     @subject.title = "Hamlet"
-    @subject.related_url = "http://psu.edu/"
+    @subject.related_url = ["http://psu.edu/"]
     @subject.related_url << "http://projecthydra.org/"
 
     @subject.title.should == "Hamlet"
@@ -192,7 +192,7 @@ describe ActiveFedora::NtriplesRDFDatastream do
     @subject.related_url.should == ["http://psu.edu/"]
   end
   it "should delete multiple values at once" do
-    @subject.part = "MacBeth"
+    @subject.part = ["MacBeth"]
     @subject.part << "Hamlet"
     @subject.part << "Romeo & Juliet"
     @subject.part.first.should == "MacBeth"

data/spec/integration/om_datastream_spec.rb

@@ -30,11 +30,11 @@ describe ActiveFedora::OmDatastream do
     end
 
     it "should not be changed when no fields have been set" do
-      @obj.descMetadata.should_not be_changed
+      @obj.descMetadata.should_not be_content_changed
     end
     it "should be changed when a field has been set" do
       @obj.descMetadata.title = 'Foobar'
-      @obj.descMetadata.should be_changed
+      @obj.descMetadata.should be_content_changed
     end
     describe "#changed?" do
       it "should not be changed if the new xml matches the old xml" do

data/spec/integration/rdf_nested_attributes_spec.rb

@@ -147,7 +147,7 @@ describe "Nesting attribute behavior of RDFDatastream" do
           property :parts, predicate: RDF::DC.hasPart, :class_name=>'Component'
           accepts_nested_attributes_for :parts, allow_destroy: true
 
-          class Component < ActiveFedora::Rdf::ObjectResource
+          class Component < ActiveTriples::Resource
             property :label, predicate: RDF::DC.title
           end
         end

data/spec/integration/relation_delegation_spec.rb

@@ -29,9 +29,9 @@ describe ActiveFedora::Model do
 
 
   describe "with multiple objects" do
-    let!(:instance1){ ModelIntegrationSpec::Basic.create!(:foo=>'Beta', :bar=>'Chips')}
-    let!(:instance2){ ModelIntegrationSpec::Basic.create!(:foo=>'Alpha', :bar=>'Peanuts')}
-    let!(:instance3){ ModelIntegrationSpec::Basic.create!(:foo=>'Sigma', :bar=>'Peanuts')}
+    let!(:instance1){ ModelIntegrationSpec::Basic.create!(foo: ['Beta'], bar: ['Chips'])}
+    let!(:instance2){ ModelIntegrationSpec::Basic.create!(foo: ['Alpha'], bar: ['Peanuts'])}
+    let!(:instance3){ ModelIntegrationSpec::Basic.create!(foo: ['Sigma'], bar: ['Peanuts'])}
 
     after { ModelIntegrationSpec::Basic.delete_all }
 

data/spec/samples/hydra-mods_article_datastream.rb

@@ -153,10 +153,6 @@ module Hydra
       end
       return builder.doc
     end
-
-    def prefix
-      "#{dsid.underscore}__"
-    end
     
     # Generates a new Person node
     def self.person_template

data/spec/support/an_active_model.rb

@@ -3,10 +3,6 @@ shared_examples_for "An ActiveModel" do
     expect(test).to eq(true)
   end
 
-  def assert_equal(test, obj)
-    expect(test).to eq(obj)
-  end
-
   def assert_kind_of(klass, inspected_object)
     expect(inspected_object).to be_kind_of(klass)
   end

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::Rdf::ObjectResource").should == ActiveFedora::Rdf::ObjectResource
-      ActiveFedora.class_from_string("ObjectResource", ActiveFedora::Rdf).should == ActiveFedora::Rdf::ObjectResource
+      ActiveFedora.class_from_string("ActiveFedora::RDF::Indexing").should == ActiveFedora::RDF::Indexing
+      ActiveFedora.class_from_string("Indexing", ActiveFedora::RDF).should == ActiveFedora::RDF::Indexing
     end
 
     it "should find sibling classes" do
@@ -123,7 +123,7 @@ describe ActiveFedora do
     it "should raise a NameError if the class isn't found" do
       expect {
         ActiveFedora.class_from_string("FooClass", ParentClass::OtherSiblingClass)
-      }.to raise_error NameError, /uninitialized constant FooClass/
+      }.to raise_error NameError, "uninitialized constant FooClass"
     end
   end
 end

data/spec/unit/attributes_spec.rb

@@ -99,52 +99,35 @@ describe ActiveFedora::Base do
       end
     end
 
-    describe "deprecated behavior" do
-      before(:all) do
-        @behavior = ActiveFedora::Attributes.deprecation_behavior
-        ActiveFedora::Attributes.deprecation_behavior = :raise
-      end
-      after(:all) do
-        ActiveFedora::Attributes.deprecation_behavior = @behavior
-      end
-      it "should deprecate passing a string to a multiple attribute writer" do
-        expect { subject.fubar = "Quack" }.to raise_error
-        expect { subject.fubar = ["Quack"] }.not_to raise_error
-        expect { subject.fubar = nil }.not_to raise_error
-      end
-      it "should deprecate passing an enumerable to a unique attribute writer" do
-        expect { subject.cow = "Low" }.not_to raise_error
-        expect { subject.cow = ["Low"] }.to raise_error
-        expect { subject.cow = nil }.not_to raise_error
-      end
+    it "should raise an exception when passing a string to a multiple attribute writer" do
+      expect { subject.fubar = "Quack" }.to raise_error
+    end
+
+    it "should raise an exception when passing an enumerable to a unique attribute writer" do
+      expect { subject.cow = ["Low"] }.to raise_error
     end
 
     it "should reveal the unique properties" do
-      BarHistory2.unique?(:horse).should be_false
-      BarHistory2.unique?(:pig).should be_true
-      BarHistory2.unique?(:cow).should be_true
+      BarHistory2.unique?(:horse).should be false
+      BarHistory2.unique?(:pig).should be true
+      BarHistory2.unique?(:cow).should be true
     end
 
     it "should save a delegated property uniquely" do
-      subject.fubar="Quack"
+      subject.fubar = ["Quack"]
       subject.fubar.should == ["Quack"]
       subject.withText.get_values(:fubar).first.should == 'Quack'
-      subject.cow="Low"
+      subject.cow = "Low"
       subject.cow.should == "Low"
       subject.xmlish.term_values(:cow).first.should == 'Low'
 
-      subject.pig="Oink"
+      subject.pig = "Oink"
       subject.pig.should == "Oink"
     end
 
     it "should allow passing parameters to the delegate accessor" do
-      subject.cow=["one", "two"]
-      subject.cow(1).should == 'two'
-    end
-
-    it "should return a single value if not marked as multiple" do
-      subject.cow=["one", "two"]
-      subject.cow.should == "one"
+      subject.fubar = ["one", "two"]
+      subject.fubar(1).should == ['two']
     end
 
     it "should return an array if marked as multiple" do
@@ -153,49 +136,49 @@ describe ActiveFedora::Base do
     end
 
     it "should be able to delegate deeply into the terminology" do
-      subject.duck=["Quack", "Peep"]
+      subject.duck = ["Quack", "Peep"]
       subject.duck.should == ["Quack", "Peep"]
     end
 
     it "should be able to track change status" do
-      subject.fubar_changed?.should be_false
-      subject.fubar = "Meow"
-      subject.fubar_changed?.should be_true
+      subject.fubar_changed?.should be false
+      subject.fubar = ["Meow"]
+      subject.fubar_changed?.should be true
     end
 
     describe "array getters and setters" do
       it "should accept symbol keys" do
-        subject[:duck]= ["Cluck", "Gobble"]
+        subject[:duck] = ["Cluck", "Gobble"]
         subject[:duck].should == ["Cluck", "Gobble"]
       end
 
       it "should accept string keys" do
-        subject['duck']= ["Cluck", "Gobble"]
+        subject['duck'] = ["Cluck", "Gobble"]
         subject['duck'].should == ["Cluck", "Gobble"]
       end
 
       it "should accept field names with _id that are not associations" do
-        subject['animal_id'] = ["lemur"]
-        subject['animal_id'].should == ["lemur"]
+        subject['animal_id'] = "lemur"
+        subject['animal_id'].should == "lemur"
       end
 
       it "should raise an error on the reader when the field isn't delegated" do
-        expect {subject['goose'] }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
+        expect { subject['goose'] }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
       end
 
       it "should raise an error on the setter when the field isn't delegated" do
-        expect {subject['goose']="honk" }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
+        expect {subject['goose'] = "honk" }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
       end
     end
 
     describe "attributes=" do
       it "should raise an error on an invalid attribute" do
-        expect {subject.attributes = {'goose'=>"honk" }}.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
+        expect { subject.attributes = { 'goose'=>"honk" } }.to raise_error ActiveFedora::UnknownAttributeError, "BarHistory2 does not have an attribute `goose'"
       end
     end
 
     describe "attributes" do
-      let(:vals) { {'cow'=>["moo"], 'pig' => ['oink'], 'horse' =>['neigh'], "fubar"=>[], 'duck'=>['quack'], 'animal_id'=>[] } }
+      let(:vals) { {'cow'=>"moo", 'pig'=>'oink', 'horse'=>['neigh'], "fubar"=>[], 'duck'=>['quack'], 'animal_id'=>nil } }
       before { subject.attributes = vals }
       it "should return a hash" do
         expect(subject.attributes).to eq(vals.merge('id' => nil))
@@ -222,14 +205,14 @@ describe ActiveFedora::Base do
     subject { BarHistory3.new }
 
     it "should be able to delegate deeply into the terminology" do
-      subject.donkey=["Bray", "Hee-haw"]
+      subject.donkey = ["Bray", "Hee-haw"]
       subject.donkey.should == ["Bray", "Hee-haw"]
     end
 
     it "should be able to track change status" do
-      subject.cow_changed?.should be_false
+      subject.cow_changed?.should be false
       subject.cow = ["Moo"]
-      subject.cow_changed?.should be_true
+      subject.cow_changed?.should be true
     end 
   end
 
@@ -254,16 +237,16 @@ describe ActiveFedora::Base do
 
     describe "with a multivalued field" do
       it "should be able to track change status" do
-        subject.title_changed?.should be_false
+        subject.title_changed?.should be false
         subject.title = ["Title1", "Title2"]
-        subject.title_changed?.should be_true
+        subject.title_changed?.should be true
       end
     end
     describe "with a single-valued field" do
       it "should be able to track change status" do
-        subject.description_changed?.should be_false
-        subject.description = "A brief description"
-        subject.description_changed?.should be_true
+        subject.description_changed?.should be false
+        subject.description = ["A brief description"]
+        subject.description_changed?.should be true
       end
     end
   end 
@@ -278,10 +261,10 @@ describe ActiveFedora::Base do
       Object.send(:remove_const, :BarHistory4)
     end
 
-    subject { BarHistory4}
+    subject { BarHistory4 }
 
     it "should raise an error" do
-      expect {subject.has_attributes :title, :description, multiple: true}.to raise_error
+      expect { subject.has_attributes :title, :description, multiple: true }.to raise_error
     end
   end
 
@@ -303,7 +286,7 @@ describe ActiveFedora::Base do
     end
 
     it "should raise an error on set" do
-      expect {subject.description = 'Neat'}.to raise_error(ArgumentError, "Undefined datastream id: `rdfish' in has_attributes")
+      expect {subject.description = ['Neat']}.to raise_error(ArgumentError, "Undefined datastream id: `rdfish' in has_attributes")
     end
   end
 

data/spec/unit/base_extra_spec.rb

@@ -70,15 +70,6 @@ describe ActiveFedora::Base do
 
   end
   
-  describe '#pids_from_uris' do 
-    it "should strip the info:fedora/ out of a given string" do 
-      ActiveFedora::Base.pids_from_uris("info:fedora/FOOBAR").should == "FOOBAR"
-    end
-    it "should accept an array of strings"do 
-      ActiveFedora::Base.pids_from_uris(["info:fedora/FOOBAR", "info:fedora/BAZFOO"]).should == ["FOOBAR", "BAZFOO"]
-    end
-  end
-
   describe "to_class_uri" do
     before :all do
       module SpecModel

data/spec/unit/om_datastream_spec.rb

@@ -10,12 +10,12 @@ describe ActiveFedora::OmDatastream do
                       } 
     @sample_raw_xml = "<foo><xmlelement/></foo>"
     @solr_doc = {"id"=>"mods_article1",
-      ActiveFedora::SolrService.solr_name("name_role_roleTerm", type: :string) =>["creator","submitter","teacher"],
-      ActiveFedora::SolrService.solr_name("name_0_role", type: :string)=>"\r\ncreator\r\nsubmitter\r\n",
-      ActiveFedora::SolrService.solr_name("name_1_role", type: :string)=>"\r\n teacher \r\n",
-      ActiveFedora::SolrService.solr_name("name_0_role_0_roleTerm", type: :string)=>"creator",
-      ActiveFedora::SolrService.solr_name("name_0_role_1_roleTerm", type: :string)=>"submitter",
-      ActiveFedora::SolrService.solr_name("name_1_role_0_roleTerm", type: :string)=>["teacher"]}
+      ActiveFedora::SolrService.solr_name("test_ds__name_role_roleTerm", type: :string) =>["creator","submitter","teacher"],
+      ActiveFedora::SolrService.solr_name("test_ds__name_0_role", type: :string)=>"\r\ncreator\r\nsubmitter\r\n",
+      ActiveFedora::SolrService.solr_name("test_ds__name_1_role", type: :string)=>"\r\n teacher \r\n",
+      ActiveFedora::SolrService.solr_name("test_ds__name_0_role_0_roleTerm", type: :string)=>"creator",
+      ActiveFedora::SolrService.solr_name("test_ds__name_0_role_1_roleTerm", type: :string)=>"submitter",
+      ActiveFedora::SolrService.solr_name("test_ds__name_1_role_0_roleTerm", type: :string)=>["teacher"]}
   end
   
   before(:each) do
@@ -31,7 +31,7 @@ describe ActiveFedora::OmDatastream do
     @test_ds.stub(:new? => false)
   end
   
-  its(:metadata?) { should be_true}
+  its(:metadata?) { should be true}
 
   its(:controlGroup) { should == "M"}
 
@@ -58,8 +58,8 @@ describe ActiveFedora::OmDatastream do
 
   describe "#prefix" do
     subject { ActiveFedora::OmDatastream.new(nil, 'descMetadata') }
-    it "should be an empty string (until active-fedora 8. Then it should be \"\#{dsid.underscore}__\"" do
-      subject.send(:prefix).should == ""
+    it "should be \"\#{dsid.underscore}__\"" do
+      subject.send(:prefix).should == "desc_metadata__"
     end
   end
   
@@ -222,7 +222,7 @@ describe ActiveFedora::OmDatastream do
       subject.stub(:new? => false )
       subject.content = "<a />"
       subject.ng_xml.to_xml.should =~ /<a\/>/
-      subject.xml_loaded.should be_true
+      subject.xml_loaded.should be true
     end
   end
   
@@ -329,11 +329,11 @@ describe ActiveFedora::OmDatastream do
 
   describe '.has_solr_name?' do
     it "should return true if the given key exists in the solr document passed in" do
-      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("name_0_role_0_roleTerm", type: :string),@solr_doc).should == true
-      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("name_0_role_0_roleTerm", type: :string).to_sym,@solr_doc).should == true
-      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("name_1_role_1_roleTerm", type: :string),@solr_doc).should == false
+      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("test_ds__name_0_role_0_roleTerm", type: :string),@solr_doc).should == true
+      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("test_ds__name_0_role_0_roleTerm", type: :string).to_sym,@solr_doc).should == true
+      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("test_ds__name_1_role_1_roleTerm", type: :string),@solr_doc).should == false
       #if not doc passed in should be new empty solr doc and always return false
-      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("name_0_role_0_roleTerm", type: :string)).should == false
+      @test_ds.has_solr_name?(ActiveFedora::SolrService.solr_name("test_ds__name_0_role_0_roleTerm", type: :string)).should == false
     end
   end