adiwg-mdtranslator 1.1.1 → 1.2.0

data/lib/adiwg/mdtranslator/writers/iso/classes/class_maintenanceInformation.rb

@@ -6,8 +6,9 @@
 # 	Stan Smith 2013-12-18 added contact
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_maintenanceFrequency'
+require 'class_codelist'
 require 'class_responsibleParty'
 
 module ADIWG
@@ -24,7 +25,7 @@ module ADIWG
                     def writeXML(hMaintInfo)
 
                         # classes used
-                        maintFreqCode = $IsoNS::MD_MaintenanceFrequencyCode.new(@xml)
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
                         rPartyClass = $IsoNS::CI_ResponsibleParty.new(@xml)
 
                         @xml.tag! 'gmd:MD_MaintenanceInformation' do
@@ -35,7 +36,7 @@ module ADIWG
                                 @xml.tag!('gmd:maintenanceAndUpdateFrequency', {'gco:nilReason' => 'unknown'})
                             else
                                 @xml.tag!('gmd:maintenanceAndUpdateFrequency') do
-                                    maintFreqCode.writeXML(s)
+                                    codelistClass.writeXML('iso_maintenanceFrequency',s)
                                 end
                             end
 
@@ -53,7 +54,7 @@ module ADIWG
 
                             # maintenance information - contact - CI_ResponsibleParty
                             aContacts = hMaintInfo[:maintContacts]
-                            if aContacts.empty? && $shoeEmpty
+                            if aContacts.empty? && $showEmpty
                                 @xml.tag!('gmd:contact')
                             else
                                 aContacts.each do |hContact|

data/lib/adiwg/mdtranslator/writers/iso/classes/class_medium.rb

@@ -5,9 +5,9 @@
 # 	Stan Smith 2013-09-26 original script
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_mediumName'
-require 'code_mediumFormat'
+require 'class_codelist'
 
 module ADIWG
     module Mdtranslator
@@ -23,8 +23,7 @@ module ADIWG
                     def writeXML(medium)
 
                         # classes used
-                        medFormatCode = $IsoNS::MD_MediumFormatCode.new(@xml)
-                        medNameCode = $IsoNS::MD_MediumNameCode.new(@xml)
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
 
                         @xml.tag!('gmd:MD_Medium') do
 
@@ -32,7 +31,7 @@ module ADIWG
                             s = medium[:mediumName]
                             if !s.nil?
                                 @xml.tag!('gmd:name') do
-                                    medNameCode.writeXML(s)
+                                    codelistClass.writeXML('iso_mediumName',s)
                                 end
                             elsif $showAllTags
                                 @xml.tag!('gmd:name')
@@ -42,7 +41,7 @@ module ADIWG
                             s = medium[:mediumFormat]
                             if !s.nil?
                                 @xml.tag!('gmd:mediumFormat') do
-                                    medFormatCode.writeXML(s)
+                                    codelistClass.writeXML('iso_mediumFormat',s)
                                 end
                             elsif $showAllTags
                                 @xml.tag!('gmd:mediumFormat')

data/lib/adiwg/mdtranslator/writers/iso/classes/class_metadataExtension.rb

@@ -5,9 +5,10 @@
 # 	Stan Smith 2013-11-22 original script
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_obligation'
-require 'code_datatype'
+require 'class_codelist'
+require 'class_enumerationList'
 require 'class_onlineResource'
 require 'class_responsibleParty'
 
@@ -25,10 +26,10 @@ module ADIWG
                     def writeXML(hExtension)
 
                         # classes used
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
+                        enumerationClass = $IsoNS::MD_EnumerationList.new(@xml)
                         olResClass = $IsoNS::CI_OnlineResource.new(@xml)
                         rPartyClass = $IsoNS::CI_ResponsibleParty.new(@xml)
-                        obCode = $IsoNS::MD_ObligationCode.new(@xml)
-                        dataTCode = $IsoNS::MD_DatatypeCode.new(@xml)
 
                         @xml.tag!('gmd:MD_MetadataExtensionInformation') do
 
@@ -80,7 +81,7 @@ module ADIWG
                                     s = hExtension[:obligation]
                                     if !s.nil?
                                         @xml.tag!('gmd:obligation') do
-                                            obCode.writeXML(s)
+                                            enumerationClass.writeXML('iso_obligation',s)
                                         end
                                     elsif $showAllTags
                                         @xml.tag!('gmd:obligation')
@@ -92,7 +93,7 @@ module ADIWG
                                         @xml.tag!('gmd:dataType', {'gco:nilReason' => 'missing'})
                                     else
                                         @xml.tag!('gmd:dataType') do
