ddr-models 3.0.0.beta.1 → 3.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a968b891893ea815c1d2cdfd34f7b30fd7b0037
-  data.tar.gz: ab7b098e5f87fa7f31793e878206031bd010c98b
+  metadata.gz: 75efc0f919210a7a3c4f77818f3d48191485bd5c
+  data.tar.gz: a831671103f6e4d9e3b2c0d5ff60ecd217292836
 SHA512:
-  metadata.gz: 76508b87a3e44c630e445d2ac5f89286ff08c59ffac61f07902e5e9e3ef59d54db78e2b1707d578f905c4c682008fc178ce770f8b61aa326a67490db2975a727
-  data.tar.gz: 3b288f688a6513a82feada181e1fe8c60dde16fbb4bba03c809b5c0dcc21730008e551ab6c5575fa63f01bec9fd861f757431e5dcb09b664d7e091e37fcf11a7
+  metadata.gz: 311a0413074b9c8b82cad7f373d56f1a8dc12c0177183e587f4c571463b3f04abce3f142036fb99fcaf2a7b88977caa4a6df3d6d950426266e73e37cfa172c33
+  data.tar.gz: 85ee619d6263ebe046185b267d695804635e3defb72bf58749909317d0089f60344e9cc9fba0e044be4f71866eca03c32c1864ccc69d3f67a3e3f6e38a673ca7

data/lib/ddr/auth/roles/role_set_manager.rb

@@ -20,7 +20,7 @@ module Ddr::Auth
         if role.is_a?(Role)
           role_set.include?(role)
         else
-          !where(role).empty?
+          granted? Role.new(role)
         end
       end
 

data/lib/ddr/index/fields.rb

@@ -40,6 +40,7 @@ module Ddr::Index
     DOI                         = Field.new :doi, :symbol
     EAD_ID                      = Field.new :ead_id, :stored_sortable
     EXTRACTED_TEXT              = Field.new :extracted_text, :searchable, type: :text
+    FCREPO3_PID                 = Field.new :fcrepo3_pid, :stored_sortable
     HAS_MODEL                   = Field.new :has_model, :symbol
     IDENTIFIER_ALL              = Field.new :identifier_all, :symbol
     IS_ATTACHED_TO              = Field.new :is_attached_to, :symbol

data/lib/ddr/models/base.rb

@@ -119,50 +119,5 @@ module Ddr::Models
       self
     end
 
-    # Moves the first (descriptive metadata) identifier into
-    # (administrative metadata) local_id according to the following
-    # rubric:
-    #
-    # No existing local_id:
-    #   - Set local_id to first identifier value
-    #   - Remove first identifier value
-    #
-    # Existing local_id:
-    #   Same as first identifier value
-    #     - Remove first identifier value
-    #   Not same as first identifier value
-    #     :replace option is true
-    #       - Set local_id to first identifier value
-    #       - Remove first identifier value
-    #     :replace option is false
-    #       - Do nothing
-    #
-    # Returns true or false depending on whether the object was
-    # changed by this method
-    def move_first_identifier_to_local_id(replace: true)
-      moved = false
-      identifiers = descMetadata.identifier.to_a
-      first_id = identifiers.shift
-      if first_id
-        if local_id.blank?
-          self.local_id = first_id
-          self.descMetadata.identifier = identifiers
-          moved = true
-        else
-          if local_id == first_id
-            self.descMetadata.identifier = identifiers
-            moved = true
-          else
-            if replace
-              self.local_id = first_id
-              self.descMetadata.identifier = identifiers
-              moved = true
-            end
-          end
-        end
-      end
-      moved
-    end
-
   end
 end

data/lib/ddr/models/has_admin_metadata.rb

@@ -29,6 +29,10 @@ module Ddr::Models
                predicate: Ddr::Vocab::Asset.eadId,
                multiple: false
 
+      property :fcrepo3_pid,
+               predicate: RDF::URI("info:fedora/fedora-system:def/model#PID"),
+               multiple: false
+
       property :license,
                predicate: RDF::DC.license,
                multiple: false

