ddr-models 2.8.0 → 2.9.0.rc1

data/spec/models/indexing_spec.rb

@@ -155,5 +155,13 @@ module Ddr::Models
       }
     end
 
+    describe "nested path" do
+      subject { FactoryGirl.build(:item) }
+      before { subject.nested_path = "/foo/bar/baz" }
+      specify {
+        expect(subject.index_fields[Indexing::NESTED_PATH]).to eq "/foo/bar/baz"
+        expect(subject.index_fields[Indexing::NESTED_PATH_TEXT]).to eq "/foo/bar/baz"
+      }
+    end
   end
 end

data/spec/models/item_spec.rb

@@ -46,4 +46,68 @@ RSpec.describe Item, type: :model do
     }
   end
 
+  describe "#default_structure" do
+    describe "when the item has no components" do
+      let(:expected) do
+        xml = <<-EOS
+            <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+              <metsHdr>
+                <agent ROLE="#{Ddr::Models::Structures::Agent::ROLE_CREATOR}">
+                  <name>#{Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT}</name>
+                </agent>
+              </metsHdr>
+              <structMap TYPE="#{Ddr::Models::Structure::TYPE_DEFAULT}" />
+            </mets>
+        EOS
+        xml
+      end
+      it "should be the appropriate structure" do
+        expect(subject.default_structure.to_xml).to be_equivalent_to(expected)
+      end
+    end
+    describe "when the item has components" do
+      let(:comp1) { FactoryGirl.create(:component) }
+      let(:comp2) { FactoryGirl.create(:component) }
+      let(:expected) do
+        xml = <<-EOS
+            <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+              <metsHdr>
+                <agent ROLE="#{Ddr::Models::Structures::Agent::ROLE_CREATOR}">
+                  <name>#{Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT}</name>
+                </agent>
+              </metsHdr>
+              <structMap TYPE="#{Ddr::Models::Structure::TYPE_DEFAULT}">
+                <div ORDER="1">
+                  <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4bbb" />
+                </div>
+                <div ORDER="2">
+                  <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4aaa" />
+                </div>
+              </structMap>
+            </mets>
+        EOS
+        xml
+      end
+      before do
+        comp1.local_id = "test002"
+        comp1.permanent_id = "ark:/99999/fk4aaa"
+        comp1.save!
+        comp2.local_id = "test001"
+        comp2.permanent_id = "ark:/99999/fk4bbb"
+        comp2.save!
+        subject.children << comp1
+        subject.children << comp2
+        subject.save!
+        allow(SecureRandom).to receive(:uuid).and_return("abc-def", "ghi-jkl")
+      end
+      after do
+        comp1.destroy
+        comp2.destroy
+      end
+      it "should be the appropriate structure" do
+        expect(subject.default_structure.to_xml).to be_equivalent_to(expected)
+      end
+    end
+  end
+
 end

data/spec/models/solr_document_spec.rb

@@ -207,6 +207,117 @@ EOS
     }
   end
 
+  describe "#intermediate_type" do
+    specify {
+      allow(subject).to receive(:has_intermediate_file?) { false }
+      expect(subject.intermediate_path).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:datastreams) do
+        {"intermediateFile"=>{"dsMIME"=>"audio/wav"}}
+      end
+      expect(subject.intermediate_type).to eq "audio/wav"
+    }
+  end
+
+  describe "#intermediate_path" do
+    specify {
+      allow(subject).to receive(:has_intermediate_file?) { false }
+      expect(subject.intermediate_path).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:datastreams) do
+        {"intermediateFile"=>{"dsLocation"=>"file:/foo/bar/baz.txt"}}
+      end
+      expect(subject.intermediate_path).to eq "/foo/bar/baz.txt"
+    }
+  end
+
+  describe "#intermediate_extension" do
+    let(:extensions) { {'audio/wav' => 'wav', 'video/quicktime' => 'mov'} }
+    before { allow(Ddr::Models).to receive(:preferred_file_extensions) { extensions } }
+    before { allow(subject).to receive(:has_intermediate_file?) { true } }
+    specify {
+      allow(subject).to receive(:has_intermediate_file?) { false }
+      expect(subject.intermediate_extension).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:intermediate_type) { 'audio/wav'}
+      expect(subject.intermediate_extension).to eq "wav"
+    }
+    specify {
+      allow(subject).to receive(:intermediate_type) { 'video/quicktime'}
+      expect(subject.intermediate_extension).to eq "mov"
+    }
+    specify {
+      allow(subject).to receive(:intermediate_type) { 'application/foo'}
+      allow(subject).to receive(:intermediate_extension_default) { "bin" }
+      expect(subject.intermediate_extension).to eq "bin"
+    }
+  end
+
+
+  describe "#captionable?" do
+    specify {
+      allow(subject).to receive(:has_datastream?).with(Ddr::Datastreams::CAPTION) { false }
+      expect(subject).not_to be_captionable
+    }
+    specify {
+      allow(subject).to receive(:has_datastream?).with(Ddr::Datastreams::CAPTION) { true }
+      expect(subject).to be_captionable
+    }
+  end
+
+  describe "#caption_type" do
+    specify {
+      allow(subject).to receive(:captionable?) { false }
+      expect(subject.caption_type).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:datastreams) do
+        {"caption"=>{"dsMIME"=>"text/vtt"}}
+      end
+      expect(subject.caption_type).to eq "text/vtt"
+    }
+  end
+
+  describe "#caption_path" do
+    specify {
+      allow(subject).to receive(:captionable?) { false }
+      expect(subject.caption_path).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:datastreams) do
+        {"caption"=>{"dsLocation"=>"file:/foo/bar/baz.txt"}}
+      end
+      expect(subject.caption_path).to eq "/foo/bar/baz.txt"
+    }
+  end
+
+  describe "#caption_extension" do
+    let(:extensions) { {'text/vtt' => 'vtt', 'application/zip' => 'zip'} }
+    before { allow(Ddr::Models).to receive(:preferred_file_extensions) { extensions } }
+    before { allow(subject).to receive(:captionable?) { true } }
+    specify {
+      allow(subject).to receive(:captionable?) { false }
+      expect(subject.caption_extension).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:caption_type) { 'text/vtt'}
+      expect(subject.caption_extension).to eq "vtt"
+    }
+    specify {
+      allow(subject).to receive(:caption_type) { 'application/zip'}
+      expect(subject.caption_extension).to eq "zip"
+    }
+    specify {
+      allow(subject).to receive(:caption_type) { 'application/foo'}
+      allow(subject).to receive(:caption_extension_default) { "bin" }
+      expect(subject.caption_extension).to eq "bin"
+    }
+  end
+
+
   describe "#streamable?" do
     specify {
       allow(subject).to receive(:has_datastream?).with(Ddr::Datastreams::STREAMABLE_MEDIA) { false }
@@ -231,6 +342,26 @@ EOS
     }
   end
 