-                                            dataTCode.writeXML(s)
+                                            codelistClass.writeXML('iso_dataType',s)
                                         end
                                     end
 

data/lib/adiwg/mdtranslator/writers/iso/classes/class_onlineResource.rb

@@ -6,8 +6,9 @@
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-08-14 added protocol to onlineResource
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_onlineFunction'
+require 'class_codelist'
 
 module ADIWG
     module Mdtranslator
@@ -23,7 +24,7 @@ module ADIWG
                     def writeXML(hOlResource)
 
                         # classes used
-                        olFunctionCode = $IsoNS::CI_OnLineFunctionCode.new(@xml)
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
 
                         @xml.tag! 'gmd:CI_OnlineResource' do
 
@@ -71,7 +72,7 @@ module ADIWG
                             s = hOlResource[:olResFunction]
                             if !s.nil?
                                 @xml.tag!('gmd:function') do
-                                    olFunctionCode.writeXML(s)
+                                    codelistClass.writeXML('iso_onlineFunction',s)
                                 end
                             elsif $showAllTags
                                 @xml.tag!('gmd:function')

data/lib/adiwg/mdtranslator/writers/iso/classes/class_responsibleParty.rb

@@ -6,8 +6,9 @@
 #   Stan Smith 2014-05-14 modified for JSON schema 0.4.0
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_role'
+require 'class_codelist'
 require 'class_contact'
 
 module ADIWG
@@ -24,8 +25,8 @@ module ADIWG
                     def writeXML(rParty)
 
                         # classes used
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
                         ciContactClass = $IsoNS::CI_Contact.new(@xml)
-                        ciRoleCode = $IsoNS::CI_RoleCode.new(@xml)
 
                         # search array of responsible party for matches in contact object
                         rpID = rParty[:contactId]
@@ -83,7 +84,7 @@ module ADIWG
                                         xml.tag!('gmd:role', {'gco:nilReason' => 'missing'})
                                     else
                                         @xml.tag! 'gmd:role' do
-                                            ciRoleCode.writeXML(s)
+                                            codelistClass.writeXML('iso_role',s)
                                         end
                                     end
 

data/lib/adiwg/mdtranslator/writers/iso/classes/class_securityConstraints.rb

@@ -5,8 +5,9 @@
 # 	Stan Smith 2013-11-01 original script
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-require 'code_classification'
+require 'class_codelist'
 
 module ADIWG
     module Mdtranslator
@@ -22,7 +23,7 @@ module ADIWG
                     def writeXML(hSecurityCons)
 
                         # classes used
-                        classCode = $IsoNS::MD_ClassificationCode.new(@xml)
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
 
                         @xml.tag!('gmd:MD_SecurityConstraints') do
 
@@ -32,7 +33,7 @@ module ADIWG
                                 @xml.tag!('gmd:classification', {'gco:nilReason' => 'missing'})
                             else
                                 @xml.tag!('gmd:classification') do
-                                    classCode.writeXML(s)
+                                    codelistClass.writeXML('iso_classification',s)
                                 end
                             end
 

data/lib/adiwg/mdtranslator/writers/iso19110/class_FCfeatureCatalogue.rb

@@ -38,6 +38,10 @@ module ADIWG
                         # document head
                         metadata = @xml.instruct! :xml, encoding: 'UTF-8'
                         @xml.comment!('core gfc based instance document for ISO 19110')
+                        @xml.comment!('metadata file constructed using mdTranslator')
+                        @xml.comment!('mdTranslator software is an open-source project sponsored by the Alaska Data Integration working group (ADIwg)')
+                        @xml.comment!('Alaska Data Integration working group is not responsible for the metadata content')
+                        @xml.comment!('mdTranslator and other metadata tools available at https://github.com/adiwg')
                         @xml.tag!('gfc:FC_FeatureCatalogue', {'xmlns:gmi' => 'http://www.isotc211.org/2005/gmi',
                                                               'xmlns:gmd' => 'http://www.isotc211.org/2005/gmd',
                                                               'xmlns:gco' => 'http://www.isotc211.org/2005/gco',
@@ -49,7 +53,7 @@ module ADIWG
                                                               'xmlns:gfc' => 'http://www.isotc211.org/2005/gfc',
                                                               'xmlns:xlink' => 'http://www.w3.org/1999/xlink',
                                                               'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-                                                              'xsi:schemaLocation' => 'http://www.isotc211.org/2005/gfc ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/schema.xsd'}) do
+                                                              'xsi:schemaLocation' => 'http://www.isotc211.org/2005/gfc ftp://ftp.ncddc.noaa.gov/pub/Metadata/Online_ISO_Training/Intro_to_ISO/schemas/ISObio/gfc/gfc.xsd'}) do
 
                             # feature catalogue information - name - required
                             # name is pulled from citation title in data dictionary information section

