active-fedora 6.7.8 → 6.8.0

data/spec/unit/datastream_spec.rb

@@ -1,25 +1,28 @@
 require 'spec_helper'
 
 require 'active_fedora'
-require "nokogiri"
+require 'nokogiri'
 
 describe ActiveFedora::Datastream do
-  
+
   before(:each) do
     @test_object = ActiveFedora::Base.new
     @test_datastream = ActiveFedora::Datastream.new(@test_object.inner_object, 'abcd')
-    @test_datastream.content = "hi there"
+    @test_datastream.content = 'hi there'
   end
 
-  its(:metadata?) { should be_false}
+  describe '#metadata?' do
+    subject { super().metadata? }
+    it { is_expected.to be_falsey}
+  end
 
-  it "should escape dots in  to_param" do
-    @test_datastream.stub(:dsid).and_return('foo.bar')
-    @test_datastream.to_param.should == 'foo%2ebar'
+  it 'should escape dots in  to_param' do
+    allow(@test_datastream).to receive(:dsid).and_return('foo.bar')
+    expect(@test_datastream.to_param).to eq('foo%2ebar')
   end
-  
-  it "should be inspectable" do
-    @test_datastream.inspect.should match /#<ActiveFedora::Datastream @pid=\"\" @dsid=\"abcd\" @controlGroup=\"M\" changed=\"true\" @mimeType=\"\" >/
+
+  it 'should be inspectable' do
+    expect(@test_datastream.inspect).to match /#<ActiveFedora::Datastream @pid=\"\" @dsid=\"abcd\" @controlGroup=\"M\" changed=\"true\" @mimeType=\"\" >/
   end
 
   describe '#validate_content_present' do
@@ -28,65 +31,65 @@ describe ActiveFedora::Datastream do
       @test_datastream.dsLocation = nil
     end
 
-    it "should expect content on an Inline (X) datastream" do
+    it 'should expect content on an Inline (X) datastream' do
       @test_datastream.controlGroup = 'X'
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_true
+      @test_datastream.dsLocation = 'http://example.com/test/content/abcd'
+      expect(@test_datastream.validate_content_present).to be_falsey
+      @test_datastream.content = '<foo><xmlelement/></foo>'
+      expect(@test_datastream.validate_content_present).to be_truthy
     end
 
-    context "on a Managed (M) datastream" do
+    context 'on a Managed (M) datastream' do
       before { @test_datastream.controlGroup = 'M' }
-      it "should be false when neither dsLocation nor content is present" do
-        @test_datastream.validate_content_present.should be_false
+      it 'should be false when neither dsLocation nor content is present' do
+        expect(@test_datastream.validate_content_present).to be_falsey
       end
-      it "should be true when dsLocation is present" do
-        @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-        @test_datastream.validate_content_present.should be_true
+      it 'should be true when dsLocation is present' do
+        @test_datastream.dsLocation = 'http://example.com/test/content/abcd'
+        expect(@test_datastream.validate_content_present).to be_truthy
       end
-      it "should be true when content is present" do
-        @test_datastream.content = "<foo><xmlelement/></foo>"
-        @test_datastream.validate_content_present.should be_true
+      it 'should be true when content is present' do
+        @test_datastream.content = '<foo><xmlelement/></foo>'
+        expect(@test_datastream.validate_content_present).to be_truthy
       end
     end
 
-    it "should expect a dsLocation on an External (E) datastream" do
+    it 'should expect a dsLocation on an External (E) datastream' do
       @test_datastream.controlGroup = 'E'
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_true
-      @test_datastream.should be_external
+      @test_datastream.content = '<foo><xmlelement/></foo>'
+      expect(@test_datastream.validate_content_present).to be_falsey
+      @test_datastream.dsLocation = 'http://example.com/test/content/abcd'
+      expect(@test_datastream.validate_content_present).to be_truthy
+      expect(@test_datastream).to be_external
     end
 
