ddr-models 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4cad288ab66e27f4a979008788abc101167edee
-  data.tar.gz: 4f2e67b23dc23c59b03af55688c68b911dcdb757
+  metadata.gz: b40e42bff6d22b301a1b06925cf23a5583bcb727
+  data.tar.gz: d82f30c7c237c53bb375c8f307ce50420059bbc2
 SHA512:
-  metadata.gz: cfdf876d984f71747568ad4f02ffa0d5d3930e7236646367bcb84c0b17d377baaabfd772575f024c73378efcb43df0d1c9fd97a0854da2fdab125ed9e0b27dc1
-  data.tar.gz: 58e1ea9ab30fab595d3f1b8475f3cc9c80a46ab3af3093f419592fda2ca2847329a9d469c601c66db16f9a9e8e0728b2c2ed4ad065ddf17b2291ca867deb94d9
+  metadata.gz: 2b2a22ff451d8c58a36b31ab245b9e5b3570e8e994eaca1a5e8f91698ff1c1111767175cd6d6c5bc011662aea234ac1bd88a4a2c96abbc21374ffc896aeee530
+  data.tar.gz: ae332fd91309fdf16e90ed94c3de73f8fa225cdc47404f32ec92f61dc1121f5c8f9d1f9737ed0e3851d975c8cd01a2fc317ed983e5c638a1883205bdad7847f8

data/lib/ddr/index/fields.rb

@@ -89,7 +89,12 @@ module Ddr::Index
     SERIES_FACET                = Field.new :series_facet, :facetable
     SETTING_FACET               = Field.new :setting_facet, :facetable
     SPATIAL_FACET               = Field.new :spatial_facet, :facetable
+    # STRUCT is interim index field to facilitate conversion of the STRUCTURE index field from
+    # stored and indexed to just stored.  The STRUCTURE field will eventually be pointed to this
+    # Field definition.
+    STRUCT                      = Field.new :structure, solr_name: "structure_ss"
     STRUCTURE                   = Field.new :structure, :stored_sortable
+    STRUCTURE_SOURCE            = Field.new :structure_source, :stored_sortable
     SUBJECT_FACET               = Field.new :subject_facet, :facetable
     SUBSERIES_FACET             = Field.new :subseries_facet, :facetable
     TECHMD_COLOR_SPACE          = Field.new :techmd_color_space, :symbol

data/lib/ddr/models/indexing.rb

@@ -103,7 +103,10 @@ module Ddr::Models
         fields[MULTIRES_IMAGE_FILE_PATH] = multires_image_file_path
       end
       if has_struct_metadata?
-        fields[STRUCTURE] = structure.dereferenced_structure.to_json
+        # STRUCT is an interim index field to facilitate conversion of STRUCTURE field definition.
+        fields[STRUCT] = fields[STRUCTURE] = structure.dereferenced_structure.to_json
+        fields[STRUCTURE_SOURCE] = structure.repository_maintained? ? Ddr::Models::Structure::REPOSITORY_MAINTAINED
+                                                                    : Ddr::Models::Structure::EXTERNALLY_PROVIDED
       end
       if has_extracted_text?
         fields[EXTRACTED_TEXT] = extractedText.content

data/lib/ddr/models/structure.rb

@@ -4,6 +4,11 @@ module Ddr::Models
   #
   class Structure < SimpleDelegator
 
+    # Indicates whether the structure is externally provided or maintained by the repository itself (i.e., is the
+    # default structure for the object).
+    EXTERNALLY_PROVIDED = 'provided'.freeze
+    REPOSITORY_MAINTAINED = 'repository'.freeze
+
     TYPE_DEFAULT = 'default'.freeze
 
     # Based on the PCDM Extension 'Use' ontology -- https://github.com/duraspace/pcdm/blob/master/pcdm-ext/use.rdf

data/lib/ddr/models/version.rb

@@ -1,5 +1,5 @@
 module Ddr
   module Models
-    VERSION = "2.7.2"
+    VERSION = "2.7.3"
   end
 end

data/spec/models/has_struct_metadata_spec.rb

@@ -33,9 +33,29 @@ module Ddr::Models
       end
       it "should index the JSON representation of the structures" do
         indexing = item.to_solr
-        expect(indexing.keys).to include(Ddr::Index::Fields::STRUCTURE)
+        expect(indexing[Ddr::Index::Fields::STRUCT]).to eq(expected_json)
         expect(indexing[Ddr::Index::Fields::STRUCTURE]).to eq(expected_json)
       end
+      describe "structure source" do
+        describe "repository maintained" do
+          before do
+            item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = simple_structure_xml
+          end
+          it "should index the structure source as repository maintained" do
+            indexing = item.to_solr
+            expect(indexing[Ddr::Index::Fields::STRUCTURE_SOURCE]).to eq(Ddr::Models::Structure::REPOSITORY_MAINTAINED)
+          end
+        end
+        describe "externally provided" do
+          before do
+            item.datastreams[Ddr::Datastreams::STRUCT_METADATA].content = nested_structure_xml
+          end
+          it "should index the structure source as repository maintained" do
+            indexing = item.to_solr
+            expect(indexing[Ddr::Index::Fields::STRUCTURE_SOURCE]).to eq(Ddr::Models::Structure::EXTERNALLY_PROVIDED)
+          end
+        end
+      end
     end
 
   end

data/spec/models/structure_spec.rb

@@ -28,7 +28,7 @@ module Ddr::Models
       describe "structure has a metsHdr" do
         let(:structure) { FactoryGirl.build(:simple_structure) }
         it "returns the creator" do
-          expect(structure.creator).to eq("Sam Spade")
+          expect(structure.creator).to eq(Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT)
         end
       end
       describe "structure does not have a metsHdr" do

data/spec/support/structural_metadata_helper.rb

@@ -29,7 +29,7 @@ def simple_structure_xml
     <mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink">
       <metsHdr>
         <agent ROLE="CREATOR">
-          <name>Sam Spade</name>
+          <name>#{Ddr::Models::Structures::Agent::NAME_REPOSITORY_DEFAULT}</name>
         </agent>
       </metsHdr>
       <fileSec>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-models
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Jim Coble
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -780,7 +780,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository