adiwg-mdtranslator 2.0.0rc9 → 2.0.0rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad510fae06cdf03810393ba683686f22f9fe569e
-  data.tar.gz: 24acaf6b181b68e723835ab70648b76481abfac3
+  metadata.gz: '0934464b5cb7ffa7244aa794417a3bb7ff01c082'
+  data.tar.gz: dd47220a7cb46d796d611ea7adc23e9ecb77b976
 SHA512:
-  metadata.gz: 9476a3bc114e8c5d5f98fa695f629b857b6a530ecceaa254b60cc9dfb33c1a9628de3c73ed47ea6d233746caa9575cb6c0e1df4c969bda4ab41b7068c7d97029
-  data.tar.gz: 9f5c4dac97608fc35749ee8e5f407c26deb48c00c7d5dcf885c14b1fb8dd7b81cafe895ec20fc52364a0c9c8640a0598e97b0c1ec44c0b3ff38d6f855cb57d63
+  metadata.gz: 4b6e2d96171f64e284fb9810bf8e030eafb2c41dc424b743b3aebc22f25cbefb7d5a6d87be8923cdbdf15a8162bdf2af78aaa887af93ce4a6ad3b1457e395802
+  data.tar.gz: de8f49629d78349c068eb6ad4744d3c008ba94600e7d8d953f21dbdd8bf63d865aaf6dcefded23de666a5da9e9d155e57fe2f23863221eea2019e381e8f470d1

data/adiwg-mdtranslator.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
    spec.add_runtime_dependency "thor", "~> 0.19"
    spec.add_runtime_dependency "uuidtools", "~> 2.1"
    spec.add_runtime_dependency "json-schema", "~> 2.7"
-   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.1.2"
+   spec.add_runtime_dependency "adiwg-mdjson_schemas", ">= 2.2"
    spec.add_runtime_dependency "adiwg-mdcodes", "~> 2.1"
    spec.add_runtime_dependency "jbuilder", "~> 2.5"
 

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

@@ -972,6 +972,7 @@ class InternalMetadata
    def newMetadataRepository
       {
          repository: nil,
+         citation: {},
          metadataStandard: nil
       }
    end

data/lib/adiwg/mdtranslator/readers/mdJson/modules/module_metadataRepository.rb

@@ -2,52 +2,65 @@
 # Reader - ADIwg JSON to internal data structure
 
 # History:
+#  Stan Smith 2017-06-06 add citation to repository
 # 	Stan Smith 2017-02-09 original script
 
+require_relative 'module_citation'
+
 module ADIWG
-    module Mdtranslator
-        module Readers
-            module MdJson
+   module Mdtranslator
+      module Readers
+         module MdJson
 
-                module MetadataRepository
+            module MetadataRepository
 
-                    def self.unpack(hMdDist, responseObj)
+               def self.unpack(hMdDist, responseObj)
 
-                        # return nil object if input is empty
-                        if hMdDist.empty?
-                            responseObj[:readerExecutionMessages] << 'Metadata Repository object is empty'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # return nil object if input is empty
+                  if hMdDist.empty?
+                     responseObj[:readerExecutionMessages] << 'Metadata Repository object is empty'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # instance classes needed in script
-                        intMetadataClass = InternalMetadata.new
-                        intMdDist = intMetadataClass.newMetadataRepository
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  intMdDist = intMetadataClass.newMetadataRepository
 
-                        # metadata distribution - repository (required)
-                        if hMdDist.has_key?('repository')
-                            intMdDist[:repository] = hMdDist['repository']
-                        end
-                        if intMdDist[:repository].nil? || intMdDist[:repository] == ''
-                            responseObj[:readerExecutionMessages] << 'Metadata Repository repository is missing'
-                            responseObj[:readerExecutionPass] = false
-                            return nil
-                        end
+                  # metadata distribution - repository (required)
+                  if hMdDist.has_key?('repository')
+                     intMdDist[:repository] = hMdDist['repository']
+                  end
+                  if intMdDist[:repository].nil? || intMdDist[:repository] == ''
+                     responseObj[:readerExecutionMessages] << 'Metadata Repository repository is missing'
+                     responseObj[:readerExecutionPass] = false
+                     return nil
+                  end
 