-    it "should expect a dsLocation on a Redirect (R) datastream" do
+    it 'should expect a dsLocation on a Redirect (R) datastream' do
       @test_datastream.controlGroup = 'R'
-      @test_datastream.content = "<foo><xmlelement/></foo>"
-      @test_datastream.validate_content_present.should be_false
-      @test_datastream.dsLocation = "http://example.com/test/content/abcd"
-      @test_datastream.validate_content_present.should be_true
+      @test_datastream.content = '<foo><xmlelement/></foo>'
+      expect(@test_datastream.validate_content_present).to be_falsey
+      @test_datastream.dsLocation = 'http://example.com/test/content/abcd'
+      expect(@test_datastream.validate_content_present).to be_truthy
     end
   end
-  
-  it "should have mimeType accessors" do
+
+  it 'should have mimeType accessors' do
     ds1 = ActiveFedora::Datastream.new
-    ds1.mimeType = "text/foo"
-    ds1.mimeType.should == "text/foo"
+    ds1.mimeType = 'text/foo'
+    expect(ds1.mimeType).to eq('text/foo')
     ds2 = ActiveFedora::Datastream.new
-    ds2.mimeType = "text/bar"
-    ds2.mimeType.should == "text/bar"
+    ds2.mimeType = 'text/bar'
+    expect(ds2.mimeType).to eq('text/bar')
   end
 
-  describe ".size" do
-    it "should lazily load the datastream size attribute from the fedora repository" do
+  describe '.size' do
+    it 'should lazily load the datastream size attribute from the fedora repository' do
       ds_profile = <<-EOS
-        <datastreamProfile 
-            xmlns=\"http://www.fedora.info/definitions/1/0/management/\"  
-            xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" 
-            xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" 
-            xsi:schemaLocation=\"http://www.fedora.info/definitions/1/0/management/ http://www.fedora.info/definitions/1/0/datastreamProfile.xsd\" 
-            pid=\"#{@test_object.pid}\" 
+        <datastreamProfile
+            xmlns=\"http://www.fedora.info/definitions/1/0/management/\"
+            xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"
+            xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"
+            xsi:schemaLocation=\"http://www.fedora.info/definitions/1/0/management/ http://www.fedora.info/definitions/1/0/datastreamProfile.xsd\"
+            pid=\"#{@test_object.pid}\"
             dsID=\"#{@test_datastream.dsid}\" >
          <dsLabel></dsLabel>
          <dsVersionID>#{@test_datastream.dsid}.1</dsVersionID>
@@ -106,13 +109,13 @@ describe ActiveFedora::Datastream do
       EOS
 
       mock_repo = Rubydora::Repository.new
-      @test_object.inner_object.stub(:repository).and_return(mock_repo)
-      mock_repo.api.should_receive(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).and_return(ds_profile)
-      @test_datastream.size.should == 9999
+      allow(@test_object.inner_object).to receive(:repository).and_return(mock_repo)
+      expect(mock_repo.api).to receive(:datastream).with(:dsid => 'abcd', :pid => @test_object.pid).and_return(ds_profile)
+      expect(@test_datastream.size).to eq(9999)
     end
 
-    it "should default to an empty string if ds has not been saved" do
-      @test_datastream.size.should be_nil
+    it 'should default to an empty string if ds has not been saved' do
+      expect(@test_datastream.size).to be_nil
     end
   end
 end

data/spec/unit/datastreams_spec.rb

@@ -11,16 +11,16 @@ describe ActiveFedora::Datastreams do
       end
     end
 
-    it "should have a ds_specs entry" do
-      FooHistory.ds_specs.should have_key('dsid')
+    it 'should have a ds_specs entry' do
+      expect(FooHistory.ds_specs).to have_key('dsid')
     end
 
-    it "should have reasonable defaults" do
-      FooHistory.ds_specs['dsid'].should include(:autocreate => false)
+    it 'should have reasonable defaults' do
+      expect(FooHistory.ds_specs['dsid']).to include(:autocreate => false)
     end
 
