ddr-models 2.11.0 → 3.0.0.alpha.1

data/spec/support/shared_examples_for_describables.rb

@@ -1,62 +1,67 @@
 RSpec.shared_examples "a describable object" do
 
-  context "having an identifier" do
+  let(:object) { described_class.new }
+
+  describe "having an identifier" do
     before do
-      subject.identifier = ["id001"]
-      subject.save!
+      object.descMetadata.identifier = ["id001"]
+      object.save(validate: false)
     end
-    it "is findable by identifier" do
-      expect(described_class.find_by_identifier('id001')).to include subject
+    it "should be findable by identifier" do
+      expect(described_class.find_by_identifier('id001')).to include object
     end
   end
+
   describe "#desc_metadata_terms" do
-    it "has a default value" do
-      expect(subject.desc_metadata_terms).to eq Ddr::Datastreams::DescriptiveMetadataDatastream.term_names
+    it "should have a default value" do
+      expect(object.desc_metadata_terms).to match_array(Ddr::Models::DescriptiveMetadata.unqualified_names)
     end
     describe "arguments" do
       it "with fixed results" do
-        expect(subject.desc_metadata_terms(:dcterms)).to eq(Ddr::Vocab::Vocabulary.term_names(RDF::DC11) + (Ddr::Vocab::Vocabulary.term_names(RDF::DC) - Ddr::Vocab::Vocabulary.term_names(RDF::DC11)))
-        expect(subject.desc_metadata_terms(:dcterms)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC)
-        expect(subject.desc_metadata_terms(:duke)).to eq Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
-        expect(subject.desc_metadata_terms(:dcterms_elements11)).to eq Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
-        expect(subject.desc_metadata_terms(:defined_attributes)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
+        expect(object.desc_metadata_terms(:dcterms))
+          .to eq(Ddr::Models::MetadataMapper.dc11.unqualified_names + (Ddr::Models::MetadataMapper.dcterms.unqualified_names - Ddr::Models::MetadataMapper.dc11.unqualified_names))
+        expect(object.desc_metadata_terms(:dcterms))
+          .to match_array(Ddr::Models::MetadataMapper.dcterms.unqualified_names)
+        expect(object.desc_metadata_terms(:duke)).to eq Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
+        expect(object.desc_metadata_terms(:dcterms_elements11)).to eq Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
+        expect(object.desc_metadata_terms(:defined_attributes)).to match_array Ddr::Vocab::Vocabulary.term_names(RDF::DC11)
       end
       context "with variable results" do
         before do
-          subject.descMetadata.title = ["Object Title"]
-          subject.descMetadata.creator = ["Duke University Libraries"]
-          subject.descMetadata.identifier = ["id001"]
-          subject.save!
+          object.descMetadata.title = ["Object Title"]
+          object.descMetadata.creator = ["Duke University Libraries"]
+          object.descMetadata.identifier = ["id001"]
+          object.save
         end
-        it "accepts an :empty argument" do
-          expect(subject.desc_metadata_terms(:empty)).to eq(subject.desc_metadata_terms - [:title, :creator, :identifier])
+        it "should accept an :empty argument" do
+          expect(object.desc_metadata_terms(:empty)).to eq(object.desc_metadata_terms - [:title, :creator, :identifier])
         end
-        it "accepts a :present argument" do
-          expect(subject.desc_metadata_terms(:present)).to match_array [:title, :creator, :identifier]
+        it "should accept a :present argument" do
+          expect(object.desc_metadata_terms(:present)).to match_array [:title, :creator, :identifier]
         end
       end
     end
   end
   describe "#set_desc_metadata" do
-    let(:term_values_hash) { subject.desc_metadata_terms.each_with_object({}) {|t, memo| memo[t] = ["Value"]} }
-    it "sets the descMetadata terms to the values of the matching keys in the hash" do
-      subject.desc_metadata_terms.each do |t|
-        expect(subject).to receive(:set_desc_metadata_values).with(t, ["Value"])
+    let(:term_values_hash) { object.desc_metadata_terms.each_with_object({}) {|t, memo| memo[t] = ["Value"]} }
+    it "should set the descMetadata terms to the values of the matching keys in the hash" do
+      object.desc_metadata_terms.each do |t|
+        expect(object).to receive(:set_desc_metadata_values).with(t, ["Value"])
       end
-      subject.set_desc_metadata(term_values_hash)
+      object.set_desc_metadata(term_values_hash)
     end
   end
   describe "#set_desc_metadata_values" do
     context "when values == nil" do
-      it "sets the term to an empty value" do
-        subject.set_desc_metadata_values(:title, nil)
-        expect(subject.descMetadata.title).to be_empty
+      it "should set the term to an empty value" do
+        object.set_desc_metadata_values(:title, nil)
+        expect(object.descMetadata.title).to be_empty
       end
     end
     context "when values is an array" do
-      it "rejects empty values from the array" do
-        subject.set_desc_metadata_values(:title, ["Object Title", nil, "Alternative Title", ""])
-        expect(subject.descMetadata.title).to eq ["Object Title", "Alternative Title"]
+      it "should reject empty values from the array" do
+        object.set_desc_metadata_values(:title, ["Object Title", nil, "Alternative Title", ""])
+        expect(object.descMetadata.title).to eq ["Object Title", "Alternative Title"]
       end
     end
   end

data/spec/support/shared_examples_for_governables.rb

@@ -1,9 +1,8 @@
 RSpec.shared_examples "a governable object" do
   let(:object) do
     described_class.new.tap do |obj|
-      obj.title = [ 'Describable' ]
-      obj.admin_set = "foo" if obj.is_a?(Collection)
-      obj.identifier = [ 'id001' ]
+      obj.descMetadata.title = [ 'Describable' ]
+      obj.descMetadata.identifier = [ 'id001' ]
       obj.save(validate: false)
     end
   end

data/spec/support/shared_examples_for_has_content.rb

@@ -1,21 +1,12 @@
+require 'spec_helper'
 require 'openssl'
 
 RSpec.shared_examples "an object that can have content" do
 
-  subject { described_class.new(title: [ "I Have Content!" ]) }
+  subject { described_class.new(dc_title: [ "I Have Content!" ]) }
 
   before { allow(Resque).to receive(:enqueue) }
 
-  its(:can_have_content?) { is_expected.to be true }
-  it { is_expected.to_not have_content }
-  specify {
-    allow(subject.content).to receive(:has_content?) { true }
-    expect(subject).to have_content
-  }
-
-  its(:can_have_children?) { is_expected.to be false }
-  it { is_expected.to_not have_children }
-
   it "should delegate :validate_checksum! to :content" do
     checksum = "dea56f15b309e47b74fa24797f85245dda0ca3d274644a96804438bbd659555a"
     expect(subject.content).to receive(:validate_checksum!).with(checksum, "SHA-256")
@@ -29,51 +20,56 @@ RSpec.shared_examples "an object that can have content" do
     its(:last_virus_check_outcome) { should eq(virus_check.outcome) }
   end
 
-  describe "indexing" do
-    let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-    before { subject.upload file }
-    it "should index the content ds control group" do
-      expect(subject.to_solr).to include(Ddr::Index::Fields::CONTENT_CONTROL_GROUP)
-    end
-  end
-
   describe "extracted text" do
     describe "when it is not present" do
       its(:has_extracted_text?) { should be false }
-      its(:to_solr) { is_expected.not_to include(Ddr::Index::Fields::EXTRACTED_TEXT) }
+      its(:to_solr) { should_not include(Ddr::Index::Fields::EXTRACTED_TEXT) }
     end
     describe "when it is present" do
       before { subject.extractedText.content = "This is my text. See Spot run." }
       its(:has_extracted_text?) { should be true }
-      its(:to_solr) { is_expected.to include(Ddr::Index::Fields::EXTRACTED_TEXT) }
+      it "should be indexed" do
+        expect(subject.to_solr[Ddr::Index::Fields::EXTRACTED_TEXT]).to eq("This is my text. See Spot run.")
+      end
     end
   end
 
   describe "adding a file" do
     let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
-    before { subject.add_file file, "content" }
-    its(:original_filename) { should eq("imageA.tif") }
-    its(:content_type) { should eq("image/tiff") }
-    it "should create a 'virus check' event for the object" do
-      expect(Ddr::Events::VirusCheckEvent).to receive(:create)
-      subject.save!
+    context "defaults" do
+      before { subject.add_file file, path: "content", mime_type: "image/tiff" }
+      its(:content_type) { should eq("image/tiff") }
+      it "should create a 'virus check' event for the object" do
+        expect { subject.save }.to change { subject.virus_checks.count }
+      end
     end
   end
 
   describe "save" do
+
     describe "when new content is present" do
+
       context "and it's a new object" do
-        before { subject.add_file file, "content" }
+        before { subject.add_file file, path: "content" }
         let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
         it "should generate derivatives" do
-          expect_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:update_derivatives)
+          expect(subject.derivatives).to receive(:update_derivatives)
           subject.save
         end
