active-fedora 6.7.8 → 6.8.0

data/spec/integration/fedora_solr_sync_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 require 'timeout'
 
-describe "fedora_solr_sync_issues" do
+describe 'fedora_solr_sync_issues' do
   before :all do
     class ParentThing < ActiveFedora::Base
-      has_many :things, :class_name=>'ChildThing', :property=>:is_part_of
+      has_many :things, :class_name => 'ChildThing', :property => :is_part_of
     end
 
     class ChildThing < ActiveFedora::Base
-      belongs_to :parent, :class_name=>'ParentThing', :property=>:is_part_of
+      belongs_to :parent, :class_name => 'ParentThing', :property => :is_part_of
     end
   end
 
@@ -20,9 +20,9 @@ describe "fedora_solr_sync_issues" do
   let(:parent) { ParentThing.create }
   subject { ChildThing.create :parent => parent }
 
-  it "should not go into an infinite loop" do
+  it 'should not go into an infinite loop' do
     subject.inner_object.delete
     parent.reload
-    parent.things.should == []
+    expect(parent.things).to eq([])
   end
 end

data/spec/integration/full_featured_model_spec.rb

@@ -9,24 +9,24 @@ describe ActiveFedora::Base do
     class OralHistory < ActiveFedora::Base
         # These are all the properties that don't quite fit into Qualified DC
         # Put them on the object itself (in the properties datastream) for now.
-        has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
-          m.field "narrator",  :string
-          m.field "interviewer", :string
-          m.field "transcript_editor", :text
-          m.field "bio", :string
-          m.field "notes", :text
-          m.field "hard_copy_availability", :text
-          m.field "hard_copy_location", :text
-          m.field "other_contributor", :string
-          m.field "restrictions", :text
-          m.field "series", :string
-          m.field "location", :string
+        has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream do |m|
+          m.field 'narrator',  :string
+          m.field 'interviewer', :string
+          m.field 'transcript_editor', :text
+          m.field 'bio', :string
+          m.field 'notes', :text
+          m.field 'hard_copy_availability', :text
+          m.field 'hard_copy_location', :text
+          m.field 'other_contributor', :string
+          m.field 'restrictions', :text
+          m.field 'series', :string
+          m.field 'location', :string
         end
-        
-        
-        has_metadata :name=>"mods_article", :type=> Hydra::ModsArticleDatastream 
-        
-        has_metadata :name => "dublin_core", :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
+
+
+        has_metadata :name => 'mods_article', :type => Hydra::ModsArticleDatastream
+
+        has_metadata :name => 'dublin_core', :type => ActiveFedora::QualifiedDublinCoreDatastream do |m|
           # Default :multiple => true
           #
           # on retrieval, these will be pluralized and returned as arrays
@@ -34,30 +34,30 @@ describe ActiveFedora::Base do
           #
           # aimint to use method-missing to support calling methods like
           # my_oral_history.subjects  OR   my_oral_history.titles  OR EVEN my_oral_history.title whenever possible
-          
+
           # Setting new Types for dates and text content
           #m.field "creation_date", :date, :xml_node => "date"
           #m.field "abstract", :text, :xml_node => "abstract"
           #m.field "rights", :text, :xml_node => "rights"
-          
+
           # Setting up special named fields
-          #m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH" 
+          #m.field "subject_heading", :string, :xml_node => "subject", :encoding => "LCSH"
           #m.field "spatial_coverage", :string, :xml_node => "spatial", :encoding => "TGN"
           #m.field "temporal_coverage", :string, :xml_node => "temporal", :encoding => "Period"
           #m.field "type", :string, :xml_node => "type", :encoding => "DCMITYPE"
           #m.field "alt_title", :string, :xml_node => "alternative"
         end
-        
-        has_metadata :name => "significant_passages", :type => ActiveFedora::SimpleDatastream do |m|
-          m.field "significant_passage", :text
+
+        has_metadata :name => 'significant_passages', :type => ActiveFedora::SimpleDatastream do |m|
+          m.field 'significant_passage', :text
         end