-    it "should let you override defaults" do
-      FooHistory.ds_specs['complex_ds'].should include(:versionable => true, :autocreate => true, :type => 'Z', :label => 'My Label', :control_group => 'Z')
+    it 'should let you override defaults' do
+      expect(FooHistory.ds_specs['complex_ds']).to include(:versionable => true, :autocreate => true, :type => 'Z', :label => 'My Label', :control_group => 'Z')
     end
   end
 
@@ -32,90 +32,90 @@ describe ActiveFedora::Datastreams do
       end
     end
 
-    it "should have reasonable defaults" do
-      FooHistory.ds_specs['dsid'].should include(:type => ActiveFedora::Datastream, :label => 'File Datastream', :control_group => 'M')
-      FooHistory.ds_specs['another'].should include(:type => ActiveFedora::Datastream, :label => 'File Datastream', :control_group => 'M')
+    it 'should have reasonable defaults' do
+      expect(FooHistory.ds_specs['dsid']).to include(:type => ActiveFedora::Datastream, :label => 'File Datastream', :control_group => 'M')
+      expect(FooHistory.ds_specs['another']).to include(:type => ActiveFedora::Datastream, :label => 'File Datastream', :control_group => 'M')
     end
   end
 
-  describe "#serialize_datastreams" do
-    it "should touch each datastream" do
+  describe '#serialize_datastreams' do
+    it 'should touch each datastream' do
       m1 = double()
       m2 = double()
 
-      m1.should_receive(:serialize!)
-      m2.should_receive(:serialize!)
+      expect(m1).to receive(:serialize!)
+      expect(m2).to receive(:serialize!)
        subject.stub(:datastreams => { :m1 => m1, :m2 => m2})
        subject.serialize_datastreams
     end
   end
 
-  describe "#add_disseminator_location_to_datastreams" do
-    it "should infer dsLocations for E datastreams without hitting Fedora" do
-      
+  describe '#add_disseminator_location_to_datastreams' do
+    it 'should infer dsLocations for E datastreams without hitting Fedora' do
+
       mock_specs = {:e => { :disseminator => 'xyz' }}
       mock_ds = double(:controlGroup => 'E')
       ActiveFedora::Base.stub(:ds_specs => mock_specs)
       ActiveFedora.stub(:config_for_environment => { :url => 'http://localhost'})
       subject.stub(:pid => 'test:1', :datastreams => {:e => mock_ds})
-      mock_ds.should_receive(:dsLocation=).with("http://localhost/objects/test:1/methods/xyz")
+      expect(mock_ds).to receive(:dsLocation=).with('http://localhost/objects/test:1/methods/xyz')
       subject.add_disseminator_location_to_datastreams
     end
   end
 
-  describe "#corresponding_datastream_name" do
+  describe '#corresponding_datastream_name' do
     before(:each) do
       subject.stub(:datastreams => { 'abc' => double(), 'a_b_c' => double(), 'a-b' => double()})
     end
 
-    it "should use the name, if it exists" do
-      subject.corresponding_datastream_name('abc').should == 'abc'
+    it 'should use the name, if it exists' do
+      expect(subject.corresponding_datastream_name('abc')).to eq('abc')
     end
 
-    it "should hash-erize underscores" do
-      subject.corresponding_datastream_name('a_b').should == 'a-b'
+    it 'should hash-erize underscores' do
+      expect(subject.corresponding_datastream_name('a_b')).to eq('a-b')
     end
 
-    it "should return nil if nothing matches" do
-      subject.corresponding_datastream_name('xyz').should be_nil
+    it 'should return nil if nothing matches' do
+      expect(subject.corresponding_datastream_name('xyz')).to be_nil
     end
   end
