adiwg-mdtranslator 2.1.0 → 2.1.1

data/lib/adiwg/mdtranslator/readers/fgdc/modules/module_timePeriod.rb

@@ -0,0 +1,88 @@
+# Reader - fgdc to internal data structure
+# unpack fgdc time period
+
+# History:
+#  Stan Smith 2017-08-17 original script
+
+require 'nokogiri'
+require 'adiwg/mdtranslator/internal/internal_metadata_obj'
+require_relative 'module_dateTime'
+
+module ADIWG
+   module Mdtranslator
+      module Readers
+         module Fgdc
+
+            module TimePeriod
+
+               def self.unpack(xTimePeriod, hResponseObj)
+
+                  # instance classes needed in script
+                  intMetadataClass = InternalMetadata.new
+                  hTimePeriod = intMetadataClass.newTimePeriod
+
+                  # time period 9 (timeinfo) - time period information
+                  xTimeInfo = xTimePeriod.xpath('./timeinfo')
+                  current = xTimePeriod.xpath('./current').text
+
+                  unless xTimeInfo.empty?
+
+                     # time period 9.1 (sngdate) - single date
+                     xSingle = xTimeInfo.xpath('./sngdate')
+                     unless xSingle.empty?
+
+                        # single date 9.1.1/9.1.2 (caldate/time) - single date/time {date} (required) {time}
+                        date = xSingle.xpath('./caldate').text
+                        time = xSingle.xpath('./time').text
+                        hDateTime = DateTime.unpack(date, time, hResponseObj)
+                        unless hDateTime.nil?
+                           hTimePeriod[:endDateTime] = hDateTime
+                        end
+                        hTimePeriod[:description] = current
+
+                        return hTimePeriod
+
+                     end
+
+                     # time period 9.2 (mdattim) - multiple date times
+                     # placed in temporal extent
+
+                     # time period 9.3 (rngdates) - range of dates
+                     xRange = xTimeInfo.xpath('./rngdates')
+                     unless xRange.empty?
+
+                        # range of dates 9.3.1 (begdate) - begin date {date} (required)
+                        # range of dates 9.3.2 (begtime) - begin time {time}
+                        beginDate = xRange.xpath('./begdate').text
+                        beginTime = xRange.xpath('./begtime').text
+                        hDateTime = DateTime.unpack(beginDate, beginTime, hResponseObj)
+                        unless hDateTime.nil?
+                           hTimePeriod[:startDateTime] = hDateTime
+                        end
+
+                        # range of dates 9.3.3 (enddate) - end date {date} (required)
+                        # range of dates 9.3.4 (endtime) - end time {time}
+                        endDate = xRange.xpath('./enddate').text
+                        endTime = xRange.xpath('./endtime').text
+                        hDateTime = DateTime.unpack(endDate, endTime, hResponseObj)
+                        unless hDateTime.nil?
+                           hTimePeriod[:endDateTime] = hDateTime
+                        end
+                        hTimePeriod[:description] = current
+
+                        return hTimePeriod
+
+                     end
+
+                  end
+
+                  return nil
+
+               end
+
+            end
+
+         end
+      end
+   end
+end

data/lib/adiwg/mdtranslator/readers/fgdc/readme.md