-        
-        has_metadata :name => "sensitive_passages", :type => ActiveFedora::SimpleDatastream do |m|
-          m.field "sensitive_passage", :text
+
+        has_metadata :name => 'sensitive_passages', :type => ActiveFedora::SimpleDatastream do |m|
+          m.field 'sensitive_passage', :text
         end
 
     end
-    sample_location = "Boston, Massachusetts"
+    sample_location = 'Boston, Massachusetts'
     sample_notes = 'Addelson, Frances. (1973?) "The Induced Abortion," American Journal of Ortho-Psychiatry,  Addelson, Frances. "Abortion: Source of Guilt or Growth," National Journal of Gynecology and Obstetrics., Addelson, Frances. "First Zionist Novel," Jewish Frontier.'
     sample_other_contributor = 'any other contributors, people or corporate names (eg. Temple Israel)'
     sample_transcript_editor = 'Siegel, Cheryl'
@@ -68,113 +68,113 @@ describe ActiveFedora::Base do
     sample_bio = <<-END
     Rochelle Ruthchild interviewed Frances Addleson on October 18, November 14, and December 10, 1997.   The interview thoroughly examined the trajectory of Frances\' life from birth until the time of the interview. As a young child, Frances\' father died during the influenza epidemic, and her mother was not equipped to care for her and her siblings.  Consequently, they were placed in a Jewish foster home. Although her experience was mostly positive, this experience would leave life-long effects.  Frances attended Radcliffe upon the urging of a mentor and later obtained her Master\'s degree in social work from Simmons College in 1954.  In the 1940\'s, she returned to work while her children were still young; a rather unusual event for that time period.  While working as a social worker at Beth Israel Hospital in the early 1970\'s, she helped counsel countless women who came to the hospital seeking abortions before the procedure was officially legalized during the landmark Roe vs. Wade decision in 1973.  Frances would later write two articles that were published in medical journals about her experience during this time.  Although not a very religious person, Frances felt connected to the Jewish notion of social justice and remained very active until an accident in the late 1990\'s.
     END
-    sample_interviewer = "Ruthchild, & Rochelle"
-    
-    @properties_sample_values2 = Hash[:narrator => "Narrator1 & Narrator2", :interviewer => "Interviewer", :transcript_editor => "Transcript Editor", :bio => "Biographic info", 
-                                    :notes => "My Note\\\'s a good one", :hard_copy_availability => "Yes", :hard_copy_location => "Archives", :other_contributor => "Sally Ride", 
-                                    :restrictions => "None", :series => "My Series", :location => "location"]
-    
-    @properties_sample_values = Hash[:narrator => sample_narrator, :interviewer => sample_interviewer, :transcript_editor => sample_transcript_editor, :bio => sample_bio, 
-                                    :notes => sample_notes, :hard_copy_availability => sample_hard_copy_availability, :hard_copy_location => "Archives", :other_contributor => sample_other_contributor, 
-                                    :restrictions => "None", :series => "My Series", :location => sample_location]
-
-    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => "Jewish Womens's Archive", :description => "description", :identifier => "jwa:sample_pid", 
-                                    :title => "title", 
-                                    #:alt_title => "alt_title", :subject => "subject", 
-                                    #:subject_heading => "subject heading", 
-                                    #:creation_date => "2008-07-02T05:09:42.015Z", 
-                                    :language => "language", 
-                                    #:spatial_coverage => "spatial coverage", 
-                                    #:temporal_coverage => "temporal coverage", 
+    sample_interviewer = 'Ruthchild, & Rochelle'
+
+    @properties_sample_values2 = Hash[:narrator => 'Narrator1 & Narrator2', :interviewer => 'Interviewer', :transcript_editor => 'Transcript Editor', :bio => 'Biographic info',
+                                    :notes => "My Note\\\'s a good one", :hard_copy_availability => 'Yes', :hard_copy_location => 'Archives', :other_contributor => 'Sally Ride',
+                                    :restrictions => 'None', :series => 'My Series', :location => 'location']
+
+    @properties_sample_values = Hash[:narrator => sample_narrator, :interviewer => sample_interviewer, :transcript_editor => sample_transcript_editor, :bio => sample_bio,
+                                    :notes => sample_notes, :hard_copy_availability => sample_hard_copy_availability, :hard_copy_location => 'Archives', :other_contributor => sample_other_contributor,
+                                    :restrictions => 'None', :series => 'My Series', :location => sample_location]
+
+    @dublin_core_sample_values = Hash[:creator => 'Matt && McClain', :publisher => "Jewish Womens's Archive", :description => 'description', :identifier => 'jwa:sample_pid',
+                                    :title => 'title',
+                                    #:alt_title => "alt_title", :subject => "subject",
+                                    #:subject_heading => "subject heading",
+                                    #:creation_date => "2008-07-02T05:09:42.015Z",
+                                    :language => 'language',
+                                    #:spatial_coverage => "spatial coverage",
+                                    #:temporal_coverage => "temporal coverage",
                                     #:abstract => "abstract",
-                                    :rights => "rights", :type => "type",
-                                    #:extent => "extent", 
-                                    :format => "format", :medium => "medium"]
+                                    :rights => 'rights', :type => 'type',
+                                    #:extent => "extent",
+                                    :format => 'format', :medium => 'medium']
     @signigicant_passages_sample_values = {}