- 
-  describe "#datastreams" do
-    it "should return the datastream hash proxy" do
-      subject.stub(:load_datastreams)
-      subject.datastreams.should be_a_kind_of(ActiveFedora::DatastreamHash)
+
+  describe '#datastreams' do
+    it 'should return the datastream hash proxy' do
+      allow(subject).to receive(:load_datastreams)
+      expect(subject.datastreams).to be_a_kind_of(ActiveFedora::DatastreamHash)
     end
 
-    it "should round-trip to/from YAML" do
-      YAML.load(subject.datastreams.to_yaml).inspect.should == subject.datastreams.inspect
+    it 'should round-trip to/from YAML' do
+      expect(YAML.load(subject.datastreams.to_yaml).inspect).to eq(subject.datastreams.inspect)
     end
   end
 
-  describe "#configure_datastream" do
-    it "should look up the ds_spec" do
+  describe '#configure_datastream' do
+    it 'should look up the ds_spec' do
       mock_dsspec = { :type => nil }
       subject.stub(:ds_specs => {'abc' => mock_dsspec})
       subject.configure_datastream(double(:dsid => 'abc'))
     end
 
-    it "should be ok if there is no ds spec" do
+    it 'should be ok if there is no ds spec' do
       mock_dsspec = double()
       subject.stub(:ds_specs => {})
       subject.configure_datastream(double(:dsid => 'abc'))
     end
 
-    it "should configure RelsExtDatastream" do
+    it 'should configure RelsExtDatastream' do
       mock_dsspec = { :type => ActiveFedora::RelsExtDatastream }
       subject.stub(:ds_specs => {'abc' => mock_dsspec})
 
       ds = double(:dsid => 'abc')
-      ds.should_receive(:model=).with(subject)
+      expect(ds).to receive(:model=).with(subject)
 
       subject.configure_datastream(ds)
     end
 
-    it "should run a Proc" do
+    it 'should run a Proc' do
       ds = double(:dsid => 'abc')
       @count = 0
       mock_dsspec = { :block => lambda { |x| @count += 1 } }
@@ -128,110 +128,110 @@ describe ActiveFedora::Datastreams do
     end
   end
 
-  describe "#datastream_from_spec" do
-    it "should fetch the rubydora datastream" do
-      subject.inner_object.should_receive(:datastream_object_for).with('dsid', {}, {})
+  describe '#datastream_from_spec' do
+    it 'should fetch the rubydora datastream' do
+      expect(subject.inner_object).to receive(:datastream_object_for).with('dsid', {}, {})
       subject.datastream_from_spec({}, 'dsid')
     end
   end
 
-  describe "#load_datastreams" do
-    it "should load and configure persisted datastreams and should add any datastreams left over in the ds specs" do
-      pending
+  describe '#load_datastreams' do
+    it 'should load and configure persisted datastreams and should add any datastreams left over in the ds specs' do
+      skip
     end
   end
 
-  describe "#add_datastream" do
-    it "should add the datastream to the object" do
+  describe '#add_datastream' do
+    it 'should add the datastream to the object' do
       ds = double(:dsid => 'Abc')
       subject.add_datastream(ds)
-      subject.datastreams['Abc'].should == ds
+      expect(subject.datastreams['Abc']).to eq(ds)
     end
 
-    it "should mint a dsid" do
+    it 'should mint a dsid' do
       ds = ActiveFedora::Datastream.new
-      subject.add_datastream(ds).should == 'DS1'
+      expect(subject.add_datastream(ds)).to eq('DS1')
     end
   end
 
-  describe "#metadata_streams" do
-    it "should only be metadata datastreams" do
+  describe '#metadata_streams' do
+    it 'should only be metadata datastreams' do
       ds1 = double(:metadata? => true)
       ds2 = double(:metadata? => true)
       ds3 = double(:metadata? => true)
       relsextds = ActiveFedora::RelsExtDatastream.new
       file_ds = double(:metadata? => false)
       subject.stub(:datastreams => {:a => ds1, :b => ds2, :c => ds3, :d => relsextds, :e => file_ds})