-        it "should notify that content has changed" do
-          callback = lambda { |*args| args }
-          ActiveSupport::Notifications.subscribed(callback, "content_changed.content.repo_file") do
-            expect(callback).to receive(:call) { nil }
-            subject.save
+        describe "file characterization" do
+          context "characterize files is false" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
+            it "should not enqueue a FITS file characterization job" do
+              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.save
+            end
+          end
+          context "characterize files is true" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
+            it "should enqueue a FITS file characterization job" do
+              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.save
+            end
           end
         end
       end
@@ -82,36 +78,23 @@ RSpec.shared_examples "an object that can have content" do
         before { subject.upload! fixture_file_upload('imageA.tif', 'image/tiff') }
         let(:file) { fixture_file_upload("imageB.tif", "image/tiff") }
         it "should generate derivatives" do
-          expect_any_instance_of(Ddr::Managers::DerivativesManager).to receive(:update_derivatives)
+          expect(subject.derivatives).to receive(:update_derivatives)
           subject.upload! file
         end
-        it "should notify that content has changed" do
-          callback = lambda { |*args| args }
-          ActiveSupport::Notifications.subscribed(callback, "content_changed.content.repo_file") do
-            expect(callback).to receive(:call) { nil }
-            subject.upload! file
+        describe "file characterization" do
+          context "characterize files is false" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { false } }
+            it "should not enqueue a FITS file characterization job" do
+              expect(Resque).to_not receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.upload! file
+            end
           end