data/lib/ddr/models/has_children.rb

@@ -4,8 +4,12 @@ module Ddr
 
       def first_child
         child_class = self.class.reflect_on_association(:children).klass
-        solr_field = child_class.reflect_on_association(:parent).solr_key
-        child_class.where(solr_field => id).order("#{Ddr::Index::Fields::LOCAL_ID} ASC").first
+        if has_struct_metadata?
+          child_class.find(structure.default_struct_map_ids.first)
+        else
+          solr_field = child_class.reflect_on_association(:parent).solr_key
+          child_class.where(solr_field => id).order("#{Ddr::Index::Fields::LOCAL_ID} ASC").first
+        end
       end
 
     end

data/lib/ddr/models/has_struct_metadata.rb

@@ -32,7 +32,7 @@ module Ddr
       private
 
       def find_children
-        query = association_query(:children)
+        query = ActiveFedora::SolrService.construct_query_for_rel([[ self.class.reflect_on_association(:children), self.id ]])
         sort = "#{Ddr::Index::Fields::LOCAL_ID} ASC, #{Ddr::Index::Fields::OBJECT_CREATE_DATE} ASC"
         ActiveFedora::SolrService.query(query, sort: sort, rows: 999999)
       end
@@ -50,9 +50,9 @@ module Ddr
         div
       end
 
-      def create_fptr(stru, div, pid)
+      def create_fptr(stru, div, id)
         fptr = Nokogiri::XML::Node.new('fptr', stru.as_xml_document)
-        fptr['CONTENTIDS'] = "info:fedora/#{pid}"
+        fptr['CONTENTIDS'] = id
         div.add_child(fptr)
       end
 

data/lib/ddr/models/indexing.rb

@@ -22,6 +22,7 @@ module Ddr
           DISPLAY_FORMAT        => display_format,
           DOI                   => doi,
           EAD_ID                => ead_id,
+          FCREPO3_PID           => fcrepo3_pid,
           IDENTIFIER_ALL        => all_identifiers,
           LICENSE               => license,
           LOCAL_ID              => local_id,

data/lib/ddr/models/struct_div.rb

@@ -43,7 +43,7 @@ module Ddr
       private
 
       def fptr_pids(div_node)
-        div_node.xpath('xmlns:fptr').map { |fptr_node| fptr_node["CONTENTIDS"].gsub('info:fedora/', '') }
+        div_node.xpath('xmlns:fptr').map { |fptr_node| fptr_node["CONTENTIDS"] }
       end
 
       def subdivs(structmap_or_div_node)

data/lib/ddr/models/structure.rb

@@ -13,6 +13,14 @@ module Ddr
         @struct_maps ||= build_struct_maps(structMap_nodes)
       end
 
+      def default_struct_map
+        struct_maps['default'] || struct_maps[struct_maps.keys.first]
+      end
+
+      def default_struct_map_ids
+        default_struct_map.pids
+      end
+
       def structMap_node(type='default')
         xpath("//xmlns:structMap[@TYPE='#{type}']").first
       end

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "3.0.0.beta.1"
+    VERSION = "3.0.0.beta.2"
   end
 end

data/spec/auth/roles/role_set_manager_spec.rb

@@ -79,6 +79,10 @@ module Ddr::Auth
           expect(subject.granted?(role1.to_h)).to be true
           expect(subject.granted?(role2.to_h)).to be false
         end
+        it "coerces argument to Role" do
+          expect(subject.granted?(role_type: Roles::EDITOR, agent: role1.agent, scope: "resource"))
+            .to be true
+        end
       end
 
     end

data/spec/models/has_children_spec.rb

@@ -1,7 +1,7 @@
 module Ddr::Models
   RSpec.describe HasChildren do
 
-    subject { FactoryGirl.create(:collection) }
+    subject { FactoryGirl.create(:item) }
 
     describe "#first_child" do
       describe "when the object has no children" do
@@ -10,19 +10,50 @@ module Ddr::Models
         end
       end
       describe "when the object has children" do
