adiwg-mdtranslator 2.0.0rc11 → 2.0.0rc13

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_contact.rb

@@ -22,15 +22,24 @@ module ADIWG
                   # gather all responsibility objects in intObj
                   aResponsibility = @Namespace.nested_objs_by_element(intObj, 'roleName')
 
+                  # set an additional 'Material Request Contact' for each distributor contact
+                  aMRContacts = @Namespace.nested_objs_by_element(intObj[:metadata][:distributorInfo], 'roleName')
+                  aMRContactsDup = Marshal::load(Marshal.dump(aMRContacts))
+                  aMRContactsDup.each do |hResponsibility|
+                     hResponsibility[:roleName] = 'Material Request Contact'
+                     aResponsibility << hResponsibility
+                  end
+
                   # make a list of unique role/party contacts
                   aContactList = []
                   aResponsibility.each do |hResponsibility|
                      role = hResponsibility[:roleName]
+                     sbRole = Codelists.codelist_iso_to_sb('iso_sb_role', :isoCode => role)
+                     sbRole = sbRole.nil? ? role : sbRole
                      hResponsibility[:parties].each do |hParty|
-                        aContactList << { :role => role, :index => hParty[:contactIndex] }
+                        aContactList << { :role => sbRole, :index => hParty[:contactIndex] }
                      end
                   end
-
                   aContactList = aContactList.uniq
 
                end
@@ -62,8 +71,7 @@ module ADIWG
                         json.name hContact[:name]
                         json.contactType type
                         json.personalTitle hContact[:positionName] if type == 'person'
-                        sbRole = Codelists.codelist_iso_to_sb('iso_sb_role', :isoCode => role)
-                        json.type sbRole = sbRole.nil? ? role : sbRole
+                        json.type role
                         json.email hContact[:eMailList][0] unless hContact[:eMailList].empty?
                         json.hours Hours.build(hContact[:hoursOfService]) unless hContact[:hoursOfService].empty?
                         json.instructions hContact[:contactInstructions]

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_date.rb

@@ -26,11 +26,11 @@ module ADIWG
                         # if iso date codes does not map to scienceBase use type = 'Info'
                         if dateType.nil?
                            sbDate[:type] = 'Info'
-                           sbDate[:dateString] = AdiwgDateTimeFun.stringFromDateObject(hDate)
+                           sbDate[:dateString] = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDate)
                            sbDate[:label] = hDate[:dateType]
                         else
                            sbDate[:type] = dateType
-                           sbDate[:dateString] = AdiwgDateTimeFun.stringFromDateObject(hDate)
+                           sbDate[:dateString] = AdiwgDateTimeFun.stringDateTimeFromDateObject(hDate)
                            sbDate[:label] = hDate[:description] unless hDate[:description].nil?
                         end
 
@@ -43,14 +43,14 @@ module ADIWG
                      unless hResource[:timePeriod][:startDateTime].empty?
                         sbDate = {}
                         sbDate[:type] = 'Start'
-                        sbDate[:dateString] = AdiwgDateTimeFun.stringFromDateObject(hResource[:timePeriod][:startDateTime])
+                        sbDate[:dateString] = AdiwgDateTimeFun.stringDateTimeFromDateObject(hResource[:timePeriod][:startDateTime])
                         sbDate[:label] = hResource[:timePeriod][:description] unless hResource[:timePeriod][:description].nil?
                         aDates << sbDate
                      end
                      unless hResource[:timePeriod][:endDateTime].empty?
                         sbDate = {}
                         sbDate[:type] = 'End'
-                        sbDate[:dateString] = AdiwgDateTimeFun.stringFromDateObject(hResource[:timePeriod][:endDateTime])
+                        sbDate[:dateString] = AdiwgDateTimeFun.stringDateTimeFromDateObject(hResource[:timePeriod][:endDateTime])
                         sbDate[:label] = hResource[:timePeriod][:description] unless hResource[:timePeriod][:description].nil?
                         aDates << sbDate
                      end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_id.rb

@@ -14,35 +14,34 @@ module ADIWG
             module Id
 
                # use metadataInfo identifier