-        end
-        context "and it is saved with :skip_update_derivatives=>true" do
-          it "does not generate derivatives" do
-            expect_any_instance_of(Ddr::Managers::DerivativesManager).not_to receive(:update_derivatives)
-            subject.upload file
-            subject.save(skip_update_derivatives: true)
-          end
-        end
-        context "and the file has not previously been characterized" do
-          it "does not try to delete the existing characterization data" do
-            expect(subject.fits).not_to receive(:delete)
-            subject.upload! file
-          end
-        end
-        context "and the file has new characterization data" do
-          before {
-            subject.fits.content = fixture_file_upload("fits/document.xml")
-          }
-          it "preserves the characterization data" do
-            subject.upload! file
-            expect(subject.reload.fits).to have_content
+          context "characterize files is true" do
+            before { allow(Ddr::Models).to receive(:characterize_files?) { true } }
+            it "should enqueue a FITS file characterization job" do
+              expect(Resque).to receive(:enqueue).with(Ddr::Jobs::FitsFileCharacterization, instance_of(String))
+              subject.upload! file
+            end
           end
         end
       end
@@ -121,7 +104,7 @@ RSpec.shared_examples "an object that can have content" do
   describe "#upload" do
     let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     it "should add the file to the content datastream" do
-      expect(subject).to receive(:add_file).with(file, "content", {})
+      expect(subject).to receive(:add_file).with(file, { path: "content" })
       subject.upload(file)
     end
   end
@@ -129,48 +112,10 @@ RSpec.shared_examples "an object that can have content" do
   describe "#upload!" do
     let(:file) { fixture_file_upload("imageA.tif", "image/tiff") }
     it "should add the file to the content datastream and save the object" do
-      expect(subject).to receive(:add_file).with(file, "content", {}).and_call_original
+      expect(subject).to receive(:add_file).with(file, { path: "content" }).and_call_original
       expect(subject).to receive(:save)
       subject.upload!(file)
     end
   end
 
-  describe "deleting / deaccessioning" do
-    let(:file1) { fixture_file_upload("sample.pdf") }
-    let(:file2) { fixture_file_upload("sample.docx") }
-    before do
-      subject.upload! file1
-      @path1 = subject.content.file_path
-      subject.upload! file2
-      @path2 = subject.content.file_path
-    end
-    describe "#destroy" do
-      it "deletes the content files" do
-        expect(::File.exist?(@path1)).to be true
-        expect(::File.exist?(@path2)).to be true
-        subject.destroy
-        expect(::File.exist?(@path1)).to be false
-        expect(::File.exist?(@path2)).to be false
-      end
-    end
-    describe "#deaccession" do
-      it "deletes the content files" do
-        expect(::File.exist?(@path1)).to be true
-        expect(::File.exist?(@path2)).to be true
-        subject.deaccession
-        expect(::File.exist?(@path1)).to be false
-        expect(::File.exist?(@path2)).to be false
-      end
-    end
-    describe "deleting the 'content' datastream" do
-      it "deletes the content files" do
-        expect(::File.exist?(@path1)).to be true
-        expect(::File.exist?(@path2)).to be true
-        subject.content.delete
-        expect(::File.exist?(@path1)).to be false
-        expect(::File.exist?(@path2)).to be false
-      end
-    end
-  end
-
 end

data/spec/support/shared_examples_for_indexing.rb

@@ -3,13 +3,13 @@ RSpec.shared_examples "an object that has a display title" do
     let(:object) { described_class.new }
     subject { object.title_display }
     context "has title" do
-      before { object.title = [ 'Title' ] }
+      before { object.descMetadata.title = [ 'Title' ] }
       it "should return the first title" do
         expect(subject).to eq('Title')
       end
     end
     context "has no title, has identifier" do
-      before { object.identifier = [ 'id001' ] }
+      before { object.descMetadata.identifier = [ 'id001' ] }
       it "should return the first identifier" do
         expect(subject).to eq('id001')
       end
@@ -27,9 +27,9 @@ RSpec.shared_examples "an object that has a display title" do
     #   end
     # end
     context "has no title, no identifier, no original_filename" do
-      let(:object) { described_class.new(:pid => 'duke:test') }
+      let(:object) { described_class.new(:pid => 'duke-test') }
       it "should return the PID in square brackets" do
-        expect(subject).to eq "[duke:test]"
+        expect(subject).to eq "[duke-test]"
       end
     end
   end
@@ -41,7 +41,7 @@ RSpec.shared_examples "an object that has identifiers" do
     subject { object.all_identifiers }
     context "has descriptive identifiers, local ID, permanent ID, and PID" do
       before do
-        object.identifier = [ 'ID001', 'ID002' ]
+        object.descMetadata.identifier = [ 'ID001', 'ID002' ]
         object.local_id = 'LOCAL_ID_A'
         object.permanent_id = 'ark:/999999/cd3'
       end
@@ -56,4 +56,4 @@ RSpec.shared_examples "an object that has identifiers" do
       end
     end
   end
-end
+end

data/spec/support/shared_examples_for_non_collection_models.rb

@@ -3,39 +3,8 @@ RSpec.shared_examples "a non-collection model" do
     subject { described_class.new }
     let(:user) { FactoryGirl.build(:user) }
     before { subject.grant_roles_to_creator(user) }
-    it "includes the Editor role in resource scope" do
+    it "should include the Editor role in resource scope" do
       expect(subject.roles.to_a).to eq([Ddr::Auth::Roles::Role.build(type: "Editor", agent: user.agent, scope: "resource")])
     end
   end
