adiwg-mdtranslator 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d88910886287dc0c89238e8beba62d7871315f
-  data.tar.gz: 8c50527b56e4bce5d5b130f1f767ab3e30d18877
+  metadata.gz: 010b1cbf2339294147a58e5b78ded88b4df91be5
+  data.tar.gz: 8364931e9e108a14613fc714c32062e6c76f068c
 SHA512:
-  metadata.gz: 8b4d1d298a11e19eb17e928f1e4b0cae68e28f8792117f6f01a1db7fbcd1e06a7a6c9e8bb6c9366e8102747f6669184a76f170431b9d5d53c32dfb48d060e323
-  data.tar.gz: f6dbbfe2083d67f9963c61f87cead13a9b6b35ae877c476631ae8cd82f03c6d93d7e6e3cf4e6a1cd0dd246ef8990a3044daabd7c2d2845e61cb0f5fdcf7989d9
+  metadata.gz: 31f1fb5def4ba901a6c029f785c6c30d551e9e1e5a66aaaac3b7484d0bfbcfb78f47ee813997fd09d81a2193c7b626102712c2bb9b5b1a97daef9333509ac42a
+  data.tar.gz: d941add4d9e083587fd7fb800b2bb828373022ae9920343d59278357fcc91ab0fc0070e5e196036b0c47adad33a06bfe7db24f5a0b59d6c06f2d0924c9c066b1

data/.gitignore

@@ -17,6 +17,7 @@ test/tmp
 test/version_tmp
 test/adiwgJson_full_test_example.json
 test/adiwgJson_min_test_example.json
+test/adiwgJson_template_data.json
 test/dev.rb
 tmp
 *.bundle

data/.gitmodules

@@ -1,3 +1,3 @@
-[submodule "test/schemas/v0_8"]
-	path = test/schemas/v0_8
+[submodule "test/schemas/v0_9"]
+	path = test/schemas/v0_9
 	url = https://github.com/adiwg/adiwg-json-schemas.git

data/adiwg-mdtranslator.gemspec

@@ -1,6 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'adiwg/mdtranslator/version'
 
 Gem::Specification.new do |spec|
@@ -26,6 +27,6 @@ Gem::Specification.new do |spec|
 	spec.add_runtime_dependency "builder", "~>3.2"
 	spec.add_runtime_dependency "thor", "~>0.19"
 	spec.add_runtime_dependency "uuidtools", "~>2.1"
-	spec.add_runtime_dependency "json-schema", "~>2.2"
-	spec.add_runtime_dependency "adiwg-json_schemas", "~>0.8"
+	spec.add_runtime_dependency "json-schema", "~>2.4"
+	spec.add_runtime_dependency "adiwg-json_schemas", "~>0.9"
 end

data/lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb

@@ -42,6 +42,9 @@
 #   Stan Smith 2014-05-28 modified resourceId & responsibleParty for schema 0.5.0
 #   Stan Smith 2014-08-15 modified citation, onlineResource, resourceId for 0.6.0
 #   Stan Smith 2014-09-03 added spatialReferenceSystems for name, EPSG, and WKT for 0.6.0
+#   Stan Smith 2014-11-06 added resourceType to resourceInfo for 0.9.0
+#   Stan Smith 2014-11-06 removed metadataScope from metadataInfo for 0.9.0
+#   Stan Smith 2014-11-06 added newAdditionalDocumentation
 
 class InternalMetadata
 