data/lib/adiwg/mdtranslator/writers/iso19115_2/class_MImetadata.rb

@@ -24,9 +24,10 @@
 #   Stan Smith 2014-11-06 changed hierarchy level to load values from resourceInfo > resourceType
 #   Stan Smith 2014-12-15 refactored to handle namespacing readers and writers
 #   Stan Smith 2014-12-29 set builder object '@xml' into string 'metadata'
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
+#   Stan Smith 2015-06-12 added support for user to specify metadataCharacterSet
 
-require 'code_characterSet'
-require 'code_scope'
+require 'class_codelist'
 require 'class_responsibleParty'
 require 'class_metadataExtension'
 require 'class_dataIdentification'
@@ -51,8 +52,7 @@ module ADIWG
                         $IsoNS = ADIWG::Mdtranslator::Writers::Iso
 
                         # classes used
-                        charCode = $IsoNS::MD_CharacterSetCode.new(@xml)
-                        scopeCode = $IsoNS::MD_ScopeCode.new(@xml)
+                        codelistClass = $IsoNS::MD_Codelist.new(@xml)
                         rPartyClass = $IsoNS::CI_ResponsibleParty.new(@xml)
                         mdExtClass = $IsoNS::MD_MetadataExtensionInformation.new(@xml)
                         dataIdClass = $IsoNS::MD_DataIdentification.new(@xml)
@@ -70,6 +70,10 @@ module ADIWG
                         # document head
                         metadata = @xml.instruct! :xml, encoding: 'UTF-8'
                         @xml.comment!('core gmi based instance document ISO 19115-2')
+                        @xml.comment!('metadata file constructed using mdTranslator')
+                        @xml.comment!('mdTranslator software is an open-source project sponsored by the Alaska Data Integration working group (ADIwg)')
+                        @xml.comment!('Alaska Data Integration working group is not responsible for the metadata content')
+                        @xml.comment!('mdTranslator and other metadata tools available at https://github.com/adiwg')
                         @xml.tag!('gmi:MI_Metadata', {'xmlns:gmi' => 'http://www.isotc211.org/2005/gmi',
                                                       'xmlns:gmd' => 'http://www.isotc211.org/2005/gmd',
                                                       'xmlns:gco' => 'http://www.isotc211.org/2005/gco',
@@ -111,10 +115,13 @@ module ADIWG
                                 @xml.tag!('gco:CharacterString', 'eng; USA')
                             end
 
-                            # metadata information - character set - default
+                            # metadata information - character set - default 'utf8'
                             @xml.tag!('gmd:characterSet') do
-                                # all out put is in utf8
-                                charCode.writeXML('utf8')
+                                s = hMetaInfo[:metadataCharacterSet]
+                                if s.nil?
+                                    s = 'utf8'
+                                end
+                                codelistClass.writeXML('iso_characterSet',s)
                             end
 
                             # metadata information - parent identifier
@@ -146,19 +153,19 @@ module ADIWG
                                 @xml.tag!('gmd:parentIdentifier')
                             end
 
-                            # metadata information - hierarchy level - defaults to 'dataset',
+                            # metadata information - hierarchy level - defaults to 'undefined',
                             # values taken from resourceInfo > resourceType
                             fileHierarchy = false
                             s = hResInfo[:resourceType]
                             if s != ''
                                 fileHierarchy = true
                                 @xml.tag!('gmd:hierarchyLevel') do
-                                    scopeCode.writeXML(s)
+                                    codelistClass.writeXML('iso_scope',s)
                                 end
                             end
                             if !fileHierarchy
                                 @xml.tag!('gmd:hierarchyLevel') do
-                                    scopeCode.writeXML('dataset')
+                                    codelistClass.writeXML('iso_scope','undefined')
                                 end
                             end
 

data/lib/adiwg/mdtranslator/writers/iso19115_2/iso19115_2_writer.rb

@@ -6,8 +6,8 @@
 #   ... for geometry supplemental information
 #   Stan Smith 2014-07-08 modify require statements to function in RubyGem structure
 #   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
+#   Stan Smith 2015-06-11 change all codelists to use 'class_codelist' method
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../iso/codelists'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../iso/classes'))
 
 require 'builder'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-06 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,9 +143,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: adiwg-mdcodes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 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 simple JSON using the mdJson-schema.  The mdtranslator architecture allows developers