-               # else use citation identifier [0]
-               # else use generated UUID
+               # else use citation identifier
+               # valid identifier must have namespace = 'gov.sciencebase.catalog'
                def self.build(intObj)
 
                   metadataInfo = intObj[:metadata][:metadataInfo]
                   resourceInfo = intObj[:metadata][:resourceInfo]
-                  hIdentifier = metadataInfo[:metadataIdentifier]
+                  hMetadataId = metadataInfo[:metadataIdentifier]
                   hCitation = resourceInfo[:citation]
 
-                  id = nil
-                  metadataId = nil
-                  citationId = nil
-                  unless hIdentifier.empty?
-                     metadataId = hIdentifier[:identifier]
+                  unless hMetadataId.empty?
+                     if hMetadataId[:namespace] == 'gov.sciencebase.catalog'
+                        unless hMetadataId[:identifier].nil?
+                           return hMetadataId[:identifier]
+                        end
+                     end
                   end
 
                   unless hCitation.empty?
-                     unless hCitation[:identifiers].empty?
-                        citationId = hCitation[:identifiers][0][:identifier]
+                     hCitation[:identifiers].each do |hIdentifier|
+                        if hIdentifier[:namespace] == 'gov.sciencebase.catalog'
+                           unless hIdentifier[:identifier].nil?
+                              return hIdentifier[:identifier]
+                           end
+                        end
                      end
                   end
 
-                  if !metadataId.nil?
-                     id = metadataId
-                  elsif !citationId.nil?
-                     id = citationId
-                  else
-                     id = UUIDTools::UUID.random_create.to_s
-                  end
+                  return nil
 
                end
 

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_materialRequest.rb

@@ -3,6 +3,8 @@
 # History:
 #  Stan Smith 2017-05-25 original script
 
+require_relative 'sbJson_codelists'
+
 module ADIWG
    module Mdtranslator
       module Writers
@@ -23,6 +25,8 @@ module ADIWG
                         end
                         unless hDistributor[:contact].empty?
                            role = hDistributor[:contact][:roleName]
+                           sbRole = Codelists.codelist_iso_to_sb('iso_sb_role', :isoCode => role)
+                           sbRole = sbRole.nil? ? role : sbRole
                            aParties = hDistributor[:contact][:parties]
                            aParties.each do |hParty|
                               contactIndex = hParty[:contactIndex]
@@ -31,9 +35,9 @@ module ADIWG
                                  unless hContact.empty?
                                     name = hContact[:name]
                                     if instructions.nil?
-                                       materialRequest += name + '(' + role + '); '
+                                       materialRequest += name + '(' + sbRole + '); '
                                     else
-                                       materialRequest += name + '(' + role + ' - ' + instructions + '); '
+                                       materialRequest += name + '(' + sbRole + ' - ' + instructions + '); '
                                     end
                                  end
                               end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_provenance.rb

@@ -10,26 +10,10 @@ module ADIWG
 
             module Provenance
 
-               def self.build(hMetadataInfo)
-
-                  aContacts = hMetadataInfo[:metadataContacts]
-                  aDates = hMetadataInfo[:metadataDates]
+               def self.build
 
                   hProvenance = {}
-                  hProvenance[:dataSource] = 'generated using ADIwg mdTranslator ' + ADIWG::Mdtranslator::VERSION
-
-                  aDates.each do |hDate|
-                     if hDate[:dateType] == 'creation'
-                        hProvenance[:dateCreated] = AdiwgDateTimeFun.stringFromDateObject(hDate)
-                     end
-                     if hDate[:dateType] == 'lastUpdate'
-                        hProvenance[:lastUpdated] = AdiwgDateTimeFun.stringFromDateObject(hDate)
-                     end
-                  end
-
-                  if hProvenance.empty?
-                     return nil
-                  end
+                  hProvenance[:annotation] = 'generated using ADIwg mdTranslator ' + ADIWG::Mdtranslator::VERSION
 
                   hProvenance
 

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_rights.rb

@@ -3,6 +3,8 @@
 # History:
 #  Stan Smith 2017-05-22 original script
 
+require_relative 'sbJson_codelists'
+
 module ADIWG
    module Mdtranslator
       module Writers
@@ -17,9 +19,20 @@ module ADIWG
                   aConstraints.each do |hConstraint|
                      if hConstraint[:type] = 'legal'
                         unless hConstraint[:legalConstraint].empty?
+
+                           # map legal constraint usage restriction codes
+                           hConstraint[:legalConstraint][:useCodes].each do |code|
+                              codeDef = Codelists.get_code_definition('iso_restriction', code)
+                              unless codeDef.nil?
+                                 rights += code + ' - ' + codeDef + '; '
+                              end
+                           end
+
+                           # map other legal constraints
                            hConstraint[:legalConstraint][:otherCons].each do |con|
                               rights += con + '; '
                            end
+
                         end
                      end
                   end

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_sbJson.rb

@@ -21,6 +21,7 @@ require_relative 'sbJson_spatial'
 require_relative 'sbJson_facet'
 require_relative 'sbJson_metadataRepository'
 require_relative 'sbJson_geographicExtent'
+require_relative 'sbJson_abstract'
 
 module ADIWG
    module Mdtranslator
@@ -41,13 +42,13 @@ module ADIWG
                   json.id Id.build(intObj)
                   json.title hCitation[:title] unless hCitation.empty?
                   json.alternateTitles hCitation[:alternateTitles] unless hCitation[:alternateTitles].empty?
-                  json.body resourceInfo[:abstract]
+                  json.body Abstract.build(resourceInfo[:abstract])
                   json.summary resourceInfo[:shortAbstract]
                   json.citation Citation.build(hCitation) unless hCitation.empty?
                   json.identifiers @Namespace.json_map(hCitation[:identifiers], Identifier) unless hCitation.empty?
                   json.purpose resourceInfo[:purpose]
                   json.rights Rights.build(resourceInfo[:constraints]) unless resourceInfo[:constraints].empty?
-                  json.provenance Provenance.build(metadataInfo)
+                  json.provenance Provenance.build()
                   json.materialRequestInstructions MaterialRequest.build(distributorInfo) unless distributorInfo.empty?
                   json.parentId ParentId.build(metadataInfo[:parentMetadata]) unless metadataInfo[:parentMetadata].empty?
                   aContactList = Contact.get_contact_list(intObj)

data/lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_webLink.rb

@@ -18,8 +18,17 @@ module ADIWG
                   hWebLink = {}
 
                   function = hResource[:olResFunction]
-                  function = 'download' if function.nil?
-                  hWebLink[:type] = Codelists.codelist_iso_to_sb('iso_sb_onlineFunction', :isoCode => function)
+                  if function.nil?
+                     hWebLink[:type] = 'webLink'
+                  else
+                     if Codelists.is_sb_code('iso_sb_onlineFunction', function)
+                        hWebLink[:type] = function
+                     else
+                        sbFunction = Codelists.codelist_iso_to_sb('iso_sb_onlineFunction', :isoCode => function)
+                        hWebLink[:type] = sbFunction.nil? ? 'webLink' : sbFunction
+                     end
+                  end
+
                   hWebLink[:typeLabel] = hResource[:olResDesc] unless hResource[:olResDesc].nil?
                   hWebLink[:uri] = hResource[:olResURI] unless hResource[:olResURI].nil?
                   hWebLink[:title] = hResource[:olResName] unless hResource[:olResName].nil?
@@ -50,6 +59,18 @@ module ADIWG
                      end
                   end
 
+                  # build webLinks from distributor
+                  hMetadata[:distributorInfo].each do |aDistribution|
+                     aDistribution[:distributor].each do |aDistributor|
+                        aDistributor[:transferOptions].each do |aOption|
+                           aOption[:onlineOptions].each do |hResource|
+                              hWebLink = buildWebLink(hResource)
+                              aLinks << hWebLink unless hWebLink.empty?
+                           end
+                        end
+                     end
+                  end
+
                   if aLinks.empty?
                      return nil
                   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc11