@@ -117,7 +120,6 @@ class InternalMetadata
 		intObj = {
 			metadataId: {},
 			parentMetadata: {},
-			metadataScope: [],
 			metadataCustodians: [],
 			metadataCreateDate: {},
 			metadataUpdateDate: {},
@@ -147,7 +149,9 @@ class InternalMetadata
 
 	def newResourceInfo
 		intObj = {
+			resourceType: nil,
 			citation: {},
+			timePeriod: {},
 			abstract: nil,
 			shortAbstract: nil,
 			hasMapLocation?: nil,
@@ -490,10 +494,18 @@ class InternalMetadata
 	def newAssociatedResource
 		intObj = {
 			associationType: nil,
+			initiativeType: nil,
 			resourceType: nil,
 			resourceCitation: {},
 			metadataCitation: {}
 		}
 	end
 
+	def newAdditionalDocumentation
+		intObj = {
+			resourceType: nil,
+			citation: {}
+		}
+	end
+
 end

data/lib/adiwg/mdtranslator/readers/adiwgJson/modules_0.9.0/module_additionalDocumentation.rb

@@ -0,0 +1,36 @@
+# unpack additional doucmentation
+# Reader - ADIwg JSON V1 to internal data structure
+
+# History:
+# 	Stan Smith 2014-11-06 original script
+
+require ADIWG::Mdtranslator.reader_module('module_citation', $response[:readerVersionUsed])
+
+module Adiwg_AdditionalDocumentation
+
+	def self.unpack(hAddDoc)
+
+		# instance classes needed in script
+		intMetadataClass = InternalMetadata.new
+		intAddDoc = intMetadataClass.newAssociatedResource
+
+		# associated resource - resource type
+		if hAddDoc.has_key?('resourceType')
+			s = hAddDoc['resourceType']
+			if s != ''
+				intAddDoc[:resourceType] = s
+			end
+		end
+
+		# associated resource - resource citation
+		if hAddDoc.has_key?('citation')
+			hCitation = hAddDoc['citation']
+			unless hCitation.empty?
+				intAddDoc[:citation] = Adiwg_Citation.unpack(hCitation)
+			end
+		end
+
+		return intAddDoc
+	end
+
+end

data/lib/adiwg/mdtranslator/readers/adiwgJson/{modules_0.8.0 → modules_0.9.0}/module_associatedResource.rb

@@ -7,9 +7,10 @@
 # 	Stan Smith 2014-06-02 added resource metadata citation section
 #   Stan Smith 2014-07-08 resolve require statements using Mdtranslator.reader_module
 #   Stan Smith 2014-08-18 moved resourceIdentifier to citation module schema 0.6.0
+#   Stan Smith 2014-11-06 changed resourceType to initiative type for 0.9.0
+#   Stan Smith 2014-11-06 added resourceType for 0.9.0
 
 require ADIWG::Mdtranslator.reader_module('module_citation', $response[:readerVersionUsed])
-require ADIWG::Mdtranslator.reader_module('module_resourceIdentifier', $response[:readerVersionUsed])
 
 module Adiwg_AssociatedResource
 
@@ -19,7 +20,7 @@ module Adiwg_AssociatedResource
 		intMetadataClass = InternalMetadata.new
 		intAssocRes = intMetadataClass.newAssociatedResource
 
-		# associated resource - resource type - initiativeTypeCode
+		# associated resource - association type
 		if hAssocRes.has_key?('associationType')
 			s = hAssocRes['associationType']
 			if s != ''
@@ -27,7 +28,15 @@ module Adiwg_AssociatedResource
 			end
 		end
 
-		# associated resource - association type - associationTypeCode
+		# associated resource - initiative type
+		if hAssocRes.has_key?('initiativeType')
+			s = hAssocRes['initiativeType']
+			if s != ''
+				intAssocRes[:initiativeType] = s
+			end
+		end
+
+		# associated resource - resource type
 		if hAssocRes.has_key?('resourceType')
 			s = hAssocRes['resourceType']
 			if s != ''

data/lib/adiwg/mdtranslator/readers/adiwgJson/{modules_0.8.0 → modules_0.9.0}/module_metadata.rb

@@ -17,6 +17,7 @@ require ADIWG::Mdtranslator.reader_module('module_metadataInfo', $response[:read
 require ADIWG::Mdtranslator.reader_module('module_resourceInfo', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_distributionInfo', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_associatedResource', $response[:readerVersionUsed])
+require ADIWG::Mdtranslator.reader_module('module_additionalDocumentation', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_citation', $response[:readerVersionUsed])
 
 module Adiwg_Metadata
@@ -61,10 +62,10 @@ module Adiwg_Metadata
 
 		# metadata - additional documents
 		if hMetadata.has_key?('additionalDocumentation')
-			aCitation = hMetadata['additionalDocumentation']
-			unless aCitation.empty?
-				aCitation.each do |hCitation|
-					intMetadata[:additionalDocuments] << Adiwg_Citation.unpack(hCitation)
+			aAddDocs = hMetadata['additionalDocumentation']
+			unless aAddDocs.empty?
+				aAddDocs.each do |hAddDoc|
+					intMetadata[:additionalDocuments] << Adiwg_AdditionalDocumentation.unpack(hAddDoc)
 				end
 			end
 		end

data/lib/adiwg/mdtranslator/readers/adiwgJson/{modules_0.8.0 → modules_0.9.0}/module_metadataInfo.rb

@@ -6,6 +6,7 @@
 #   Stan Smith 2014-07-03 resolve require statements using Mdtranslator.reader_module
 #   Stan Smith 2014-09-19 changed metadata identifier type resource identifier json 0.8.0
 #   Stan Smith 2014-09-19 changed parent metadata identifier type citation json 0.8.0
+#   Stan Smith 2014-11-06 removed metadataScope, moved to resourceType under resourceInfo json 0.9.0
 
 require ADIWG::Mdtranslator.reader_module('module_responsibleParty', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_dateTime', $response[:readerVersionUsed])
@@ -39,14 +40,6 @@ module Adiwg_MetadataInfo
 			end
 		end
 
-		# metadata - scope - from codeList
-		if hMetadataInfo.has_key?('metadataScope')
-			aMetadataScope = hMetadataInfo['metadataScope']
-			unless aMetadataScope.empty?
-				intMetadataInfo[:metadataScope] = aMetadataScope
-			end
-		end
-
 		# metadata - metadata contacts, custodians
 		if hMetadataInfo.has_key?('metadataContact')
 			aCust = hMetadataInfo['metadataContact']

data/lib/adiwg/mdtranslator/readers/adiwgJson/{modules_0.8.0 → modules_0.9.0}/module_resourceInfo.rb

@@ -13,6 +13,8 @@
 #   Stan Smith 2014-07-03 resolve require statements using Mdtranslator.reader_module
 #   Stan Smith 2014-08-18 moved resourceIdentifier to citation module schema 0.6.0
 #   Stan Smith 2014-09-03 added spatial reference system module for 0.7.0
+#   Stan Smith 2014-10-29 added support for resource time period
+#   Stan Smith 2014-11-06 added resourceType for 0.9.0
 
 require ADIWG::Mdtranslator.reader_module('module_citation', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_resourceIdentifier', $response[:readerVersionUsed])
@@ -29,6 +31,7 @@ require ADIWG::Mdtranslator.reader_module('module_resolution', $response[:reader
 require ADIWG::Mdtranslator.reader_module('module_extent', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_dataQuality', $response[:readerVersionUsed])
 require ADIWG::Mdtranslator.reader_module('module_spatialReference', $response[:readerVersionUsed])
+require ADIWG::Mdtranslator.reader_module('module_timePeriod', $response[:readerVersionUsed])
 
 module Adiwg_ResourceInfo
 
@@ -38,6 +41,14 @@ module Adiwg_ResourceInfo
 		intMetadataClass = InternalMetadata.new
 		intResInfo = intMetadataClass.newResourceInfo
 
+		# resource information - resource type
+		if hResourceInfo.has_key?('resourceType')
+			s = hResourceInfo['resourceType']
+			if s != ''
+				intResInfo[:resourceType] = s
+			end
+		end
+
 		# resource information - citation
 		if hResourceInfo.has_key?('citation')
 			hCitation = hResourceInfo['citation']
@@ -46,6 +57,14 @@ module Adiwg_ResourceInfo
 			end
 		end
 
+		# resource information - resource time period
+		if hResourceInfo.has_key?('resourceTimePeriod')
+			hResPeriod = hResourceInfo['resourceTimePeriod']
+			unless hResPeriod.empty?
+				intResInfo[:timePeriod] = Adiwg_TimePeriod.unpack(hResPeriod)
+			end
+		end
+
 		# resource information - point of contact
 		if hResourceInfo.has_key?('pointOfContact')
 			aPOC = hResourceInfo['pointOfContact']

data/lib/adiwg/mdtranslator/version.rb

@@ -14,11 +14,14 @@
 #              ... block in the input.
 # 0.8.5 2014-10-11 added methods to pass content of readme files
 # 0.8.6 2014-10-15 added cli option to return entire content mdTranslator response
+# 0.8.7 2014-10-29 added support for resource time period
+# 0.9.0 2014-11-06 added resourceType to associatedResource and additionalInformation
+#              ... moved resourceType from metadataInfo to resourceInfo in json
 
 module ADIWG
 	module Mdtranslator
 		# current mdtranslator version
-		VERSION = "0.8.6"
+		VERSION = "0.9.0"
 	end
 end
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_aggregateInformation.rb

@@ -4,6 +4,8 @@
 # History:
 # 	Stan Smith 2014-05-29 original script
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#   Stan Smith 2014-11-06 take initiativeType from internal initiativeType
+#   ... rather than resourceType for 0.9.0
 
 require 'code_associationType'
 require 'code_initiativeType'
@@ -52,7 +54,7 @@ class MD_AggregateInformation
 			end
 
 			# aggregate information - initiative type
-			s = hAssocRes[:resourceType]
+			s = hAssocRes[:initiativeType]
 			if !s.nil?
 				@xml.tag!('gmd:initiativeType') do
 					initCode.writeXML(s)

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dataIdentification.rb

@@ -13,6 +13,7 @@
 #   Stan Smith 2014-05-15 modify to support JSON schema version 0.4.0
 #   Stan Smith 2014-05-21 added aggregate information section
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
+#   Stan Smith 2014-10-29 add resource time period as a extent temporal element
 
 require 'code_progress'
 require 'code_topicCategory'
@@ -46,6 +47,7 @@ class MD_DataIdentification
 		topicCode = MD_TopicCategoryCode.new(@xml)
 
 		# classes used by MD_Metadata
+		intMetadataClass = InternalMetadata.new
 		citationClass = CI_Citation.new(@xml)
 		rPartyClass = CI_ResponsibleParty.new(@xml)
 		mInfoClass = MD_MaintenanceInformation.new(@xml)
@@ -310,6 +312,23 @@ class MD_DataIdentification
 			end
 
 			# data identification - extent
+			# if resource time period, represent the time period as
+			# a temporal element in the first extent
+			needTag = true
+			hTimePeriod = hDataId[:timePeriod]
+			if !hTimePeriod.empty?
+				hTempEle = intMetadataClass.newTemporalElement
+				hTempEle[:timePeriod] = hTimePeriod
+				hExt = intMetadataClass.newExtent
+				hExt[:extDesc] = 'Temporal span of the resource (data or project)'
+				hExt[:extTempElements] << hTempEle
+				@xml.tag!('gmd:extent') do
+					extentClass.writeXML(hExt)
+				end
+				needTag = false
+			end
+
+			# add the remaining geographic, temporal, and veritcal extents
 			aExtents = hDataId[:extents]
 			if !aExtents.empty?
 				aExtents.each do |hExtent|
@@ -317,7 +336,7 @@ class MD_DataIdentification
 						extentClass.writeXML(hExtent)
 					end
 				end
-			elsif $showAllTags
+			elsif $showAllTags && needTag
 				@xml.tag!('gmd:extent')
 			end
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_extent.rb

@@ -60,8 +60,6 @@ class EX_Extent
 						geoEleIdClass.writeXML(hGeoElement)
 					end
 				end
-			elsif $showAllTags
-				@xml.tag!('gmd:geographicElement')
 			end
 
 			# extent - temporal element

data/lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_metadata.rb

@@ -21,6 +21,7 @@
 #   ... metadata: {resourceInfo: {citation: {citOlResources[0]: {olResURI:}}}}
 #   Stan Smith 2014-10-10 modified to pass minimum metadata input test
 #   ... test were added to handle a missing metadata > metadataInfo block in the input
+#   Stan Smith 2014-11-06 changed hierarchy level to load values from resourceInfo > resourceType
 
 require 'code_characterSet'
 require 'code_scope'
@@ -137,21 +138,16 @@ class MI_Metadata
 				@xml.tag!('gmd:parentIdentifier')
 			end
 
-			# metadata information - file hierarchy - defaults to 'dataset'
+			# metadata information - hierarchy level - defaults to 'dataset',
+			# values taken from resourceInfo > resourceType
 			fileHierarchy = false
-			if hMetaInfo
-				if hMetaInfo[:metadataScope]
-					aHierarchy = hMetaInfo[:metadataScope]
-					unless aHierarchy.empty?
-						fileHierarchy = true
-						aHierarchy.each do |hierarchy|
-							@xml.tag!('gmd:hierarchyLevel') do
-								scopeCode.writeXML(hierarchy)
-							end
-						end
+				s = hResInfo[:resourceType]
+				if s != ''
+					fileHierarchy = true
+					@xml.tag!('gmd:hierarchyLevel') do
+						scopeCode.writeXML(s)
 					end
 				end
-			end
 			if !fileHierarchy
 				@xml.tag!('gmd:hierarchyLevel') do
 					scopeCode.writeXML('dataset')