-
-  describe "admin set" do
-    subject { described_class.new }
-    let(:collection) { FactoryGirl.build(:collection) }
-    let(:admin_set) { Ddr::Models::AdminSet.new(code: "foobar", title: "FooBar") }
-    before {
-      allow(Ddr::Models::AdminSet).to receive(:find_by_code).with("foobar") { admin_set }
-      collection.admin_set = "foobar"
-      collection.save!
-      subject.admin_policy = collection
-    }
-    it "indexes the admin set title" do
-      expect(subject.to_solr[Ddr::Index::Fields::ADMIN_SET_TITLE]).to eq("FooBar")
-    end
-  end
-
-  describe "collection title" do
-    subject { described_class.new }
-    let(:collection) { FactoryGirl.create(:collection) }
-    before {
-      subject.admin_policy = collection
-    }
-    it "indexes the collection title" do
-      expect(subject.to_solr[Ddr::Index::Fields::COLLECTION_TITLE]).to eq("Test Collection")
-    end
-  end
-
-  describe "attachments" do
-    its(:can_have_attachments?) { is_expected.to be false }
-    it { is_expected.not_to have_attachments }
-  end
 end

data/spec/support/structural_metadata_helper.rb

@@ -1,19 +1,13 @@
 require 'spec_helper'
 
 def simple_structure_document
-  Nokogiri::XML(simple_structure_xml) do |config|
+  Nokogiri::XML(simple_structure) do |config|
     config.noblanks
   end
 end
 
 def nested_structure_document
-  Nokogiri::XML(nested_structure_xml) do |config|
-    config.noblanks
-  end
-end
-
-def nested_structure_mptr_document
-  Nokogiri::XML(nested_structure_mptr_xml) do |config|
+  Nokogiri::XML(nested_structure) do |config|
     config.noblanks
   end
 end
@@ -24,99 +18,38 @@ def multiple_struct_maps_structure_document
   end
 end
 
-def simple_structure_xml
+def simple_structure
   <<-eos
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
-      <metsHdr>
-        <agent ROLE="CREATOR">
-          <name>#{Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT}</name>
-        </agent>
-      </metsHdr>
-      <fileSec>
-        <fileGrp>
-          <file ID="abc" USE="foo">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ab3" />
-          </file>
-          <file ID="def" USE="bar">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4cd9" />
-          </file>
-          <file ID="ghi" USE="baz">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ef1" />
-          </file>
-        </fileGrp>
-      </fileSec>
       <structMap TYPE="default">
         <div ORDER="1">
-          <fptr FILEID="abc" />
+          <fptr CONTENTIDS="info:fedora/test:6" />
         </div>
         <div ORDER="2">
-          <fptr FILEID="def" />
+          <fptr CONTENTIDS="info:fedora/test:5" />
         </div>
         <div ORDER="3">
-          <fptr FILEID="ghi" />
+          <fptr CONTENTIDS="info:fedora/test:7" />
         </div>
       </structMap>
     </mets>
   eos
 end
 
-def nested_structure_xml
+def nested_structure
   <<-eos
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
-      <metsHdr>
-        <agent ROLE="CREATOR">
-          <name>Sam Spade</name>
-        </agent>
-      </metsHdr>
-      <fileSec>
-        <fileGrp>
-          <file ID="abc" USE="foo">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ab3" />
-          </file>
-          <file ID="def" USE="bar">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4cd9" />
-          </file>
-          <file ID="ghi" USE="baz">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ef1" />
-          </file>
-        </fileGrp>
-      </fileSec>
       <structMap TYPE="default">
         <div ORDER="1" LABEL="Front">
-          <fptr FILEID="abc" />
+          <fptr CONTENTIDS="info:fedora/test:5" />
         </div>
         <div ORDER="2" LABEL="Back">
           <div ORDER="1" LABEL="Top">