-    @sensitive_passages_sample_values = {}     
-    @sample_xml = "<xml><fields><system_create_date>REMOVED</system_create_date><system_modified_date>REMOVED</system_modified_date><active_fedora_model_s>OralHistory</active_fedora_model_s><id>changeme:14527</id><subject_heading>subject heading</subject_heading><type>type</type><rights>rights</rights><publisher>publisher</publisher><creation_date>creation date</creation_date><identifier>jwa:sample_pid</identifier><format>format</format><extent>extent</extent><language>language</language><description>description</description><title>title</title><medium>medium</medium><spatial_coverage>spatial coverage</spatial_coverage><alt_title>alt_title</alt_title><temporal_coverage>temporal coverage</temporal_coverage><subject>subject</subject><creator>creator</creator><abstract>abstract</abstract><other_contributor>Sally Ride</other_contributor><transcript_editor>Transcript Editor</transcript_editor><restrictions>None</restrictions><bio>Biographic info</bio><series>My Series</series><notes>My Note</notes><location>location</location><hard_copy_availability>Yes</hard_copy_availability><narrator>Narrator</narrator><hard_copy_location>Archives</hard_copy_location><interviewer>Interviewer</interviewer></fields><content/></xml>"
-               
-  end  
-  
+    @sensitive_passages_sample_values = {}
+    @sample_xml = '<xml><fields><system_create_date>REMOVED</system_create_date><system_modified_date>REMOVED</system_modified_date><active_fedora_model_s>OralHistory</active_fedora_model_s><id>changeme:14527</id><subject_heading>subject heading</subject_heading><type>type</type><rights>rights</rights><publisher>publisher</publisher><creation_date>creation date</creation_date><identifier>jwa:sample_pid</identifier><format>format</format><extent>extent</extent><language>language</language><description>description</description><title>title</title><medium>medium</medium><spatial_coverage>spatial coverage</spatial_coverage><alt_title>alt_title</alt_title><temporal_coverage>temporal coverage</temporal_coverage><subject>subject</subject><creator>creator</creator><abstract>abstract</abstract><other_contributor>Sally Ride</other_contributor><transcript_editor>Transcript Editor</transcript_editor><restrictions>None</restrictions><bio>Biographic info</bio><series>My Series</series><notes>My Note</notes><location>location</location><hard_copy_availability>Yes</hard_copy_availability><narrator>Narrator</narrator><hard_copy_location>Archives</hard_copy_location><interviewer>Interviewer</interviewer></fields><content/></xml>'
+
+  end
+
   before(:each) do
     @test_history = OralHistory.new
   end