-        let(:child1) { FactoryGirl.create(:item) }
-        let(:child2) { FactoryGirl.create(:item) }
+        let(:child1) { FactoryGirl.create(:component) }
+        let(:child2) { FactoryGirl.create(:component) }
+        let(:child3) { FactoryGirl.create(:component) }
         before do
           child1.local_id = "test002"
-          child1.save
+          child1.save!
           child2.local_id = "test001"
-          child2.save
+          child2.save!
+          child3.local_id = "test003"
+          child3.save!
           subject.children << child1
           subject.children << child2
-          subject.save
+          subject.children << child3
+          subject.save!
         end
-        it "should return the first child as sorted by local ID" do
-          expect(subject.first_child).to eq(child2)
+        describe "when the object has structural metadata" do
+          before do
+            struct_map = <<-EOS
+              <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <structMap TYPE="default">
+                  <div ORDER="1">
+                    <fptr CONTENTIDS="#{child3.id}" />
+                  </div>
+                  <div ORDER="2">
+                    <fptr CONTENTIDS="#{child2.id}" />
+                  </div>
+                  <div ORDER="3">
+                    <fptr CONTENTIDS="#{child1.id}" />
+                  </div>
+                </structMap>
+              </mets>
+            EOS
+            subject.structMetadata.content = struct_map
+            subject.save!
+          end
+          it "should return the first child based on structural metadata order" do
+            expect(subject.first_child).to eq(child3)
+          end
+        end
+        describe "when the object does not have structural metadata" do
+
+          it "should return the first child as sorted by local ID" do
+            expect(subject.first_child).to eq(child2)
+          end
         end
       end
     end

data/spec/models/has_struct_metadata_spec.rb

@@ -4,7 +4,7 @@ module Ddr
   module Models
     RSpec.describe HasStructMetadata, type: :model, structural_metadata: true do
 
-      let(:item) { Item.new(pid: 'test:2') }
+      let(:item) { Item.new(id: 'test_2') }
 
       describe "#structure" do
         context "no existing structural metadata" do
@@ -21,9 +21,9 @@ module Ddr
       end
 
       describe "#build_default_structure" do