+  version: 2.0.0rc13
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -165,6 +165,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: The mdtranslator was written by the Alaska Data Integration Working Group
   (ADIwg) to assist with creating ISO 19139 metadata records.  Input to the mdtranslator
   is JSON conforming to the mdJson-schema.  The mdtranslator architecture allows developers
@@ -282,27 +310,35 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/readme.md
 - lib/adiwg/mdtranslator/readers/mdJson/version.rb
 - lib/adiwg/mdtranslator/readers/mdReaders.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_additionalDocumentation.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_boundingBox.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_browseGraphic.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_citation.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_contacts.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_dateTime.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_distributionInfo.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_extent.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_geoCoordSystem.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_geoProperties.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_geographicElement.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_metadata.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_metadataInfo.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_onlineResource.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_resourceIdentifier.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_resourceInfo.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_responsibleParty.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_sbJson.rb
-- lib/adiwg/mdtranslator/readers/sbJson/modules_v0/version.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_additionalDocumentation.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_boundingBox.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_browseGraphic.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_citation.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_contacts.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_dateTime.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_distributionInfo.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_extent.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_geoCoordSystem.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_geoProperties.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_geographicElement.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_metadata.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_metadataInfo.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_onlineResource.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_resourceIdentifier.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_resourceInfo.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_responsibleParty.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_body.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_citation.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_id.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_identifier.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_provenance.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_purpose.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_rights.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_sbJson.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_titles.rb
 - lib/adiwg/mdtranslator/readers/sbJson/readme.md
 - lib/adiwg/mdtranslator/readers/sbJson/sbJson_reader.rb
+- lib/adiwg/mdtranslator/readers/sbJson/version.rb
 - lib/adiwg/mdtranslator/version.rb
 - lib/adiwg/mdtranslator/writers/html/html_writer.rb
 - lib/adiwg/mdtranslator/writers/html/readme.md
@@ -580,6 +616,7 @@ files:
 - lib/adiwg/mdtranslator/writers/mdWriters.rb
 - lib/adiwg/mdtranslator/writers/sbJson/readme.md
 - lib/adiwg/mdtranslator/writers/sbJson/sbJson_writer.rb
+- lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_abstract.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_browseCategory.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_budget.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_citation.rb
@@ -624,7 +661,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/module_sbJson.rb

@@ -1,52 +0,0 @@
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_contacts')
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_metadata')
-#require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_dataDictionary')
-
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                def self.unpack(intObj, hSbJson, responseObj)
-
-                    # get json schema name and version
-                    hVersion = hSbJson['version']
-                    intObj[:schema][:name] = hVersion['name']
-                    intObj[:schema][:version] = hVersion['version']
-
-                    # contact array
-                    # load the array of contacts from the json input
-                    if hSbJson.has_key?('contacts')
-                    	aContacts = hSbJson['contacts']
-                    	aContacts.each do |hContact|
-                    		unless hContact.empty?
-                    			intObj[:contacts] << Contact.unpack(hContact, responseObj)
-                    		end
-                    	end
-                    end
-                    # add default contacts
-                    intObj[:contacts].concat(Contact.setDefaultContacts)
-
-                    # metadata section
-                    # load metadata from the hash object
-                    intObj[:metadata] = Metadata.unpack(hSbJson, responseObj, intObj)
-
-                    # # data dictionary section
-                    # if hSbJson.has_key?('dataDictionary')
-                    #     aDictionary = hSbJson['dataDictionary']
-                    #     aDictionary.each do |hDictionary|
-                    #         unless hDictionary.empty?
-                    #             intObj[:dataDictionary] << DataDictionary.unpack(hDictionary, responseObj)
-                    #         end
-                    #     end
-                    # end
-
-                    # return ADIwg internal container
-                    return intObj
-
-                end
-
-            end
-        end
-    end
-end

data/lib/adiwg/mdtranslator/readers/sbJson/modules_v0/version.rb

@@ -1,12 +0,0 @@
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                # current version of sbJson reader
-                VERSION = '0.0.0'
-
-            end
-        end
-    end
-end