-  
+
   after(:each) do
   end
-  
+
   after(:all) do
     Object.send(:remove_const, :OralHistory)
   end
-  
-  it "should be an instance of ActiveFedora::Base" do
-    @test_history.should be_kind_of(ActiveFedora::Base)
+
+  it 'should be an instance of ActiveFedora::Base' do
+    expect(@test_history).to be_kind_of(ActiveFedora::Base)
+  end
+
+
+  it 'should create proxies to all the datastreams' do
+    properties_ds = @test_history.datastreams['properties']
+    dublin_core_ds = @test_history.datastreams['dublin_core']
+    expect(@test_history).not_to respond_to(:properties)
+    expect(@test_history.properties).to be properties_ds
+    expect(@test_history).to respond_to(:properties)
+    expect(OralHistory.new).to respond_to(:properties)
   end
-  
-
-  it "should create proxies to all the datastreams" do
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    @test_history.should_not respond_to(:properties)
-    @test_history.properties.should be properties_ds    
-    @test_history.should respond_to(:properties)
-    OralHistory.new.should respond_to(:properties)
-  end 
-
-    
-  it "should push all of the metadata fields into solr" do
+
+
+  it 'should push all of the metadata fields into solr' do
     # TODO: test must test values using solr symbol names (ie. _field, _text and _date)
-    properties_ds = @test_history.datastreams["properties"]
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-        
+    properties_ds = @test_history.datastreams['properties']
+    dublin_core_ds = @test_history.datastreams['dublin_core']
+
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
       properties_ds.send("#{field.to_s}=", [value])
     end
-    
+
     @dublin_core_sample_values.each_pair do |field, value|
       next if [:format, :type].include?(field)  #format and type are methods declared on Object
       dublin_core_ds.send("#{field.to_s}=", [value])
     end
-    
+
     @test_history.save
-    
-    @solr_result = OralHistory.find_with_conditions(:id=>@test_history.pid)[0]
+
+    @solr_result = OralHistory.find_with_conditions(:id => @test_history.pid)[0]
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
-      next if field == :location #FIXME HYDRA-825 
-      (@solr_result[ActiveFedora::SolrService.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrService.solr_name(field, type: :date)]).should == [::Solrizer::Extractor.format_node_value(value)] 
+      next if field == :location #FIXME HYDRA-825
+      expect(@solr_result[ActiveFedora::SolrService.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrService.solr_name(field, type: :date)]).to eq([::Solrizer::Extractor.format_node_value(value)])
     end
-    
+
     @dublin_core_sample_values.each_pair do |field, value|
       next if [:format, :type].include?(field)  #format and type are methods declared on Object
-      dublin_core_ds.send("#{field.to_s}").should == [value]
-    end    
+      expect(dublin_core_ds.send("#{field.to_s}")).to eq([value])
+    end
   end
-  
-  it "should have Qualified Dublin core, with custom accessors" do
-    
-    dublin_core_ds = @test_history.datastreams["dublin_core"]
-    
-    dublin_core_ds.subject = "My Subject Heading"
+
+  it 'should have Qualified Dublin core, with custom accessors' do
+
+    dublin_core_ds = @test_history.datastreams['dublin_core']
+
+    dublin_core_ds.subject = 'My Subject Heading'
     dc_xml = REXML::Document.new(dublin_core_ds.to_xml)
-    
-    dc_xml.root.elements["dcterms:subject"].text.should == "My Subject Heading"
-    
+
+    expect(dc_xml.root.elements['dcterms:subject'].text).to eq('My Subject Heading')
+
   end
-  
-  it "should support #find_with_conditions" do
+
+  it 'should support #find_with_conditions' do
     solr_result = OralHistory.find_with_conditions({})
-    solr_result.should_not be_nil
+    expect(solr_result).not_to be_nil
   end
-  
+
   describe '#new' do