-            <fptr FILEID="def" />
-          </div>
-          <div ORDER="2" LABEL="Bottom">
-            <fptr FILEID="ghi" />
-          </div>
-        </div>
-      </structMap>
-    </mets>
-  eos
-end
-
-def nested_structure_mptr_xml
-  <<-eos
-    <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
-      <metsHdr>
-        <agent ROLE="CREATOR">
-          <name>Sam Spade</name>
-        </agent>
-      </metsHdr>
-      <structMap TYPE="default">
-        <div ORDER="1" LABEL="Front">
-          <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4ab3" />
-        </div>
-        <div ORDER="2" LABEL="Back">
-          <div ORDER="1" LABEL="Top">
-            <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4cd9" />
-          </div>
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
           <div ORDER="2" LABEL="Bottom">
-            <mptr LOCTYPE="ARK" xlink:href="ark:/99999/fk4ef1" />
-          </div>
+            <fptr CONTENTIDS="info:fedora/test:6" />
+          </div>    
         </div>
       </structMap>
     </mets>
@@ -126,181 +59,77 @@ end
 def multiple_struct_maps_structure
   <<-eos
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
-      <fileSec>
-        <fileGrp>
-          <file ID="abc" USE="foo">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ab3" />
-          </file>
-          <file ID="def" USE="bar">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4cd9" />
-          </file>
-          <file ID="ghi" USE="baz">
-            <FLocat LOCTYPE="ARK" xlink:href="ark:/99999/fk4ef1" />
-          </file>
-        </fileGrp>
-      </fileSec>
       <structMap TYPE="default">
         <div ORDER="1" LABEL="Front">
-          <fptr FILEID="abc" />
+          <fptr CONTENTIDS="info:fedora/test:5" />
         </div>
         <div ORDER="2" LABEL="Back">
           <div ORDER="1" LABEL="Top">
-            <fptr FILEID="def" />
-          </div>
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
           <div ORDER="2" LABEL="Bottom">
-            <fptr FILEID="ghi" />
-          </div>
+            <fptr CONTENTIDS="info:fedora/test:6" />
+          </div>    
         </div>
       </structMap>
       <structMap TYPE="reverse">
         <div ORDER="1" LABEL="Back">
           <div ORDER="1" LABEL="Bottom">
-            <fptr FILEID="ghi" />
+            <fptr CONTENTIDS="info:fedora/test:6" />
           </div>
           <div ORDER="2" LABEL="Top">
-            <fptr FILEID="def" />
-          </div>
+            <fptr CONTENTIDS="info:fedora/test:7" />
+          </div>    
         </div>
         <div ORDER="2" LABEL="Front">
-          <fptr FILEID="abc" />
+          <fptr CONTENTIDS="info:fedora/test:5" />
         </div>
       </structMap>
     </mets>
   eos
 end
 
