adiwg-mdtranslator 2.4.0 → 2.5.0

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

@@ -0,0 +1,28 @@
+# mdJson 2.0 writer - value range
+
+# History:
+#  Stan Smith 2017-11-01 original script
+
+require 'jbuilder'
+
+module ADIWG
+   module Mdtranslator
+      module Writers
+         module MdJson
+
+            module ValueRange
+
+               def self.build(hRange)
+
+                  Jbuilder.new do |json|
+                     json.minRangeValue hRange[:minRangeValue]
+                     json.maxRangeValue hRange[:maxRangeValue]
+                  end
+
+               end # build
+            end # ValueRange
+
+         end
+      end
+   end
+end

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

@@ -59,32 +59,52 @@ module ADIWG
                         budget[:totalFunds] = total
                      end
 
-                     # year
-                     # give priority to ending dateTime
-                     # write year only
-                     # use fiscal year beginning October 1
+                     # federal fiscal year
+                     # compute federal fiscal year for timePeriod of funding
+                     # use federal fiscal year beginning October 1
+                     # if timePeriod occupies more than one fiscal year, use only ending period
+
+                     # if ending date month 1-9 year = year
+                     # if ending date month 10-12 year = +1
+                     # if no ending date use starting year with same rules
+
+                     # dates will be encoded as zulu when saved
+                     # ... add one day to starting date for eastern hemisphere dateTime
+                     # ... subtract one day from ending date for western hemisphere dateTime
+                     startMonth = nil
+                     startYear = nil
+                     endMonth = nil
+                     endYear = nil
                      unless hFunding[:timePeriod].empty?
                         unless hFunding[:timePeriod][:startDateTime].empty?
                            startDateTime = hFunding[:timePeriod][:startDateTime][:dateTime]
+                           date = startDateTime.to_date + 1
+                           startMonth = date.month
+                           startYear = date.year
                         end
                         unless hFunding[:timePeriod][:endDateTime].empty?
                            endDateTime = hFunding[:timePeriod][:endDateTime][:dateTime]
+                           date = endDateTime.to_date - 1
+                           endMonth = date.month
+                           endYear = date.year
                         end
-                        dateTime = endDateTime.nil? ? startDateTime : endDateTime
-                        unless dateTime.nil?
-                           year = AdiwgDateTimeFun.stringDateFromDateTime(dateTime, 'Y')
-                           if dateTime.month > 9
-                              year.succ!
-                           end
-                           budget[:year] = year
+                        if endYear.nil?
+                           month = startMonth
+                           year = startYear
+                        else
+                           month = endMonth
+                           year = endYear
+                        end
+                        if month > 9
+                           year += 1
                         end
+                        budget[:year] = year.to_s
                      end
 
                      hBudget[:annualBudgets] << budget
-
                   end
 
-                  hBudget
+                  return hBudget
 
                end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adiwg-mdtranslator
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Stan Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,6 +262,7 @@ files:
 - lib/adiwg/mdtranslator/readers/fgdc/modules/mapProjections/projection_vanDerGrinten.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_attribute.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_citation.rb
+- lib/adiwg/mdtranslator/readers/fgdc/modules/module_codeSet.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_contact.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_date.rb
 - lib/adiwg/mdtranslator/readers/fgdc/modules/module_dateTime.rb
@@ -399,13 +400,13 @@ files:
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_timeInterval.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_timePeriod.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_transferOption.rb
+- lib/adiwg/mdtranslator/readers/mdJson/modules/module_valueRange.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_vectorObject.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_vectorRepresentation.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_verticalDatum.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_verticalExtent.rb
 - lib/adiwg/mdtranslator/readers/mdJson/modules/module_voucher.rb
 - 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/module_body.rb
 - lib/adiwg/mdtranslator/readers/sbJson/modules/module_browseCategory.rb
@@ -463,6 +464,7 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_domain.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_domainItem.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_duration.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_ellipsoidParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entity.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityAttribute.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_entityForeignKey.rb
@@ -495,9 +497,12 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_medium.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_metadataInfo.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_metadataRepository.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_obliqueLinePoint.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_onlineResource.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_processStep.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_projectionParameters.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_referenceSystemParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_releasability.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceFormat.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_resourceInfo.rb
@@ -520,25 +525,33 @@ files:
 - lib/adiwg/mdtranslator/writers/html/sections/html_usage.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_vectorObject.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_vectorRepresentation.rb
+- lib/adiwg/mdtranslator/writers/html/sections/html_verticalDatumParameters.rb
 - lib/adiwg/mdtranslator/writers/html/sections/html_verticalExtent.rb
 - lib/adiwg/mdtranslator/writers/html/version.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_address.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_baseUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_citation.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_codelist.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_contact.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_conventionalUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_date.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_definitionReference.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_definitionUnit.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_derivedUnit.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_domain.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_fcFeatureCatalogue.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_featureAttribute.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_featureConstraint.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_featureType.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_gcoDateTime.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_listedValue.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_locale.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_mdIdentifier.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_multiplicity.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_onlineResource.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_phone.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_responsibleParty.rb
+- lib/adiwg/mdtranslator/writers/iso19110/classes/class_series.rb
 - lib/adiwg/mdtranslator/writers/iso19110/classes/class_unitsOfMeasure.rb
 - lib/adiwg/mdtranslator/writers/iso19110/iso19110_writer.rb
 - lib/adiwg/mdtranslator/writers/iso19110/readme.md
@@ -553,6 +566,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_contact.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_conventionalUnit.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_coverageDescription.rb
+- lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_crs.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dataIdentification.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dataQuality.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_date.rb
@@ -561,6 +575,7 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_dimension.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_distribution.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_distributor.rb
+- lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_ellipsoidParameters.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_enumerationList.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_extension.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_extent.rb
@@ -596,12 +611,14 @@ files:
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiLine.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiPoint.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_multiPolygon.rb
+- lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_obliqueLinePoint.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_onlineResource.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_orderProcess.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_phone.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_point.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_polygon.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_processStep.rb
+- lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_projectionParameters.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_rangeDimension.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_referenceSystem.rb
 - lib/adiwg/mdtranslator/writers/iso19115_2/classes/class_resolution.rb
@@ -712,6 +729,7 @@ files:
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_timePeriod.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_transferOption.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_usage.rb
+- lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_valueRange.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_vectorObject.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_vectorRepresentation.rb
 - lib/adiwg/mdtranslator/writers/mdJson/sections/mdJson_verticalDatumParameters.rb
@@ -765,7 +783,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+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/mdJson/version.rb

@@ -1,16 +0,0 @@
-# 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
-
-module ADIWG
-   module Mdtranslator
-      module Readers
-         module MdJson
-            VERSION = "2.2.0"
-         end
-      end
-   end
-end