@@ -0,0 +1,18 @@
+
+## sbJson
+
+### Supported versions
+
+> 1.x (FGDC-STD-001-1998)
+
+### Reader for Federal Geographic Data Committee's Content Standard for Digital Geospatial Metadata (fgdc)
+
+Content Standard for Digital Geospatial Metadata (CSDGM), Vers. 2 
+(FGDC-STD-001-1998) is the current version of this FGDC authored and 
+endorsed standard. Executive Order 12906, directed that Federal agencies 
+document geospatial resources using this standard. Since the publication 
+of EO 12906, the FGDC has endorsed several ISO Geospatial Metadata 
+Standards that are now encouraged for use.
+
+The FGDC CSDGM format standard is fully documented on the 
+[Content Standard for Digital Geospatial Metadata page](https://www.fgdc.gov/metadata/csdgm-standard).

data/lib/adiwg/mdtranslator/readers/mdJson/readme.md

@@ -3,7 +3,7 @@
 
 ### Supported versions
 
-> 2.0.x
+> 2.x
 
 ### Reader for ADIwg JSON metadata format (mdJson)
 

data/lib/adiwg/mdtranslator/readers/mdJson/version.rb

@@ -1,6 +1,7 @@
 # adiwg mdTranslator / readers / mdJson
 
 # version 2 history
+# 2.2.0 2017-08-10 added sbJson reader and writer
 # 2.1.2 2017-05-19 deprecated iso topicCategory
 # 2.0.0 2016-10-01 start of version 2
 
@@ -8,7 +9,7 @@ module ADIWG
    module Mdtranslator
       module Readers
          module MdJson
-            VERSION = "2.1.2"
+            VERSION = "2.2.0"
          end
       end
    end

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_browseCategory.rb

@@ -14,13 +14,13 @@ module ADIWG
 
             module BrowseCategory
 
-               def self.unpack(hSbJson, hResourceInfo, hResponseObj)
+               def self.unpack(hJson, aResourceTypes, hResponseObj)
 
                   # instance classes needed in script
                   intMetadataClass = InternalMetadata.new
 
-                  if hSbJson.has_key?('browseCategories')
-                     hSbJson['browseCategories'].each do |category|
+                  if hJson.has_key?('browseCategories')
+                     hJson['browseCategories'].each do |category|
                         hResType = intMetadataClass.newResourceType
                         scope = Codelists.codelist_sb2adiwg('scope_sb2adiwg', category)
                         if scope.nil?
@@ -29,11 +29,11 @@ module ADIWG
                         else
                            hResType[:type] = scope
                         end
-                        hResourceInfo[:resourceTypes] << hResType
+                        aResourceTypes << hResType
                      end
                   end
 
-                  return hResourceInfo
+                  return aResourceTypes
 
                end
 

data/lib/adiwg/mdtranslator/readers/sbJson/modules/module_relatedItem.rb

@@ -8,6 +8,7 @@ require 'json'
 require 'open-uri'
 require 'adiwg/mdtranslator/internal/internal_metadata_obj'
 require_relative 'module_codelists'
+require_relative 'module_browseCategory'
 
 module ADIWG
    module Mdtranslator
@@ -93,6 +94,7 @@ module ADIWG
                               hResponseObj[:readerExecutionMessages] << 'Either the item does not exist or the item is secured and requires authentication to access.'
                               break
                            else
+
                               # parse related item
                               begin
                                  hRelatedItem = JSON.parse(web_contents)
@@ -105,16 +107,8 @@ module ADIWG
                               # create mew associated resource
                               hResource = intMetadataClass.newAssociatedResource
 
-                              if hRelatedItem.has_key?('browseCategories')
-                                 aBrowse = hRelatedItem['browseCategories']
-                                 aBrowse.each do |category|
-                                    resourceType = Codelists.codelist_sb2adiwg('scope_sb2adiwg', category)
-                                    resourceType = resourceType.nil? ? category : resourceType
-                                    hResource[:resourceTypes] << resourceType
-                                 end
-                              else
-                                 hResponseObj[:readerExecutionMessages] << "Related item #{resourceId} did not have browseCategories"
-                              end
+                              # add resource types
+                              BrowseCategory.unpack(hRelatedItem, hResource[:resourceTypes], hResponseObj)
 
                               # fill in associated resource citation
                               hCitation = intMetadataClass.newCitation

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

@@ -104,7 +104,7 @@ module ADIWG
                   hResourceInfo[:graphicOverviews].concat(aReturn) unless aReturn.nil?
 
                   # browse categories
-                  BrowseCategory.unpack(hSbJson, hResourceInfo, hResponseObj)
+                  BrowseCategory.unpack(hSbJson, hResourceInfo[:resourceTypes], hResponseObj)
 
                   # tags
                   Tag.unpack(hSbJson, hResourceInfo, hResponseObj)

data/lib/adiwg/mdtranslator/readers/sbJson/readme.md

@@ -15,4 +15,4 @@ integrate across multiple metadata standards, conventions, and
 practices in describing a wide array of scientific data and 
 information assets important to science teams using ScienceBase.
 
-The sbJSON format is fully documented on the [ScienceBase Confluence page](https://my.usgs.gov/confluence/display/sciencebase/ScienceBase+Information+Model).
+The sbJSON format is partially documented on the [ScienceBase Confluence page](https://my.usgs.gov/confluence/display/sciencebase/ScienceBase+Information+Model).

data/lib/adiwg/mdtranslator/readers/sbJson/sbJson_reader.rb

@@ -25,14 +25,14 @@ module ADIWG
                   return {}
                end
 
-               # file must contain an mdJson object
+               # file must contain an sbJson object
                if hSbJson.empty?
                   hResponseObj[:readerStructureMessages] << 'sbJson object is empty'
                   hResponseObj[:readerStructurePass] = false
                   return {}
                end
 
-               # faking the version since sbJSON has no version support
+               # faking the version since sbJson has no version support
                hSbJson['schema'] = {
                   'name' => 'sbJson',
                   'version' => '0.0.0'

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

@@ -7,7 +7,7 @@ module ADIWG
    module Mdtranslator
       module Readers
          module SbJson
-            VERSION = '0.0.0'
+            VERSION = '0.1.0'
          end
       end
    end

data/lib/adiwg/mdtranslator/version.rb

@@ -22,7 +22,7 @@
 module ADIWG
    module Mdtranslator
       # current mdtranslator version
-      VERSION = "2.1.0"
+      VERSION = "2.1.1"
    end
 end
 

data/lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_resourceType.rb

@@ -15,6 +15,7 @@ module ADIWG
 
                def self.build(hResType)
 
+
                   Jbuilder.new do |json|
                      json.type hResType[:type]
                      json.name hResType[:name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,6 +193,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 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
@@ -221,7 +235,27 @@ files:
 - lib/adiwg/mdtranslator/internal/internal_metadata_obj.rb
 - lib/adiwg/mdtranslator/internal/module_coordinates.rb
 - lib/adiwg/mdtranslator/internal/module_dateTimeFun.rb
-- lib/adiwg/mdtranslator/readers/fgcd/version.rb
+- lib/adiwg/mdtranslator/readers/fgdc/fgdc_reader.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_citation.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_date.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_dateTime.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_distribution.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_entityAttribute.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_fgdc.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_identification.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_metadataInfo.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_onlineResource.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_publication.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_quality.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_responsibility.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_series.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialDomain.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialOrganization.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_spatialReference.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_timeInstant.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_timePeriod.rb
+- lib/adiwg/mdtranslator/readers/fgdc/readme.md
+- lib/adiwg/mdtranslator/readers/fgdc/version.rb
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_reader.rb
 - lib/adiwg/mdtranslator/readers/mdJson/mdJson_validator.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_additionalDocumentation.rb