-                        # metadata distribution - metadata format
-                        if hMdDist.has_key?('metadataStandard')
-                            if hMdDist['metadataStandard'] != ''
-                                intMdDist[:metadataStandard] = hMdDist['metadataStandard']
-                            end
+                  # metadata distribution - citation
+                  if hMdDist.has_key?('citation')
+                     unless hMdDist['citation'].empty?
+                        hReturn = Citation.unpack(hMdDist['citation'], responseObj)
+                        unless hReturn.nil?
+                           intMdDist[:citation] = hReturn
                         end
+                     end
+                  end
 
-                        return intMdDist
+                  # metadata distribution - metadata format
+                  if hMdDist.has_key?('metadataStandard')
+                     if hMdDist['metadataStandard'] != ''
+                        intMdDist[:metadataStandard] = hMdDist['metadataStandard']
+                     end
+                  end
 
-                    end
+                  return intMdDist
 
-                end
+               end
 
             end
-        end
-    end
+
+         end
+      end
+   end
 end

data/lib/adiwg/mdtranslator/version.rb

@@ -16,7 +16,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.0.0rc9"
+      VERSION = "2.0.0rc10"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/html/sections/html_metadataRepository.rb

@@ -2,8 +2,11 @@
 # metadata repository
 
 # History:
+#  Stan Smith 2017-06-06 added metadata repository citation
 #  Stan Smith 2017-04-05 original script
 
+require_relative 'html_citation'
+
 module ADIWG
    module Mdtranslator
       module Writers
@@ -17,6 +20,9 @@ module ADIWG
 
                def writeHtml(hRepository)
 
+                  # classes used
+                  citationClass = Html_Citation.new(@html)
+
                   # metadata repository - repository
                   unless hRepository[:repository].nil?
                      @html.em('Repository Name: ')
@@ -31,6 +37,16 @@ module ADIWG
                      @html.br
                   end
 
+                  # metadata repository - citation
+                  unless hRepository[:citation].empty?
+                     @html.details do
+                        @html.summary('Citation', {'class' => 'h5'})
+                        @html.section(:class => 'block') do
+                           citationClass.writeHtml(hRepository[:citation])
+                        end
+                     end
+                  end
+
                end # writeHtml
             end # Html_Repository
 

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

@@ -17,16 +17,15 @@ module ADIWG
 
                   aCategories = []
 
+                  # always include a 'Data' browse category
+                  aCategories << 'Data'
+
                   aTypes.each do |hType|
                      type = hType[:type]
                      sbType = Codelists.codelist_iso_to_sb('iso_sb_scope', :isoCode => type)
                      aCategories << sbType unless sbType.nil?
                   end
 
-                  if aCategories.empty?
-                     return nil
-                  end
-
                   aCategories = aCategories.uniq
 
                end

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

@@ -0,0 +1,33 @@
+# sbJson 1.0 writer geographic extent
+
+# History:
+#  Stan Smith 2017-06-06 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module SbJson
+
+            module GeographicExtent
+
+               def self.build(aExtents)
+
+                  aGeoExtents = []
+
+                  # gather geographicExtents geoJson blocks
+                  aExtents.each do |hExtent|
+                     hExtent[:geographicExtents].each do |hGeoExtent|
+                        aGeoExtents << hGeoExtent[:nativeGeoJson]
+                     end
+                  end
+
+                  aGeoExtents
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -1,4 +1,4 @@
-# sbJson 1.0 writer
+# sbJson 1.0 writer hours
 
 # History:
 #  Stan Smith 2017-05-26 original script

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

