active-fedora 8.2.1 → 8.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d7acaa7fd5b4c4169d90edec5aeeb666827550
-  data.tar.gz: 07cd68277f2a42645b4d0287c0f440766345f748
+  metadata.gz: 5a6dfd10717c2d461bac0b6cc9f6995d3cf6dc20
+  data.tar.gz: 69d6d72ca460c5e2bd94d6a7958d1ca4052e206e
 SHA512:
-  metadata.gz: b8af87b30741ba86a75b8dbc407151edbb3826187b65c495475138a4643d29051f87c1dce4a9a4eb545bd41a203865f69d7a42d99714ff4abc732acab1e3191c
-  data.tar.gz: 58d74f4be39a5c5982bfe058aa2c20b22ba80a67f7ee27f77edef45f6edc23b3120f7562c5310758f7eee12cd45a7ae1526bbbbdfc8cfb2ae3d99a4d9c87f2f3
+  metadata.gz: 5b86606eba5e479f3134b09294403fc3aaf3425960cf96545e6701ea490fbbdc008d4522d2ae892989fedd153100754c0e1581e9596fb44823ef9ced057ed9ff
+  data.tar.gz: c7220c220a6420afe2d64b4f5150ac28b176fb5a656079529a77d92265fc030a530acfe583a31abeb039a2ae97566b79bb4cba50aff8f987f7ade9f996656690

data/active-fedora.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard"
   s.add_development_dependency "rake"
   s.add_development_dependency "jettywrapper", ">=1.4.0"
-  s.add_development_dependency "rspec", "~> 2.99"
+  s.add_development_dependency "rspec", "~> 3.0"
   s.add_development_dependency "rspec-its"
   s.add_development_dependency "equivalent-xml"
   s.add_development_dependency "rest-client"
@@ -43,4 +43,3 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
 end
-

data/lib/active_fedora/datastream_collections.rb

@@ -6,17 +6,13 @@ module ActiveFedora
     included do
       class_attribute :class_named_datastreams_desc
       self.class_named_datastreams_desc = {}
-      class << self
-        def inherited_with_datastream_collections(kls) #:nodoc:
-          ## Do some inheritance logic that doesn't override Base.inherited
-          inherited_without_datastream_collections kls
-          kls.class_named_datastreams_desc = kls.class_named_datastreams_desc.dup
-        end
-        alias_method_chain :inherited, :datastream_collections
-      end
     end
 
     module ClassMethods
+      def inherited(kls) #:nodoc:
+        super
+        kls.class_named_datastreams_desc = kls.class_named_datastreams_desc.dup
+      end
 
       # Allows for a datastream to be treated like any other attribute of a model class 
       # while enforcing mimeType and/or datastream type (ie. external, managed, etc.) if defined. 

data/lib/active_fedora/datastreams.rb

@@ -7,20 +7,18 @@ module ActiveFedora
     included do
       class_attribute :ds_specs
       self.ds_specs = {'RELS-EXT'=> {:type=> ActiveFedora::RelsExtDatastream, :label=>"Fedora Object-to-Object Relationship Metadata", :block=>nil}}
-      class << self
-        def inherited_with_datastreams(kls) #:nodoc:
-          ## Do some inheritance logic that doesn't override Base.inherited
-          inherited_without_datastreams kls
-          # each subclass should get a copy of the parent's datastream definitions, it should not add to the parent's definition table.
-          kls.ds_specs = kls.ds_specs.dup
-        end
-        alias_method_chain :inherited, :datastreams
-      end
 
       before_save :add_disseminator_location_to_datastreams
       #before_save :serialize_datastreams
     end
 
+    module ClassMethods
+      def inherited(kls) #:nodoc:
+        super
+        kls.ds_specs = kls.ds_specs.dup
+      end
+    end
+
     def ds_specs
       self.class.ds_specs
     end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "8.2.1"
+  VERSION = "8.2.2"
 end

data/spec/config_helper.rb

@@ -1,8 +1,8 @@
 def mock_yaml(hash, path)
   mock_file = double(path.split("/")[-1])
-  File.stub(:exist?).with(path).and_return(true)
-  File.stub(:open).with(path).and_return(mock_file)
-  Psych.stub(:load).and_return(hash)
+  allow(File).to receive(:exist?).with(path).and_return(true)
+  allow(File).to receive(:open).with(path).and_return(mock_file)
+  allow(Psych).to receive(:load).and_return(hash)
 end
 
 def default_predicate_mapping_file

data/spec/integration/associations_spec.rb

@@ -63,75 +63,75 @@ describe ActiveFedora::Base do
 
         it "should build child" do
           new_book = @library.books.build({})
-          new_book.should be_new_record
-          new_book.should be_kind_of Book
-          new_book.library.should be_kind_of Library
-          @library.books.should == [new_book]
+          expect(new_book).to be_new_record
+          expect(new_book).to be_kind_of Book
+          expect(new_book.library).to be_kind_of Library
+          expect(@library.books).to eq([new_book])
         end
 
         it "should make a new child" do
           new_book = @library.books.new
-          new_book.should be_new_record
-          new_book.should be_kind_of Book
-          new_book.library.should be_kind_of Library
-          @library.books.should == [new_book]
+          expect(new_book).to be_new_record
+          expect(new_book).to be_kind_of Book
+          expect(new_book.library).to be_kind_of Library
+          expect(@library.books).to eq([new_book])
         end
 
         it "should not create children if the parent isn't saved" do
-          lambda {@library.books.create({})}.should raise_error ActiveFedora::RecordNotSaved, "You cannot call create unless the parent is saved"
+          expect {@library.books.create({})}.to raise_error ActiveFedora::RecordNotSaved, "You cannot call create unless the parent is saved"
         end
 
         it "should create children" do
           @library.save!
           new_book = @library.books.create({})
-          new_book.should_not be_new_record
-          new_book.should be_kind_of Book
-          new_book.library.should == @library
+          expect(new_book).not_to be_new_record
+          expect(new_book).to be_kind_of Book
+          expect(new_book.library).to eq(@library)
         end
 
         it "should build parent" do
           new_library = @book.build_library({})
-          new_library.should be_new_record
-          new_library.should be_kind_of Library
-          @book.library.should == new_library
+          expect(new_library).to be_new_record
+          expect(new_library).to be_kind_of Library
+          expect(@book.library).to eq(new_library)
         end
 
         it "should create parent" do
           new_library = @book.create_library({})
-          new_library.should_not be_new_record
-          new_library.should be_kind_of Library
-          @book.library.should == new_library
+          expect(new_library).not_to be_new_record
+          expect(new_library).to be_kind_of Library
+          expect(@book.library).to eq(new_library)
         end
 
         it "should let you shift onto the association" do
-          @library.new_record?.should be_true
-          @library.books.size.should == 0
-          @library.books.should == []
-          @library.book_ids.should == []
+          expect(@library.new_record?).to be_truthy
+          expect(@library.books.size).to eq(0)
+          expect(@library.books).to eq([])
+          expect(@library.book_ids).to eq([])
           @library.books << @book
-          @library.books.should == [@book]
-          @library.book_ids.should ==[@book.pid]
+          expect(@library.books).to eq([@book])
+          expect(@library.book_ids).to eq([@book.pid])
 
         end
 
         it "should let you set an array of objects" do
           @library.books = [@book, @book2]
-          @library.books.should == [@book, @book2]
+          expect(@library.books).to eq([@book, @book2])
           @library.save
 
           @library.books = [@book]
-          @library.books.should == [@book]
+          expect(@library.books).to eq([@book])
         
         end
         it "should let you set an array of object ids" do
           @library.book_ids = [@book.pid, @book2.pid]
-          @library.books.should == [@book, @book2]
+          expect(@library.books).to eq([@book, @book2])
         end
 
         it "setter should wipe out previously saved relations" do
           @library.book_ids = [@book.pid, @book2.pid]
           @library.book_ids = [@book2.pid]
-          @library.books.should == [@book2]
+          expect(@library.books).to eq([@book2])
           
         end
 
@@ -140,7 +140,7 @@ describe ActiveFedora::Base do
           @library.books = [@book, @book2]
           @library.save
           @library = Library.find(@library.pid)
-          @library.books.should == [@book, @book2]
+          expect(@library.books).to eq([@book, @book2])
         end
 
 
@@ -152,12 +152,12 @@ describe ActiveFedora::Base do
           @book2.save
 
           @library = Library.find(@library.pid)
-          @library.books.should == [@book, @book2]
+          expect(@library.books).to eq([@book, @book2])
         
           solr_resp =  @library.books(:response_format=>:solr)
-          solr_resp.size.should == 2
-          solr_resp[0]['id'].should == @book.pid 
-          solr_resp[1]['id'].should == @book2.pid 
+          expect(solr_resp.size).to eq(2)
+          expect(solr_resp[0]['id']).to eq(@book.pid) 
+          expect(solr_resp[1]['id']).to eq(@book2.pid) 
         
         end
 
@@ -181,10 +181,10 @@ describe ActiveFedora::Base do
         end
         it "should be settable from the book side" do
           @book.library_id = @library.pid
-          @book.library.should == @library
-          @book.library.pid.should == @library.pid
+          expect(@book.library).to eq(@library)
+          expect(@book.library.pid).to eq(@library.pid)
           @book.attributes= {:library_id => ""}
-          @book.library_id.should be_nil
+          expect(@book.library_id).to be_nil
         end
         after do
           @library.delete
@@ -208,12 +208,12 @@ describe ActiveFedora::Base do
         it "should have many books once it has been saved" do
           @library.books << @book
 
-          @book.library.pid.should == @library.pid
+          expect(@book.library.pid).to eq(@library.pid)
           @library.books.reload
-          @library.books.should == [@book]
+          expect(@library.books).to eq([@book])
 
           @library2 = Library.find(@library.pid)
-          @library2.books.should == [@book]
+          expect(@library2.books).to eq([@book])
         end
 
         it "should have a count once it has been saved" do
@@ -221,14 +221,14 @@ describe ActiveFedora::Base do
           @library.save
 
           @library2 = Library.find(@library.pid)
-          @library2.books.size.should == 2
+          expect(@library2.books.size).to eq(2)
         end
 
         it "should respect the :class_name parameter" do
           @book.author = @person
           @book.save
-          Book.find(@book.id).author_id.should == @person.pid
-          Book.find(@book.id).author.should be_kind_of Person
+          expect(Book.find(@book.id).author_id).to eq(@person.pid)
+          expect(Book.find(@book.id).author).to be_kind_of Person
         end
 
         it "should respect multiple associations that share the same :property and respect associated class" do
@@ -236,11 +236,11 @@ describe ActiveFedora::Base do
           @book.publisher = @publisher
           @book.save
           
-          Book.find(@book.id).publisher_id.should == @publisher.pid
-          Book.find(@book.id).publisher.should be_kind_of Publisher
+          expect(Book.find(@book.id).publisher_id).to eq(@publisher.pid)
+          expect(Book.find(@book.id).publisher).to be_kind_of Publisher
 
-          Book.find(@book.id).author_id.should == @person.pid
-          Book.find(@book.id).author.should be_kind_of Person
+          expect(Book.find(@book.id).author_id).to eq(@person.pid)
+          expect(Book.find(@book.id).author).to be_kind_of Person
         end
 
         describe "when changing the belonger" do
@@ -250,10 +250,10 @@ describe ActiveFedora::Base do
             @library2 = Library.create
           end
           it "should replace an existing instance" do
-            @book.library_id.should == @library.id
+            expect(@book.library_id).to eq(@library.id)
             @book.library = @library2
             @book.save
-            Book.find(@book.id).library_id.should == @library2.id
+            expect(Book.find(@book.id).library_id).to eq(@library2.id)
           end
           after do
             @library2.delete
@@ -282,11 +282,11 @@ describe ActiveFedora::Base do
       end
       it "should set the association" do
         @book.library = @library
-        @book.library.pid.should == @library.pid
+        expect(@book.library.pid).to eq(@library.pid)
         @book.save
 
 
-        Book.find(@book.pid).library.pid.should == @library.pid
+        expect(Book.find(@book.pid).library.pid).to eq(@library.pid)
         
       end
       it "should clear the association" do
@@ -294,7 +294,7 @@ describe ActiveFedora::Base do
         @book.library = nil
         @book.save
 
-        Book.find(@book.pid).library.should be_nil 
+        expect(Book.find(@book.pid).library).to be_nil 
         
       end
 
@@ -305,7 +305,7 @@ describe ActiveFedora::Base do
         @book.save
         @book.library = @library2
         @book.save
-        Book.find(@book.pid).library.pid.should == @library2.pid 
+        expect(Book.find(@book.pid).library.pid).to eq(@library2.pid) 
 
       end
 
@@ -320,8 +320,8 @@ describe ActiveFedora::Base do
         @book.publisher = @publisher2
         @book.save
 
-        Book.find(@book.pid).publisher.pid.should == @publisher2.pid
-        Book.find(@book.pid).author.pid.should == @author.pid
+        expect(Book.find(@book.pid).publisher.pid).to eq(@publisher2.pid)
+        expect(Book.find(@book.pid).author.pid).to eq(@author.pid)
       end
 
       it "should only clear the matching class association" do
@@ -332,16 +332,16 @@ describe ActiveFedora::Base do
         @book.author = nil
         @book.save
 
-        Book.find(@book.pid).author.should be_nil
-        Book.find(@book.pid).publisher.pid.should == @publisher.pid
+        expect(Book.find(@book.pid).author).to be_nil
+        expect(Book.find(@book.pid).publisher.pid).to eq(@publisher.pid)
       end
 
       it "should be able to be set by id" do
         @book.library_id = @library.pid
-        @book.library_id.should == @library.pid
-        @book.library.pid.should == @library.pid
+        expect(@book.library_id).to eq(@library.pid)
+        expect(@book.library.pid).to eq(@library.pid)
         @book.save
-        Book.find(@book.pid).library_id.should == @library.pid
+        expect(Book.find(@book.pid).library_id).to eq(@library.pid)
       end
 
       after do
@@ -381,7 +381,7 @@ describe ActiveFedora::Base do
 
       it "should load the association stored in the parent" do
         @reloaded_course = Course.find(@course.pid)
-        @reloaded_course.textbooks.should == [@t1, @t2]
+        expect(@reloaded_course.textbooks).to eq([@t1, @t2])
       end
 
       it "should allow a parent to be deleted from the has_many association" do
@@ -390,7 +390,7 @@ describe ActiveFedora::Base do
         @reloaded_course.save
 
         @reloaded_course = Course.find(@course.pid)
-        @reloaded_course.textbooks.should == [@t2]
+        expect(@reloaded_course.textbooks).to eq([@t2])
       end
 
       it "should allow replacing the children" do
@@ -399,7 +399,7 @@ describe ActiveFedora::Base do
         @course.textbooks = [@t3, @t4]
         @course.save
 
-        @course.reload.textbooks.should == [@t3, @t4]
+        expect(@course.reload.textbooks).to eq([@t3, @t4])
       end
 
       it "should allow a child to be deleted from the has_and_belongs_to_many association" do
@@ -409,7 +409,7 @@ describe ActiveFedora::Base do
         @t1.save
 
         @reloaded_course = Course.find(@course.pid)
-        @reloaded_course.textbooks.should == [@t2]
+        expect(@reloaded_course.textbooks).to eq([@t2])
       end
     end
   end
@@ -451,7 +451,7 @@ describe ActiveFedora::Base do
           subject.save!
         end
         it "should save between the before and after hooks" do
-          subject.should_receive(:say_hi).with(@p2).twice
+          expect(subject).to receive(:say_hi).with(@p2).twice
           subject.pages.delete(@p2)
         end
       end
@@ -479,7 +479,7 @@ describe ActiveFedora::Base do
           @p2 = subject.pages.build
         end
         it "should run the hooks" do
-          subject.should_receive(:say_hi).with(@p2)
+          expect(subject).to receive(:say_hi).with(@p2)
           subject.pages.delete(@p2)
         end
       end
@@ -502,7 +502,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the predicate" do
-        MediaObject.new.association(:baubles).send(:find_predicate).should == :is_part_of
+        expect(MediaObject.new.association(:baubles).send(:find_predicate)).to eq(:is_part_of)
       end
     end
 
@@ -521,7 +521,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the predicate" do
-        MediaObject.new.association(:parts).send(:find_predicate).should == :is_part_of
+        expect(MediaObject.new.association(:parts).send(:find_predicate)).to eq(:is_part_of)
       end
     end
 
@@ -540,7 +540,7 @@ describe ActiveFedora::Base do
       end
 
       it "it should find the predicate" do
-        MediaObject.new.association(:baubles).send(:find_predicate).should == :has_baubles
+        expect(MediaObject.new.association(:baubles).send(:find_predicate)).to eq(:has_baubles)
       end
     end
     describe "an object doesn't have a property" do
@@ -601,20 +601,20 @@ describe ActiveFedora::Base do
           book2.contents = [text2, image2]
           book2.save!
 
-          book1.reload.contents.should include(text1, image1)
-          text1.reload.books.should == [book1]
-          image1.reload.books.should == [book1]
+          expect(book1.reload.contents).to include(text1, image1)
+          expect(text1.reload.books).to eq([book1])
+          expect(image1.reload.books).to eq([book1])
 
-          book2.reload.contents.should include(text2, image2)
-          text2.reload.books.should == [book2]
-          image2.reload.books.should == [book2]
+          expect(book2.reload.contents).to include(text2, image2)
+          expect(text2.reload.books).to eq([book2])
+          expect(image2.reload.books).to eq([book2])
         end
 
         it "should work when added via the has_many" do
           text2.books << book2
           book2.save
-          book2.reload.contents.should == [text2]
-          text2.reload.books.should == [book2]
+          expect(book2.reload.contents).to eq([text2])
+          expect(text2.reload.books).to eq([book2])
         end
       end
     end