-    it "should support custom pids" do
-      oh = OralHistory.new(:pid=>"uuid:blah-blah-blah")
-      oh.pid.should == "uuid:blah-blah-blah"
+    it 'should support custom pids' do
+      oh = OralHistory.new(:pid => 'uuid:blah-blah-blah')
+      expect(oh.pid).to eq('uuid:blah-blah-blah')
     end
   end
-  
 
-  
+
+
 end

data/spec/integration/has_many_associations_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
-describe "When two or more relationships share the same property" do 
+describe 'When two or more relationships share the same property' do
   before do
-    class Book < ActiveFedora::Base 
-      has_many :collections, :class_name=>'Collection'
+    class Book < ActiveFedora::Base
+      has_many :collections, :class_name => 'Collection'
       has_many :people
     end
 
     class Person < ActiveFedora::Base
-      belongs_to :book, :property=>:is_part_of
+      belongs_to :book, :property => :is_part_of
     end
 
     class Collection < ActiveFedora::Base
-      belongs_to :book, :property=>:is_part_of
+      belongs_to :book, :property => :is_part_of
     end
 
     @book = Book.create!
-    @person1 = Person.create!(:book=>@book)
-    @person2 = Person.create!(:book=>@book)
+    @person1 = Person.create!(:book => @book)
+    @person2 = Person.create!(:book => @book)
   end
   after do
       Object.send(:remove_const, :Collection)
@@ -25,25 +25,25 @@ describe "When two or more relationships share the same property" do
       Object.send(:remove_const, :Book)
   end
 
-  it "Should only return relationships of the correct class" do
+  it 'Should only return relationships of the correct class' do
     @book.reload
-    @book.people.should == [@person1, @person2]
-    @book.collections.should == []
+    expect(@book.people).to eq([@person1, @person2])
+    expect(@book.collections).to eq([])
   end
 end
 
-describe "When relationship is restricted to AF::Base" do
+describe 'When relationship is restricted to AF::Base' do
   before do
-    class Email < ActiveFedora::Base 
-      has_many :attachments, :property=>:is_part_of, :class_name=>'ActiveFedora::Base'
+    class Email < ActiveFedora::Base
+      has_many :attachments, :property => :is_part_of, :class_name => 'ActiveFedora::Base'
     end
 
     class Image < ActiveFedora::Base
-      belongs_to :email, :property=>:is_part_of
+      belongs_to :email, :property => :is_part_of
     end
 
     class PDF < ActiveFedora::Base
-      belongs_to :email, :property=>:is_part_of
+      belongs_to :email, :property => :is_part_of
     end
   end
 
@@ -54,19 +54,19 @@ describe "When relationship is restricted to AF::Base" do
   end
 
 
-  describe "creating new objects with object relationships" do
+  describe 'creating new objects with object relationships' do
     before do
       @book = Email.create!
-      @image = Image.create!(:email=>@book)
-      @pdf = PDF.create!(:email=>@book)
+      @image = Image.create!(:email => @book)
+      @pdf = PDF.create!(:email => @book)
     end
-    it "Should not restrict relationships " do
+    it 'Should not restrict relationships ' do
       @book.reload
-      @book.attachments.should == [@image, @pdf]
+      expect(@book.attachments).to eq([@image, @pdf])
     end
   end
 
-  describe "creating new objects with id setter" do
+  describe 'creating new objects with id setter' do
     let!(:image) { Image.create }
     let!(:email) { Email.create }
     let!(:pdf) { PDF.create }
@@ -77,11 +77,11 @@ describe "When relationship is restricted to AF::Base" do
       image.destroy
     end
 
-    it "Should not restrict relationships " do
-      Deprecation.should_not_receive(:warn) # a deprecation in 6.6.0 that's going away in 7.0.0
+    it 'Should not restrict relationships ' do
+      expect(Deprecation).not_to receive(:warn) # a deprecation in 6.6.0 that's going away in 7.0.0
       email.attachment_ids = [image.id, pdf.id]
       email.reload
-      email.attachments.should == [image, pdf]
+      expect(email.attachments).to eq([image, pdf])
     end
   end
 end