+  is JSON conforming to the mdJson-schema.  The mdtranslator architecture allows developers
   to write additional readers for other input formats and/or write additional writers
   for other output other than ISO 19139.
 email:
@@ -284,6 +298,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso/classes/class_boundingPolygon.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_browseGraphic.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_citation.rb
+- lib/adiwg/mdtranslator/writers/iso/classes/class_codelist.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_contact.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_dataIdentification.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_dataQuality.rb
@@ -291,6 +306,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso/classes/class_digitalTransferOptions.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_distribution.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_distributor.rb
+- lib/adiwg/mdtranslator/writers/iso/classes/class_enumerationList.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_extent.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_featureAttribute.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_featureConstraint.rb
@@ -332,25 +348,6 @@ files:
 - lib/adiwg/mdtranslator/writers/iso/classes/class_useConstraints.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_verticalExtent.rb
 - lib/adiwg/mdtranslator/writers/iso/classes/class_vouchers.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_associationType.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_characterSet.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_classification.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_datatype.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_dateType.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_initiativeType.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_keywordType.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_maintenanceFrequency.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_mediumFormat.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_mediumName.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_obligation.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_onlineFunction.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_presentationForm.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_progress.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_restriction.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_role.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_scope.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_spatialRepresentationType.rb
-- lib/adiwg/mdtranslator/writers/iso/codelists/code_topicCategory.rb
 - lib/adiwg/mdtranslator/writers/iso/units/class_baseUnit.rb
 - lib/adiwg/mdtranslator/writers/iso/units/class_conventionalUnit.rb
 - lib/adiwg/mdtranslator/writers/iso/units/class_definitionUnit.rb
@@ -373,7 +370,6 @@ files:
 - test/readers/mdJson/v1_0/tc_reader_mdjson_domain.rb
 - test/readers/mdJson/v1_0/tc_reader_mdjson_onlineResource.rb
 - test/readers/mdJson/v1_0/tc_reader_mdjson_phone.rb
-- test/readers/mdJson/v1_0/tc_reader_mdjson_responsibleParty.rb
 - test/readers/mdJson/v1_0/tc_translation.rb
 - test/writers/iso19115_2/tc_writer_iso19115_2_address.rb
 homepage: http://www.adiwg.org/mdTranslator
@@ -413,6 +409,5 @@ test_files:
 - test/readers/mdJson/v1_0/tc_reader_mdjson_domain.rb
 - test/readers/mdJson/v1_0/tc_reader_mdjson_onlineResource.rb
 - test/readers/mdJson/v1_0/tc_reader_mdjson_phone.rb
-- test/readers/mdJson/v1_0/tc_reader_mdjson_responsibleParty.rb
 - test/readers/mdJson/v1_0/tc_translation.rb
 - test/writers/iso19115_2/tc_writer_iso19115_2_address.rb

data/lib/adiwg/mdtranslator/writers/iso/codelists/code_associationType.rb

@@ -1,47 +0,0 @@
-# ISO <<CodeLists>> gmd:MD_ClassificationCode
-
-# from http://mdtranslator.adiwg.org/api/codelists?format=xml
-# History:
-# 	Stan Smith 2013-10-21 original script
-#   Stan Smith 2014-10-15 allow non-ISO codesNames to be rendered
-#   Stan Smith 2014-12-12 refactored to handle namespacing readers and writers
-#   Stan Smith 2014-12-15 replaced NOAA CT_CodelistCatalogue with mdTranslator CT_CodelistCatalogue
-
-module ADIWG
-    module Mdtranslator
-        module Writers
-            module Iso
-
-                class DS_AssociationTypeCode
-                    def initialize(xml)
-                        @xml = xml
-                    end
-
-                    def writeXML(codeName)
-                        case (codeName)
-                            when 'crossReference' then
-                                codeID = '001'
-                            when 'largerWorkCitation' then
-                                codeID = '002'
-                            when 'partOfSeamlessDatabase' then
-                                codeID = '003'
-                            when 'source' then
-                                codeID = '004'
-                            when 'stereoMate' then
-                                codeID = '005'
-                            else
-                                codeID = 'non-ISO codeName'
-                        end
-
-                        # write xml
-                        @xml.tag!('gmd:DS_AssociationTypeCode', {:codeList => 'http://mdtranslator.adiwg.org/api/codelists?format=xml#DS_AssociationTypeCode',
-                                                                 :codeListValue => "#{codeName}",
-                                                                 :codeSpace => "#{codeID}"})
-                    end
-
-                end
-
-            end
-        end
-    end
-end