-      subject.metadata_streams.should include(ds1, ds2, ds3)
-      subject.metadata_streams.should_not include(relsextds)
-      subject.metadata_streams.should_not include(file_ds)
+      expect(subject.metadata_streams).to include(ds1, ds2, ds3)
+      expect(subject.metadata_streams).not_to include(relsextds)
+      expect(subject.metadata_streams).not_to include(file_ds)
     end
   end
 
-  describe "#generate_dsid" do
-    it "should create an autoincrementing dsid" do
-      subject.generate_dsid('FOO').should == 'FOO1'
+  describe '#generate_dsid' do
+    it 'should create an autoincrementing dsid' do
+      expect(subject.generate_dsid('FOO')).to eq('FOO1')
     end
 
-    it "should start from the highest existin dsid" do
+    it 'should start from the highest existin dsid' do
       subject.stub(:datastreams => {'FOO56' => double()})
-      subject.generate_dsid('FOO').should == 'FOO57'
+      expect(subject.generate_dsid('FOO')).to eq('FOO57')
     end
   end
 
-  describe "#relsext" do
-    it "should be the RELS-EXT datastream" do
+  describe '#relsext' do
+    it 'should be the RELS-EXT datastream' do
       m = double
       subject.stub(:datastreams => { 'RELS-EXT' => m})
-      subject.rels_ext.should == m
+      expect(subject.rels_ext).to eq(m)
     end
 
-    it "should make one up otherwise" do
+    it 'should make one up otherwise' do
       subject.stub(:datastreams => {})
 
-      subject.rels_ext.should be_a_kind_of(ActiveFedora::RelsExtDatastream)
+      expect(subject.rels_ext).to be_a_kind_of(ActiveFedora::RelsExtDatastream)
     end
   end
 
-  describe "#add_file_datastream" do
+  describe '#add_file_datastream' do
     # tested elsewhere :/
-  end 
+  end
 
-  describe "#create_datastream" do
-    it "should mint a DSID" do
+  describe '#create_datastream' do
+    it 'should mint a DSID' do
       ds = subject.create_datastream(ActiveFedora::Datastream, nil, {})
-      ds.dsid.should == 'DS1'
+      expect(ds.dsid).to eq('DS1')
     end
 
-    it "should raise an argument error if the supplied dsid is nonsense" do
+    it 'should raise an argument error if the supplied dsid is nonsense' do
       expect { subject.create_datastream(ActiveFedora::Datastream, 0) }.to raise_error(ArgumentError)
     end
 
-    it "should try to get a mime type from the blob" do
+    it 'should try to get a mime type from the blob' do
       mock_file = double(:content_type => 'x-application/asdf')
       ds = subject.create_datastream(ActiveFedora::Datastream, nil, {:blob => mock_file})
-      ds.mimeType.should == 'x-application/asdf'
+      expect(ds.mimeType).to eq('x-application/asdf')
     end
 
-    it "should provide a default mime type" do
+    it 'should provide a default mime type' do
       mock_file = double()
       ds = subject.create_datastream(ActiveFedora::Datastream, nil, {:blob => mock_file})
-      ds.mimeType.should == 'application/octet-stream'
+      expect(ds.mimeType).to eq('application/octet-stream')
     end
 
-    it "should use the filename as a default label" do
+    it 'should use the filename as a default label' do
      mock_file = double(:path => '/asdf/fdsa')
       ds = subject.create_datastream(ActiveFedora::Datastream, nil, {:blob => mock_file})
-      ds.dsLabel.should == 'fdsa'
+      expect(ds.dsLabel).to eq('fdsa')
     end
   end
 
-  describe "#additional_attributes_for_external_and_redirect_control_groups" do
+  describe '#additional_attributes_for_external_and_redirect_control_groups' do
     before(:all) do
       @behavior = ActiveFedora::Datastreams.deprecation_behavior
       ActiveFedora::Datastreams.deprecation_behavior = :silence
     end
-  
+
      after :all do
       ActiveFedora::Datastreams.deprecation_behavior = @behavior
     end