data/spec/integration/model_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
 describe ActiveFedora::Model do
-  
-  before(:each) do 
+
+  before(:each) do
     module ModelIntegrationSpec
-      
+
       class Base < ActiveFedora::Base
         include ActiveFedora::Model
         def self.pid_namespace
-          "foo"
+          'foo'
         end
-        has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream, :autocreate => true 
+        has_metadata :name => 'properties', :type => ActiveFedora::SimpleDatastream, :autocreate => true
       end
       class Basic < Base
       end
@@ -18,59 +18,59 @@ describe ActiveFedora::Model do
 
     @test_instance = ModelIntegrationSpec::Basic.new
     @test_instance.save
-    
+
   end
-  
+
   after(:each) do
     @test_instance.delete
     Object.send(:remove_const, :ModelIntegrationSpec)
   end
-  
+
   describe '#find' do
-    describe "with :all" do
-      it "should return an array of instances of the calling Class" do
+    describe 'with :all' do
+      it 'should return an array of instances of the calling Class' do
         result = ModelIntegrationSpec::Basic.find(:all)
-        result.should be_instance_of(Array)
+        expect(result).to be_instance_of(Array)
         # this test is meaningless if the array length is zero
-        result.length.should > 0
+        expect(result.length).to be > 0
         result.each do |obj|
-          obj.class.should == ModelIntegrationSpec::Basic
+          expect(obj.class).to eq(ModelIntegrationSpec::Basic)
         end
       end
     end
-    describe "#find with a valid pid with cast" do
-      subject { ActiveFedora::Base.find(@test_instance.pid, :cast=>true) }
-      it { should be_instance_of ModelIntegrationSpec::Basic}
+    describe '#find with a valid pid with cast' do
+      subject { ActiveFedora::Base.find(@test_instance.pid, :cast => true) }
+      it { is_expected.to be_instance_of ModelIntegrationSpec::Basic}
     end
-    describe "#find with a valid pid without cast on Base" do
+    describe '#find with a valid pid without cast on Base' do
       subject { ActiveFedora::Base.find(@test_instance.pid) }
       before(:each) do
-        Deprecation.should_receive(:warn).at_least(1).times
+        expect(Deprecation).to receive(:warn).at_least(1).times
       end
-      it { should be_instance_of ActiveFedora::Base}
+      it { is_expected.to be_instance_of ActiveFedora::Base}
     end
-    describe "#find with a valid pid without cast on a model extending Base" do
+    describe '#find with a valid pid without cast on a model extending Base' do
       subject { ModelIntegrationSpec::Basic.find(@test_instance.pid) }
       before(:each) do
-        Deprecation.should_not_receive(:warn)
+        expect(Deprecation).not_to receive(:warn)
       end
-      it { should be_instance_of ModelIntegrationSpec::Basic}
+      it { is_expected.to be_instance_of ModelIntegrationSpec::Basic}
     end
   end
 
-  describe "#load_instance_from_solr" do
-    describe "with a valid pid" do
+  describe '#load_instance_from_solr' do
+    describe 'with a valid pid' do
       subject { ActiveFedora::Base.load_instance_from_solr(@test_instance.pid) }
-      it { should be_instance_of ModelIntegrationSpec::Basic}
+      it { is_expected.to be_instance_of ModelIntegrationSpec::Basic}
     end
-    describe "with metadata datastream spec" do
+    describe 'with metadata datastream spec' do
       subject { ActiveFedora::Base.load_instance_from_solr(@test_instance.pid) }
-      it "should create an xml datastream" do
-        subject.datastreams['properties'].should be_kind_of ActiveFedora::SimpleDatastream
+      it 'should create an xml datastream' do
+        expect(subject.datastreams['properties']).to be_kind_of ActiveFedora::SimpleDatastream
       end
 
-      it "should know the datastreams properties" do
-        subject.properties.dsSize.should == 9
+      it 'should know the datastreams properties' do
+        expect(subject.properties.dsSize).to eq(9)
       end
     end
   end