-def simple_structure_dereferenced_hash
-  yaml = <<-eos
-    default:
-      :type: 'default'
-      :contents:
-        - :order: '1'
-          :contents:
-            - :repo_id: 'test:7'
-              :use: 'foo'
-        - :order: '2'
-          :contents:
-            - :repo_id: 'test:8'
-              :use: 'bar'
-        - :order: '3'
-          :contents:
-            - :repo_id: 'test:9'
-              :use: 'baz'
-  eos
-  YAML.load(yaml)
-end
-
-def nested_structure_dereferenced_hash
-  yaml = <<-eos
-    default:
-      :type: 'default'
-      :contents:
-        - :label: 'Front'
-          :order: '1'
-          :contents:
-            - :repo_id: 'test:7'
-              :use: 'foo'
-        - :label: 'Back'
-          :order: '2'
-          :contents:
-            - :label: 'Top'
-              :order: '1'
-              :contents:
-                - :repo_id: 'test:8'
-                  :use: 'bar'
-            - :label: 'Bottom'
-              :order: '2'
-              :contents:
-                - :repo_id: 'test:9'
-                  :use: 'baz'
-  eos
-  YAML.load(yaml)
-end
-
-def nested_structure_mptr_dereferenced_hash
-  yaml = <<-eos
-    default:
-      :type: 'default'
-      :contents:
-        - :label: 'Front'
-          :order: '1'
-          :contents:
-            - :repo_id: 'test:7'
-        - :label: 'Back'
-          :order: '2'
-          :contents:
-            - :label: 'Top'
-              :order: '1'
-              :contents:
-                - :repo_id: 'test:8'
-            - :label: 'Bottom'
-              :order: '2'
-              :contents:
-                - :repo_id: 'test:9'
-  eos
-  YAML.load(yaml)
-end
-
-def multiple_struct_maps_structure_dereferenced_hash
-  yaml = <<-eos
-    default:
-      :type: 'default'
-      :contents:
-        - :label: 'Front'
-          :order: '1'
-          :contents:
-            - :repo_id: 'test:7'
-              :use: 'foo'
-        - :label: 'Back'
-          :order: '2'
-          :contents:
-            - :label: 'Top'
-              :order: '1'
-              :contents:
-                - :repo_id: 'test:8'
-                  :use: 'bar'
-            - :label: 'Bottom'
-              :order: '2'
-              :contents:
-                - :repo_id: 'test:9'
-                  :use: 'baz'
-    reverse:
-      :type: 'reverse'
-      :contents:
-        - :label: 'Back'
-          :order: '1'
-          :contents:
-            - :label: 'Bottom'
-              :order: '1'
-              :contents:
-                - :repo_id: 'test:9'
-                  :use: 'baz'
-            - :label: 'Top'
-              :order: '2'
-              :contents:
-                - :repo_id: 'test:8'
-                  :use: 'bar'
-        - :label: 'Front'
-          :order: '2'
-          :contents:
-            - :repo_id: 'test:7'
-              :use: 'foo'
-  eos
-  YAML.load(yaml)
+def simple_structure_query_response
+  [{"system_create_dtsi"=>"2015-06-17T21:04:24Z", "system_modified_dtsi"=>"2015-06-17T21:04:56Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:6", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"bf84faa89d6b25924bc06357f7c33347a602e2ec8df9c1020ec98015fe571760\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:56Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:6+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"4d227bc972634ba2126eefff207fb3b35f6ff802a210ad7945d2ec60360076dd\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:24Z\",\"objLastModDate\":\"2015-06-17T21:04:24Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A6/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc001"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc001", "internal_uri_ssi"=>"info:fedora/test:6", "identifier_ssi"=>"abc001", "access_role_ssi"=>"[]", "_version_"=>1504261016868880384, "timestamp"=>"2015-06-17T21:04:56.958Z"}, {"system_create_dtsi"=>"2015-06-17T21:03:58Z", "system_modified_dtsi"=>"2015-06-17T21:04:54Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:5", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"6a7f1cbe6e435991ae3bba134e52e7a275af8a232b209ac725fa54fdd81bb973\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:54Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:5+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"8b106726ca2d39d9a2e187fc9da2e58b25bd3553031012515ae31cf4fbe520e9\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:03:58Z\",\"objLastModDate\":\"2015-06-17T21:03:58Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A5/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc002"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc002", "internal_uri_ssi"=>"info:fedora/test:5", "identifier_ssi"=>"abc002", "access_role_ssi"=>"[]", "_version_"=>1504261014501195776, "timestamp"=>"2015-06-17T21:04:54.701Z"}, {"system_create_dtsi"=>"2015-06-17T21:04:46Z", "system_modified_dtsi"=>"2015-06-17T21:04:59Z", "object_state_ssi"=>"A", "active_fedora_model_ssi"=>"Component", "id"=>"test:7", "object_profile_ssm"=>["{\"datastreams\":{\"RELS-EXT\":{\"dsLabel\":\"Fedora Object-to-Object Relationship Metadata\",\"dsVersionID\":\"RELS-EXT.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/rdf+xml\",\"dsFormatURI\":null,\"dsControlGroup\":\"X\",\"dsSize\":408,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+RELS-EXT+RELS-EXT.1\",\"dsLocationType\":null,\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"cb385ff9a55b5fe24e8c2a8159fc928e3ee582ef312955132d34282676102a6a\"},\"descMetadata\":{\"dsLabel\":\"Descriptive Metadata for this object\",\"dsVersionID\":\"descMetadata.1\",\"dsCreateDate\":\"2015-06-17T21:04:59Z\",\"dsState\":\"A\",\"dsMIME\":\"application/n-triples\",\"dsFormatURI\":null,\"dsControlGroup\":\"M\",\"dsSize\":70,\"dsVersionable\":true,\"dsInfoType\":null,\"dsLocation\":\"test:7+descMetadata+descMetadata.1\",\"dsLocationType\":\"INTERNAL_ID\",\"dsChecksumType\":\"SHA-256\",\"dsChecksum\":\"523ee1e5d55d188bd17b2789e4c9109c8f9d0170b63af1219de8a74d4f32966a\"},\"rightsMetadata\":{},\"properties\":{},\"thumbnail\":{},\"adminMetadata\":{},\"content\":{},\"extractedText\":{},\"multiresImage\":{},\"structMetadata\":{}},\"objLabel\":null,\"objOwnerId\":\"fedoraAdmin\",\"objModels\":[\"info:fedora/fedora-system:FedoraObject-3.0\"],\"objCreateDate\":\"2015-06-17T21:04:46Z\",\"objLastModDate\":\"2015-06-17T21:04:46Z\",\"objDissIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewMethodIndex\",\"objItemIndexViewURL\":\"http://localhost:8983/fedora/objects/test%3A7/methods/fedora-system%3A3/viewItemIndex\",\"objState\":\"A\"}"], "identifier_tesim"=>["abc003"], "is_part_of_ssim"=>["info:fedora/test:2"], "has_model_ssim"=>["info:fedora/afmodel:Component"], "title_ssi"=>"abc003", "internal_uri_ssi"=>"info:fedora/test:7", "identifier_ssi"=>"abc003", "access_role_ssi"=>"[]", "_version_"=>1504261019487174656, "timestamp"=>"2015-06-17T21:04:59.455Z"}]
 end
 
 def simple_structure_to_json