+  describe "#streamable_media_extension" do
+    let(:extensions) { {'audio/mpeg' => 'mp3', 'video/mp4' => 'mp4'} }
+    before { allow(Ddr::Models).to receive(:preferred_file_extensions) { extensions } }
+    before { allow(subject).to receive(:streamable?) { true } }
+    specify {
+      allow(subject).to receive(:streamable?) { false }
+      expect(subject.streamable_media_extension).to be_nil
+    }
+    specify {
+      allow(subject).to receive(:streamable_media_type) { 'audio/mpeg'}
+      expect(subject.streamable_media_extension).to eq "mp3"
+    }
+    specify {
+      allow(subject).to receive(:streamable_media_type) { 'application/foo'}
+      allow(subject).to receive(:streamable_media_extension_default) { "bin" }
+      expect(subject.streamable_media_extension).to eq "bin"
+    }
+  end
+
+
   describe "#rights" do
     specify {
       obj = Item.create(rights: ["http://example.com"])

data/spec/support/shared_examples_for_captionable.rb

@@ -0,0 +1,23 @@
+RSpec.shared_examples "an object that cannot be captioned" do
+  it { is_expected.to_not be_captioned }
+  its(:captionable?) { is_expected.to be false }
+end
+
+RSpec.shared_examples "an object that can be captioned" do
+  it { is_expected.to_not be_captioned }
+  its(:captionable?) { is_expected.to be true }
+
+  describe "when caption file is present" do
+    before {
+      subject.add_file(fixture_file_upload('abcd1234.vtt', 'text/vtt'), 'caption')
+      subject.save!
+    }
+    specify {
+      expect(subject).to be_captioned
+      expect(subject.caption_path).to be_present
+      expect(subject.caption_path).to eq subject.caption.file_path
+      expect(subject.caption_type).to eq 'text/vtt'
+      expect(subject.caption_extension).to eq 'vtt'
+    }
+  end
+end

data/spec/support/shared_examples_for_streamable_media.rb

@@ -17,6 +17,7 @@ RSpec.shared_examples "an object that can be streamable" do
       expect(subject.streamable_media_type).to eq 'image/jpeg'
       expect(subject.streamable_media_path).to be_present
       expect(subject.streamable_media_path).to eq subject.streamableMedia.file_path
+      expect(subject.streamable_media_extension).to eq 'jpeg'
     }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.9.0.rc1
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -494,6 +494,7 @@ files:
 - lib/ddr/auth/web_auth_context.rb
 - lib/ddr/datastreams.rb
 - lib/ddr/datastreams/administrative_metadata_datastream.rb
+- lib/ddr/datastreams/caption_datastream.rb
 - lib/ddr/datastreams/content_datastream.rb
 - lib/ddr/datastreams/datastream_behavior.rb
 - lib/ddr/datastreams/delete_external_files.rb
@@ -551,6 +552,7 @@ files:
 - lib/ddr/models/admin_set.rb
 - lib/ddr/models/base.rb
 - lib/ddr/models/cache.rb
+- lib/ddr/models/captionable.rb
 - lib/ddr/models/contact.rb
 - lib/ddr/models/describable.rb
 - lib/ddr/models/engine.rb
@@ -683,6 +685,7 @@ files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/abcd1234.vtt
 - spec/fixtures/arrow1rightred_e0.gif
 - spec/fixtures/bird.jpg
 - spec/fixtures/extractedText1.txt
@@ -748,6 +751,7 @@ files:
 - spec/support/ezid_mock_identifier.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_auth_contexts.rb
+- spec/support/shared_examples_for_captionable.rb
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
 - spec/support/shared_examples_for_events.rb
@@ -777,9 +781,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11
@@ -869,6 +873,7 @@ test_files:
 - spec/factories/user_factories.rb
 - spec/fixtures/16bit.tif
 - spec/fixtures/8bit.tif
+- spec/fixtures/abcd1234.vtt
 - spec/fixtures/arrow1rightred_e0.gif
 - spec/fixtures/bird.jpg
 - spec/fixtures/extractedText1.txt
@@ -934,6 +939,7 @@ test_files:
 - spec/support/ezid_mock_identifier.rb
 - spec/support/shared_examples_for_associations.rb
 - spec/support/shared_examples_for_auth_contexts.rb
+- spec/support/shared_examples_for_captionable.rb
 - spec/support/shared_examples_for_ddr_models.rb
 - spec/support/shared_examples_for_describables.rb
 - spec/support/shared_examples_for_events.rb