@@ -0,0 +1,44 @@
+# sbJson 1.0 writer metadata repository
+
+# History:
+#  Stan Smith 2017-06-06 original script
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module SbJson
+
+            module Repository
+
+               def self.build(aRepositories)
+
+                  repository = {}
+
+                  aRepositories.each do |hRepo|
+                     if hRepo[:repository] == 'data.gov'
+                        repository[:repository] = hRepo[:repository]
+                        repository[:title] = 'Data.gov'
+                        unless hRepo[:citation].empty?
+                           unless hRepo[:citation][:identifiers].empty?
+                              repository[:identifier] = hRepo[:citation][:identifiers][0][:identifier]
+                           end
+                        end
+                        repository[:metadataStandard] = hRepo[:metadataStandard]
+                        break
+                     end
+                  end
+
+                  if repository.empty?
+                     return nil
+                  end
+
+                  repository
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

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

@@ -19,10 +19,12 @@ module ADIWG
                   hResource[:resourceTypes].each do |hResourceType|
                      if hResourceType[:type] == 'project'
                         hProject[:className] = 'gov.sciencebase.catalog.item.facet.ProjectFacet'
-                        unless hResource[:status].empty?
-                           status = hResource[:status][0]
+                        hResource[:status].each do |status|
                            sbStatus = Codelists.codelist_iso_to_sb('iso_sb_progress', :isoCode => status)
-                           hProject[:projectStatus] = sbStatus
+                           unless sbStatus.nil?
+                              hProject[:projectStatus] = sbStatus
+                              break
+                           end
                         end
                         unless hResource[:shortAbstract].nil?
                            hProject[:parts] = [

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

@@ -19,6 +19,8 @@ require_relative 'sbJson_tag'
 require_relative 'sbJson_date'
 require_relative 'sbJson_spatial'
 require_relative 'sbJson_facet'
+require_relative 'sbJson_metadataRepository'
+require_relative 'sbJson_geographicExtent'
 
 module ADIWG
    module Mdtranslator
@@ -56,6 +58,8 @@ module ADIWG
                   json.dates Date.build(hCitation) unless hCitation.empty?
                   json.spatial Spatial.build(resourceInfo[:extents]) unless resourceInfo[:extents].empty?
                   json.facets Facet.build(intObj[:metadata])
+                  json.metadataRepository Repository.build(intObj[:metadataRepositories]) unless intObj[:metadataRepositories].empty?
+                  json.geographicExtents GeographicExtent.build(resourceInfo[:extents]) unless resourceInfo[:extents].empty?
 
                end
 

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

@@ -50,20 +50,12 @@ module ADIWG
                      end
                   end
 
-                  # tags for projects
-                  hResource[:resourceTypes].each do |hType|
-                     type = hType[:type]
-                     if type == 'project'
-                        hResource[:status].each do |status|
-                           sbStatus = Codelists.codelist_iso_to_sb('iso_sb_progress', :isoCode => status)
-                           unless sbStatus.nil?
-                              hTag = {}
-                              hTag[:type] = 'Project Status'
-                              hTag[:name] = sbStatus
-                              aTags << hTag
-                           end
-                        end
-                     end
+                  # tags for status
+                  hResource[:status].each do |status|
+                     hTag = {}
+                     hTag[:type] = 'Status'
+                     hTag[:name] = status
+                     aTags << hTag
                   end
 
                   if aTags.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc9
+  version: 2.0.0rc10
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: adiwg-mdcodes
   requirement: !ruby/object:Gem::Requirement
@@ -587,10 +587,12 @@ files:
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_contact.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_date.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_facet.rb
+- lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_geographicExtent.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_hours.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_id.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_identifier.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_materialRequest.rb
+- lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_metadataRepository.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_parentId.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_project.rb
 - lib/adiwg/mdtranslator/writers/sbJson/sections/sbJson_provenance.rb