adiwg-mdtranslator 2.0.0rc13 → 2.0.0

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

@@ -100,7 +100,6 @@ module ADIWG
                   {iso: nil, sb: 'WAF'},
                   {iso: nil, sb: 'xls'},
                   {iso: nil, sb: 'zip'}
-
                ]
 
                @iso_sb_scope = [

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

@@ -75,7 +75,11 @@ module ADIWG
                         json.email hContact[:eMailList][0] unless hContact[:eMailList].empty?
                         json.hours Hours.build(hContact[:hoursOfService]) unless hContact[:hoursOfService].empty?
                         json.instructions hContact[:contactInstructions]
-                        json.tty hContact[:phones].collect {|ph| ph[:phoneNumber] if
+                        json.officePhone hContact[:phones].collect {|ph| ph[:phoneNumber] if
+                           ph[:phoneServiceTypes].include?('voice')}.reject(&:nil?).first
+                        json.faxPhone hContact[:phones].collect {|ph| ph[:phoneNumber] if
+                           ph[:phoneServiceTypes].include?('fax')}.reject(&:nil?).first
+                        json.ttyPhone hContact[:phones].collect {|ph| ph[:phoneNumber] if
                            ph[:phoneServiceTypes].include?('tty')}.reject(&:nil?).first
                         json.organization {json.displayText orgName} unless orgName.nil?
                         json.logoUrl logoUrl unless logoUrl.nil?
@@ -87,6 +91,8 @@ module ADIWG
                                     ph[:phoneServiceTypes].include?('voice')}.reject(&:nil?).first
                                  json.faxPhone hContact[:phones].collect {|ph| ph[:phoneNumber] if
                                     ph[:phoneServiceTypes].include?('fax')}.reject(&:nil?).first
+                                 json.ttyPhone hContact[:phones].collect {|ph| ph[:phoneNumber] if
+                                    ph[:phoneServiceTypes].include?('tty')}.reject(&:nil?).first
                               end
                               unless hContact[:addresses].empty?
                                  aAddress = hContact[:addresses]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc13
+  version: 2.0.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -310,32 +310,28 @@ 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/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_browseCategory.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_budget.rb
 - lib/adiwg/mdtranslator/readers/sbJson/modules/module_citation.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_contact.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_date.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_extent.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_materialRequest.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_parentId.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_project.rb
 - lib/adiwg/mdtranslator/readers/sbJson/modules/module_provenance.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_publication.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_spatial.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_tag.rb
 - lib/adiwg/mdtranslator/readers/sbJson/modules/module_titles.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_webLinkDocument.rb
+- lib/adiwg/mdtranslator/readers/sbJson/modules/module_webLinkGraphic.rb
 - lib/adiwg/mdtranslator/readers/sbJson/readme.md
 - lib/adiwg/mdtranslator/readers/sbJson/sbJson_reader.rb
 - lib/adiwg/mdtranslator/readers/sbJson/version.rb
@@ -656,12 +652,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: The mdtranslator (metadata translator) is a tool for translating metadata

data/lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_additionalDocumentation.rb

@@ -1,52 +0,0 @@
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_citation')
-
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                module AdditionalDocumentation
-
-                    def self.unpack(hAddDoc, responseObj)
-
-                        # return nil object if input is empty
-                        intAddDoc = nil
-                        return if hAddDoc.empty?
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intAddDoc = intMetadataClass.newAdditionalDocumentation
-
-                        # additional documentation - resource type
-                        if hAddDoc.has_key?('resourceType')
-                            s = hAddDoc['resourceType']
-                            if s != ''
-                                intAddDoc[:resourceType] = s
-                            end
-                        end
-
-                        # additional documentation - resource citation
-                        if hAddDoc.has_key?('citation')
-                            hCitation = hAddDoc['citation']
-                            unless hCitation.empty?
-                                intAddDoc[:citation] = Citation.unpack(hCitation, responseObj)
-                            else
-                                responseObj[:readerExecutionMessages] << 'Additional documentation citation is empty'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        else
-                            responseObj[:readerExecutionMessages] << 'Additional documentation citation is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        return intAddDoc
-                    end
-
-                end
-
-            end
-        end
-    end
-end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_boundingBox.rb

@@ -1,54 +0,0 @@
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                module BoundingBox
-
-                    def self.unpack(aBBox, responseObj)
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intGeometry = intMetadataClass.newGeometry
-                        intGeometry[:geoType] = 'BoundingBox'
-
-                        # unpack GeoJSON bounding box elements
-                        intBBox = intMetadataClass.newBoundingBox
-                        west = aBBox[0]
-                        south = aBBox[1]
-                        east = aBBox[2]
-                        north = aBBox[3]
-
-                        # validate coordinates if easting +/-180 and northing +/-90
-                        valid = false
-                        if (180 >= west) && (west >= -180)
-                            if (90 >= south) && (south >= -90)
-                                if (180 >= east) && (east >= -180)
-                                    if (90 >= north) &&(north >= -90)
-                                        valid = true
-                                    end
-                                end
-                            end
-                        end
-
-                        # build internal geo element if valid
-                        if valid
-                            intBBox[:westLong] = west
-                            intBBox[:eastLong] = east
-                            intBBox[:southLat] = south
-                            intBBox[:northLat] = north
-                            intGeometry[:geometry] = intBBox
-
-                            return intGeometry
-                        else
-                            return nil
-                        end
-
-                    end
-
-                end
-
-            end
-        end
-    end
-end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_browseGraphic.rb

@@ -1,66 +0,0 @@
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                module BrowseGraphic
-
-                    def self.unpack(hBgraphic, responseObj)
-
-                        # return nil object if input is empty
-                        intBGraphic = nil
-                        return if hBgraphic.empty?
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intBGraphic = intMetadataClass.newBrowseGraphic
-
-                        # graphic - file name
-                        if hBgraphic.has_key?('fileName')
-                            s = hBgraphic['fileName']
-                            if s != ''
-                                intBGraphic[:bGName] = s
-                            else
-                                responseObj[:readerExecutionMessages] << 'Graphic overview name is empty'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        else
-                            responseObj[:readerExecutionMessages] << 'Graphic overview name is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # graphic - file description
-                        if hBgraphic.has_key?('fileDescription')
-                            s = hBgraphic['fileDescription']
-                            if s != ''
-                                intBGraphic[:bGDescription] = s
-                            end
-                        end
-
-                        # graphic - file  type
-                        if hBgraphic.has_key?('fileType')
-                            s = hBgraphic['fileType']
-                            if s != ''
-                                intBGraphic[:bGType] = s
-                            end
-                        end
-
-                        # graphic - web link
-                        if hBgraphic.has_key?('fileUri')
-                            s = hBgraphic['fileUri']
-                            if s != ''
-                                intBGraphic[:bGURI] = s
-                            end
-                        end
-
-                        return intBGraphic
-                    end
-
-                end
-
-            end
-        end
-    end
-end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_citation.rb

@@ -1,125 +0,0 @@
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_dateTime')
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_responsibleParty')
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_onlineResource')
-require ADIWG::Mdtranslator::Readers::SbJson.readerModule('module_resourceIdentifier')
-
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-
-                module Citation
-
-                    def self.unpack(hCitation, responseObj)
-
-                        # return nil object if input is empty
-                        intCitation = nil
-                        return if hCitation.empty?
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intCitation = intMetadataClass.newCitation
-
-                        # citation - title
-                        if hCitation.has_key?('title')
-                            s = hCitation['title']
-                            if s != ''
-                                intCitation[:citTitle] = s
-                            else
-                                responseObj[:readerExecutionMessages] << 'Citation title is empty'
-                                responseObj[:readerExecutionPass] = false
-                                return nil
-                            end
-                        else
-                            responseObj[:readerExecutionMessages] << 'Citation title is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
-
-                        # citation - alternate title
-                        if hCitation.has_key?('alternateTitle')
-                            s = hCitation['alternateTitle']
-                            if s != ''
-                                intCitation[:citAltTitle] = s
-                            end
-                        end
-
-                        # citation - date
-                        if hCitation.has_key?('date')
-                            aCitDates = hCitation['date']
-                            unless aCitDates.empty?
-                                aCitDates.each do |hCitDate|
-                                    if hCitDate.has_key?('date')
-                                        s = hCitDate['date']
-                                        if s != ''
-                                            intDateTime = SbDateTime.unpack(s, responseObj)
-                                            if hCitDate.has_key?('dateType')
-                                                s = hCitDate['dateType']
-                                                if s != ''
-                                                    intDateTime[:dateType] = s
-                                                end
-                                            end
-                                            intCitation[:citDate] << intDateTime
-                                        end
-                                    end
-                                end
-                            end
-                        end
-
-                        # citation - edition
-                        if hCitation.has_key?('edition')
-                            s = hCitation['edition']
-                            if s != ''
-                                intCitation[:citEdition] = s
-                            end
-                        end
-
-                        # citation - responsible party
-                        if hCitation.has_key?('responsibleParty')
-                            aRParty = hCitation['responsibleParty']
-                            unless aRParty.empty?
-                                aRParty.each do |hRParty|
-                                    intCitation[:citResponsibleParty] << ResponsibleParty.unpack(hRParty, responseObj)
-                                end
-                            end
-                        end
-
-                        # citation - presentation form
-                        if hCitation.has_key?('presentationForm')
-                            aPForms = hCitation['presentationForm']
-                            unless aPForms.empty?
-                                aPForms.each do |pForm|
-                                    intCitation[:citResourceForms] << pForm
-                                end
-                            end
-                        end
-
-                        # citation - resource identifiers
-                        if hCitation.has_key?('identifier')
-                            aResIds = hCitation['identifier']
-                            aResIds.each do |hIdentifier|
-                                unless hIdentifier.empty?
-                                    intCitation[:citResourceIds] << ResourceIdentifier.unpack(hIdentifier, responseObj)
-                                end
-                            end
-                        end
-
-                        # citation - online resources
-                        if hCitation.has_key?('onlineResource')
-                            aOlRes = hCitation['onlineResource']
-                            aOlRes.each do |hOlRes|
-                                unless hOlRes.empty?
-                                    intCitation[:citOlResources] << OnlineResource.unpack(hOlRes, responseObj)
-                                end
-                            end
-                        end
-
-                        return intCitation
-                    end
-
-                end
-
-            end
-        end
-    end
-end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/Old/module_contacts.rb

@@ -1,143 +0,0 @@
-require 'uuidtools'
-
-module ADIWG
-    module Mdtranslator
-        module Readers
-            module SbJson
-                module Contact
-                    def self.unpack(hContact, responseObj)
-                        # return nil object if input is empty
-                        intCont = nil
-                        return if hContact.empty?
-
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intCont = intMetadataClass.newContact
-
-                        # contact ID - required
-                        # SB doesn't provide a contactId, so we create one
-                        intCont[:contactId] = UUIDTools::UUID.random_create.to_s
-                        hContact['contactId'] = intCont[:contactId]
-
-                        # contact name
-                        s = hContact['name']
-                        if s != ''
-                            if hContact['contactType'] == 'person'
-                                intCont[:indName] = s
-                                intCont[:orgName] = hContact['organization']['displayText'] unless hContact[:organization].nil?
-                            else
-                                intCont[:orgName] = s
-                            end
-                        end
-
-                        # position name
-                        if hContact.key?('jobTitle')
-                            s = hContact['jobTitle']
-                            intCont[:position] = s if s != ''
-                        end
-
-                        # SB Role
-                        if hContact.key?('type')
-                            s = hContact['type']
-                            intCont[:primaryRole] = s if s != ''
-                        end
-
-                        # contact instructions
-                        if hContact.key?('instructions')
-                            s = hContact['instructions']
-                            intCont[:contactInstructions] = s if s != ''
-                        end
-
-                        if hContact.key?('primaryLocation')
-                            pl = hContact['primaryLocation']
-                            # phones - all service types
-                            if pl.key?('officePhone')
-                                officePhone = intMetadataClass.newPhone
-
-                                # phone - service
-                                officePhone[:phoneServiceType] = 'voice'
-                                officePhone[:phoneName] = 'officePhone'
-                                officePhone[:phoneNumber] = pl['officePhone']
-                                intCont[:phones] << officePhone
-                            end
-                            if pl.key?('faxPhone')
-                                faxPhone = intMetadataClass.newPhone
-
-                                # phone - service
-                                faxPhone[:phoneServiceType] = 'fax'
-                                faxPhone[:phoneName] = 'faxPhone'
-                                faxPhone[:phoneNumber] = pl['faxPhone']
-                                intCont[:phones] << faxPhone
-                            end
-
-                            # address
-                            address = pl['mailAddress']  || pl['streetAddress']
-                            unless address.nil?
-                                intAdd = intMetadataClass.newAddress
-
-                                # address - delivery point
-                                if address.has_key?('line1')
-                                  intAdd[:deliveryPoints] << address['line1']
-                                end
-
-                                if address.has_key?('line2')
-                                  intAdd[:deliveryPoints] << address['line2']
-                                end
-
-                                intAdd[:city] = address['city']
-                                intAdd[:adminArea] = address['state']
-                                intAdd[:postalCode] = address['zip']
-                                intAdd[:country] = address['country']
-
-                                if hContact['email']
-                                    intAdd[:eMailList] << hContact['email']
-                                end
-
-                                intCont[:address] = intAdd
-                            end
-                        end
-
-                        intCont
-                    end
-
-                    def self.setDefaultContacts
-                        # add default contacts
-                        intMetadataClass = InternalMetadata.new
-                        aDefContacts = []
-
-                        #contact for ScienceBase
-                        intCont = intMetadataClass.newContact
-                        intCont[:contactId] = 'SB'
-                        intCont[:orgName] = 'ScienceBase'
-
-                        intOlRes = intMetadataClass.newOnlineResource
-                        intOlRes[:olResURI] = 'http://www.sciencebase.gov'
-                        intOlRes[:olResName] = 'ScienceBase Homepage'
-                        intCont[:onlineRes] << intOlRes
-
-                        intAdd = intMetadataClass.newAddress
-                        intAdd[:eMailList] << 'sciencebase@usgs.gov'
-                        intCont[:address] = intAdd
-                        intCont[:internal] = true
-
-                        aDefContacts << intCont
-
-                        # contact to support doi (digital object identifier)
-                        intCont = intMetadataClass.newContact
-                        intCont[:contactId] = 'ADIwgDOI'
-                        intCont[:orgName] = 'International DOI Foundation (IDF)'
-
-                        intOlRes = intMetadataClass.newOnlineResource
-                        intOlRes[:olResURI] = 'http://www.doi.org'
-                        intCont[:onlineRes] << intOlRes
-                        intCont[:internal] = true
-
-                        aDefContacts << intCont
-
-                        aDefContacts
-                    end
-                end
-            end
-        end
-    end
-end