-  simple_structure_dereferenced_hash.to_json
-end
-
-def nested_structure_to_json
-  nested_structure_dereferenced_hash.to_json
-end
-
-def nested_structure_mptr_to_json
-  nested_structure_mptr_dereferenced_hash.to_json
+  j = <<-eos
+    {\"default\":
+      {\"type\":\"default\",
+        \"divs\":[{\"order\":\"1\",\"fptrs\":[\"test:6\"],\"divs\":[]},
+                  {\"order\":\"2\",\"fptrs\":[\"test:5\"],\"divs\":[]},
+                  {\"order\":\"3\",\"fptrs\":[\"test:7\"],\"divs\":[]}
+                 ]
+      }
+    }
+  eos
+  j.gsub(/\s+/, "")
 end
 
 def multiple_struct_maps_structure_to_json
-  multiple_struct_maps_structure_dereferenced_hash.to_json
-end
+  j = <<-eos
+    {\"default\":
+      {\"type\":\"default\",
+        \"divs\":[{\"label\":\"Front\",\"order\":\"1\",\"fptrs\":[\"test:5\"],\"divs\":[]},
+                  {\"label\":\"Back\",\"order\":\"2\",\"fptrs\":[],
+                    \"divs\":[{\"label\":\"Top\",\"order\":\"1\",\"fptrs\":[\"test:7\"],\"divs\":[]},
+                              {\"label\":\"Bottom\",\"order\":\"2\",\"fptrs\":[\"test:6\"],\"divs\":[]}
+                             ]
+                  }
+                 ]
+      },
+     \"reverse\":
+      {\"type\":\"reverse\",
+        \"divs\":[{\"label\":\"Back\",\"order\":\"1\",\"fptrs\":[],
+                    \"divs\":[{\"label\":\"Bottom\",\"order\":\"1\",\"fptrs\":[\"test:6\"],\"divs\":[]},
+                              {\"label\":\"Top\",\"order\":\"2\",\"fptrs\":[\"test:7\"],\"divs\":[]}
+                             ]
+                  },
+                  {\"label\":\"Front\",\"order\":\"2\",\"fptrs\":[\"test:5\"],\"divs\":[]}
+                 ]
+      }
+    }    
+  eos
+  j.gsub(/\s+/, "")
+end