-        let(:components) { [ Component.new(pid: 'test:5', identifier: [ 'abc002' ]),
-                             Component.new(pid: 'test:6', identifier: [ 'abc001' ]),
-                             Component.new(pid: 'test:7', identifier: [ 'abc003' ])
+        let(:components) { [ Component.new(id: 'test_5', identifier: [ 'abc002' ]),
+                             Component.new(id: 'test_6', identifier: [ 'abc001' ]),
+                             Component.new(id: 'test_7', identifier: [ 'abc003' ])
                            ] }
         let(:expected) { FactoryGirl.build(:simple_structure) }
         before { allow(item).to receive(:find_children) { simple_structure_query_response } }

data/spec/models/indexing_spec.rb

@@ -18,6 +18,7 @@ module Ddr::Models
       obj.permanent_url = "http://id.library.duke.edu/ark:/99999/fk4zzz"
       obj.display_format = "Image"
       obj.roles.grant role1, role2, role3, role4
+      obj.fcrepo3_pid = "duke:1"
     end
 
     its([Indexing::LICENSE]) { is_expected.to eq("cc-by-nc-nd-40") }
@@ -29,6 +30,6 @@ module Ddr::Models
     its([Indexing::ACCESS_ROLE]) { is_expected.to eq(obj.roles.to_json) }
     its([Indexing::POLICY_ROLE]) { is_expected.to contain_exactly(role2.agent, role3.agent, role4.agent) }
     its([Indexing::RESOURCE_ROLE]) { is_expected.to contain_exactly(role1.agent) }
-
+    its([Indexing::FCREPO3_PID]) { is_expected.to eq("duke:1") }
   end
 end

data/spec/models/struct_div_spec.rb

@@ -13,35 +13,35 @@ module Ddr
           expect(struct_div.divs.size).to eq(2)
           expect(struct_div.divs.first.label).to eq("Front")
           expect(struct_div.divs.first.divs).to be_empty
-          expect(struct_div.divs.first.fptrs).to eq([ "test:5" ])
+          expect(struct_div.divs.first.fptrs).to eq([ "test_5" ])
           expect(struct_div.divs.last.label).to eq("Back")
           expect(struct_div.divs.last.divs.size).to eq(2)
           expect(struct_div.divs.last.fptrs).to be_empty
           expect(struct_div.divs.last.divs.first.label).to eq("Top")
           expect(struct_div.divs.last.divs.first.divs).to be_empty
-          expect(struct_div.divs.last.divs.first.fptrs).to eq([ "test:7" ])
+          expect(struct_div.divs.last.divs.first.fptrs).to eq([ "test_7" ])
           expect(struct_div.divs.last.divs.last.label).to eq("Bottom")
           expect(struct_div.divs.last.divs.last.divs).to be_empty
-          expect(struct_div.divs.last.divs.last.fptrs).to eq([ "test:6" ])
+          expect(struct_div.divs.last.divs.last.fptrs).to eq([ "test_6" ])
         end
       end
 
       describe "#pids" do
         context "top level" do
           it "should return all pids in the structMap" do
-            expect(struct_div.pids).to match_array([ 'test:5', 'test:6', 'test:7' ])
+            expect(struct_div.pids).to match_array([ 'test_5', 'test_6', 'test_7' ])
           end
         end
       end
 
       describe "#docs" do
-        let(:solr_response) { [ { 'id'=>'test:5' }, { 'id'=>'test:6' }, { 'id'=>'test:7'} ] }
+        let(:solr_response) { [ { 'id'=>'test_5' }, { 'id'=>'test_6' }, { 'id'=>'test_7'} ] }
         before do
           allow(ActiveFedora::SolrService).to receive(:query) { solr_response }
         end
         it "should return a hash of Solr documents" do
           results = struct_div.docs
-          expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
+          expect(results.keys).to match_array([ 'test_5', 'test_6', 'test_7' ])
           results.keys.each do |key|
             expect(results[key]).to be_a(SolrDocument)
             expect(results[key].id).to eq(key)
@@ -50,18 +50,18 @@ module Ddr
       end
 
       describe "#objects" do
-        let(:repo_objects) { [ Component.new(pid: 'test:5'), Component.new(pid: 'test:6'), Component.new(pid: 'test:7') ] }
+        let(:repo_objects) { [ Component.new(id: 'test_5'), Component.new(id: 'test_6'), Component.new(id: 'test_7') ] }
         before do
-          allow(ActiveFedora::Base).to receive(:find).with('test:5') { repo_objects[0] }
-          allow(ActiveFedora::Base).to receive(:find).with('test:6') { repo_objects[1] }
-          allow(ActiveFedora::Base).to receive(:find).with('test:7') { repo_objects[2] }
+          allow(ActiveFedora::Base).to receive(:find).with('test_5') { repo_objects[0] }
+          allow(ActiveFedora::Base).to receive(:find).with('test_6') { repo_objects[1] }
+          allow(ActiveFedora::Base).to receive(:find).with('test_7') { repo_objects[2] }
         end
         it "should return a hash of Active Fedora objects" do
           results = struct_div.objects
-          expect(results.keys).to match_array([ 'test:5', 'test:6', 'test:7' ])
-          expect(results['test:5']).to eq(repo_objects[0])
-          expect(results['test:6']).to eq(repo_objects[1])
-          expect(results['test:7']).to eq(repo_objects[2])
+          expect(results.keys).to match_array([ 'test_5', 'test_6', 'test_7' ])
+          expect(results['test_5']).to eq(repo_objects[0])
+          expect(results['test_6']).to eq(repo_objects[1])
+          expect(results['test_7']).to eq(repo_objects[2])
         end
       end
 

data/spec/models/structure_spec.rb

@@ -5,9 +5,8 @@ module Ddr
   module Models
     RSpec.describe Structure, type: :model, structural_metadata: true do
 
-      let(:structure) { FactoryGirl.build(:multiple_struct_maps_structure) }
-
       describe "#struct_maps" do
+        let(:structure) { FactoryGirl.build(:multiple_struct_maps_structure) }
         let(:struct_maps) { structure.struct_maps }
         it "should include struct divs for each struct map" do
           expect(struct_maps.keys).to match_array([ 'default', 'reverse' ])
@@ -16,6 +15,102 @@ module Ddr
         end
       end
 
+      describe "#default_struct_map" do
+        context "struct map with type 'default'" do
+          let(:struct_map_xml) do
+            <<-eos
+              <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <structMap TYPE="reverse">
+                  <div ORDER="1" LABEL="Back">
+                    <div ORDER="1" LABEL="Bottom">
+                      <fptr CONTENTIDS="test_6" />
+                    </div>
+                    <div ORDER="2" LABEL="Top">
+                      <fptr CONTENTIDS="test_7" />
+                    </div>
+                  </div>
+                  <div ORDER="2" LABEL="Front">
+                    <fptr CONTENTIDS="test_5" />
+                  </div>
+                </structMap>
+                <structMap TYPE="default">
+                  <div ORDER="1" LABEL="Front">
+                    <fptr CONTENTIDS="test_5" />
+                  </div>
+                  <div ORDER="2" LABEL="Back">
+                    <div ORDER="1" LABEL="Top">
+                      <fptr CONTENTIDS="test_7" />
+                    </div>
+                    <div ORDER="2" LABEL="Bottom">
+                      <fptr CONTENTIDS="test_6" />
+                    </div>
+                  </div>
+                </structMap>
+              </mets>
+            eos
+          end
+          let(:struct_map_doc) do
+            Nokogiri::XML(struct_map_xml) do |config|
+              config.noblanks
+            end
+          end
+          let(:structure) { Structure.new(struct_map_doc) }
+          it "should return the struct map with type :default" do
+            expect(structure.default_struct_map).to eq(structure.struct_maps['default'])
+          end
+        end
+        context "no struct map with type 'default'" do
+          let(:struct_map_xml) do
+            <<-eos
+              <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
+                <structMap TYPE="reverse">
+                  <div ORDER="1" LABEL="Back">
+                    <div ORDER="1" LABEL="Bottom">
+                      <fptr CONTENTIDS="test_6" />
+                    </div>
+                    <div ORDER="2" LABEL="Top">
+                      <fptr CONTENTIDS="test_7" />
+                    </div>
+                  </div>
+                  <div ORDER="2" LABEL="Front">
+                    <fptr CONTENTIDS="test_5" />
+                  </div>
+                </structMap>
+                <structMap TYPE="other">
+                  <div ORDER="1" LABEL="Front">
+                    <fptr CONTENTIDS="test_5" />
+                  </div>
+                  <div ORDER="2" LABEL="Back">
+                    <div ORDER="1" LABEL="Top">
+                      <fptr CONTENTIDS="test_7" />
+                    </div>
+                    <div ORDER="2" LABEL="Bottom">
+                      <fptr CONTENTIDS="test_6" />
+                    </div>
+                  </div>
+                </structMap>
+              </mets>
+            eos
+          end
+          let(:struct_map_doc) do
+            Nokogiri::XML(struct_map_xml) do |config|
+              config.noblanks
+            end
+          end
+          let(:structure) { Structure.new(struct_map_doc) }
+          it "should return the first struct map" do
+            expect(structure.default_struct_map).to eq(structure.struct_maps['reverse'])
+          end
+        end
+      end
+
+      describe "#default_struct_map_ids" do
+        let(:structure) { FactoryGirl.build(:simple_structure) }
+        it "should return the ids in order" do
+          expect(structure.default_struct_map_ids).to match_array([ 'test_6', 'test_5', 'test_7' ])
+        end
+      end
+
     end
   end
-end
+end

data/spec/support/shared_examples_for_ddr_models.rb

@@ -22,101 +22,4 @@ RSpec.shared_examples "a DDR model" do
     end
   end
 
-  describe "move first desc metadata identifier to local id" do
-    let(:local_id) { 'locl001' }
-    let(:identifiers) { [ 'id001', 'id002' ] }
-    context "no desc metadata identifiers" do
-      context "local id present" do
-        before { subject.local_id = local_id }
-        it "should not change the local id" do
-          result = subject.move_first_identifier_to_local_id
-          expect(result).to be false
-          expect(subject.local_id).to eq(local_id)
-        end
-      end
-    end
-    context "one desc metadata identifier" do
-      before { subject.descMetadata.identifier = Array(identifiers.first) }
-      context "local id not present" do
-        it "should set the local id and remove the identifier" do
-          result = subject.move_first_identifier_to_local_id
-          expect(result).to be true
-          expect(subject.local_id).to eq(identifiers.first)
-          expect(subject.descMetadata.identifier).to be_empty
-        end
-      end
-      context "local id present" do
-        before { subject.local_id = local_id }
-        context "replace option is true" do
-          it "should set the local id and remove the identifier" do
-            result = subject.move_first_identifier_to_local_id
-            expect(result).to be true
-            expect(subject.local_id).to eq(identifiers.first)
-            expect(subject.descMetadata.identifier).to be_empty
-          end
-        end
-        context "replace option is false" do
-          context "local id matches first identifier" do
-            before { subject.descMetadata.identifier = Array(local_id) }
-            it "should remove the identifier" do
-              result = subject.move_first_identifier_to_local_id(replace: false)
-              expect(result).to be true
-              expect(subject.local_id).to eq(local_id)
-              expect(subject.descMetadata.identifier).to be_empty
-            end
-          end
-          context "local id does not match first identifier" do
-            it "should not change the local id and not remove the identifier" do
-              result = subject.move_first_identifier_to_local_id(replace: false)
-              expect(result).to be false
-              expect(subject.local_id).to eq(local_id)
-              expect(subject.descMetadata.identifier).to eq(Array(identifiers.first))
-            end
-          end
-        end
-      end
-    end
-    context "more than one desc metadata identifer" do
-      before { subject.descMetadata.identifier = identifiers }
-      context "local id not present" do
-        it "should set the local id and remove the identifier" do
-          result = subject.move_first_identifier_to_local_id
-          expect(result).to be true
-          expect(subject.local_id).to eq(identifiers.first)
-          expect(subject.descMetadata.identifier).to eq(Array(identifiers.last))
-        end
-      end
-      context "local id present" do
-        before { subject.local_id = local_id }
-        context "replace option is true" do
-          it "should set the local id and remove the identifier" do
-            result = subject.move_first_identifier_to_local_id
-            expect(result).to be true
-            expect(subject.local_id).to eq(identifiers.first)
-            expect(subject.descMetadata.identifier).to eq(Array(identifiers.last))
-          end
-        end
-        context "replace option is false" do
-          context "local id matches first identifier" do
-            before { subject.descMetadata.identifier = [ local_id, identifiers.last ] }
-            it "should remove the identifier" do
-              result = subject.move_first_identifier_to_local_id(replace: false)
-              expect(result).to be true
-              expect(subject.local_id).to eq(local_id)
-              expect(subject.descMetadata.identifier).to eq(Array(identifiers.last))
-            end
-          end
-          context "local id does not match first identifier" do
-            it "should not change the local id and not remove the identifier" do
-              result = subject.move_first_identifier_to_local_id(replace: false)
-              expect(result).to be false
-              expect(subject.local_id).to eq(local_id)
-              expect(subject.descMetadata.identifier).to eq(identifiers)
-            end
-          end
-        end
-      end
-    end
-  end
-
 end

data/spec/support/structural_metadata_helper.rb

@@ -23,13 +23,13 @@ def simple_structure
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
       <structMap TYPE="default">
         <div ORDER="1">
-          <fptr CONTENTIDS="info:fedora/test:6" />
+          <fptr CONTENTIDS="test_6" />
         </div>
         <div ORDER="2">
-          <fptr CONTENTIDS="info:fedora/test:5" />
+          <fptr CONTENTIDS="test_5" />
         </div>
         <div ORDER="3">
-          <fptr CONTENTIDS="info:fedora/test:7" />
+          <fptr CONTENTIDS="test_7" />
         </div>
       </structMap>
     </mets>
@@ -41,14 +41,14 @@ def nested_structure
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
       <structMap TYPE="default">
         <div ORDER="1" LABEL="Front">
-          <fptr CONTENTIDS="info:fedora/test:5" />
+          <fptr CONTENTIDS="test_5" />
         </div>
         <div ORDER="2" LABEL="Back">
           <div ORDER="1" LABEL="Top">
-            <fptr CONTENTIDS="info:fedora/test:7" />
+            <fptr CONTENTIDS="test_7" />
           </div>    
           <div ORDER="2" LABEL="Bottom">
-            <fptr CONTENTIDS="info:fedora/test:6" />
+            <fptr CONTENTIDS="test_6" />
           </div>    
         </div>
       </structMap>
@@ -61,28 +61,28 @@ def multiple_struct_maps_structure
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
       <structMap TYPE="default">
         <div ORDER="1" LABEL="Front">
-          <fptr CONTENTIDS="info:fedora/test:5" />
+          <fptr CONTENTIDS="test_5" />
         </div>
         <div ORDER="2" LABEL="Back">
           <div ORDER="1" LABEL="Top">
-            <fptr CONTENTIDS="info:fedora/test:7" />
+            <fptr CONTENTIDS="test_7" />
           </div>    
           <div ORDER="2" LABEL="Bottom">
-            <fptr CONTENTIDS="info:fedora/test:6" />
+            <fptr CONTENTIDS="test_6" />
           </div>    
         </div>
       </structMap>
       <structMap TYPE="reverse">
         <div ORDER="1" LABEL="Back">
           <div ORDER="1" LABEL="Bottom">
-            <fptr CONTENTIDS="info:fedora/test:6" />
+            <fptr CONTENTIDS="test_6" />
           </div>
           <div ORDER="2" LABEL="Top">
-            <fptr CONTENTIDS="info:fedora/test:7" />
+            <fptr CONTENTIDS="test_7" />
           </div>    
         </div>
         <div ORDER="2" LABEL="Front">
-          <fptr CONTENTIDS="info:fedora/test:5" />
+          <fptr CONTENTIDS="test_5" />
         </div>
       </structMap>
     </mets>
@@ -90,16 +90,16 @@ def multiple_struct_maps_structure
 end
 
 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"}]
+  [ { "id"=>"test_6", "local_id_ssi"=>"abc001"  }, { "id"=>"test_5", "local_id_ssi"=>"abc002" }, { "id"=>"test_7", "local_id_ssi"=>"abc003" } ]
 end
 
 def simple_structure_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\":[]}
+        \"divs\":[{\"order\":\"1\",\"fptrs\":[\"test_6\"],\"divs\":[]},
+                  {\"order\":\"2\",\"fptrs\":[\"test_5\"],\"divs\":[]},
+                  {\"order\":\"3\",\"fptrs\":[\"test_7\"],\"divs\":[]}
                  ]
       }
     }
@@ -111,10 +111,10 @@ def multiple_struct_maps_structure_to_json
   j = <<-eos
     {\"default\":
       {\"type\":\"default\",
-        \"divs\":[{\"label\":\"Front\",\"order\":\"1\",\"fptrs\":[\"test:5\"],\"divs\":[]},
+        \"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\":[]}
+                    \"divs\":[{\"label\":\"Top\",\"order\":\"1\",\"fptrs\":[\"test_7\"],\"divs\":[]},
+                              {\"label\":\"Bottom\",\"order\":\"2\",\"fptrs\":[\"test_6\"],\"divs\":[]}
                              ]
                   }
                  ]
@@ -122,11 +122,11 @@ def multiple_struct_maps_structure_to_json
      \"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\":[]}
+                    \"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\":[]}
+                  {\"label\":\"Front\",\"order\":\"2\",\"fptrs\":[\"test_5\"],\"divs\":[]}
                  ]
       }
     }    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.1
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails